From b8dafe86f4d9bf9f81cb623f697381f62ff8a267 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 3 Feb 2021 18:50:11 +0000
Subject: [PATCH 01/19] Move and more aptly name check_examples.py scripts

---
 .circleci/config.yml                                      | 8 +++-----
 .../check-event-schema-examples.py                        | 0
 api/check_examples.py => scripts/check-swagger-sources.py | 0
 scripts/test-and-build.sh                                 | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)
 rename event-schemas/check_examples.py => scripts/check-event-schema-examples.py (100%)
 rename api/check_examples.py => scripts/check-swagger-sources.py (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf4404ce..274dc007 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,9 +5,10 @@ gendoc: &gendoc
     scripts/gendoc.py
 
 genswagger: &genswagger
-  name: Generate the swagger
+  name: Validate sources and generate swagger json
   command: |
     source /env/bin/activate
+    scripts/check-swagger-sources.py
     scripts/dump-swagger.py
 
 buildswaggerui: &buildswaggerui
@@ -27,10 +28,7 @@ checkexamples: &checkexamples
   name: Check Event Examples
   command: |
     source /env/bin/activate
-    cd event-schemas
-    ./check_examples.py
-    cd ../api
-    ./check_examples.py
+    scripts/check-event-schema-examples.py
 
 genmatrixassets: &genmatrixassets
   name: Generate/Verify matrix.org assets
diff --git a/event-schemas/check_examples.py b/scripts/check-event-schema-examples.py
similarity index 100%
rename from event-schemas/check_examples.py
rename to scripts/check-event-schema-examples.py
diff --git a/api/check_examples.py b/scripts/check-swagger-sources.py
similarity index 100%
rename from api/check_examples.py
rename to scripts/check-swagger-sources.py
diff --git a/scripts/test-and-build.sh b/scripts/test-and-build.sh
index f45e2da6..f4c3a90f 100755
--- a/scripts/test-and-build.sh
+++ b/scripts/test-and-build.sh
@@ -14,9 +14,9 @@ pip --version
 pip install -r scripts/requirements.txt
 
 # do sanity checks on the examples and swagger
-(cd event-schemas/ && ./check_examples.py)
-(cd api && ./check_examples.py)
-(cd api && npm install && node validator.js -s "client-server")
+scripts/check-event-schema-examples.py
+scripts/check-swagger-sources.py
+(cd event-schemas/api && npm install && node validator.js -s "client-server")
 
 : ${GOPATH:=${WORKSPACE}/.gopath}
 mkdir -p "${GOPATH}"

From 64231f079da4f04247e699dc18d47c644f2f7cbd Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 4 Feb 2021 20:19:58 +0000
Subject: [PATCH 02/19] Update checker scripts to work correctly from the
 scripts/ dir

check-swagger-sources also had a bug which caused it to fail while validating the directory
structure of /data/api. This was fixed by @KitsuneRal - thank you!
---
 scripts/check-event-schema-examples.py |  9 +++-
 scripts/check-swagger-sources.py       | 62 +++++++++++++++++++-------
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/scripts/check-event-schema-examples.py b/scripts/check-event-schema-examples.py
index 31daa478..50f9de7b 100755
--- a/scripts/check-event-schema-examples.py
+++ b/scripts/check-event-schema-examples.py
@@ -128,7 +128,14 @@ def check_example_dir(exampledir, schemadir):
 
 
 if __name__ == '__main__':
+    # Get the directory that this script is residing in
+    script_directory = os.path.dirname(os.path.realpath(__file__))
+
+    # Resolve the directories to check, relative to the script path
+    examples_directory = os.path.join(script_directory, "../event-schemas/examples")
+    schema_directory = os.path.join(script_directory, "../event-schemas/schema")
+
     try:
-        check_example_dir("examples", "schema")
+        check_example_dir(examples_directory, schema_directory)
     except:
         sys.exit(1)
diff --git a/scripts/check-swagger-sources.py b/scripts/check-swagger-sources.py
index 94f3495e..df99b7c0 100755
--- a/scripts/check-swagger-sources.py
+++ b/scripts/check-swagger-sources.py
@@ -108,13 +108,36 @@ def check_swagger_file(filepath):
 
 
 def resolve_references(path, schema):
+    """Recurse through a given schema until we find a $ref key. Upon doing so,
+    check that the referenced file exists, then load it up and check all of the
+    references in that file. Continue on until we've hit all dead ends.
+
+    $ref values are deleted from schemas as they are validated, to prevent
+    duplicate work.
+    """
     if isinstance(schema, dict):
         # do $ref first
         if '$ref' in schema:
-            value = schema['$ref']
-            path = os.path.abspath(os.path.join(os.path.dirname(path), value))
-            ref = load_file("file://" + path)
-            result = resolve_references(path, ref)
+            # Pull the referenced filepath from the schema
+            referenced_file = schema['$ref']
+
+            # Referenced filepaths are relative, so take the current path's
+            # directory and append the relative, referenced path to it.
+            inner_path = os.path.join(os.path.dirname(path), referenced_file)
+
+            # Then convert the path (which may contiain '../') into a
+            # normalised, absolute path
+            inner_path = os.path.abspath(inner_path)
+
+            # Load the referenced file
+            ref = load_file("file://" + inner_path)
+
+            # Check that the references in *this* file are valid
+            result = resolve_references(inner_path, ref)
+
+            # They were valid, and so were the sub-references. Delete
+            # the reference here to ensure we don't pass over it again
+            # when checking other files
             del schema['$ref']
         else:
             result = {}
@@ -143,15 +166,22 @@ def load_file(path):
 
 
 if __name__ == '__main__':
-    paths = sys.argv[1:]
-    if not paths:
-        paths = []
-        for (root, dirs, files) in os.walk(os.curdir):
-            for filename in files:
-                if filename.endswith(".yaml"):
-                    paths.append(os.path.join(root, filename))
-    for path in paths:
-        try:
-            check_swagger_file(path)
-        except Exception as e:
-            raise ValueError("Error checking file %r" % (path,), e)
+    # Get the directory that this script is residing in
+    script_directory = os.path.dirname(os.path.realpath(__file__))
+
+    # Resolve the directory containing the swagger sources,
+    # relative to the script path
+    source_files_directory = os.path.realpath(os.path.join(script_directory, "../data"))
+
+    # Walk the source path directory, looking for YAML files to check
+    for (root, dirs, files) in os.walk(source_files_directory):
+        for filename in files:
+            if not filename.endswith(".yaml"):
+                continue
+
+            path = os.path.join(root, filename)
+
+            try:
+                check_swagger_file(path)
+            except Exception as e:
+                raise ValueError("Error checking file %s" % (path,), e)

From 3c66e149f3628b211a4d07cc58874aabfb99a324 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 5 Feb 2021 12:40:45 +0000
Subject: [PATCH 03/19] Move validator.js to scripts/ directory, update calls

---
 .circleci/config.yml      |  4 +-
 scripts/package.json      | 15 +++++++
 scripts/test-and-build.sh |  6 ++-
 scripts/validator.js      | 86 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 scripts/package.json
 create mode 100644 scripts/validator.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 274dc007..e3ac14d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,9 +39,9 @@ genmatrixassets: &genmatrixassets
 validateapi: &validateapi
   name: Validate OpenAPI specifications
   command: |
-    cd api
+    cd scripts
     npm install
-    node validator.js -s "client-server"
+    node validator.js -s "../data/api/client-server"
 
 buildspeculator: &buildspeculator
   name: Build Speculator
diff --git a/scripts/package.json b/scripts/package.json
new file mode 100644
index 00000000..84b9dd7b
--- /dev/null
+++ b/scripts/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "swagger-cli-validator",
+  "version": "0.0.1",
+  "description": "",
+  "main": "validator.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "nopt": "^3.0.2",
+    "swagger-parser": "^3.2.1"
+  }
+}
diff --git a/scripts/test-and-build.sh b/scripts/test-and-build.sh
index f4c3a90f..76f49e2e 100755
--- a/scripts/test-and-build.sh
+++ b/scripts/test-and-build.sh
@@ -11,12 +11,16 @@ virtualenv -p python3 env
 python --version
 pip --version
 
+# Install python dependencies
 pip install -r scripts/requirements.txt
 
+# Install node dependencies
+npm install --prefix=scripts
+
 # do sanity checks on the examples and swagger
 scripts/check-event-schema-examples.py
 scripts/check-swagger-sources.py
-(cd event-schemas/api && npm install && node validator.js -s "client-server")
+node scripts/validator.js --schema "data/api/client-server"
 
 : ${GOPATH:=${WORKSPACE}/.gopath}
 mkdir -p "${GOPATH}"
diff --git a/scripts/validator.js b/scripts/validator.js
new file mode 100644
index 00000000..c20dd993
--- /dev/null
+++ b/scripts/validator.js
@@ -0,0 +1,86 @@
+"use strict";
+var fs = require("fs");
+var nopt = require("nopt");
+var parser = require("swagger-parser");
+var path = require("path");
+
+var opts = nopt({
+    "help": Boolean,
+    "schema": path
+}, {
+    "h": "--help",
+    "s": "--schema"
+});
+
+if (opts.help) {
+    console.log(
+        "Use swagger-parser to validate against Swagger 2.0\n"+
+        "Usage:\n"+
+        "  node validator.js -s <schema_file_or_folder>"
+    );
+    process.exit(0);
+}
+if (!opts.schema) {
+    console.error("No [s]chema specified.");
+    process.exit(1);
+}
+
+
+var errFn = function(err, api) {
+    if (!err) {
+        return;
+    }
+    console.error(err);
+    process.exit(1);
+};
+
+/**
+ * @brief Produce a handler for parser.validate().
+ * Recommended usage: `parser.validate(filename, makeHandler(filename));`
+ * or `parser.validate(schema, makeHandler());`.
+ * @param scope - usually a filename, this will be used to denote
+ *                an (in)valid schema in console output; "Schema" if undefined
+ * @returns {function} the handler that can be passed to parser.validate
+ */
+function makeHandler(scope) {
+    if (!scope)
+        scope = "Schema";
+    return function(err, api, metadata) {
+        if (err) {
+            console.error("%s is not valid.", scope || "Schema");
+            errFn(err, api, metadata); // Won't return
+        }
+
+        Object.keys(api.paths).forEach(function (endpoint) {
+            var operationsMap = api.paths[endpoint];
+            Object.keys(operationsMap).forEach(function (verb) {
+                if (!operationsMap[verb]["operationId"]) {
+                    console.error("%s is not valid", scope);
+                    errFn("operationId is missing in " + endpoint + ", verb " + verb, api);
+                }
+            })
+        });
+
+        console.log("%s is valid.", scope);
+    }
+}
+
+var isDir = fs.lstatSync(opts.schema).isDirectory();
+if (isDir) {
+    console.log("Checking directory %s for .yaml files...", opts.schema);
+    fs.readdir(opts.schema, function(err, files) {
+        if (err) {
+            errFn(err); // Won't return
+        }
+        files.forEach(function(f) {
+            var suffix = ".yaml";
+            if (f.indexOf(suffix, f.length - suffix.length) > 0) {
+                parser.validate(path.join(opts.schema, f), makeHandler(f));
+            }
+        });
+    });
+}
+else{
+    parser.validate(opts.schema, makeHandler(opts.schema));
+}
+

From 00c6a866e29c8694b9b8f1beaf9bc0bf8c513249 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Mon, 25 Jan 2021 21:16:42 -0800
Subject: [PATCH 04/19] Move raw API and event schemas into /data directory

Historical note: this was originally a series of several commits, spread out
over several weeks. They have been squashed together to make `git annotate`
work properly.

The original commits were:
 * 91ab3934 <Will> 2021-01-25 21:16:42 -0800 Add raw API end event schemas into /data directory
 * aae22f47 <Will> 2021-01-25 21:33:06 -0800 Remove non-data files
 * 1092d4ca <Will> 2021-01-26 20:41:33 -0800 Add data-compatiuble extension (.yaml) to all data files that currently omit one
 * 21060109 <Will> 2021-01-26 20:57:28 -0800 Remove symlink to event-schemas, and update openAPI schema paths accordingly
 * 4f633845 <Travis Ralston> 2021-04-12 21:54:54 -0600 Fix event schema examples too
 * 301c7b2f <Will> 2021-02-05 10:15:42 -0800 Restore docs describing OpenAPI extensions that we use
---
 api/README                                    |    2 -
 api/client-server/definitions/event-schemas   |    1 -
 api/files/backbone-min.js                     |   38 -
 api/files/css                                 |   16 -
 api/files/handlebars-1.0.0.js                 | 2278 --------------
 api/files/highlight.7.3.pack.js               |    1 -
 api/files/jquery-1.8.0.min.js                 |    2 -
 api/files/jquery.ba-bbq.min.js                |   18 -
 api/files/jquery.slideto.min.js               |    1 -
 api/files/jquery.wiggle.min.js                |    8 -
 api/files/reset.css                           |  125 -
 api/files/screen.css                          | 1221 --------
 api/files/shred.bundle.js                     | 2765 -----------------
 api/files/swagger-oauth.js                    |  211 --
 api/files/swagger-ui.js                       | 2315 --------------
 api/files/swagger.js                          | 1604 ----------
 api/files/underscore-min.js                   |   32 -
 api/package.json                              |   15 -
 api/validator.js                              |   86 -
 .../definitions/location.yaml                 |    0
 .../definitions/location_batch.yaml           |    0
 .../definitions/protocol.yaml                 |    0
 .../definitions/protocol_metadata.yaml        |    0
 .../definitions/security.yaml                 |    0
 .../application-service/definitions/user.yaml |    0
 .../definitions/user_batch.yaml               |    0
 .../api}/application-service/protocols.yaml   |    0
 .../api}/application-service/query_room.yaml  |    0
 .../api}/application-service/query_user.yaml  |    0
 .../application-service/transactions.yaml     |    4 +-
 .../api}/client-server/account-data.yaml      |    0
 {api => data/api}/client-server/admin.yaml    |    0
 .../client-server/administrative_contact.yaml |    0
 .../appservice_room_directory.yaml            |    0
 {api => data/api}/client-server/banning.yaml  |    0
 .../api}/client-server/capabilities.yaml      |    0
 .../api}/client-server/content-repo.yaml      |    0
 .../api}/client-server/create_room.yaml       |    0
 .../api}/client-server/cross_signing.yaml     |    0
 .../client-server/definitions/auth_data.yaml  |    0
 .../definitions/auth_response.yaml            |    0
 .../definitions/client_device.yaml            |    0
 .../definitions/cross_signing_key.yaml        |    0
 .../definitions/device_keys.yaml              |    0
 .../definitions/errors/error.yaml             |    0
 .../definitions/errors/rate_limited.yaml      |    0
 .../api}/client-server/definitions/event.yaml |    0
 .../definitions/event_batch.yaml              |    2 +-
 .../definitions/event_filter.yaml             |    0
 .../definitions/key_backup_data.yaml          |    0
 .../definitions/openid_token.yaml             |    0
 .../definitions/public_rooms_response.yaml    |    0
 .../definitions/push_condition.yaml           |    0
 .../client-server/definitions/push_rule.yaml  |    0
 .../definitions/push_ruleset.yaml             |    0
 .../definitions/request_email_validation.yaml |    0
 .../request_msisdn_validation.yaml            |    0
 .../definitions/request_token_response.yaml   |    0
 .../definitions/room_event_batch.yaml         |    2 +-
 .../definitions/room_event_filter.yaml        |    0
 .../definitions/room_key_backup.yaml          |    0
 .../client-server/definitions/security.yaml   |    0
 .../definitions/state_event_batch.yaml        |    2 +-
 .../definitions/sync_filter.yaml              |    0
 .../definitions/third_party_signed.yaml       |    0
 .../definitions/timeline_batch.yaml           |    0
 .../definitions/user_identifier.yaml          |    0
 .../definitions/wellknown/full.yaml           |    0
 .../definitions/wellknown/homeserver.yaml     |    0
 .../wellknown/identity_server.yaml            |    0
 .../api}/client-server/device_management.yaml |    0
 .../api}/client-server/directory.yaml         |    0
 .../api}/client-server/event_context.yaml     |   22 +-
 {api => data/api}/client-server/filter.yaml   |    0
 {api => data/api}/client-server/inviting.yaml |    0
 {api => data/api}/client-server/joining.yaml  |    0
 .../api}/client-server/key_backup.yaml        |    0
 {api => data/api}/client-server/keys.yaml     |    0
 {api => data/api}/client-server/kicking.yaml  |    0
 {api => data/api}/client-server/leaving.yaml  |    0
 .../api}/client-server/list_joined_rooms.yaml |    0
 .../api}/client-server/list_public_rooms.yaml |    0
 {api => data/api}/client-server/login.yaml    |    0
 {api => data/api}/client-server/logout.yaml   |    0
 .../client-server/message_pagination.yaml     |   10 +-
 .../api}/client-server/notifications.yaml     |    2 +-
 {api => data/api}/client-server/old_sync.yaml |   34 +-
 {api => data/api}/client-server/openid.yaml   |    0
 .../api}/client-server/peeking_events.yaml    |    4 +-
 {api => data/api}/client-server/presence.yaml |    0
 {api => data/api}/client-server/profile.yaml  |    0
 {api => data/api}/client-server/pusher.yaml   |    0
 .../api}/client-server/pushrules.yaml         |    0
 .../api}/client-server/read_markers.yaml      |    0
 {api => data/api}/client-server/receipts.yaml |    0
 .../api}/client-server/redaction.yaml         |    0
 .../api}/client-server/registration.yaml      |    0
 .../api}/client-server/report_content.yaml    |    0
 .../api}/client-server/room_initial_sync.yaml |   18 +-
 .../api}/client-server/room_send.yaml         |    0
 .../api}/client-server/room_state.yaml        |    0
 .../api}/client-server/room_upgrades.yaml     |    0
 {api => data/api}/client-server/rooms.yaml    |   18 +-
 {api => data/api}/client-server/search.yaml   |   10 +-
 .../client-server/sso_login_redirect.yaml     |    0
 {api => data/api}/client-server/sync.yaml     |   14 +-
 {api => data/api}/client-server/tags.yaml     |    0
 .../client-server/third_party_lookup.yaml     |    0
 .../client-server/third_party_membership.yaml |    0
 .../api}/client-server/to_device.yaml         |    0
 {api => data/api}/client-server/typing.yaml   |    0
 {api => data/api}/client-server/users.yaml    |    0
 {api => data/api}/client-server/versions.yaml |    0
 {api => data/api}/client-server/voip.yaml     |    0
 .../api}/client-server/wellknown.yaml         |    0
 {api => data/api}/client-server/whoami.yaml   |    0
 {api => data/api}/identity/associations.yaml  |    0
 .../definitions/request_email_validation.yaml |    0
 .../request_msisdn_validation.yaml            |    0
 .../api}/identity/definitions/security.yaml   |    0
 .../api}/identity/definitions/sid.yaml        |    0
 .../api}/identity/email_associations.yaml     |    0
 .../api}/identity/invitation_signing.yaml     |    0
 {api => data/api}/identity/lookup.yaml        |    0
 .../api}/identity/phone_associations.yaml     |    0
 {api => data/api}/identity/ping.yaml          |    0
 {api => data/api}/identity/pubkey.yaml        |    0
 {api => data/api}/identity/store_invite.yaml  |    0
 .../api}/identity/v2_associations.yaml        |    0
 {api => data/api}/identity/v2_auth.yaml       |    0
 .../api}/identity/v2_email_associations.yaml  |    0
 .../api}/identity/v2_invitation_signing.yaml  |    0
 {api => data/api}/identity/v2_lookup.yaml     |    0
 .../api}/identity/v2_phone_associations.yaml  |    0
 {api => data/api}/identity/v2_ping.yaml       |    0
 {api => data/api}/identity/v2_pubkey.yaml     |    0
 .../api}/identity/v2_store_invite.yaml        |    0
 {api => data/api}/identity/v2_terms.yaml      |    0
 .../api}/push-gateway/push_notifier.yaml      |    0
 {api => data/api}/server-server/backfill.yaml |    0
 .../api}/server-server/definitions/edu.yaml   |    0
 .../event-schemas/m.device_list_update.yaml   |    0
 .../event-schemas/m.direct_to_device.yaml     |    0
 .../definitions/event-schemas/m.presence.yaml |    0
 .../definitions/event-schemas/m.receipt.yaml  |    0
 .../event-schemas/m.signing_key_update.yaml   |    0
 .../definitions/event-schemas/m.typing.yaml   |    0
 .../definitions/invite_event.yaml             |    0
 .../api}/server-server/definitions/keys.yaml  |    0
 .../definitions/keys_query_response.yaml      |    0
 .../api}/server-server/definitions/pdu.yaml   |    0
 .../server-server/definitions/pdu_v3.yaml     |    0
 .../server-server/definitions/pdu_v4.yaml     |    0
 .../server-server/definitions/security.yaml   |    0
 .../definitions/send_join_response.yaml       |    0
 .../definitions/single_pdu_transaction.yaml   |    0
 .../definitions/transaction.yaml              |    0
 .../unlimited_pdu_transaction.yaml            |    0
 .../definitions/unsigned_pdu.yaml             |    0
 .../definitions/unsigned_pdu_base.yaml        |    0
 .../api}/server-server/event_auth.yaml        |    0
 {api => data/api}/server-server/events.yaml   |    0
 .../api}/server-server/examples/edu.json      |    0
 .../server-server/examples/minimal_pdu.json   |    0
 .../api}/server-server/examples/pdu.json      |    0
 .../api}/server-server/examples/pdu_v3.json   |    0
 .../api}/server-server/examples/pdu_v4.json   |    0
 .../server-server/examples/server_key.json    |    0
 .../examples/server_key_notary_signed.json    |    0
 .../server-server/examples/transaction.json   |    0
 .../server-server/examples/unsigned_pdu.json  |    0
 .../examples/unsigned_pdu_base.json           |    0
 .../api}/server-server/invites-v1.yaml        |    2 +-
 .../api}/server-server/invites-v2.yaml        |    2 +-
 {api => data/api}/server-server/joins-v1.yaml |    0
 {api => data/api}/server-server/joins-v2.yaml |    0
 .../api}/server-server/keys_query.yaml        |    0
 .../api}/server-server/keys_server.yaml       |    0
 .../api}/server-server/leaving-v1.yaml        |    0
 .../api}/server-server/leaving-v2.yaml        |    0
 {api => data/api}/server-server/openid.yaml   |    0
 .../api}/server-server/public_rooms.yaml      |    0
 {api => data/api}/server-server/query.yaml    |    0
 .../server-server/third_party_invite.yaml     |    0
 .../api}/server-server/transactions.yaml      |    0
 .../api}/server-server/user_devices.yaml      |    0
 .../api}/server-server/user_keys.yaml         |    0
 {api => data/api}/server-server/version.yaml  |    0
 .../api}/server-server/wellknown.yaml         |    0
 .../event-schemas}/examples/core/event.json   |    0
 .../examples/core/room_edu.json               |    0
 .../examples/core/room_event.json             |    0
 .../examples/core/state_event.json            |    0
 .../examples/invite_room_state.json           |    0
 .../examples/m.accepted_terms.yaml            |    0
 .../event-schemas/examples/m.call.answer.yaml |    0
 .../examples/m.call.candidates.yaml           |    0
 .../event-schemas/examples/m.call.hangup.yaml |    0
 .../event-schemas/examples/m.call.invite.yaml |    0
 .../event-schemas/examples/m.direct.yaml      |    0
 .../event-schemas/examples/m.dummy.yaml       |    0
 .../examples/m.forwarded_room_key.yaml        |    0
 .../event-schemas/examples/m.fully_read.yaml  |    0
 .../examples/m.identity_server.yaml           |    0
 .../examples/m.ignored_user_list.yaml         |    0
 .../examples/m.key.verification.accept.yaml   |    0
 .../examples/m.key.verification.cancel.yaml   |    0
 .../examples/m.key.verification.key.yaml      |    0
 .../examples/m.key.verification.mac.yaml      |    0
 .../examples/m.key.verification.request.yaml  |    0
 .../m.key.verification.start$m.sas.v1.yaml    |    0
 .../examples/m.key.verification.start.yaml    |    0
 .../examples/m.policy.rule.room.yaml          |    0
 .../examples/m.policy.rule.server.yaml        |    0
 .../examples/m.policy.rule.user.yaml          |    0
 .../event-schemas/examples/m.presence.yaml    |    0
 .../event-schemas/examples/m.push_rules.yaml  |    0
 .../event-schemas/examples/m.receipt.yaml     |    0
 .../event-schemas/examples/m.room.avatar.yaml |    0
 .../examples/m.room.canonical_alias.yaml      |    0
 .../event-schemas/examples/m.room.create.yaml |    0
 .../examples/m.room.encrypted$megolm.yaml     |    0
 .../examples/m.room.encrypted$olm.yaml        |    0
 .../examples/m.room.encryption.yaml           |    0
 .../examples/m.room.guest_access.yaml         |    0
 .../examples/m.room.history_visibility.yaml   |    0
 .../examples/m.room.join_rules.yaml           |    0
 .../m.room.member$invite_room_state.yaml      |    2 +-
 .../m.room.member$third_party_invite.yaml     |    2 +-
 .../event-schemas/examples/m.room.member.yaml |    0
 .../examples/m.room.message$m.audio.yaml      |    0
 .../examples/m.room.message$m.emote.yaml      |    0
 .../examples/m.room.message$m.file.yaml       |    0
 .../examples/m.room.message$m.image.yaml      |    0
 .../examples/m.room.message$m.location.yaml   |    0
 .../examples/m.room.message$m.notice.yaml     |    0
 .../m.room.message$m.server_notice.yaml       |    0
 .../examples/m.room.message$m.text.yaml       |    0
 .../examples/m.room.message$m.video.yaml      |    0
 .../examples/m.room.message.feedback.yaml     |    0
 .../event-schemas/examples/m.room.name.yaml   |    0
 .../examples/m.room.pinned_events.yaml        |    0
 .../examples/m.room.power_levels.yaml         |    0
 .../examples/m.room.redaction.yaml            |    0
 .../examples/m.room.server_acl.yaml           |    0
 .../examples/m.room.third_party_invite.yaml   |    0
 .../examples/m.room.tombstone.yaml            |    0
 .../event-schemas/examples/m.room.topic.yaml  |    0
 .../examples/m.room_key.withheld.yaml         |    0
 .../event-schemas/examples/m.room_key.yaml    |    0
 .../m.room_key_request$cancel_request.yaml    |    0
 .../examples/m.room_key_request$request.yaml  |    0
 .../event-schemas/examples/m.sticker.yaml     |    0
 .../event-schemas/examples/m.tag.yaml         |    0
 .../event-schemas/examples/m.typing.yaml      |    0
 .../moderation_policy_rule.yaml               |    0
 .../schema/core-event-schema/event.yaml       |    0
 .../msgtype_infos/image_info.yaml             |    0
 .../msgtype_infos/thumbnail_info.yaml         |    0
 .../schema/core-event-schema/room_event.yaml  |    0
 .../schema/core-event-schema/state_event.yaml |    0
 .../core-event-schema/sync_room_event.yaml    |    0
 .../core-event-schema/sync_state_event.yaml   |    0
 .../core-event-schema/unsigned_prop.yaml      |    0
 .../schema/m.accepted_terms.yaml              |    0
 .../event-schemas/schema/m.call.answer.yaml   |    0
 .../schema/m.call.candidates.yaml             |    0
 .../event-schemas/schema/m.call.hangup.yaml   |    0
 .../event-schemas/schema/m.call.invite.yaml   |    0
 .../event-schemas/schema/m.direct.yaml        |    0
 .../event-schemas/schema/m.dummy.yaml         |    0
 .../schema/m.forwarded_room_key.yaml          |    0
 .../event-schemas/schema/m.fully_read.yaml    |    0
 .../schema/m.identity_server.yaml             |    0
 .../schema/m.ignored_user_list.yaml           |    0
 .../schema/m.key.verification.accept.yaml     |    0
 .../schema/m.key.verification.cancel.yaml     |    0
 .../schema/m.key.verification.key.yaml        |    0
 .../schema/m.key.verification.mac.yaml        |    0
 .../schema/m.key.verification.request.yaml    |    0
 .../m.key.verification.start$m.sas.v1.yaml    |    0
 .../schema/m.key.verification.start.yaml      |    0
 .../schema/m.policy.rule.room.yaml            |    0
 .../schema/m.policy.rule.server.yaml          |    0
 .../schema/m.policy.rule.user.yaml            |    0
 .../event-schemas/schema/m.presence.yaml      |    0
 .../event-schemas/schema/m.push_rules.yaml    |    0
 .../event-schemas/schema/m.receipt.yaml       |    0
 .../event-schemas/schema/m.room.avatar.yaml   |    0
 .../schema/m.room.canonical_alias.yaml        |    0
 .../event-schemas/schema/m.room.create.yaml   |    0
 .../schema/m.room.encrypted.yaml              |    0
 .../schema/m.room.encryption.yaml             |    0
 .../schema/m.room.guest_access.yaml           |    0
 .../schema/m.room.history_visibility.yaml     |    0
 .../schema/m.room.join_rules.yaml             |    0
 .../event-schemas/schema/m.room.member.yaml   |    0
 .../schema/m.room.message$m.audio.yaml        |    0
 .../schema/m.room.message$m.emote.yaml        |    0
 .../schema/m.room.message$m.file.yaml         |    0
 .../schema/m.room.message$m.image.yaml        |    0
 .../schema/m.room.message$m.location.yaml     |    0
 .../schema/m.room.message$m.notice.yaml       |    0
 .../m.room.message$m.server_notice.yaml       |    0
 .../schema/m.room.message$m.text.yaml         |    0
 .../schema/m.room.message$m.video.yaml        |    0
 .../schema/m.room.message.feedback.yaml       |    0
 .../event-schemas/schema/m.room.message.yaml  |    0
 .../event-schemas/schema/m.room.name.yaml     |    0
 .../schema/m.room.pinned_events.yaml          |    0
 .../schema/m.room.power_levels.yaml           |    0
 .../schema/m.room.redaction.yaml              |    0
 .../schema/m.room.server_acl.yaml             |    0
 .../schema/m.room.third_party_invite.yaml     |    0
 .../schema/m.room.tombstone.yaml              |    0
 .../event-schemas/schema/m.room.topic.yaml    |    0
 .../schema/m.room_key.withheld.yaml           |    0
 .../event-schemas/schema/m.room_key.yaml      |    0
 .../schema/m.room_key_request.yaml            |    0
 .../event-schemas/schema/m.sticker.yaml       |    0
 .../event-schemas/schema/m.tag.yaml           |    0
 .../event-schemas/schema/m.typing.yaml        |    0
 .../event-schemas}/schema/stripped_state.yaml |    0
 .../schemas}/server-signatures.yaml           |    0
 event-schemas/README.md                       |    6 -
 ...api_extensions.md => openapi_extensions.md |    0
 scripts/check-event-schema-examples.py        |    9 +-
 327 files changed, 82 insertions(+), 10822 deletions(-)
 delete mode 100644 api/README
 delete mode 120000 api/client-server/definitions/event-schemas
 delete mode 100644 api/files/backbone-min.js
 delete mode 100644 api/files/css
 delete mode 100644 api/files/handlebars-1.0.0.js
 delete mode 100644 api/files/highlight.7.3.pack.js
 delete mode 100644 api/files/jquery-1.8.0.min.js
 delete mode 100644 api/files/jquery.ba-bbq.min.js
 delete mode 100644 api/files/jquery.slideto.min.js
 delete mode 100644 api/files/jquery.wiggle.min.js
 delete mode 100644 api/files/reset.css
 delete mode 100644 api/files/screen.css
 delete mode 100644 api/files/shred.bundle.js
 delete mode 100644 api/files/swagger-oauth.js
 delete mode 100644 api/files/swagger-ui.js
 delete mode 100644 api/files/swagger.js
 delete mode 100644 api/files/underscore-min.js
 delete mode 100644 api/package.json
 delete mode 100644 api/validator.js
 rename {api => data/api}/application-service/definitions/location.yaml (100%)
 rename {api => data/api}/application-service/definitions/location_batch.yaml (100%)
 rename {api => data/api}/application-service/definitions/protocol.yaml (100%)
 rename {api => data/api}/application-service/definitions/protocol_metadata.yaml (100%)
 rename {api => data/api}/application-service/definitions/security.yaml (100%)
 rename {api => data/api}/application-service/definitions/user.yaml (100%)
 rename {api => data/api}/application-service/definitions/user_batch.yaml (100%)
 rename {api => data/api}/application-service/protocols.yaml (100%)
 rename {api => data/api}/application-service/query_room.yaml (100%)
 rename {api => data/api}/application-service/query_user.yaml (100%)
 rename {api => data/api}/application-service/transactions.yaml (98%)
 rename {api => data/api}/client-server/account-data.yaml (100%)
 rename {api => data/api}/client-server/admin.yaml (100%)
 rename {api => data/api}/client-server/administrative_contact.yaml (100%)
 rename {api => data/api}/client-server/appservice_room_directory.yaml (100%)
 rename {api => data/api}/client-server/banning.yaml (100%)
 rename {api => data/api}/client-server/capabilities.yaml (100%)
 rename {api => data/api}/client-server/content-repo.yaml (100%)
 rename {api => data/api}/client-server/create_room.yaml (100%)
 rename {api => data/api}/client-server/cross_signing.yaml (100%)
 rename {api => data/api}/client-server/definitions/auth_data.yaml (100%)
 rename {api => data/api}/client-server/definitions/auth_response.yaml (100%)
 rename {api => data/api}/client-server/definitions/client_device.yaml (100%)
 rename {api => data/api}/client-server/definitions/cross_signing_key.yaml (100%)
 rename {api => data/api}/client-server/definitions/device_keys.yaml (100%)
 rename {api => data/api}/client-server/definitions/errors/error.yaml (100%)
 rename {api => data/api}/client-server/definitions/errors/rate_limited.yaml (100%)
 rename {api => data/api}/client-server/definitions/event.yaml (100%)
 rename {api => data/api}/client-server/definitions/event_batch.yaml (90%)
 rename {api => data/api}/client-server/definitions/event_filter.yaml (100%)
 rename {api => data/api}/client-server/definitions/key_backup_data.yaml (100%)
 rename {api => data/api}/client-server/definitions/openid_token.yaml (100%)
 rename {api => data/api}/client-server/definitions/public_rooms_response.yaml (100%)
 rename {api => data/api}/client-server/definitions/push_condition.yaml (100%)
 rename {api => data/api}/client-server/definitions/push_rule.yaml (100%)
 rename {api => data/api}/client-server/definitions/push_ruleset.yaml (100%)
 rename {api => data/api}/client-server/definitions/request_email_validation.yaml (100%)
 rename {api => data/api}/client-server/definitions/request_msisdn_validation.yaml (100%)
 rename {api => data/api}/client-server/definitions/request_token_response.yaml (100%)
 rename {api => data/api}/client-server/definitions/room_event_batch.yaml (90%)
 rename {api => data/api}/client-server/definitions/room_event_filter.yaml (100%)
 rename {api => data/api}/client-server/definitions/room_key_backup.yaml (100%)
 rename {api => data/api}/client-server/definitions/security.yaml (100%)
 rename {api => data/api}/client-server/definitions/state_event_batch.yaml (90%)
 rename {api => data/api}/client-server/definitions/sync_filter.yaml (100%)
 rename {api => data/api}/client-server/definitions/third_party_signed.yaml (100%)
 rename {api => data/api}/client-server/definitions/timeline_batch.yaml (100%)
 rename {api => data/api}/client-server/definitions/user_identifier.yaml (100%)
 rename {api => data/api}/client-server/definitions/wellknown/full.yaml (100%)
 rename {api => data/api}/client-server/definitions/wellknown/homeserver.yaml (100%)
 rename {api => data/api}/client-server/definitions/wellknown/identity_server.yaml (100%)
 rename {api => data/api}/client-server/device_management.yaml (100%)
 rename {api => data/api}/client-server/directory.yaml (100%)
 rename {api => data/api}/client-server/event_context.yaml (85%)
 rename {api => data/api}/client-server/filter.yaml (100%)
 rename {api => data/api}/client-server/inviting.yaml (100%)
 rename {api => data/api}/client-server/joining.yaml (100%)
 rename {api => data/api}/client-server/key_backup.yaml (100%)
 rename {api => data/api}/client-server/keys.yaml (100%)
 rename {api => data/api}/client-server/kicking.yaml (100%)
 rename {api => data/api}/client-server/leaving.yaml (100%)
 rename {api => data/api}/client-server/list_joined_rooms.yaml (100%)
 rename {api => data/api}/client-server/list_public_rooms.yaml (100%)
 rename {api => data/api}/client-server/login.yaml (100%)
 rename {api => data/api}/client-server/logout.yaml (100%)
 rename {api => data/api}/client-server/message_pagination.yaml (92%)
 rename {api => data/api}/client-server/notifications.yaml (98%)
 rename {api => data/api}/client-server/old_sync.yaml (88%)
 rename {api => data/api}/client-server/openid.yaml (100%)
 rename {api => data/api}/client-server/peeking_events.yaml (95%)
 rename {api => data/api}/client-server/presence.yaml (100%)
 rename {api => data/api}/client-server/profile.yaml (100%)
 rename {api => data/api}/client-server/pusher.yaml (100%)
 rename {api => data/api}/client-server/pushrules.yaml (100%)
 rename {api => data/api}/client-server/read_markers.yaml (100%)
 rename {api => data/api}/client-server/receipts.yaml (100%)
 rename {api => data/api}/client-server/redaction.yaml (100%)
 rename {api => data/api}/client-server/registration.yaml (100%)
 rename {api => data/api}/client-server/report_content.yaml (100%)
 rename {api => data/api}/client-server/room_initial_sync.yaml (86%)
 rename {api => data/api}/client-server/room_send.yaml (100%)
 rename {api => data/api}/client-server/room_state.yaml (100%)
 rename {api => data/api}/client-server/room_upgrades.yaml (100%)
 rename {api => data/api}/client-server/rooms.yaml (93%)
 rename {api => data/api}/client-server/search.yaml (97%)
 rename {api => data/api}/client-server/sso_login_redirect.yaml (100%)
 rename {api => data/api}/client-server/sync.yaml (97%)
 rename {api => data/api}/client-server/tags.yaml (100%)
 rename {api => data/api}/client-server/third_party_lookup.yaml (100%)
 rename {api => data/api}/client-server/third_party_membership.yaml (100%)
 rename {api => data/api}/client-server/to_device.yaml (100%)
 rename {api => data/api}/client-server/typing.yaml (100%)
 rename {api => data/api}/client-server/users.yaml (100%)
 rename {api => data/api}/client-server/versions.yaml (100%)
 rename {api => data/api}/client-server/voip.yaml (100%)
 rename {api => data/api}/client-server/wellknown.yaml (100%)
 rename {api => data/api}/client-server/whoami.yaml (100%)
 rename {api => data/api}/identity/associations.yaml (100%)
 rename {api => data/api}/identity/definitions/request_email_validation.yaml (100%)
 rename {api => data/api}/identity/definitions/request_msisdn_validation.yaml (100%)
 rename {api => data/api}/identity/definitions/security.yaml (100%)
 rename {api => data/api}/identity/definitions/sid.yaml (100%)
 rename {api => data/api}/identity/email_associations.yaml (100%)
 rename {api => data/api}/identity/invitation_signing.yaml (100%)
 rename {api => data/api}/identity/lookup.yaml (100%)
 rename {api => data/api}/identity/phone_associations.yaml (100%)
 rename {api => data/api}/identity/ping.yaml (100%)
 rename {api => data/api}/identity/pubkey.yaml (100%)
 rename {api => data/api}/identity/store_invite.yaml (100%)
 rename {api => data/api}/identity/v2_associations.yaml (100%)
 rename {api => data/api}/identity/v2_auth.yaml (100%)
 rename {api => data/api}/identity/v2_email_associations.yaml (100%)
 rename {api => data/api}/identity/v2_invitation_signing.yaml (100%)
 rename {api => data/api}/identity/v2_lookup.yaml (100%)
 rename {api => data/api}/identity/v2_phone_associations.yaml (100%)
 rename {api => data/api}/identity/v2_ping.yaml (100%)
 rename {api => data/api}/identity/v2_pubkey.yaml (100%)
 rename {api => data/api}/identity/v2_store_invite.yaml (100%)
 rename {api => data/api}/identity/v2_terms.yaml (100%)
 rename {api => data/api}/push-gateway/push_notifier.yaml (100%)
 rename {api => data/api}/server-server/backfill.yaml (100%)
 rename {api => data/api}/server-server/definitions/edu.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.device_list_update.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.direct_to_device.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.presence.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.receipt.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.signing_key_update.yaml (100%)
 rename {api => data/api}/server-server/definitions/event-schemas/m.typing.yaml (100%)
 rename {api => data/api}/server-server/definitions/invite_event.yaml (100%)
 rename {api => data/api}/server-server/definitions/keys.yaml (100%)
 rename {api => data/api}/server-server/definitions/keys_query_response.yaml (100%)
 rename {api => data/api}/server-server/definitions/pdu.yaml (100%)
 rename {api => data/api}/server-server/definitions/pdu_v3.yaml (100%)
 rename {api => data/api}/server-server/definitions/pdu_v4.yaml (100%)
 rename {api => data/api}/server-server/definitions/security.yaml (100%)
 rename {api => data/api}/server-server/definitions/send_join_response.yaml (100%)
 rename {api => data/api}/server-server/definitions/single_pdu_transaction.yaml (100%)
 rename {api => data/api}/server-server/definitions/transaction.yaml (100%)
 rename {api => data/api}/server-server/definitions/unlimited_pdu_transaction.yaml (100%)
 rename {api => data/api}/server-server/definitions/unsigned_pdu.yaml (100%)
 rename {api => data/api}/server-server/definitions/unsigned_pdu_base.yaml (100%)
 rename {api => data/api}/server-server/event_auth.yaml (100%)
 rename {api => data/api}/server-server/events.yaml (100%)
 rename {api => data/api}/server-server/examples/edu.json (100%)
 rename {api => data/api}/server-server/examples/minimal_pdu.json (100%)
 rename {api => data/api}/server-server/examples/pdu.json (100%)
 rename {api => data/api}/server-server/examples/pdu_v3.json (100%)
 rename {api => data/api}/server-server/examples/pdu_v4.json (100%)
 rename {api => data/api}/server-server/examples/server_key.json (100%)
 rename {api => data/api}/server-server/examples/server_key_notary_signed.json (100%)
 rename {api => data/api}/server-server/examples/transaction.json (100%)
 rename {api => data/api}/server-server/examples/unsigned_pdu.json (100%)
 rename {api => data/api}/server-server/examples/unsigned_pdu_base.json (100%)
 rename {api => data/api}/server-server/invites-v1.yaml (98%)
 rename {api => data/api}/server-server/invites-v2.yaml (98%)
 rename {api => data/api}/server-server/joins-v1.yaml (100%)
 rename {api => data/api}/server-server/joins-v2.yaml (100%)
 rename {api => data/api}/server-server/keys_query.yaml (100%)
 rename {api => data/api}/server-server/keys_server.yaml (100%)
 rename {api => data/api}/server-server/leaving-v1.yaml (100%)
 rename {api => data/api}/server-server/leaving-v2.yaml (100%)
 rename {api => data/api}/server-server/openid.yaml (100%)
 rename {api => data/api}/server-server/public_rooms.yaml (100%)
 rename {api => data/api}/server-server/query.yaml (100%)
 rename {api => data/api}/server-server/third_party_invite.yaml (100%)
 rename {api => data/api}/server-server/transactions.yaml (100%)
 rename {api => data/api}/server-server/user_devices.yaml (100%)
 rename {api => data/api}/server-server/user_keys.yaml (100%)
 rename {api => data/api}/server-server/version.yaml (100%)
 rename {api => data/api}/server-server/wellknown.yaml (100%)
 rename {event-schemas => data/event-schemas}/examples/core/event.json (100%)
 rename {event-schemas => data/event-schemas}/examples/core/room_edu.json (100%)
 rename {event-schemas => data/event-schemas}/examples/core/room_event.json (100%)
 rename {event-schemas => data/event-schemas}/examples/core/state_event.json (100%)
 rename {event-schemas => data/event-schemas}/examples/invite_room_state.json (100%)
 rename event-schemas/examples/m.accepted_terms => data/event-schemas/examples/m.accepted_terms.yaml (100%)
 rename event-schemas/examples/m.call.answer => data/event-schemas/examples/m.call.answer.yaml (100%)
 rename event-schemas/examples/m.call.candidates => data/event-schemas/examples/m.call.candidates.yaml (100%)
 rename event-schemas/examples/m.call.hangup => data/event-schemas/examples/m.call.hangup.yaml (100%)
 rename event-schemas/examples/m.call.invite => data/event-schemas/examples/m.call.invite.yaml (100%)
 rename event-schemas/examples/m.direct => data/event-schemas/examples/m.direct.yaml (100%)
 rename event-schemas/examples/m.dummy => data/event-schemas/examples/m.dummy.yaml (100%)
 rename event-schemas/examples/m.forwarded_room_key => data/event-schemas/examples/m.forwarded_room_key.yaml (100%)
 rename event-schemas/examples/m.fully_read => data/event-schemas/examples/m.fully_read.yaml (100%)
 rename event-schemas/examples/m.identity_server => data/event-schemas/examples/m.identity_server.yaml (100%)
 rename event-schemas/examples/m.ignored_user_list => data/event-schemas/examples/m.ignored_user_list.yaml (100%)
 rename event-schemas/examples/m.key.verification.accept => data/event-schemas/examples/m.key.verification.accept.yaml (100%)
 rename event-schemas/examples/m.key.verification.cancel => data/event-schemas/examples/m.key.verification.cancel.yaml (100%)
 rename event-schemas/examples/m.key.verification.key => data/event-schemas/examples/m.key.verification.key.yaml (100%)
 rename event-schemas/examples/m.key.verification.mac => data/event-schemas/examples/m.key.verification.mac.yaml (100%)
 rename event-schemas/examples/m.key.verification.request => data/event-schemas/examples/m.key.verification.request.yaml (100%)
 rename event-schemas/examples/m.key.verification.start$m.sas.v1 => data/event-schemas/examples/m.key.verification.start$m.sas.v1.yaml (100%)
 rename event-schemas/examples/m.key.verification.start => data/event-schemas/examples/m.key.verification.start.yaml (100%)
 rename event-schemas/examples/m.policy.rule.room => data/event-schemas/examples/m.policy.rule.room.yaml (100%)
 rename event-schemas/examples/m.policy.rule.server => data/event-schemas/examples/m.policy.rule.server.yaml (100%)
 rename event-schemas/examples/m.policy.rule.user => data/event-schemas/examples/m.policy.rule.user.yaml (100%)
 rename event-schemas/examples/m.presence => data/event-schemas/examples/m.presence.yaml (100%)
 rename event-schemas/examples/m.push_rules => data/event-schemas/examples/m.push_rules.yaml (100%)
 rename event-schemas/examples/m.receipt => data/event-schemas/examples/m.receipt.yaml (100%)
 rename event-schemas/examples/m.room.avatar => data/event-schemas/examples/m.room.avatar.yaml (100%)
 rename event-schemas/examples/m.room.canonical_alias => data/event-schemas/examples/m.room.canonical_alias.yaml (100%)
 rename event-schemas/examples/m.room.create => data/event-schemas/examples/m.room.create.yaml (100%)
 rename event-schemas/examples/m.room.encrypted$megolm => data/event-schemas/examples/m.room.encrypted$megolm.yaml (100%)
 rename event-schemas/examples/m.room.encrypted$olm => data/event-schemas/examples/m.room.encrypted$olm.yaml (100%)
 rename event-schemas/examples/m.room.encryption => data/event-schemas/examples/m.room.encryption.yaml (100%)
 rename event-schemas/examples/m.room.guest_access => data/event-schemas/examples/m.room.guest_access.yaml (100%)
 rename event-schemas/examples/m.room.history_visibility => data/event-schemas/examples/m.room.history_visibility.yaml (100%)
 rename event-schemas/examples/m.room.join_rules => data/event-schemas/examples/m.room.join_rules.yaml (100%)
 rename event-schemas/examples/m.room.member$invite_room_state => data/event-schemas/examples/m.room.member$invite_room_state.yaml (90%)
 rename event-schemas/examples/m.room.member$third_party_invite => data/event-schemas/examples/m.room.member$third_party_invite.yaml (93%)
 rename event-schemas/examples/m.room.member => data/event-schemas/examples/m.room.member.yaml (100%)
 rename event-schemas/examples/m.room.message$m.audio => data/event-schemas/examples/m.room.message$m.audio.yaml (100%)
 rename event-schemas/examples/m.room.message$m.emote => data/event-schemas/examples/m.room.message$m.emote.yaml (100%)
 rename event-schemas/examples/m.room.message$m.file => data/event-schemas/examples/m.room.message$m.file.yaml (100%)
 rename event-schemas/examples/m.room.message$m.image => data/event-schemas/examples/m.room.message$m.image.yaml (100%)
 rename event-schemas/examples/m.room.message$m.location => data/event-schemas/examples/m.room.message$m.location.yaml (100%)
 rename event-schemas/examples/m.room.message$m.notice => data/event-schemas/examples/m.room.message$m.notice.yaml (100%)
 rename event-schemas/examples/m.room.message$m.server_notice => data/event-schemas/examples/m.room.message$m.server_notice.yaml (100%)
 rename event-schemas/examples/m.room.message$m.text => data/event-schemas/examples/m.room.message$m.text.yaml (100%)
 rename event-schemas/examples/m.room.message$m.video => data/event-schemas/examples/m.room.message$m.video.yaml (100%)
 rename event-schemas/examples/m.room.message.feedback => data/event-schemas/examples/m.room.message.feedback.yaml (100%)
 rename event-schemas/examples/m.room.name => data/event-schemas/examples/m.room.name.yaml (100%)
 rename event-schemas/examples/m.room.pinned_events => data/event-schemas/examples/m.room.pinned_events.yaml (100%)
 rename event-schemas/examples/m.room.power_levels => data/event-schemas/examples/m.room.power_levels.yaml (100%)
 rename event-schemas/examples/m.room.redaction => data/event-schemas/examples/m.room.redaction.yaml (100%)
 rename event-schemas/examples/m.room.server_acl => data/event-schemas/examples/m.room.server_acl.yaml (100%)
 rename event-schemas/examples/m.room.third_party_invite => data/event-schemas/examples/m.room.third_party_invite.yaml (100%)
 rename event-schemas/examples/m.room.tombstone => data/event-schemas/examples/m.room.tombstone.yaml (100%)
 rename event-schemas/examples/m.room.topic => data/event-schemas/examples/m.room.topic.yaml (100%)
 rename event-schemas/examples/m.room_key.withheld => data/event-schemas/examples/m.room_key.withheld.yaml (100%)
 rename event-schemas/examples/m.room_key => data/event-schemas/examples/m.room_key.yaml (100%)
 rename event-schemas/examples/m.room_key_request$cancel_request => data/event-schemas/examples/m.room_key_request$cancel_request.yaml (100%)
 rename event-schemas/examples/m.room_key_request$request => data/event-schemas/examples/m.room_key_request$request.yaml (100%)
 rename event-schemas/examples/m.sticker => data/event-schemas/examples/m.sticker.yaml (100%)
 rename event-schemas/examples/m.tag => data/event-schemas/examples/m.tag.yaml (100%)
 rename event-schemas/examples/m.typing => data/event-schemas/examples/m.typing.yaml (100%)
 rename {event-schemas => data/event-schemas}/moderation_policy_rule.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/event.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/msgtype_infos/image_info.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/room_event.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/state_event.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/sync_room_event.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/sync_state_event.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/core-event-schema/unsigned_prop.yaml (100%)
 rename event-schemas/schema/m.accepted_terms => data/event-schemas/schema/m.accepted_terms.yaml (100%)
 rename event-schemas/schema/m.call.answer => data/event-schemas/schema/m.call.answer.yaml (100%)
 rename event-schemas/schema/m.call.candidates => data/event-schemas/schema/m.call.candidates.yaml (100%)
 rename event-schemas/schema/m.call.hangup => data/event-schemas/schema/m.call.hangup.yaml (100%)
 rename event-schemas/schema/m.call.invite => data/event-schemas/schema/m.call.invite.yaml (100%)
 rename event-schemas/schema/m.direct => data/event-schemas/schema/m.direct.yaml (100%)
 rename event-schemas/schema/m.dummy => data/event-schemas/schema/m.dummy.yaml (100%)
 rename event-schemas/schema/m.forwarded_room_key => data/event-schemas/schema/m.forwarded_room_key.yaml (100%)
 rename event-schemas/schema/m.fully_read => data/event-schemas/schema/m.fully_read.yaml (100%)
 rename event-schemas/schema/m.identity_server => data/event-schemas/schema/m.identity_server.yaml (100%)
 rename event-schemas/schema/m.ignored_user_list => data/event-schemas/schema/m.ignored_user_list.yaml (100%)
 rename event-schemas/schema/m.key.verification.accept => data/event-schemas/schema/m.key.verification.accept.yaml (100%)
 rename event-schemas/schema/m.key.verification.cancel => data/event-schemas/schema/m.key.verification.cancel.yaml (100%)
 rename event-schemas/schema/m.key.verification.key => data/event-schemas/schema/m.key.verification.key.yaml (100%)
 rename event-schemas/schema/m.key.verification.mac => data/event-schemas/schema/m.key.verification.mac.yaml (100%)
 rename event-schemas/schema/m.key.verification.request => data/event-schemas/schema/m.key.verification.request.yaml (100%)
 rename event-schemas/schema/m.key.verification.start$m.sas.v1 => data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml (100%)
 rename event-schemas/schema/m.key.verification.start => data/event-schemas/schema/m.key.verification.start.yaml (100%)
 rename event-schemas/schema/m.policy.rule.room => data/event-schemas/schema/m.policy.rule.room.yaml (100%)
 rename event-schemas/schema/m.policy.rule.server => data/event-schemas/schema/m.policy.rule.server.yaml (100%)
 rename event-schemas/schema/m.policy.rule.user => data/event-schemas/schema/m.policy.rule.user.yaml (100%)
 rename event-schemas/schema/m.presence => data/event-schemas/schema/m.presence.yaml (100%)
 rename event-schemas/schema/m.push_rules => data/event-schemas/schema/m.push_rules.yaml (100%)
 rename event-schemas/schema/m.receipt => data/event-schemas/schema/m.receipt.yaml (100%)
 rename event-schemas/schema/m.room.avatar => data/event-schemas/schema/m.room.avatar.yaml (100%)
 rename event-schemas/schema/m.room.canonical_alias => data/event-schemas/schema/m.room.canonical_alias.yaml (100%)
 rename event-schemas/schema/m.room.create => data/event-schemas/schema/m.room.create.yaml (100%)
 rename event-schemas/schema/m.room.encrypted => data/event-schemas/schema/m.room.encrypted.yaml (100%)
 rename event-schemas/schema/m.room.encryption => data/event-schemas/schema/m.room.encryption.yaml (100%)
 rename event-schemas/schema/m.room.guest_access => data/event-schemas/schema/m.room.guest_access.yaml (100%)
 rename event-schemas/schema/m.room.history_visibility => data/event-schemas/schema/m.room.history_visibility.yaml (100%)
 rename event-schemas/schema/m.room.join_rules => data/event-schemas/schema/m.room.join_rules.yaml (100%)
 rename event-schemas/schema/m.room.member => data/event-schemas/schema/m.room.member.yaml (100%)
 rename event-schemas/schema/m.room.message$m.audio => data/event-schemas/schema/m.room.message$m.audio.yaml (100%)
 rename event-schemas/schema/m.room.message$m.emote => data/event-schemas/schema/m.room.message$m.emote.yaml (100%)
 rename event-schemas/schema/m.room.message$m.file => data/event-schemas/schema/m.room.message$m.file.yaml (100%)
 rename event-schemas/schema/m.room.message$m.image => data/event-schemas/schema/m.room.message$m.image.yaml (100%)
 rename event-schemas/schema/m.room.message$m.location => data/event-schemas/schema/m.room.message$m.location.yaml (100%)
 rename event-schemas/schema/m.room.message$m.notice => data/event-schemas/schema/m.room.message$m.notice.yaml (100%)
 rename event-schemas/schema/m.room.message$m.server_notice => data/event-schemas/schema/m.room.message$m.server_notice.yaml (100%)
 rename event-schemas/schema/m.room.message$m.text => data/event-schemas/schema/m.room.message$m.text.yaml (100%)
 rename event-schemas/schema/m.room.message$m.video => data/event-schemas/schema/m.room.message$m.video.yaml (100%)
 rename event-schemas/schema/m.room.message.feedback => data/event-schemas/schema/m.room.message.feedback.yaml (100%)
 rename event-schemas/schema/m.room.message => data/event-schemas/schema/m.room.message.yaml (100%)
 rename event-schemas/schema/m.room.name => data/event-schemas/schema/m.room.name.yaml (100%)
 rename event-schemas/schema/m.room.pinned_events => data/event-schemas/schema/m.room.pinned_events.yaml (100%)
 rename event-schemas/schema/m.room.power_levels => data/event-schemas/schema/m.room.power_levels.yaml (100%)
 rename event-schemas/schema/m.room.redaction => data/event-schemas/schema/m.room.redaction.yaml (100%)
 rename event-schemas/schema/m.room.server_acl => data/event-schemas/schema/m.room.server_acl.yaml (100%)
 rename event-schemas/schema/m.room.third_party_invite => data/event-schemas/schema/m.room.third_party_invite.yaml (100%)
 rename event-schemas/schema/m.room.tombstone => data/event-schemas/schema/m.room.tombstone.yaml (100%)
 rename event-schemas/schema/m.room.topic => data/event-schemas/schema/m.room.topic.yaml (100%)
 rename event-schemas/schema/m.room_key.withheld => data/event-schemas/schema/m.room_key.withheld.yaml (100%)
 rename event-schemas/schema/m.room_key => data/event-schemas/schema/m.room_key.yaml (100%)
 rename event-schemas/schema/m.room_key_request => data/event-schemas/schema/m.room_key_request.yaml (100%)
 rename event-schemas/schema/m.sticker => data/event-schemas/schema/m.sticker.yaml (100%)
 rename event-schemas/schema/m.tag => data/event-schemas/schema/m.tag.yaml (100%)
 rename event-schemas/schema/m.typing => data/event-schemas/schema/m.typing.yaml (100%)
 rename {event-schemas => data/event-schemas}/schema/stripped_state.yaml (100%)
 rename {schemas => data/schemas}/server-signatures.yaml (100%)
 delete mode 100644 event-schemas/README.md
 rename api/openapi_extensions.md => openapi_extensions.md (100%)

diff --git a/api/README b/api/README
deleted file mode 100644
index 7b971fac..00000000
--- a/api/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains swagger-compatible representations of our APIs. See
-the main README.rst for details on how to make use of them.
diff --git a/api/client-server/definitions/event-schemas b/api/client-server/definitions/event-schemas
deleted file mode 120000
index 376cf90c..00000000
--- a/api/client-server/definitions/event-schemas
+++ /dev/null
@@ -1 +0,0 @@
-../../../event-schemas
\ No newline at end of file
diff --git a/api/files/backbone-min.js b/api/files/backbone-min.js
deleted file mode 100644
index c1c0d4ff..00000000
--- a/api/files/backbone-min.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
-{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g=
-z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
-{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null==
-b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent:
-b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
-a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
-h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
-return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending=
-{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length||
-!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator);
-this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c<d;c++){if(!(e=a[c]=this._prepareModel(a[c],b)))throw Error("Can't add an invalid model to a collection");g=e.cid;i=e.id;j[g]||this._byCid[g]||null!=i&&(k[i]||this._byId[i])?
-l.push(c):j[g]=k[i]=e}for(c=l.length;c--;)a.splice(l[c],1);c=0;for(d=a.length;c<d;c++)(e=a[c]).on("all",this._onModelEvent,this),this._byCid[e.cid]=e,null!=e.id&&(this._byId[e.id]=e);this.length+=d;A.apply(this.models,[null!=b.at?b.at:this.models.length,0].concat(a));this.comparator&&this.sort({silent:!0});if(b.silent)return this;c=0;for(d=this.models.length;c<d;c++)if(j[(e=this.models[c]).cid])b.index=c,e.trigger("add",e,this,b);return this},remove:function(a,b){var c,d,e,g;b||(b={});a=f.isArray(a)?
-a.slice():[a];c=0;for(d=a.length;c<d;c++)if(g=this.getByCid(a[c])||this.get(a[c]))delete this._byId[g.id],delete this._byCid[g.cid],e=this.indexOf(g),this.models.splice(e,1),this.length--,b.silent||(b.index=e,g.trigger("remove",g,this,b)),this._removeReference(g);return this},push:function(a,b){a=this._prepareModel(a,b);this.add(a,b);return a},pop:function(a){var b=this.at(this.length-1);this.remove(b,a);return b},unshift:function(a,b){a=this._prepareModel(a,b);this.add(a,f.extend({at:0},b));return a},
-shift:function(a){var b=this.at(0);this.remove(b,a);return b},get:function(a){return null==a?void 0:this._byId[null!=a.id?a.id:a]},getByCid:function(a){return a&&this._byCid[a.cid||a]},at:function(a){return this.models[a]},where:function(a){return f.isEmpty(a)?[]:this.filter(function(b){for(var c in a)if(a[c]!==b.get(c))return!1;return!0})},sort:function(a){a||(a={});if(!this.comparator)throw Error("Cannot sort a set without a comparator");var b=f.bind(this.comparator,this);1==this.comparator.length?
-this.models=this.sortBy(b):this.models.sort(b);a.silent||this.trigger("reset",this,a);return this},pluck:function(a){return f.map(this.models,function(b){return b.get(a)})},reset:function(a,b){a||(a=[]);b||(b={});for(var c=0,d=this.models.length;c<d;c++)this._removeReference(this.models[c]);this._reset();this.add(a,f.extend({silent:!0},b));b.silent||this.trigger("reset",this,b);return this},fetch:function(a){a=a?f.clone(a):{};void 0===a.parse&&(a.parse=!0);var b=this,c=a.success;a.success=function(d,
-e,f){b[a.add?"add":"reset"](b.parse(d,f),a);c&&c(b,d)};a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},create:function(a,b){var c=this,b=b?f.clone(b):{},a=this._prepareModel(a,b);if(!a)return!1;b.wait||c.add(a,b);var d=b.success;b.success=function(e,f){b.wait&&c.add(e,b);d?d(e,f):e.trigger("sync",a,f,b)};a.save(null,b);return a},parse:function(a){return a},chain:function(){return f(this.models).chain()},_reset:function(){this.length=0;this.models=[];this._byId=
-{};this._byCid={}},_prepareModel:function(a,b){b||(b={});a instanceof o?a.collection||(a.collection=this):(b.collection=this,a=new this.model(a,b),a._validate(a.attributes,b)||(a=!1));return a},_removeReference:function(a){this==a.collection&&delete a.collection;a.off("all",this._onModelEvent,this)},_onModelEvent:function(a,b,c,d){("add"==a||"remove"==a)&&c!=this||("destroy"==a&&this.remove(b,d),b&&a==="change:"+b.idAttribute&&(delete this._byId[b.previous(b.idAttribute)],this._byId[b.id]=b),this.trigger.apply(this,
-arguments))}});f.each("forEach,each,map,reduce,reduceRight,find,detect,filter,select,reject,every,all,some,any,include,contains,invoke,max,min,sortBy,sortedIndex,toArray,size,first,initial,rest,last,without,indexOf,shuffle,lastIndexOf,isEmpty,groupBy".split(","),function(a){r.prototype[a]=function(){return f[a].apply(f,[this.models].concat(f.toArray(arguments)))}});var u=g.Router=function(a){a||(a={});a.routes&&(this.routes=a.routes);this._bindRoutes();this.initialize.apply(this,arguments)},B=/:\w+/g,
-C=/\*\w+/g,D=/[-[\]{}()+?.,\\^$|#\s]/g;f.extend(u.prototype,k,{initialize:function(){},route:function(a,b,c){g.history||(g.history=new m);f.isRegExp(a)||(a=this._routeToRegExp(a));c||(c=this[b]);g.history.route(a,f.bind(function(d){d=this._extractParameters(a,d);c&&c.apply(this,d);this.trigger.apply(this,["route:"+b].concat(d));g.history.trigger("route",this,b,d)},this));return this},navigate:function(a,b){g.history.navigate(a,b)},_bindRoutes:function(){if(this.routes){var a=[],b;for(b in this.routes)a.unshift([b,
-this.routes[b]]);b=0;for(var c=a.length;b<c;b++)this.route(a[b][0],a[b][1],this[a[b][1]])}},_routeToRegExp:function(a){a=a.replace(D,"\\$&").replace(B,"([^/]+)").replace(C,"(.*?)");return RegExp("^"+a+"$")},_extractParameters:function(a,b){return a.exec(b).slice(1)}});var m=g.History=function(){this.handlers=[];f.bindAll(this,"checkUrl")},s=/^[#\/]/,E=/msie [\w.]+/;m.started=!1;f.extend(m.prototype,k,{interval:50,getHash:function(a){return(a=(a?a.location:window.location).href.match(/#(.*)$/))?a[1]:
-""},getFragment:function(a,b){if(null==a)if(this._hasPushState||b){var a=window.location.pathname,c=window.location.search;c&&(a+=c)}else a=this.getHash();a.indexOf(this.options.root)||(a=a.substr(this.options.root.length));return a.replace(s,"")},start:function(a){if(m.started)throw Error("Backbone.history has already been started");m.started=!0;this.options=f.extend({},{root:"/"},this.options,a);this._wantsHashChange=!1!==this.options.hashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=
-!(!this.options.pushState||!window.history||!window.history.pushState);var a=this.getFragment(),b=document.documentMode;if(b=E.exec(navigator.userAgent.toLowerCase())&&(!b||7>=b))this.iframe=i('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo("body")[0].contentWindow,this.navigate(a);this._hasPushState?i(window).bind("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!b?i(window).bind("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,
-this.interval));this.fragment=a;a=window.location;b=a.pathname==this.options.root;if(this._wantsHashChange&&this._wantsPushState&&!this._hasPushState&&!b)return this.fragment=this.getFragment(null,!0),window.location.replace(this.options.root+"#"+this.fragment),!0;this._wantsPushState&&this._hasPushState&&b&&a.hash&&(this.fragment=this.getHash().replace(s,""),window.history.replaceState({},document.title,a.protocol+"//"+a.host+this.options.root+this.fragment));if(!this.options.silent)return this.loadUrl()},
-stop:function(){i(window).unbind("popstate",this.checkUrl).unbind("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);m.started=!1},route:function(a,b){this.handlers.unshift({route:a,callback:b})},checkUrl:function(){var a=this.getFragment();a==this.fragment&&this.iframe&&(a=this.getFragment(this.getHash(this.iframe)));if(a==this.fragment)return!1;this.iframe&&this.navigate(a);this.loadUrl()||this.loadUrl(this.getHash())},loadUrl:function(a){var b=this.fragment=this.getFragment(a);return f.any(this.handlers,
-function(a){if(a.route.test(b))return a.callback(b),!0})},navigate:function(a,b){if(!m.started)return!1;if(!b||!0===b)b={trigger:b};var c=(a||"").replace(s,"");this.fragment!=c&&(this._hasPushState?(0!=c.indexOf(this.options.root)&&(c=this.options.root+c),this.fragment=c,window.history[b.replace?"replaceState":"pushState"]({},document.title,c)):this._wantsHashChange?(this.fragment=c,this._updateHash(window.location,c,b.replace),this.iframe&&c!=this.getFragment(this.getHash(this.iframe))&&(b.replace||
-this.iframe.document.open().close(),this._updateHash(this.iframe.location,c,b.replace))):window.location.assign(this.options.root+a),b.trigger&&this.loadUrl(a))},_updateHash:function(a,b,c){c?a.replace(a.toString().replace(/(javascript:|#).*$/,"")+"#"+b):a.hash=b}});var v=g.View=function(a){this.cid=f.uniqueId("view");this._configure(a||{});this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()},F=/^(\S+)\s*(.*)$/,w="model,collection,el,id,attributes,className,tagName".split(",");
-f.extend(v.prototype,k,{tagName:"div",$:function(a){return this.$el.find(a)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();return this},make:function(a,b,c){a=document.createElement(a);b&&i(a).attr(b);c&&i(a).html(c);return a},setElement:function(a,b){this.$el&&this.undelegateEvents();this.$el=a instanceof i?a:i(a);this.el=this.$el[0];!1!==b&&this.delegateEvents();return this},delegateEvents:function(a){if(a||(a=n(this,"events"))){this.undelegateEvents();
-for(var b in a){var c=a[b];f.isFunction(c)||(c=this[a[b]]);if(!c)throw Error('Method "'+a[b]+'" does not exist');var d=b.match(F),e=d[1],d=d[2],c=f.bind(c,this),e=e+(".delegateEvents"+this.cid);""===d?this.$el.bind(e,c):this.$el.delegate(d,e,c)}}},undelegateEvents:function(){this.$el.unbind(".delegateEvents"+this.cid)},_configure:function(a){this.options&&(a=f.extend({},this.options,a));for(var b=0,c=w.length;b<c;b++){var d=w[b];a[d]&&(this[d]=a[d])}this.options=a},_ensureElement:function(){if(this.el)this.setElement(this.el,
-!1);else{var a=n(this,"attributes")||{};this.id&&(a.id=this.id);this.className&&(a["class"]=this.className);this.setElement(this.make(this.tagName,a),!1)}}});o.extend=r.extend=u.extend=v.extend=function(a,b){var c=G(this,a,b);c.extend=this.extend;return c};var H={create:"POST",update:"PUT","delete":"DELETE",read:"GET"};g.sync=function(a,b,c){var d=H[a];c||(c={});var e={type:d,dataType:"json"};c.url||(e.url=n(b,"url")||t());if(!c.data&&b&&("create"==a||"update"==a))e.contentType="application/json",
-e.data=JSON.stringify(b.toJSON());g.emulateJSON&&(e.contentType="application/x-www-form-urlencoded",e.data=e.data?{model:e.data}:{});if(g.emulateHTTP&&("PUT"===d||"DELETE"===d))g.emulateJSON&&(e.data._method=d),e.type="POST",e.beforeSend=function(a){a.setRequestHeader("X-HTTP-Method-Override",d)};"GET"!==e.type&&!g.emulateJSON&&(e.processData=!1);return i.ajax(f.extend(e,c))};g.wrapError=function(a,b,c){return function(d,e){e=d===b?e:d;a?a(b,e,c):b.trigger("error",b,e,c)}};var x=function(){},G=function(a,
-b,c){var d;d=b&&b.hasOwnProperty("constructor")?b.constructor:function(){a.apply(this,arguments)};f.extend(d,a);x.prototype=a.prototype;d.prototype=new x;b&&f.extend(d.prototype,b);c&&f.extend(d,c);d.prototype.constructor=d;d.__super__=a.prototype;return d},n=function(a,b){return!a||!a[b]?null:f.isFunction(a[b])?a[b]():a[b]},t=function(){throw Error('A "url" property or function must be specified');}}).call(this);
diff --git a/api/files/css b/api/files/css
deleted file mode 100644
index 3b5a0643..00000000
--- a/api/files/css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* latin */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Droid Sans'), local('DroidSans'), url(http://fonts.gstatic.com/s/droidsans/v5/s-BiyweUPV0v-yRb-cjciPk_vArhqVIZ0nv9q090hN8.woff2), format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
-/* latin */
-@font-face {
-  font-family: 'Droid Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url(http://fonts.gstatic.com/s/droidsans/v5/EFpQQyG9GqCrobXxL-KRMYWiMMZ7xLd792ULpGE4W_Y.woff2), format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
-}
diff --git a/api/files/handlebars-1.0.0.js b/api/files/handlebars-1.0.0.js
deleted file mode 100644
index c70f09d1..00000000
--- a/api/files/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
-  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '== 1.0.0-rc.3',
-  3: '== 1.0.0-rc.4',
-  4: '>= 1.0.0'
-};
-
-Handlebars.helpers  = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
-    functionType = '[object Function]',
-    objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
-  if (toString.call(name) === objectType) {
-    if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
-    Handlebars.Utils.extend(this.helpers, name);
-  } else {
-    if (inverse) { fn.not = inverse; }
-    this.helpers[name] = fn;
-  }
-};
-
-Handlebars.registerPartial = function(name, str) {
-  if (toString.call(name) === objectType) {
-    Handlebars.Utils.extend(this.partials,  name);
-  } else {
-    this.partials[name] = str;
-  }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
-  if(arguments.length === 2) {
-    return undefined;
-  } else {
-    throw new Error("Missing helper: '" + arg + "'");
-  }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
-  var inverse = options.inverse || function() {}, fn = options.fn;
-
-  var type = toString.call(context);
-
-  if(type === functionType) { context = context.call(this); }
-
-  if(context === true) {
-    return fn(this);
-  } else if(context === false || context == null) {
-    return inverse(this);
-  } else if(type === "[object Array]") {
-    if(context.length > 0) {
-      return Handlebars.helpers.each(context, options);
-    } else {
-      return inverse(this);
-    }
-  } else {
-    return fn(context);
-  }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
-  Handlebars.K.prototype = object;
-  var obj = new Handlebars.K();
-  Handlebars.K.prototype = null;
-  return obj;
-};
-
-Handlebars.logger = {
-  DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
-  methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
-  // can be overridden in the host environment
-  log: function(level, obj) {
-    if (Handlebars.logger.level <= level) {
-      var method = Handlebars.logger.methodMap[level];
-      if (typeof console !== 'undefined' && console[method]) {
-        console[method].call(console, obj);
-      }
-    }
-  }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
-  var fn = options.fn, inverse = options.inverse;
-  var i = 0, ret = "", data;
-
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (options.data) {
-    data = Handlebars.createFrame(options.data);
-  }
-
-  if(context && typeof context === 'object') {
-    if(context instanceof Array){
-      for(var j = context.length; i<j; i++) {
-        if (data) { data.index = i; }
-        ret = ret + fn(context[i], { data: data });
-      }
-    } else {
-      for(var key in context) {
-        if(context.hasOwnProperty(key)) {
-          if(data) { data.key = key; }
-          ret = ret + fn(context[key], {data: data});
-          i++;
-        }
-      }
-    }
-  }
-
-  if(i === 0){
-    ret = inverse(this);
-  }
-
-  return ret;
-});
-
-Handlebars.registerHelper('if', function(conditional, options) {
-  var type = toString.call(conditional);
-  if(type === functionType) { conditional = conditional.call(this); }
-
-  if(!conditional || Handlebars.Utils.isEmpty(conditional)) {
-    return options.inverse(this);
-  } else {
-    return options.fn(this);
-  }
-});
-
-Handlebars.registerHelper('unless', function(conditional, options) {
-  return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn});
-});
-
-Handlebars.registerHelper('with', function(context, options) {
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
-});
-
-Handlebars.registerHelper('log', function(context, options) {
-  var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-  Handlebars.log(level, context);
-});
-;
-// lib/handlebars/compiler/parser.js
-/* Jison generated parser */
-var handlebars = (function(){
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"params":27,"hash":28,"dataName":29,"param":30,"STRING":31,"INTEGER":32,"BOOLEAN":33,"hashSegments":34,"hashSegment":35,"ID":36,"EQUALS":37,"DATA":38,"pathSegments":39,"SEP":40,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",31:"STRING",32:"INTEGER",33:"BOOLEAN",36:"ID",37:"EQUALS",38:"DATA",40:"SEP"},
-productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[27,2],[27,1],[30,1],[30,1],[30,1],[30,1],[30,1],[28,1],[34,2],[34,1],[35,3],[35,3],[35,3],[35,3],[35,3],[26,1],[26,1],[26,1],[29,2],[21,1],[39,3],[39,1]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1: return $$[$0-1]; 
-break;
-case 2: this.$ = new yy.ProgramNode([], $$[$0]); 
-break;
-case 3: this.$ = new yy.ProgramNode($$[$0-2], $$[$0]); 
-break;
-case 4: this.$ = new yy.ProgramNode($$[$0-1], []); 
-break;
-case 5: this.$ = new yy.ProgramNode($$[$0]); 
-break;
-case 6: this.$ = new yy.ProgramNode([], []); 
-break;
-case 7: this.$ = new yy.ProgramNode([]); 
-break;
-case 8: this.$ = [$$[$0]]; 
-break;
-case 9: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 10: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]); 
-break;
-case 11: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]); 
-break;
-case 12: this.$ = $$[$0]; 
-break;
-case 13: this.$ = $$[$0]; 
-break;
-case 14: this.$ = new yy.ContentNode($$[$0]); 
-break;
-case 15: this.$ = new yy.CommentNode($$[$0]); 
-break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); 
-break;
-case 18: this.$ = $$[$0-1]; 
-break;
-case 19:
-    // Parsing out the '&' escape token at this level saves ~500 bytes after min due to the removal of one parser node.
-    this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2][2] === '&');
-  
-break;
-case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true); 
-break;
-case 21: this.$ = new yy.PartialNode($$[$0-1]); 
-break;
-case 22: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1]); 
-break;
-case 23: 
-break;
-case 24: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]; 
-break;
-case 25: this.$ = [[$$[$0-1]].concat($$[$0]), null]; 
-break;
-case 26: this.$ = [[$$[$0-1]], $$[$0]]; 
-break;
-case 27: this.$ = [[$$[$0]], null]; 
-break;
-case 28: this.$ = [[$$[$0]], null]; 
-break;
-case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 30: this.$ = [$$[$0]]; 
-break;
-case 31: this.$ = $$[$0]; 
-break;
-case 32: this.$ = new yy.StringNode($$[$0]); 
-break;
-case 33: this.$ = new yy.IntegerNode($$[$0]); 
-break;
-case 34: this.$ = new yy.BooleanNode($$[$0]); 
-break;
-case 35: this.$ = $$[$0]; 
-break;
-case 36: this.$ = new yy.HashNode($$[$0]); 
-break;
-case 37: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-break;
-case 38: this.$ = [$$[$0]]; 
-break;
-case 39: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 40: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]; 
-break;
-case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; 
-break;
-case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; 
-break;
-case 43: this.$ = [$$[$0-2], $$[$0]]; 
-break;
-case 44: this.$ = new yy.PartialNameNode($$[$0]); 
-break;
-case 45: this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0])); 
-break;
-case 46: this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0])); 
-break;
-case 47: this.$ = new yy.DataNode($$[$0]); 
-break;
-case 48: this.$ = new yy.IdNode($$[$0]); 
-break;
-case 49: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
-break;
-case 50: this.$ = [{part: $$[$0]}]; 
-break;
-}
-},
-table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],25:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],25:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],25:[1,16]},{17:23,18:[1,22],21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],25:[2,8]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{4:30,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{17:31,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:32,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:33,21:24,29:25,36:[1,28],38:[1,27],39:26},{21:35,26:34,31:[1,36],32:[1,37],36:[1,28],39:26},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],25:[1,16]},{17:23,21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,4],7:38,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],25:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{18:[1,39]},{18:[2,27],21:44,24:[2,27],27:40,28:41,29:48,30:42,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,28],24:[2,28]},{18:[2,48],24:[2,48],31:[2,48],32:[2,48],33:[2,48],36:[2,48],38:[2,48],40:[1,51]},{21:52,36:[1,28],39:26},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],38:[2,50],40:[2,50]},{10:53,20:[1,54]},{10:55,20:[1,54]},{18:[1,56]},{18:[1,57]},{24:[1,58]},{18:[1,59],21:60,36:[1,28],39:26},{18:[2,44],36:[2,44]},{18:[2,45],36:[2,45]},{18:[2,46],36:[2,46]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],25:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{18:[2,25],21:44,24:[2,25],28:61,29:48,30:62,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,26],24:[2,26]},{18:[2,30],24:[2,30],31:[2,30],32:[2,30],33:[2,30],36:[2,30],38:[2,30]},{18:[2,36],24:[2,36],35:63,36:[1,64]},{18:[2,31],24:[2,31],31:[2,31],32:[2,31],33:[2,31],36:[2,31],38:[2,31]},{18:[2,32],24:[2,32],31:[2,32],32:[2,32],33:[2,32],36:[2,32],38:[2,32]},{18:[2,33],24:[2,33],31:[2,33],32:[2,33],33:[2,33],36:[2,33],38:[2,33]},{18:[2,34],24:[2,34],31:[2,34],32:[2,34],33:[2,34],36:[2,34],38:[2,34]},{18:[2,35],24:[2,35],31:[2,35],32:[2,35],33:[2,35],36:[2,35],38:[2,35]},{18:[2,38],24:[2,38],36:[2,38]},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],37:[1,65],38:[2,50],40:[2,50]},{36:[1,66]},{18:[2,47],24:[2,47],31:[2,47],32:[2,47],33:[2,47],36:[2,47],38:[2,47]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{21:67,36:[1,28],39:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,68]},{18:[2,24],24:[2,24]},{18:[2,29],24:[2,29],31:[2,29],32:[2,29],33:[2,29],36:[2,29],38:[2,29]},{18:[2,37],24:[2,37],36:[2,37]},{37:[1,65]},{21:69,29:73,31:[1,70],32:[1,71],33:[1,72],36:[1,28],38:[1,27],39:26},{18:[2,49],24:[2,49],31:[2,49],32:[2,49],33:[2,49],36:[2,49],38:[2,49],40:[2,49]},{18:[1,74]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{18:[2,39],24:[2,39],36:[2,39]},{18:[2,40],24:[2,40],36:[2,40]},{18:[2,41],24:[2,41],36:[2,41]},{18:[2,42],24:[2,42],36:[2,42]},{18:[2,43],24:[2,43],36:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]}],
-defaultActions: {17:[2,1]},
-parseError: function parseError(str, hash) {
-    throw new Error(str);
-},
-parse: function parse(input) {
-    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    this.lexer.setInput(input);
-    this.lexer.yy = this.yy;
-    this.yy.lexer = this.lexer;
-    this.yy.parser = this;
-    if (typeof this.lexer.yylloc == "undefined")
-        this.lexer.yylloc = {};
-    var yyloc = this.lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = this.lexer.options && this.lexer.options.ranges;
-    if (typeof this.yy.parseError === "function")
-        this.parseError = this.yy.parseError;
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    function lex() {
-        var token;
-        token = self.lexer.lex() || 1;
-        if (typeof token !== "number") {
-            token = self.symbols_[token] || token;
-        }
-        return token;
-    }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == "undefined") {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
-        }
-        if (typeof action === "undefined" || !action.length || !action[0]) {
-            var errStr = "";
-            if (!recovering) {
-                expected = [];
-                for (p in table[state])
-                    if (this.terminals_[p] && p > 2) {
-                        expected.push("'" + this.terminals_[p] + "'");
-                    }
-                if (this.lexer.showPosition) {
-                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
-                } else {
-                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                }
-                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-            }
-        }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(this.lexer.yytext);
-            lstack.push(this.lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = this.lexer.yyleng;
-                yytext = this.lexer.yytext;
-                yylineno = this.lexer.yylineno;
-                yyloc = this.lexer.yylloc;
-                if (recovering > 0)
-                    recovering--;
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-            if (ranges) {
-                yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
-            }
-            r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-            if (typeof r !== "undefined") {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}
-};
-/* Jison generated lexer */
-var lexer = (function(){
-var lexer = ({EOF:1,
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
-setInput:function (input) {
-        this._input = input;
-        this._more = this._less = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-        if (this.options.ranges) this.yylloc.range = [0,0];
-        this.offset = 0;
-        return this;
-    },
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) this.yylloc.range[1]++;
-
-        this._input = this._input.slice(1);
-        return ch;
-    },
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
-
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length-1);
-        this.matched = this.matched.substr(0, this.matched.length-1);
-
-        if (lines.length-1) this.yylineno -= lines.length-1;
-        var r = this.yylloc.range;
-
-        this.yylloc = {first_line: this.yylloc.first_line,
-          last_line: this.yylineno+1,
-          first_column: this.yylloc.first_column,
-          last_column: lines ?
-              (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-              this.yylloc.first_column - len
-          };
-
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        return this;
-    },
-more:function () {
-        this._more = true;
-        return this;
-    },
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-    },
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c+"^";
-    },
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) this.done = true;
-
-        var token,
-            match,
-            tempMatch,
-            index,
-            col,
-            lines;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i=0;i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (!this.options.flex) break;
-            }
-        }
-        if (match) {
-            lines = match[0].match(/(?:\r\n?|\n).*/g);
-            if (lines) this.yylineno += lines.length;
-            this.yylloc = {first_line: this.yylloc.last_line,
-                           last_line: this.yylineno+1,
-                           first_column: this.yylloc.last_column,
-                           last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-            this.yytext += match[0];
-            this.match += match[0];
-            this.matches = match;
-            this.yyleng = this.yytext.length;
-            if (this.options.ranges) {
-                this.yylloc.range = [this.offset, this.offset += this.yyleng];
-            }
-            this._more = false;
-            this._input = this._input.slice(match[0].length);
-            this.matched += match[0];
-            token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-            if (this.done && this._input) this.done = false;
-            if (token) return token;
-            else return;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                    {text: "", token: null, line: this.yylineno});
-        }
-    },
-lex:function lex() {
-        var r = this.next();
-        if (typeof r !== 'undefined') {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
-popState:function popState() {
-        return this.conditionStack.pop();
-    },
-_currentRules:function _currentRules() {
-        return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
-    },
-topState:function () {
-        return this.conditionStack[this.conditionStack.length-2];
-    },
-pushState:function begin(condition) {
-        this.begin(condition);
-    }});
-lexer.options = {};
-lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-var YYSTATE=YY_START
-switch($avoiding_name_collisions) {
-case 0: yy_.yytext = "\\"; return 14; 
-break;
-case 1:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
-                                   if(yy_.yytext) return 14;
-                                 
-break;
-case 2: return 14; 
-break;
-case 3:
-                                   if(yy_.yytext.slice(-1) !== "\\") this.popState();
-                                   if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1);
-                                   return 14;
-                                 
-break;
-case 4: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15; 
-break;
-case 5: return 25; 
-break;
-case 6: return 16; 
-break;
-case 7: return 20; 
-break;
-case 8: return 19; 
-break;
-case 9: return 19; 
-break;
-case 10: return 23; 
-break;
-case 11: return 22; 
-break;
-case 12: this.popState(); this.begin('com'); 
-break;
-case 13: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15; 
-break;
-case 14: return 22; 
-break;
-case 15: return 37; 
-break;
-case 16: return 36; 
-break;
-case 17: return 36; 
-break;
-case 18: return 40; 
-break;
-case 19: /*ignore whitespace*/ 
-break;
-case 20: this.popState(); return 24; 
-break;
-case 21: this.popState(); return 18; 
-break;
-case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 31; 
-break;
-case 23: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 31; 
-break;
-case 24: return 38; 
-break;
-case 25: return 33; 
-break;
-case 26: return 33; 
-break;
-case 27: return 32; 
-break;
-case 28: return 36; 
-break;
-case 29: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 36; 
-break;
-case 30: return 'INVALID'; 
-break;
-case 31: return 5; 
-break;
-}
-};
-lexer.rules = [/^(?:\\\\(?=(\{\{)))/,/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[}\/ ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:-?[0-9]+(?=[}\s]))/,/^(?:[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-lexer.conditions = {"mu":{"rules":[5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31],"inclusive":false},"emu":{"rules":[3],"inclusive":false},"com":{"rules":[4],"inclusive":false},"INITIAL":{"rules":[0,1,2,31],"inclusive":true}};
-return lexer;})()
-parser.lexer = lexer;
-function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();;
-// lib/handlebars/compiler/base.js
-
-Handlebars.Parser = handlebars;
-
-Handlebars.parse = function(input) {
-
-  // Just return if an already-compile AST was passed in.
-  if(input.constructor === Handlebars.AST.ProgramNode) { return input; }
-
-  Handlebars.Parser.yy = Handlebars.AST;
-  return Handlebars.Parser.parse(input);
-};
-;
-// lib/handlebars/compiler/ast.js
-Handlebars.AST = {};
-
-Handlebars.AST.ProgramNode = function(statements, inverse) {
-  this.type = "program";
-  this.statements = statements;
-  if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
-};
-
-Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) {
-  this.type = "mustache";
-  this.escaped = !unescaped;
-  this.hash = hash;
-
-  var id = this.id = rawParams[0];
-  var params = this.params = rawParams.slice(1);
-
-  // a mustache is an eligible helper if:
-  // * its id is simple (a single part, not `this` or `..`)
-  var eligibleHelper = this.eligibleHelper = id.isSimple;
-
-  // a mustache is definitely a helper if:
-  // * it is an eligible helper, and
-  // * it has at least one parameter or hash segment
-  this.isHelper = eligibleHelper && (params.length || hash);
-
-  // if a mustache is an eligible helper but not a definite
-  // helper, it is ambiguous, and will be resolved in a later
-  // pass or at runtime.
-};
-
-Handlebars.AST.PartialNode = function(partialName, context) {
-  this.type         = "partial";
-  this.partialName  = partialName;
-  this.context      = context;
-};
-
-Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
-  var verifyMatch = function(open, close) {
-    if(open.original !== close.original) {
-      throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
-    }
-  };
-
-  verifyMatch(mustache.id, close);
-  this.type = "block";
-  this.mustache = mustache;
-  this.program  = program;
-  this.inverse  = inverse;
-
-  if (this.inverse && !this.program) {
-    this.isInverse = true;
-  }
-};
-
-Handlebars.AST.ContentNode = function(string) {
-  this.type = "content";
-  this.string = string;
-};
-
-Handlebars.AST.HashNode = function(pairs) {
-  this.type = "hash";
-  this.pairs = pairs;
-};
-
-Handlebars.AST.IdNode = function(parts) {
-  this.type = "ID";
-
-  var original = "",
-      dig = [],
-      depth = 0;
-
-  for(var i=0,l=parts.length; i<l; i++) {
-    var part = parts[i].part;
-    original += (parts[i].separator || '') + part;
-
-    if (part === ".." || part === "." || part === "this") {
-      if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + original); }
-      else if (part === "..") { depth++; }
-      else { this.isScoped = true; }
-    }
-    else { dig.push(part); }
-  }
-
-  this.original = original;
-  this.parts    = dig;
-  this.string   = dig.join('.');
-  this.depth    = depth;
-
-  // an ID is simple if it only has one part, and that part is not
-  // `..` or `this`.
-  this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-  this.stringModeValue = this.string;
-};
-
-Handlebars.AST.PartialNameNode = function(name) {
-  this.type = "PARTIAL_NAME";
-  this.name = name.original;
-};
-
-Handlebars.AST.DataNode = function(id) {
-  this.type = "DATA";
-  this.id = id;
-};
-
-Handlebars.AST.StringNode = function(string) {
-  this.type = "STRING";
-  this.original =
-    this.string =
-    this.stringModeValue = string;
-};
-
-Handlebars.AST.IntegerNode = function(integer) {
-  this.type = "INTEGER";
-  this.original =
-    this.integer = integer;
-  this.stringModeValue = Number(integer);
-};
-
-Handlebars.AST.BooleanNode = function(bool) {
-  this.type = "BOOLEAN";
-  this.bool = bool;
-  this.stringModeValue = bool === "true";
-};
-
-Handlebars.AST.CommentNode = function(comment) {
-  this.type = "comment";
-  this.comment = comment;
-};
-;
-// lib/handlebars/utils.js
-
-var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-Handlebars.Exception = function(message) {
-  var tmp = Error.prototype.constructor.apply(this, arguments);
-
-  // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-  for (var idx = 0; idx < errorProps.length; idx++) {
-    this[errorProps[idx]] = tmp[errorProps[idx]];
-  }
-};
-Handlebars.Exception.prototype = new Error();
-
-// Build out our basic SafeString type
-Handlebars.SafeString = function(string) {
-  this.string = string;
-};
-Handlebars.SafeString.prototype.toString = function() {
-  return this.string.toString();
-};
-
-var escape = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#x27;",
-  "`": "&#x60;"
-};
-
-var badChars = /[&<>"'`]/g;
-var possible = /[&<>"'`]/;
-
-var escapeChar = function(chr) {
-  return escape[chr] || "&amp;";
-};
-
-Handlebars.Utils = {
-  extend: function(obj, value) {
-    for(var key in value) {
-      if(value.hasOwnProperty(key)) {
-        obj[key] = value[key];
-      }
-    }
-  },
-
-  escapeExpression: function(string) {
-    // don't escape SafeStrings, since they're already safe
-    if (string instanceof Handlebars.SafeString) {
-      return string.toString();
-    } else if (string == null || string === false) {
-      return "";
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = string.toString();
-
-    if(!possible.test(string)) { return string; }
-    return string.replace(badChars, escapeChar);
-  },
-
-  isEmpty: function(value) {
-    if (!value && value !== 0) {
-      return true;
-    } else if(toString.call(value) === "[object Array]" && value.length === 0) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
-;
-// lib/handlebars/compiler/compiler.js
-
-/*jshint eqnull:true*/
-var Compiler = Handlebars.Compiler = function() {};
-var JavaScriptCompiler = Handlebars.JavaScriptCompiler = function() {};
-
-// the foundHelper register will disambiguate helper lookup from finding a
-// function in a context. This is necessary for mustache compatibility, which
-// requires that context functions in blocks are evaluated by blockHelperMissing,
-// and then proceed as if the resulting value was provided to blockHelperMissing.
-
-Compiler.prototype = {
-  compiler: Compiler,
-
-  disassemble: function() {
-    var opcodes = this.opcodes, opcode, out = [], params, param;
-
-    for (var i=0, l=opcodes.length; i<l; i++) {
-      opcode = opcodes[i];
-
-      if (opcode.opcode === 'DECLARE') {
-        out.push("DECLARE " + opcode.name + "=" + opcode.value);
-      } else {
-        params = [];
-        for (var j=0; j<opcode.args.length; j++) {
-          param = opcode.args[j];
-          if (typeof param === "string") {
-            param = "\"" + param.replace("\n", "\\n") + "\"";
-          }
-          params.push(param);
-        }
-        out.push(opcode.opcode + " " + params.join(" "));
-      }
-    }
-
-    return out.join("\n");
-  },
-  equals: function(other) {
-    var len = this.opcodes.length;
-    if (other.opcodes.length !== len) {
-      return false;
-    }
-
-    for (var i = 0; i < len; i++) {
-      var opcode = this.opcodes[i],
-          otherOpcode = other.opcodes[i];
-      if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
-        return false;
-      }
-      for (var j = 0; j < opcode.args.length; j++) {
-        if (opcode.args[j] !== otherOpcode.args[j]) {
-          return false;
-        }
-      }
-    }
-
-    len = this.children.length;
-    if (other.children.length !== len) {
-      return false;
-    }
-    for (i = 0; i < len; i++) {
-      if (!this.children[i].equals(other.children[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  },
-
-  guid: 0,
-
-  compile: function(program, options) {
-    this.children = [];
-    this.depths = {list: []};
-    this.options = options;
-
-    // These changes will propagate to the other compiler components
-    var knownHelpers = this.options.knownHelpers;
-    this.options.knownHelpers = {
-      'helperMissing': true,
-      'blockHelperMissing': true,
-      'each': true,
-      'if': true,
-      'unless': true,
-      'with': true,
-      'log': true
-    };
-    if (knownHelpers) {
-      for (var name in knownHelpers) {
-        this.options.knownHelpers[name] = knownHelpers[name];
-      }
-    }
-
-    return this.program(program);
-  },
-
-  accept: function(node) {
-    return this[node.type](node);
-  },
-
-  program: function(program) {
-    var statements = program.statements, statement;
-    this.opcodes = [];
-
-    for(var i=0, l=statements.length; i<l; i++) {
-      statement = statements[i];
-      this[statement.type](statement);
-    }
-    this.isSimple = l === 1;
-
-    this.depths.list = this.depths.list.sort(function(a, b) {
-      return a - b;
-    });
-
-    return this;
-  },
-
-  compileProgram: function(program) {
-    var result = new this.compiler().compile(program, this.options);
-    var guid = this.guid++, depth;
-
-    this.usePartial = this.usePartial || result.usePartial;
-
-    this.children[guid] = result;
-
-    for(var i=0, l=result.depths.list.length; i<l; i++) {
-      depth = result.depths.list[i];
-
-      if(depth < 2) { continue; }
-      else { this.addDepth(depth - 1); }
-    }
-
-    return guid;
-  },
-
-  block: function(block) {
-    var mustache = block.mustache,
-        program = block.program,
-        inverse = block.inverse;
-
-    if (program) {
-      program = this.compileProgram(program);
-    }
-
-    if (inverse) {
-      inverse = this.compileProgram(inverse);
-    }
-
-    var type = this.classifyMustache(mustache);
-
-    if (type === "helper") {
-      this.helperMustache(mustache, program, inverse);
-    } else if (type === "simple") {
-      this.simpleMustache(mustache);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('blockValue');
-    } else {
-      this.ambiguousMustache(mustache, program, inverse);
-
-      // now that the simple mustache is resolved, we need to
-      // evaluate it by executing `blockHelperMissing`
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-      this.opcode('emptyHash');
-      this.opcode('ambiguousBlockValue');
-    }
-
-    this.opcode('append');
-  },
-
-  hash: function(hash) {
-    var pairs = hash.pairs, pair, val;
-
-    this.opcode('pushHash');
-
-    for(var i=0, l=pairs.length; i<l; i++) {
-      pair = pairs[i];
-      val  = pair[1];
-
-      if (this.options.stringParams) {
-        if(val.depth) {
-          this.addDepth(val.depth);
-        }
-        this.opcode('getContext', val.depth || 0);
-        this.opcode('pushStringParam', val.stringModeValue, val.type);
-      } else {
-        this.accept(val);
-      }
-
-      this.opcode('assignToHash', pair[0]);
-    }
-    this.opcode('popHash');
-  },
-
-  partial: function(partial) {
-    var partialName = partial.partialName;
-    this.usePartial = true;
-
-    if(partial.context) {
-      this.ID(partial.context);
-    } else {
-      this.opcode('push', 'depth0');
-    }
-
-    this.opcode('invokePartial', partialName.name);
-    this.opcode('append');
-  },
-
-  content: function(content) {
-    this.opcode('appendContent', content.string);
-  },
-
-  mustache: function(mustache) {
-    var options = this.options;
-    var type = this.classifyMustache(mustache);
-
-    if (type === "simple") {
-      this.simpleMustache(mustache);
-    } else if (type === "helper") {
-      this.helperMustache(mustache);
-    } else {
-      this.ambiguousMustache(mustache);
-    }
-
-    if(mustache.escaped && !options.noEscape) {
-      this.opcode('appendEscaped');
-    } else {
-      this.opcode('append');
-    }
-  },
-
-  ambiguousMustache: function(mustache, program, inverse) {
-    var id = mustache.id,
-        name = id.parts[0],
-        isBlock = program != null || inverse != null;
-
-    this.opcode('getContext', id.depth);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    this.opcode('invokeAmbiguous', name, isBlock);
-  },
-
-  simpleMustache: function(mustache) {
-    var id = mustache.id;
-
-    if (id.type === 'DATA') {
-      this.DATA(id);
-    } else if (id.parts.length) {
-      this.ID(id);
-    } else {
-      // Simplified ID for `this`
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-      this.opcode('pushContext');
-    }
-
-    this.opcode('resolvePossibleLambda');
-  },
-
-  helperMustache: function(mustache, program, inverse) {
-    var params = this.setupFullMustacheParams(mustache, program, inverse),
-        name = mustache.id.parts[0];
-
-    if (this.options.knownHelpers[name]) {
-      this.opcode('invokeKnownHelper', params.length, name);
-    } else if (this.options.knownHelpersOnly) {
-      throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
-    } else {
-      this.opcode('invokeHelper', params.length, name);
-    }
-  },
-
-  ID: function(id) {
-    this.addDepth(id.depth);
-    this.opcode('getContext', id.depth);
-
-    var name = id.parts[0];
-    if (!name) {
-      this.opcode('pushContext');
-    } else {
-      this.opcode('lookupOnContext', id.parts[0]);
-    }
-
-    for(var i=1, l=id.parts.length; i<l; i++) {
-      this.opcode('lookup', id.parts[i]);
-    }
-  },
-
-  DATA: function(data) {
-    this.options.data = true;
-    if (data.id.isScoped || data.id.depth) {
-      throw new Handlebars.Exception('Scoped data references are not supported: ' + data.original);
-    }
-
-    this.opcode('lookupData');
-    var parts = data.id.parts;
-    for(var i=0, l=parts.length; i<l; i++) {
-      this.opcode('lookup', parts[i]);
-    }
-  },
-
-  STRING: function(string) {
-    this.opcode('pushString', string.string);
-  },
-
-  INTEGER: function(integer) {
-    this.opcode('pushLiteral', integer.integer);
-  },
-
-  BOOLEAN: function(bool) {
-    this.opcode('pushLiteral', bool.bool);
-  },
-
-  comment: function() {},
-
-  // HELPERS
-  opcode: function(name) {
-    this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
-  },
-
-  declare: function(name, value) {
-    this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
-  },
-
-  addDepth: function(depth) {
-    if(isNaN(depth)) { throw new Error("EWOT"); }
-    if(depth === 0) { return; }
-
-    if(!this.depths[depth]) {
-      this.depths[depth] = true;
-      this.depths.list.push(depth);
-    }
-  },
-
-  classifyMustache: function(mustache) {
-    var isHelper   = mustache.isHelper;
-    var isEligible = mustache.eligibleHelper;
-    var options    = this.options;
-
-    // if ambiguous, we can possibly resolve the ambiguity now
-    if (isEligible && !isHelper) {
-      var name = mustache.id.parts[0];
-
-      if (options.knownHelpers[name]) {
-        isHelper = true;
-      } else if (options.knownHelpersOnly) {
-        isEligible = false;
-      }
-    }
-
-    if (isHelper) { return "helper"; }
-    else if (isEligible) { return "ambiguous"; }
-    else { return "simple"; }
-  },
-
-  pushParams: function(params) {
-    var i = params.length, param;
-
-    while(i--) {
-      param = params[i];
-
-      if(this.options.stringParams) {
-        if(param.depth) {
-          this.addDepth(param.depth);
-        }
-
-        this.opcode('getContext', param.depth || 0);
-        this.opcode('pushStringParam', param.stringModeValue, param.type);
-      } else {
-        this[param.type](param);
-      }
-    }
-  },
-
-  setupMustacheParams: function(mustache) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  },
-
-  // this will replace setupMustacheParams when we're done
-  setupFullMustacheParams: function(mustache, program, inverse) {
-    var params = mustache.params;
-    this.pushParams(params);
-
-    this.opcode('pushProgram', program);
-    this.opcode('pushProgram', inverse);
-
-    if(mustache.hash) {
-      this.hash(mustache.hash);
-    } else {
-      this.opcode('emptyHash');
-    }
-
-    return params;
-  }
-};
-
-var Literal = function(value) {
-  this.value = value;
-};
-
-JavaScriptCompiler.prototype = {
-  // PUBLIC API: You can override these methods in a subclass to provide
-  // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name /* , type*/) {
-    if (/^[0-9]+$/.test(name)) {
-      return parent + "[" + name + "]";
-    } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-      return parent + "." + name;
-    }
-    else {
-      return parent + "['" + name + "']";
-    }
-  },
-
-  appendToBuffer: function(string) {
-    if (this.environment.isSimple) {
-      return "return " + string + ";";
-    } else {
-      return {
-        appendToBuffer: true,
-        content: string,
-        toString: function() { return "buffer += " + string + ";"; }
-      };
-    }
-  },
-
-  initializeBuffer: function() {
-    return this.quotedString("");
-  },
-
-  namespace: "Handlebars",
-  // END PUBLIC API
-
-  compile: function(environment, options, context, asObject) {
-    this.environment = environment;
-    this.options = options || {};
-
-    Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n");
-
-    this.name = this.environment.name;
-    this.isChild = !!context;
-    this.context = context || {
-      programs: [],
-      environments: [],
-      aliases: { }
-    };
-
-    this.preamble();
-
-    this.stackSlot = 0;
-    this.stackVars = [];
-    this.registers = { list: [] };
-    this.compileStack = [];
-    this.inlineStack = [];
-
-    this.compileChildren(environment, options);
-
-    var opcodes = environment.opcodes, opcode;
-
-    this.i = 0;
-
-    for(l=opcodes.length; this.i<l; this.i++) {
-      opcode = opcodes[this.i];
-
-      if(opcode.opcode === 'DECLARE') {
-        this[opcode.name] = opcode.value;
-      } else {
-        this[opcode.opcode].apply(this, opcode.args);
-      }
-    }
-
-    return this.createFunctionContext(asObject);
-  },
-
-  nextOpcode: function() {
-    var opcodes = this.environment.opcodes;
-    return opcodes[this.i + 1];
-  },
-
-  eat: function() {
-    this.i = this.i + 1;
-  },
-
-  preamble: function() {
-    var out = [];
-
-    if (!this.isChild) {
-      var namespace = this.namespace;
-
-      var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
-      if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
-      if (this.options.data) { copies = copies + " data = data || {};"; }
-      out.push(copies);
-    } else {
-      out.push('');
-    }
-
-    if (!this.environment.isSimple) {
-      out.push(", buffer = " + this.initializeBuffer());
-    } else {
-      out.push("");
-    }
-
-    // track the last context pushed into place to allow skipping the
-    // getContext opcode when it would be a noop
-    this.lastContext = 0;
-    this.source = out;
-  },
-
-  createFunctionContext: function(asObject) {
-    var locals = this.stackVars.concat(this.registers.list);
-
-    if(locals.length > 0) {
-      this.source[1] = this.source[1] + ", " + locals.join(", ");
-    }
-
-    // Generate minimizer alias mappings
-    if (!this.isChild) {
-      for (var alias in this.context.aliases) {
-        if (this.context.aliases.hasOwnProperty(alias)) {
-          this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
-        }
-      }
-    }
-
-    if (this.source[1]) {
-      this.source[1] = "var " + this.source[1].substring(2) + ";";
-    }
-
-    // Merge children
-    if (!this.isChild) {
-      this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
-    }
-
-    if (!this.environment.isSimple) {
-      this.source.push("return buffer;");
-    }
-
-    var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
-    for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
-      params.push("depth" + this.environment.depths.list[i]);
-    }
-
-    // Perform a second pass over the output to merge content when possible
-    var source = this.mergeSource();
-
-    if (!this.isChild) {
-      var revision = Handlebars.COMPILER_REVISION,
-          versions = Handlebars.REVISION_CHANGES[revision];
-      source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
-    }
-
-    if (asObject) {
-      params.push(source);
-
-      return Function.apply(this, params);
-    } else {
-      var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-      Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
-      return functionSource;
-    }
-  },
-  mergeSource: function() {
-    // WARN: We are not handling the case where buffer is still populated as the source should
-    // not have buffer append operations as their final action.
-    var source = '',
-        buffer;
-    for (var i = 0, len = this.source.length; i < len; i++) {
-      var line = this.source[i];
-      if (line.appendToBuffer) {
-        if (buffer) {
-          buffer = buffer + '\n    + ' + line.content;
-        } else {
-          buffer = line.content;
-        }
-      } else {
-        if (buffer) {
-          source += 'buffer += ' + buffer + ';\n  ';
-          buffer = undefined;
-        }
-        source += line + '\n  ';
-      }
-    }
-    return source;
-  },
-
-  // [blockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // On stack, after: return value of blockHelperMissing
-  //
-  // The purpose of this opcode is to take a block of the form
-  // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
-  // replace it on the stack with the result of properly
-  // invoking blockHelperMissing.
-  blockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    this.replaceStack(function(current) {
-      params.splice(1, 0, current);
-      return "blockHelperMissing.call(" + params.join(", ") + ")";
-    });
-  },
-
-  // [ambiguousBlockValue]
-  //
-  // On stack, before: hash, inverse, program, value
-  // Compiler value, before: lastHelper=value of last found helper, if any
-  // On stack, after, if no lastHelper: same as [blockValue]
-  // On stack, after, if lastHelper: value
-  ambiguousBlockValue: function() {
-    this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-    var params = ["depth0"];
-    this.setupParams(0, params);
-
-    var current = this.topStack();
-    params.splice(1, 0, current);
-
-    // Use the options value generated from the invocation
-    params[params.length-1] = 'options';
-
-    this.source.push("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
-  },
-
-  // [appendContent]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  //
-  // Appends the string value of `content` to the current buffer
-  appendContent: function(content) {
-    this.source.push(this.appendToBuffer(this.quotedString(content)));
-  },
-
-  // [append]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Coerces `value` to a String and appends it to the current buffer.
-  //
-  // If `value` is truthy, or 0, it is coerced into a string and appended
-  // Otherwise, the empty string is appended
-  append: function() {
-    // Force anything that is inlined onto the stack so we don't have duplication
-    // when we examine local
-    this.flushInline();
-    var local = this.popStack();
-    this.source.push("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
-    if (this.environment.isSimple) {
-      this.source.push("else { " + this.appendToBuffer("''") + " }");
-    }
-  },
-
-  // [appendEscaped]
-  //
-  // On stack, before: value, ...
-  // On stack, after: ...
-  //
-  // Escape `value` and append it to the buffer
-  appendEscaped: function() {
-    this.context.aliases.escapeExpression = 'this.escapeExpression';
-
-    this.source.push(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
-  },
-
-  // [getContext]
-  //
-  // On stack, before: ...
-  // On stack, after: ...
-  // Compiler value, after: lastContext=depth
-  //
-  // Set the value of the `lastContext` compiler value to the depth
-  getContext: function(depth) {
-    if(this.lastContext !== depth) {
-      this.lastContext = depth;
-    }
-  },
-
-  // [lookupOnContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext[name], ...
-  //
-  // Looks up the value of `name` on the current context and pushes
-  // it onto the stack.
-  lookupOnContext: function(name) {
-    this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
-  },
-
-  // [pushContext]
-  //
-  // On stack, before: ...
-  // On stack, after: currentContext, ...
-  //
-  // Pushes the value of the current context onto the stack.
-  pushContext: function() {
-    this.pushStackLiteral('depth' + this.lastContext);
-  },
-
-  // [resolvePossibleLambda]
-  //
-  // On stack, before: value, ...
-  // On stack, after: resolved value, ...
-  //
-  // If the `value` is a lambda, replace it on the stack by
-  // the return value of the lambda
-  resolvePossibleLambda: function() {
-    this.context.aliases.functionType = '"function"';
-
-    this.replaceStack(function(current) {
-      return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
-    });
-  },
-
-  // [lookup]
-  //
-  // On stack, before: value, ...
-  // On stack, after: value[name], ...
-  //
-  // Replace the value on the stack with the result of looking
-  // up `name` on `value`
-  lookup: function(name) {
-    this.replaceStack(function(current) {
-      return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
-    });
-  },
-
-  // [lookupData]
-  //
-  // On stack, before: ...
-  // On stack, after: data[id], ...
-  //
-  // Push the result of looking up `id` on the current data
-  lookupData: function(id) {
-    this.push('data');
-  },
-
-  // [pushStringParam]
-  //
-  // On stack, before: ...
-  // On stack, after: string, currentContext, ...
-  //
-  // This opcode is designed for use in string mode, which
-  // provides the string value of a parameter along with its
-  // depth rather than resolving it immediately.
-  pushStringParam: function(string, type) {
-    this.pushStackLiteral('depth' + this.lastContext);
-
-    this.pushString(type);
-
-    if (typeof string === 'string') {
-      this.pushString(string);
-    } else {
-      this.pushStackLiteral(string);
-    }
-  },
-
-  emptyHash: function() {
-    this.pushStackLiteral('{}');
-
-    if (this.options.stringParams) {
-      this.register('hashTypes', '{}');
-      this.register('hashContexts', '{}');
-    }
-  },
-  pushHash: function() {
-    this.hash = {values: [], types: [], contexts: []};
-  },
-  popHash: function() {
-    var hash = this.hash;
-    this.hash = undefined;
-
-    if (this.options.stringParams) {
-      this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
-      this.register('hashTypes', '{' + hash.types.join(',') + '}');
-    }
-    this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
-  },
-
-  // [pushString]
-  //
-  // On stack, before: ...
-  // On stack, after: quotedString(string), ...
-  //
-  // Push a quoted version of `string` onto the stack
-  pushString: function(string) {
-    this.pushStackLiteral(this.quotedString(string));
-  },
-
-  // [push]
-  //
-  // On stack, before: ...
-  // On stack, after: expr, ...
-  //
-  // Push an expression onto the stack
-  push: function(expr) {
-    this.inlineStack.push(expr);
-    return expr;
-  },
-
-  // [pushLiteral]
-  //
-  // On stack, before: ...
-  // On stack, after: value, ...
-  //
-  // Pushes a value onto the stack. This operation prevents
-  // the compiler from creating a temporary variable to hold
-  // it.
-  pushLiteral: function(value) {
-    this.pushStackLiteral(value);
-  },
-
-  // [pushProgram]
-  //
-  // On stack, before: ...
-  // On stack, after: program(guid), ...
-  //
-  // Push a program expression onto the stack. This takes
-  // a compile-time guid and converts it into a runtime-accessible
-  // expression.
-  pushProgram: function(guid) {
-    if (guid != null) {
-      this.pushStackLiteral(this.programExpression(guid));
-    } else {
-      this.pushStackLiteral(null);
-    }
-  },
-
-  // [invokeHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // Pops off the helper's parameters, invokes the helper,
-  // and pushes the helper's return value onto the stack.
-  //
-  // If the helper is not found, `helperMissing` is called.
-  invokeHelper: function(paramSize, name) {
-    this.context.aliases.helperMissing = 'helpers.helperMissing';
-
-    var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-
-    this.push(helper.name + ' || ' + nonHelper);
-    this.replaceStack(function(name) {
-      return name + ' ? ' + name + '.call(' +
-          helper.callParams + ") " + ": helperMissing.call(" +
-          helper.helperMissingParams + ")";
-    });
-  },
-
-  // [invokeKnownHelper]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of helper invocation
-  //
-  // This operation is used when the helper is known to exist,
-  // so a `helperMissing` fallback is not required.
-  invokeKnownHelper: function(paramSize, name) {
-    var helper = this.setupHelper(paramSize, name);
-    this.push(helper.name + ".call(" + helper.callParams + ")");
-  },
-
-  // [invokeAmbiguous]
-  //
-  // On stack, before: hash, inverse, program, params..., ...
-  // On stack, after: result of disambiguation
-  //
-  // This operation is used when an expression like `{{foo}}`
-  // is provided, but we don't know at compile-time whether it
-  // is a helper or a path.
-  //
-  // This operation emits more code than the other options,
-  // and can be avoided by passing the `knownHelpers` and
-  // `knownHelpersOnly` flags at compile-time.
-  invokeAmbiguous: function(name, helperCall) {
-    this.context.aliases.functionType = '"function"';
-
-    this.pushStackLiteral('{}');    // Hash value
-    var helper = this.setupHelper(0, name, helperCall);
-
-    var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-    var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-    var nextStack = this.nextStack();
-
-    this.source.push('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
-    this.source.push('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.apply(depth0) : ' + nextStack + '; }');
-  },
-
-  // [invokePartial]
-  //
-  // On stack, before: context, ...
-  // On stack after: result of partial invocation
-  //
-  // This operation pops off a context, invokes a partial with that context,
-  // and pushes the result of the invocation back.
-  invokePartial: function(name) {
-    var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
-
-    if (this.options.data) {
-      params.push("data");
-    }
-
-    this.context.aliases.self = "this";
-    this.push("self.invokePartial(" + params.join(", ") + ")");
-  },
-
-  // [assignToHash]
-  //
-  // On stack, before: value, hash, ...
-  // On stack, after: hash, ...
-  //
-  // Pops a value and hash off the stack, assigns `hash[key] = value`
-  // and pushes the hash back onto the stack.
-  assignToHash: function(key) {
-    var value = this.popStack(),
-        context,
-        type;
-
-    if (this.options.stringParams) {
-      type = this.popStack();
-      context = this.popStack();
-    }
-
-    var hash = this.hash;
-    if (context) {
-      hash.contexts.push("'" + key + "': " + context);
-    }
-    if (type) {
-      hash.types.push("'" + key + "': " + type);
-    }
-    hash.values.push("'" + key + "': (" + value + ")");
-  },
-
-  // HELPERS
-
-  compiler: JavaScriptCompiler,
-
-  compileChildren: function(environment, options) {
-    var children = environment.children, child, compiler;
-
-    for(var i=0, l=children.length; i<l; i++) {
-      child = children[i];
-      compiler = new this.compiler();
-
-      var index = this.matchExistingProgram(child);
-
-      if (index == null) {
-        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-        index = this.context.programs.length;
-        child.index = index;
-        child.name = 'program' + index;
-        this.context.programs[index] = compiler.compile(child, options, this.context);
-        this.context.environments[index] = child;
-      } else {
-        child.index = index;
-        child.name = 'program' + index;
-      }
-    }
-  },
-  matchExistingProgram: function(child) {
-    for (var i = 0, len = this.context.environments.length; i < len; i++) {
-      var environment = this.context.environments[i];
-      if (environment && environment.equals(child)) {
-        return i;
-      }
-    }
-  },
-
-  programExpression: function(guid) {
-    this.context.aliases.self = "this";
-
-    if(guid == null) {
-      return "self.noop";
-    }
-
-    var child = this.environment.children[guid],
-        depths = child.depths.list, depth;
-
-    var programParams = [child.index, child.name, "data"];
-
-    for(var i=0, l = depths.length; i<l; i++) {
-      depth = depths[i];
-
-      if(depth === 1) { programParams.push("depth0"); }
-      else { programParams.push("depth" + (depth - 1)); }
-    }
-
-    return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
-  },
-
-  register: function(name, val) {
-    this.useRegister(name);
-    this.source.push(name + " = " + val + ";");
-  },
-
-  useRegister: function(name) {
-    if(!this.registers[name]) {
-      this.registers[name] = true;
-      this.registers.list.push(name);
-    }
-  },
-
-  pushStackLiteral: function(item) {
-    return this.push(new Literal(item));
-  },
-
-  pushStack: function(item) {
-    this.flushInline();
-
-    var stack = this.incrStack();
-    if (item) {
-      this.source.push(stack + " = " + item + ";");
-    }
-    this.compileStack.push(stack);
-    return stack;
-  },
-
-  replaceStack: function(callback) {
-    var prefix = '',
-        inline = this.isInline(),
-        stack;
-
-    // If we are currently inline then we want to merge the inline statement into the
-    // replacement statement via ','
-    if (inline) {
-      var top = this.popStack(true);
-
-      if (top instanceof Literal) {
-        // Literals do not need to be inlined
-        stack = top.value;
-      } else {
-        // Get or create the current stack name for use by the inline
-        var name = this.stackSlot ? this.topStackName() : this.incrStack();
-
-        prefix = '(' + this.push(name) + ' = ' + top + '),';
-        stack = this.topStack();
-      }
-    } else {
-      stack = this.topStack();
-    }
-
-    var item = callback.call(this, stack);
-
-    if (inline) {
-      if (this.inlineStack.length || this.compileStack.length) {
-        this.popStack();
-      }
-      this.push('(' + prefix + item + ')');
-    } else {
-      // Prevent modification of the context depth variable. Through replaceStack
-      if (!/^stack/.test(stack)) {
-        stack = this.nextStack();
-      }
-
-      this.source.push(stack + " = (" + prefix + item + ");");
-    }
-    return stack;
-  },
-
-  nextStack: function() {
-    return this.pushStack();
-  },
-
-  incrStack: function() {
-    this.stackSlot++;
-    if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
-    return this.topStackName();
-  },
-  topStackName: function() {
-    return "stack" + this.stackSlot;
-  },
-  flushInline: function() {
-    var inlineStack = this.inlineStack;
-    if (inlineStack.length) {
-      this.inlineStack = [];
-      for (var i = 0, len = inlineStack.length; i < len; i++) {
-        var entry = inlineStack[i];
-        if (entry instanceof Literal) {
-          this.compileStack.push(entry);
-        } else {
-          this.pushStack(entry);
-        }
-      }
-    }
-  },
-  isInline: function() {
-    return this.inlineStack.length;
-  },
-
-  popStack: function(wrapped) {
-    var inline = this.isInline(),
-        item = (inline ? this.inlineStack : this.compileStack).pop();
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      if (!inline) {
-        this.stackSlot--;
-      }
-      return item;
-    }
-  },
-
-  topStack: function(wrapped) {
-    var stack = (this.isInline() ? this.inlineStack : this.compileStack),
-        item = stack[stack.length - 1];
-
-    if (!wrapped && (item instanceof Literal)) {
-      return item.value;
-    } else {
-      return item;
-    }
-  },
-
-  quotedString: function(str) {
-    return '"' + str
-      .replace(/\\/g, '\\\\')
-      .replace(/"/g, '\\"')
-      .replace(/\n/g, '\\n')
-      .replace(/\r/g, '\\r')
-      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-      .replace(/\u2029/g, '\\u2029') + '"';
-  },
-
-  setupHelper: function(paramSize, name, missingParams) {
-    var params = [];
-    this.setupParams(paramSize, params, missingParams);
-    var foundHelper = this.nameLookup('helpers', name, 'helper');
-
-    return {
-      params: params,
-      name: foundHelper,
-      callParams: ["depth0"].concat(params).join(", "),
-      helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
-    };
-  },
-
-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(paramSize, params, useRegister) {
-    var options = [], contexts = [], types = [], param, inverse, program;
-
-    options.push("hash:" + this.popStack());
-
-    inverse = this.popStack();
-    program = this.popStack();
-
-    // Avoid setting fn and inverse if neither are set. This allows
-    // helpers to do a check for `if (options.fn)`
-    if (program || inverse) {
-      if (!program) {
-        this.context.aliases.self = "this";
-        program = "self.noop";
-      }
-
-      if (!inverse) {
-       this.context.aliases.self = "this";
-        inverse = "self.noop";
-      }
-
-      options.push("inverse:" + inverse);
-      options.push("fn:" + program);
-    }
-
-    for(var i=0; i<paramSize; i++) {
-      param = this.popStack();
-      params.push(param);
-
-      if(this.options.stringParams) {
-        types.push(this.popStack());
-        contexts.push(this.popStack());
-      }
-    }
-
-    if (this.options.stringParams) {
-      options.push("contexts:[" + contexts.join(",") + "]");
-      options.push("types:[" + types.join(",") + "]");
-      options.push("hashContexts:hashContexts");
-      options.push("hashTypes:hashTypes");
-    }
-
-    if(this.options.data) {
-      options.push("data:data");
-    }
-
-    options = "{" + options.join(",") + "}";
-    if (useRegister) {
-      this.register('options', options);
-      params.push('options');
-    } else {
-      params.push(options);
-    }
-    return params.join(", ");
-  }
-};
-
-var reservedWords = (
-  "break else new var" +
-  " case finally return void" +
-  " catch for switch while" +
-  " continue function this with" +
-  " default if throw" +
-  " delete in try" +
-  " do instanceof typeof" +
-  " abstract enum int short" +
-  " boolean export interface static" +
-  " byte extends long super" +
-  " char final native synchronized" +
-  " class float package throws" +
-  " const goto private transient" +
-  " debugger implements protected volatile" +
-  " double import public let yield"
-).split(" ");
-
-var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-for(var i=0, l=reservedWords.length; i<l; i++) {
-  compilerWords[reservedWords[i]] = true;
-}
-
-JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-  if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
-    return true;
-  }
-  return false;
-};
-
-Handlebars.precompile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var ast = Handlebars.parse(input);
-  var environment = new Compiler().compile(ast, options);
-  return new JavaScriptCompiler().compile(environment, options);
-};
-
-Handlebars.compile = function(input, options) {
-  if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
-    throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
-  }
-
-  options = options || {};
-  if (!('data' in options)) {
-    options.data = true;
-  }
-  var compiled;
-  function compile() {
-    var ast = Handlebars.parse(input);
-    var environment = new Compiler().compile(ast, options);
-    var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
-    return Handlebars.template(templateSpec);
-  }
-
-  // Template is only compiled on first use and cached after that point.
-  return function(context, options) {
-    if (!compiled) {
-      compiled = compile();
-    }
-    return compiled.call(this, context, options);
-  };
-};
-
-;
-// lib/handlebars/runtime.js
-
-Handlebars.VM = {
-  template: function(templateSpec) {
-    // Just add water
-    var container = {
-      escapeExpression: Handlebars.Utils.escapeExpression,
-      invokePartial: Handlebars.VM.invokePartial,
-      programs: [],
-      program: function(i, fn, data) {
-        var programWrapper = this.programs[i];
-        if(data) {
-          programWrapper = Handlebars.VM.program(i, fn, data);
-        } else if (!programWrapper) {
-          programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
-        }
-        return programWrapper;
-      },
-      merge: function(param, common) {
-        var ret = param || common;
-
-        if (param && common) {
-          ret = {};
-          Handlebars.Utils.extend(ret, common);
-          Handlebars.Utils.extend(ret, param);
-        }
-        return ret;
-      },
-      programWithDepth: Handlebars.VM.programWithDepth,
-      noop: Handlebars.VM.noop,
-      compilerInfo: null
-    };
-
-    return function(context, options) {
-      options = options || {};
-      var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
-
-      var compilerInfo = container.compilerInfo || [],
-          compilerRevision = compilerInfo[0] || 1,
-          currentRevision = Handlebars.COMPILER_REVISION;
-
-      if (compilerRevision !== currentRevision) {
-        if (compilerRevision < currentRevision) {
-          var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
-              compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
-          throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
-                "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
-        } else {
-          // Use the embedded version info since the runtime doesn't know about this revision yet
-          throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
-                "Please update your runtime to a newer version ("+compilerInfo[1]+").";
-        }
-      }
-
-      return result;
-    };
-  },
-
-  programWithDepth: function(i, fn, data /*, $depth */) {
-    var args = Array.prototype.slice.call(arguments, 3);
-
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn.apply(this, [context, options.data || data].concat(args));
-    };
-    program.program = i;
-    program.depth = args.length;
-    return program;
-  },
-  program: function(i, fn, data) {
-    var program = function(context, options) {
-      options = options || {};
-
-      return fn(context, options.data || data);
-    };
-    program.program = i;
-    program.depth = 0;
-    return program;
-  },
-  noop: function() { return ""; },
-  invokePartial: function(partial, name, context, helpers, partials, data) {
-    var options = { helpers: helpers, partials: partials, data: data };
-
-    if(partial === undefined) {
-      throw new Handlebars.Exception("The partial " + name + " could not be found");
-    } else if(partial instanceof Function) {
-      return partial(context, options);
-    } else if (!Handlebars.compile) {
-      throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
-    } else {
-      partials[name] = Handlebars.compile(partial, {data: data !== undefined});
-      return partials[name](context, options);
-    }
-  }
-};
-
-Handlebars.template = Handlebars.VM.template;
-;
-// lib/handlebars/browser-suffix.js
-})(Handlebars);
-;
diff --git a/api/files/highlight.7.3.pack.js b/api/files/highlight.7.3.pack.js
deleted file mode 100644
index 9a95a75e..00000000
--- a/api/files/highlight.7.3.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
diff --git a/api/files/jquery-1.8.0.min.js b/api/files/jquery-1.8.0.min.js
deleted file mode 100644
index f121291c..00000000
--- a/api/files/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compareDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.oMatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.propHooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cY.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cN&&(cN=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cN),cN=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c$=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=c_(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/api/files/jquery.ba-bbq.min.js b/api/files/jquery.ba-bbq.min.js
deleted file mode 100644
index bcbf2483..00000000
--- a/api/files/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
-/*
- * jQuery hashchange event - v1.2 - 2/11/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/api/files/jquery.slideto.min.js b/api/files/jquery.slideto.min.js
deleted file mode 100644
index ba32cff3..00000000
--- a/api/files/jquery.slideto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
diff --git a/api/files/jquery.wiggle.min.js b/api/files/jquery.wiggle.min.js
deleted file mode 100644
index 2adb0d6d..00000000
--- a/api/files/jquery.wiggle.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-jQuery Wiggle
-Author: WonderGroup, Jordan Thomas
-URL: http://labs.wondergroup.com/demos/mini-ui/index.html
-License: MIT (http://en.wikipedia.org/wiki/MIT_License)
-*/
-jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
-if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
diff --git a/api/files/reset.css b/api/files/reset.css
deleted file mode 100644
index b2b07894..00000000
--- a/api/files/reset.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
-  display: block;
-}
-body {
-  line-height: 1;
-}
-ol,
-ul {
-  list-style: none;
-}
-blockquote,
-q {
-  quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-  content: '';
-  content: none;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/api/files/screen.css b/api/files/screen.css
deleted file mode 100644
index f2148836..00000000
--- a/api/files/screen.css
+++ /dev/null
@@ -1,1221 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
-  content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
-  display: block;
-  clear: none;
-  float: left;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
-  padding: 5px;
-  font-size: 0.9em;
-  color: #666666;
-  border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
-  background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
-  padding: 6px;
-  font-size: 0.9em;
-  border-bottom: 1px solid #cccccc;
-  vertical-align: top;
-  line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
-  margin: 0px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
-  padding: 5px 0px;
-  font-size: 0.9em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
-  list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
-  color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
-  border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
-  display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
-  line-height: 1.6em;
-  background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
-  clear: both;
-  display: block;
-  color: #0F6AB4;
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
-  font-size: 12px;
-  margin-top: 5px;
-  padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
-  padding-bottom: 10px;
-  font-weight: bold;
-  font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
-  font-size: 1em;
-  margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
-  width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
-  color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_contact {
-  padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
-  padding-bottom: 10px;
-  font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
-  padding: 3px 0px;
-  line-height: 1.4em;
-  color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
-  display: block;
-  padding: 4px;
-  width: auto;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
-  font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
-  width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 1em;
-  line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
-  text-decoration: none;
-  color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
-  color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
-  background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
-  font-size: .85em;
-  line-height: 1.2em;
-  overflow: auto;
-  max-height: 200px;
-  cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
-  float: left;
-  margin: 0 5px 5px 0;
-  padding: 2px 5px 2px 0;
-  border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
-  color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
-  font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
-  font-weight: bold;
-  color: #000;
-  font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
-  font-size: 0.9em;
-  line-height: 1.5em;
-  margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
-  font-weight: bold;
-  color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
-  width: 300px;
-  height: 100px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #f0f0f0;
-  color: black;
-  padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
-  width: 300px;
-  border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
-  color: black;
-  font-size: 1.5em;
-  line-height: 1.3em;
-  padding: 10px 0 10px 0;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
-  display: block;
-  clear: none;
-  float: right;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
-  color: black;
-  font-size: 1.3em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
-  font-size: 0.7em;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
-  color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
-  color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
-  font-family: "Droid Sans", sans-serif;
-  height: 250px;
-  padding: 4px;
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
-  display: block;
-  clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
-  display: block;
-  float: left;
-  clear: none;
-  margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
-  display: block;
-  clear: both;
-  width: auto;
-  padding: 0 0 3px;
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
-  padding-left: 3px;
-  color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
-  margin-left: 0;
-  font-style: italic;
-  font-size: 0.9em;
-  margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
-  color: #888888;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
-  color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  background-color: #fcf6db;
-  border: 1px solid #e5e0c6;
-  padding: 10px;
-  margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
-  line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
-  margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
-  font-family: "Droid Sans", sans-serif;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
-  border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
-  color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
-  border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
-  border: 1px solid transparent;
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  border-right: 1px solid #dddddd;
-  color: #666666;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
-  color: #aaaaaa;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
-  text-decoration: underline;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
-  color: #999999;
-  padding-left: 0;
-  display: block;
-  clear: none;
-  float: left;
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
-  color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0 0 10px;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
-  display: block;
-  clear: none;
-  float: left;
-  width: auto;
-  margin: 0;
-  padding: 0;
-  line-height: 1.1em;
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
-  padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
-  color: black;
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  text-decoration: none;
-  color: white;
-  display: inline-block;
-  width: 50px;
-  font-size: 0.7em;
-  text-align: center;
-  padding: 7px 0 4px;
-  -moz-border-radius: 2px;
-  -webkit-border-radius: 2px;
-  -o-border-radius: 2px;
-  -ms-border-radius: 2px;
-  -khtml-border-radius: 2px;
-  border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
-  margin: 0;
-  padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
-  overflow: hidden;
-  padding: 0;
-  display: block;
-  clear: none;
-  float: right;
-  margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
-  float: left;
-  clear: none;
-  margin: 0;
-  padding: 2px 10px;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
-  text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
-  color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
-  border-top: none;
-  padding: 10px;
-  -moz-border-radius-bottomleft: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-  -o-border-bottom-left-radius: 6px;
-  -ms-border-bottom-left-radius: 6px;
-  -khtml-border-bottom-left-radius: 6px;
-  border-bottom-left-radius: 6px;
-  -moz-border-radius-bottomright: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-  -o-border-bottom-right-radius: 6px;
-  -ms-border-bottom-right-radius: 6px;
-  -khtml-border-bottom-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
-  font-size: 1.1em;
-  margin: 0;
-  padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
-  float: none;
-  clear: both;
-  overflow: hidden;
-  display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
-  padding: 4px 0 0 10px;
-  display: inline-block;
-  font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header img {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
-  display: block;
-  clear: none;
-  float: left;
-  padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
-  outline: 2px solid black;
-  outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
-  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-  padding: 10px;
-  font-size: 0.9em;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
-  background-color: #f9f2e9;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
-  background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0e0ca;
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
-  background-color: #faf5ee;
-  border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
-  color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #ffd20f;
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
-  background-color: #fcffcd;
-  border: 1px solid black;
-  border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
-  color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
-  background-color: #f5e8e8;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
-  text-transform: uppercase;
-  background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #e8c6c7;
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  background-color: #f7eded;
-  border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
-  color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
-  color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
-  background-color: #e7f6ec;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
-  background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3e8d1;
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
-  background-color: #ebf7f0;
-  border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
-  color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
-  color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
-  background-color: #FCE9E3;
-  border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
-  background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #f0cecb;
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
-  background-color: #faf0ef;
-  border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-  color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
-  color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
-  background-color: #e7f0f7;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
-  background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
-  border-right: 1px solid #dddddd;
-  border-right-color: #c3d9ec;
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
-  color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
-  color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
-  border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
-  padding-right: 0;
-  border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
-  text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
-  padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
-  margin: 0 15px 40px 15px;
-  padding: 10px 0;
-  font-size: 0.8em;
-  border-top: 1px solid #dddddd;
-  font-family: "Droid Sans", sans-serif;
-  color: #999999;
-  font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
-  text-decoration: none;
-  color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
-  color: black;
-  font-size: 1.1em;
-  padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
-  font-family: "Droid Sans", sans-serif;
-  margin: 5px 0 10px;
-  padding: 0 0 0 18px;
-  list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
-  background-color: #ebf3f9;
-  border: 1px solid #c3d9ec;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
-  color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
-  display: block;
-  padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
-  font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
-  font-size: 0.9em;
-  padding: 0 0 15px;
-  color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
-  color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
-  color: black;
-}
-.swagger-section .title {
-  font-style: bold;
-}
-.swagger-section .secondary_form {
-  display: none;
-}
-.swagger-section .main_image {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .oauth_body {
-  margin-left: 100px;
-  margin-right: 100px;
-}
-.swagger-section .oauth_submit {
-  text-align: center;
-}
-.swagger-section .api-popup-dialog {
-  z-index: 10000;
-  position: absolute;
-  width: 500px;
-  background: #FFF;
-  padding: 20px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
-  font-size: 24px;
-  padding: 10px 0;
-}
-.swagger-section .api-popup-dialog p.error-msg {
-  padding-left: 5px;
-  padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
-  height: 30px;
-}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
-  height: 30px;
-}
-.swagger-section .api-popup-scopes {
-  padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
-  padding: 5px 0;
-  line-height: 20px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
-  padding-left: 20px;
-  font-style: italic;
-}
-.swagger-section .api-popup-scopes li input {
-  position: relative;
-  top: 2px;
-}
-.swagger-section .api-popup-actions {
-  padding-top: 10px;
-}
-.swagger-section .access {
-  float: right;
-}
-.swagger-section .auth {
-  float: right;
-}
-.swagger-section #api_information_panel {
-  position: absolute;
-  background: #FFF;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  display: none;
-  font-size: 13px;
-  max-width: 300px;
-  line-height: 30px;
-  color: black;
-  padding: 5px;
-}
-.swagger-section #api_information_panel p .api-msg-enabled {
-  color: green;
-}
-.swagger-section #api_information_panel p .api-msg-disabled {
-  color: red;
-}
-.swagger-section .api-ic {
-  height: 18px;
-  vertical-align: middle;
-  display: inline-block;
-  background: url(../images/explorer_icons.png) no-repeat;
-}
-.swagger-section .ic-info {
-  background-position: 0 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-warning {
-  background-position: -60px 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-error {
-  background-position: -30px 0;
-  width: 18px;
-  margin-top: -7px;
-  margin-left: 4px;
-}
-.swagger-section .ic-off {
-  background-position: -90px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section .ic-on {
-  background-position: -160px 0;
-  width: 58px;
-  margin-top: -4px;
-  cursor: pointer;
-}
-.swagger-section #header {
-  background-color: #89bf04;
-  padding: 14px;
-}
-.swagger-section #header a#logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
-  padding: 20px 0 20px 40px;
-  color: white;
-}
-.swagger-section #header form#api_selector {
-  display: block;
-  clear: none;
-  float: right;
-}
-.swagger-section #header form#api_selector .input {
-  display: block;
-  clear: none;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.swagger-section #header form#api_selector .input input#input_apiKey {
-  width: 200px;
-}
-.swagger-section #header form#api_selector .input input#input_baseUrl {
-  width: 400px;
-}
-.swagger-section #header form#api_selector .input a#explore {
-  display: block;
-  text-decoration: none;
-  font-weight: bold;
-  padding: 6px 8px;
-  font-size: 0.9em;
-  color: white;
-  background-color: #547f00;
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -o-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -khtml-border-radius: 4px;
-  border-radius: 4px;
-}
-.swagger-section #header form#api_selector .input a#explore:hover {
-  background-color: #547f00;
-}
-.swagger-section #header form#api_selector .input input {
-  font-size: 0.9em;
-  padding: 3px;
-  margin: 0;
-}
-.swagger-section #content_message {
-  margin: 10px 15px;
-  font-style: italic;
-  color: #999999;
-}
-.swagger-section #message-bar {
-  min-height: 30px;
-  text-align: center;
-  padding-top: 10px;
-}
diff --git a/api/files/shred.bundle.js b/api/files/shred.bundle.js
deleted file mode 100644
index 74d08168..00000000
--- a/api/files/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
-    var resolved = require.resolve(file, cwd || '/');
-    var mod = require.modules[resolved];
-    if (!mod) throw new Error(
-        'Failed to resolve module ' + file + ', tried ' + resolved
-    );
-    var res = mod._cached ? mod._cached : mod();
-    return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
-    'assert': true,
-    'events': true,
-    'fs': true,
-    'path': true,
-    'vm': true
-};
-
-require.resolve = (function () {
-    return function (x, cwd) {
-        if (!cwd) cwd = '/';
-        
-        if (require._core[x]) return x;
-        var path = require.modules.path();
-        var y = cwd || '.';
-        
-        if (x.match(/^(?:\.\.?\/|\/)/)) {
-            var m = loadAsFileSync(path.resolve(y, x))
-                || loadAsDirectorySync(path.resolve(y, x));
-            if (m) return m;
-        }
-        
-        var n = loadNodeModulesSync(x, y);
-        if (n) return n;
-        
-        throw new Error("Cannot find module '" + x + "'");
-        
-        function loadAsFileSync (x) {
-            if (require.modules[x]) {
-                return x;
-            }
-            
-            for (var i = 0; i < require.extensions.length; i++) {
-                var ext = require.extensions[i];
-                if (require.modules[x + ext]) return x + ext;
-            }
-        }
-        
-        function loadAsDirectorySync (x) {
-            x = x.replace(/\/+$/, '');
-            var pkgfile = x + '/package.json';
-            if (require.modules[pkgfile]) {
-                var pkg = require.modules[pkgfile]();
-                var b = pkg.browserify;
-                if (typeof b === 'object' && b.main) {
-                    var m = loadAsFileSync(path.resolve(x, b.main));
-                    if (m) return m;
-                }
-                else if (typeof b === 'string') {
-                    var m = loadAsFileSync(path.resolve(x, b));
-                    if (m) return m;
-                }
-                else if (pkg.main) {
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                }
-            }
-            
-            return loadAsFileSync(x + '/index');
-        }
-        
-        function loadNodeModulesSync (x, start) {
-            var dirs = nodeModulesPathsSync(start);
-            for (var i = 0; i < dirs.length; i++) {
-                var dir = dirs[i];
-                var m = loadAsFileSync(dir + '/' + x);
-                if (m) return m;
-                var n = loadAsDirectorySync(dir + '/' + x);
-                if (n) return n;
-            }
-            
-            var m = loadAsFileSync(x);
-            if (m) return m;
-        }
-        
-        function nodeModulesPathsSync (start) {
-            var parts;
-            if (start === '/') parts = [ '' ];
-            else parts = path.normalize(start).split('/');
-            
-            var dirs = [];
-            for (var i = parts.length - 1; i >= 0; i--) {
-                if (parts[i] === 'node_modules') continue;
-                var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
-                dirs.push(dir);
-            }
-            
-            return dirs;
-        }
-    };
-})();
-
-require.alias = function (from, to) {
-    var path = require.modules.path();
-    var res = null;
-    try {
-        res = require.resolve(from + '/package.json', '/');
-    }
-    catch (err) {
-        res = require.resolve(from, '/');
-    }
-    var basedir = path.dirname(res);
-    
-    var keys = (Object.keys || function (obj) {
-        var res = [];
-        for (var key in obj) res.push(key)
-        return res;
-    })(require.modules);
-    
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (key.slice(0, basedir.length + 1) === basedir + '/') {
-            var f = key.slice(basedir.length);
-            require.modules[to + f] = require.modules[basedir + f];
-        }
-        else if (key === basedir) {
-            require.modules[to] = require.modules[basedir];
-        }
-    }
-};
-
-require.define = function (filename, fn) {
-    var dirname = require._core[filename]
-        ? ''
-        : require.modules.path().dirname(filename)
-    ;
-    
-    var require_ = function (file) {
-        return require(file, dirname)
-    };
-    require_.resolve = function (name) {
-        return require.resolve(name, dirname);
-    };
-    require_.modules = require.modules;
-    require_.define = require.define;
-    var module_ = { exports : {} };
-    
-    require.modules[filename] = function () {
-        require.modules[filename]._cached = module_.exports;
-        fn.call(
-            module_.exports,
-            require_,
-            module_,
-            module_.exports,
-            dirname,
-            filename
-        );
-        require.modules[filename]._cached = module_.exports;
-        return module_.exports;
-    };
-};
-
-if (typeof process === 'undefined') process = {};
-
-if (!process.nextTick) process.nextTick = (function () {
-    var queue = [];
-    var canPost = typeof window !== 'undefined'
-        && window.postMessage && window.addEventListener
-    ;
-    
-    if (canPost) {
-        window.addEventListener('message', function (ev) {
-            if (ev.source === window && ev.data === 'browserify-tick') {
-                ev.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
-                }
-            }
-        }, true);
-    }
-    
-    return function (fn) {
-        if (canPost) {
-            queue.push(fn);
-            window.postMessage('browserify-tick', '*');
-        }
-        else setTimeout(fn, 0);
-    };
-})();
-
-if (!process.title) process.title = 'browser';
-
-if (!process.binding) process.binding = function (name) {
-    if (name === 'evals') return require('vm')
-    else throw new Error('No such module')
-};
-
-if (!process.cwd) process.cwd = function () { return '.' };
-
-require.define("path", function (require, module, exports, __dirname, __filename) {
-    function filter (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (fn(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
-}
-
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length; i >= 0; i--) {
-    var last = parts[i];
-    if (last == '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
-  }
-
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
-    }
-  }
-
-  return parts;
-}
-
-// Regex to split a filename into [*, dir, basename, ext]
-// posix version
-var splitPathRe = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/;
-
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-var resolvedPath = '',
-    resolvedAbsolute = false;
-
-for (var i = arguments.length; i >= -1 && !resolvedAbsolute; i--) {
-  var path = (i >= 0)
-      ? arguments[i]
-      : process.cwd();
-
-  // Skip empty and invalid entries
-  if (typeof path !== 'string' || !path) {
-    continue;
-  }
-
-  resolvedPath = path + '/' + resolvedPath;
-  resolvedAbsolute = path.charAt(0) === '/';
-}
-
-// At this point the path should be resolved to a full absolute path, but
-// handle relative paths to be safe (might happen when process.cwd() fails)
-
-// Normalize the path
-resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
-
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
-
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-var isAbsolute = path.charAt(0) === '/',
-    trailingSlash = path.slice(-1) === '/';
-
-// Normalize the path
-path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
-
-  if (!path && !isAbsolute) {
-    path = '.';
-  }
-  if (path && trailingSlash) {
-    path += '/';
-  }
-  
-  return (isAbsolute ? '/' : '') + path;
-};
-
-
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    return p && typeof p === 'string';
-  }).join('/'));
-};
-
-
-exports.dirname = function(path) {
-  var dir = splitPathRe.exec(path)[1] || '';
-  var isWindows = false;
-  if (!dir) {
-    // No dirname
-    return '.';
-  } else if (dir.length === 1 ||
-      (isWindows && dir.length <= 3 && dir.charAt(1) === ':')) {
-    // It is just a slash or a drive letter with a slash
-    return dir;
-  } else {
-    // It is a full dirname, strip trailing slash
-    return dir.substring(0, dir.length - 1);
-  }
-};
-
-
-exports.basename = function(path, ext) {
-  var f = splitPathRe.exec(path)[2] || '';
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
-
-
-exports.extname = function(path) {
-  return splitPathRe.exec(path)[3] || '';
-};
-
-});
-
-require.define("/shred.js", function (require, module, exports, __dirname, __filename) {
-    // Shred is an HTTP client library intended to simplify the use of Node's
-// built-in HTTP library. In particular, we wanted to make it easier to interact
-// with HTTP-based APIs.
-// 
-// See the [examples](./examples.html) for more details.
-
-// Ax is a nice logging library we wrote. You can use any logger, providing it
-// has `info`, `warn`, `debug`, and `error` methods that take a string.
-var Ax = require("ax")
-  , CookieJarLib = require( "cookiejar" )
-  , CookieJar = CookieJarLib.CookieJar
-;
-
-// Shred takes some options, including a logger and request defaults.
-
-var Shred = function(options) {
-  options = (options||{});
-  this.agent = options.agent;
-  this.defaults = options.defaults||{};
-  this.log = options.logger||(new Ax({ level: "info" }));
-  this._sharedCookieJar = new CookieJar();
-  this.logCurl = options.logCurl || false;
-};
-
-// Most of the real work is done in the request and reponse classes.
- 
-Shred.Request = require("./shred/request");
-Shred.Response = require("./shred/response");
-
-// The `request` method kicks off a new request, instantiating a new `Request`
-// object and passing along whatever default options we were given.
-
-Shred.prototype = {
-  request: function(options) {
-    options.logger = this.log;
-    options.logCurl = options.logCurl || this.logCurl;
-    options.cookieJar = ( 'cookieJar' in options ) ? options.cookieJar : this._sharedCookieJar; // let them set cookieJar = null
-    options.agent = options.agent || this.agent;
-    // fill in default options
-    for (var key in this.defaults) {
-      if (this.defaults.hasOwnProperty(key) && !options[key]) {
-        options[key] = this.defaults[key]
-      }
-    }
-    return new Shred.Request(options);
-  }
-};
-
-// Define a bunch of convenience methods so that you don't have to include
-// a `method` property in your request options.
-
-"get put post delete".split(" ").forEach(function(method) {
-  Shred.prototype[method] = function(options) {
-    options.method = method;
-    return this.request(options);
-  };
-});
-
-
-module.exports = Shred;
-
-});
-
-require.define("/node_modules/ax/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/ax.js"}
-});
-
-require.define("/node_modules/ax/lib/ax.js", function (require, module, exports, __dirname, __filename) {
-    var inspect = require("util").inspect
-  , fs = require("fs")
-;
-
-
-// this is a quick-and-dirty logger. there are other nicer loggers out there
-// but the ones i found were also somewhat involved. this one has a Ruby
-// logger type interface
-//
-// we can easily replace this, provide the info, debug, etc. methods are the
-// same. or, we can change Haiku to use a more standard node.js interface
-
-var format = function(level,message) {
-  var debug = (level=="debug"||level=="error");
-  if (!message) { return message.toString(); }
-  if (typeof(message) == "object") {
-    if (message instanceof Error && debug) {
-      return message.stack;
-    } else {
-      return inspect(message);
-    }
-  } else {
-    return message.toString();
-  }
-};
-
-var noOp = function(message) { return this; }
-var makeLogger = function(level,fn) {
-  return function(message) { 
-    this.stream.write(this.format(level, message)+"\n");
-    return this;
-  }
-};
-
-var Logger = function(options) {
-  var logger = this;
-  var options = options||{};
-
-  // Default options
-  options.level = options.level || "info";
-  options.timestamp = options.timestamp || true;
-  options.prefix = options.prefix || "";
-  logger.options = options;
-
-  // Allows a prefix to be added to the message.
-  //
-  //    var logger = new Ax({ module: 'Haiku' })
-  //    logger.warn('this is going to be awesome!');
-  //    //=> Haiku: this is going to be awesome!
-  //
-  if (logger.options.module){
-    logger.options.prefix = logger.options.module;
-  }
-
-  // Write to stderr or a file
-  if (logger.options.file){
-    logger.stream = fs.createWriteStream(logger.options.file, {"flags": "a"});
-  } else {
-      if(process.title === "node")
-    logger.stream = process.stderr;
-      else if(process.title === "browser")
-    logger.stream = function () {
-      // Work around weird console context issue: http://code.google.com/p/chromium/issues/detail?id=48662
-      return console[logger.options.level].apply(console, arguments);
-    };
-  }
-
-  switch(logger.options.level){
-    case 'debug':
-      ['debug', 'info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'info':
-      ['info', 'warn'].forEach(function (level) {
-        logger[level] = Logger.writer(level);
-      });
-    case 'warn':
-      logger.warn = Logger.writer('warn');
-  }
-}
-
-// Used to define logger methods
-Logger.writer = function(level){
-  return function(message){
-    var logger = this;
-
-    if(process.title === "node")
-  logger.stream.write(logger.format(level, message) + '\n');
-    else if(process.title === "browser")
-  logger.stream(logger.format(level, message) + '\n');
-
-  };
-}
-
-
-Logger.prototype = {
-  info: function(){},
-  debug: function(){},
-  warn: function(){},
-  error: Logger.writer('error'),
-  format: function(level, message){
-    if (! message) return '';
-
-    var logger = this
-      , prefix = logger.options.prefix
-      , timestamp = logger.options.timestamp ? " " + (new Date().toISOString()) : ""
-    ;
-
-    return (prefix + timestamp + ": " + message);
-  }
-};
-
-module.exports = Logger;
-
-});
-
-require.define("util", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("fs", function (require, module, exports, __dirname, __filename) {
-    // nothing to see here... no file methods for the browser
-
-});
-
-require.define("/node_modules/cookiejar/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"cookiejar.js"}
-});
-
-require.define("/node_modules/cookiejar/cookiejar.js", function (require, module, exports, __dirname, __filename) {
-    exports.CookieAccessInfo=CookieAccessInfo=function CookieAccessInfo(domain,path,secure,script) {
-    if(this instanceof CookieAccessInfo) {
-      this.domain=domain||undefined;
-      this.path=path||"/";
-      this.secure=!!secure;
-      this.script=!!script;
-      return this;
-    }
-    else {
-        return new CookieAccessInfo(domain,path,secure,script)    
-    }
-}
-
-exports.Cookie=Cookie=function Cookie(cookiestr) {
-  if(cookiestr instanceof Cookie) {
-    return cookiestr;
-  }
-    else {
-        if(this instanceof Cookie) {
-          this.name = null;
-          this.value = null;
-          this.expiration_date = Infinity;
-          this.path = "/";
-          this.domain = null;
-          this.secure = false; //how to define?
-          this.noscript = false; //httponly
-          if(cookiestr) {
-            this.parse(cookiestr)
-          }
-          return this;
-        }
-        return new Cookie(cookiestr)
-    }
-}
-
-Cookie.prototype.toString = function toString() {
-  var str=[this.name+"="+this.value];
-  if(this.expiration_date !== Infinity) {
-    str.push("expires="+(new Date(this.expiration_date)).toGMTString());
-  }
-  if(this.domain) {
-    str.push("domain="+this.domain);
-  }
-  if(this.path) {
-    str.push("path="+this.path);
-  }
-  if(this.secure) {
-    str.push("secure");
-  }
-  if(this.noscript) {
-    str.push("httponly");
-  }
-  return str.join("; ");
-}
-
-Cookie.prototype.toValueString = function toValueString() {
-  return this.name+"="+this.value;
-}
-
-var cookie_str_splitter=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g
-Cookie.prototype.parse = function parse(str) {
-  if(this instanceof Cookie) {
-      var parts=str.split(";")
-      , pair=parts[0].match(/([^=]+)=((?:.|\n)*)/)
-      , key=pair[1]
-      , value=pair[2];
-      this.name = key;
-      this.value = value;
-    
-      for(var i=1;i<parts.length;i++) {
-        pair=parts[i].match(/([^=]+)(?:=((?:.|\n)*))?/)
-        , key=pair[1].trim().toLowerCase()
-        , value=pair[2];
-        switch(key) {
-          case "httponly":
-            this.noscript = true;
-          break;
-          case "expires":
-            this.expiration_date = value
-              ? Number(Date.parse(value))
-              : Infinity;
-          break;
-          case "path":
-            this.path = value
-              ? value.trim()
-              : "";
-          break;
-          case "domain":
-            this.domain = value
-              ? value.trim()
-              : "";
-          break;
-          case "secure":
-            this.secure = true;
-          break
-        }
-      }
-    
-      return this;
-  }
-    return new Cookie().parse(str)
-}
-
-Cookie.prototype.matches = function matches(access_info) {
-  if(this.noscript && access_info.script
-  || this.secure && !access_info.secure
-  || !this.collidesWith(access_info)) {
-    return false
-  }
-  return true;
-}
-
-Cookie.prototype.collidesWith = function collidesWith(access_info) {
-  if((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
-    return false
-  }
-  if(this.path && access_info.path.indexOf(this.path) !== 0) {
-    return false;
-  }
-  if (this.domain===access_info.domain) {
-    return true;
-  }
-  else if(this.domain && this.domain.charAt(0)===".")
-  {
-    var wildcard=access_info.domain.indexOf(this.domain.slice(1))
-    if(wildcard===-1 || wildcard!==access_info.domain.length-this.domain.length+1) {
-      return false;
-    }
-  }
-  else if(this.domain){
-    return false
-  }
-  return true;
-}
-
-exports.CookieJar=CookieJar=function CookieJar() {
-  if(this instanceof CookieJar) {
-      var cookies = {} //name: [Cookie]
-    
-      this.setCookie = function setCookie(cookie) {
-        cookie = Cookie(cookie);
-        //Delete the cookie if the set is past the current time
-        var remove = cookie.expiration_date <= Date.now();
-        if(cookie.name in cookies) {
-          var cookies_list = cookies[cookie.name];
-          for(var i=0;i<cookies_list.length;i++) {
-            var collidable_cookie = cookies_list[i];
-            if(collidable_cookie.collidesWith(cookie)) {
-              if(remove) {
-                cookies_list.splice(i,1);
-                if(cookies_list.length===0) {
-                  delete cookies[cookie.name]
-                }
-                return false;
-              }
-              else {
-                return cookies_list[i]=cookie;
-              }
-            }
-          }
-          if(remove) {
-            return false;
-          }
-          cookies_list.push(cookie);
-          return cookie;
-        }
-        else if(remove){
-          return false;
-        }
-        else {
-          return cookies[cookie.name]=[cookie];
-        }
-      }
-      //returns a cookie
-      this.getCookie = function getCookie(cookie_name,access_info) {
-        var cookies_list = cookies[cookie_name];
-        for(var i=0;i<cookies_list.length;i++) {
-          var cookie = cookies_list[i];
-          if(cookie.expiration_date <= Date.now()) {
-            if(cookies_list.length===0) {
-              delete cookies[cookie.name]
-            }
-            continue;
-          }
-          if(cookie.matches(access_info)) {
-            return cookie;
-          }
-        }
-      }
-      //returns a list of cookies
-      this.getCookies = function getCookies(access_info) {
-        var matches=[];
-        for(var cookie_name in cookies) {
-          var cookie=this.getCookie(cookie_name,access_info);
-          if (cookie) {
-            matches.push(cookie);
-          }
-        }
-        matches.toString=function toString(){return matches.join(":");}
-            matches.toValueString=function() {return matches.map(function(c){return c.toValueString();}).join(';');}
-        return matches;
-      }
-    
-      return this;
-  }
-    return new CookieJar()
-}
-
-
-//returns list of cookies that were set correctly
-CookieJar.prototype.setCookies = function setCookies(cookies) {
-  cookies=Array.isArray(cookies)
-    ?cookies
-    :cookies.split(cookie_str_splitter);
-  var successful=[]
-  for(var i=0;i<cookies.length;i++) {
-    var cookie = Cookie(cookies[i]);
-    if(this.setCookie(cookie)) {
-      successful.push(cookie);
-    }
-  }
-  return successful;
-}
-
-});
-
-require.define("/shred/request.js", function (require, module, exports, __dirname, __filename) {
-    // The request object encapsulates a request, creating a Node.js HTTP request and
-// then handling the response.
-
-var HTTP = require("http")
-  , HTTPS = require("https")
-  , parseUri = require("./parseUri")
-  , Emitter = require('events').EventEmitter
-  , sprintf = require("sprintf").sprintf
-  , Response = require("./response")
-  , HeaderMixins = require("./mixins/headers")
-  , Content = require("./content")
-;
-
-var STATUS_CODES = HTTP.STATUS_CODES || {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-// The Shred object itself constructs the `Request` object. You should rarely
-// need to do this directly.
-
-var Request = function(options) {
-  this.log = options.logger;
-  this.cookieJar = options.cookieJar;
-  this.encoding = options.encoding;
-  this.logCurl = options.logCurl;
-  processOptions(this,options||{});
-  createRequest(this);
-};
-
-// A `Request` has a number of properties, many of which help with details like
-// URL parsing or defaulting the port for the request.
-
-Object.defineProperties(Request.prototype, {
-
-// - **url**. You can set the `url` property with a valid URL string and all the
-//   URL-related properties (host, port, etc.) will be automatically set on the
-//   request object.
-
-  url: {
-    get: function() {
-      if (!this.scheme) { return null; }
-      return sprintf("%s://%s:%s%s",
-          this.scheme, this.host, this.port,
-          (this.proxy ? "/" : this.path) +
-          (this.query ? ("?" + this.query) : ""));
-    },
-    set: function(_url) {
-      _url = parseUri(_url);
-      this.scheme = _url.protocol;
-      this.host = _url.host;
-      this.port = _url.port;
-      this.path = _url.path;
-      this.query = _url.query;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **headers**. Returns a hash representing the request headers. You can't set
-//   this directly, only get it. You can add or modify headers by using the
-//   `setHeader` or `setHeaders` method. This ensures that the headers are
-//   normalized - that is, you don't accidentally send `Content-Type` and
-//   `content-type` headers. Keep in mind that if you modify the returned hash,
-//   it will *not* modify the request headers.
-
-  headers: {
-    get: function() {
-      return this.getHeaders();
-    },
-    enumerable: true
-  },
-
-// - **port**. Unless you set the `port` explicitly or include it in the URL, it
-//   will default based on the scheme.
-
-  port: {
-    get: function() {
-      if (!this._port) {
-        switch(this.scheme) {
-          case "https": return this._port = 443;
-          case "http":
-          default: return this._port = 80;
-        }
-      }
-      return this._port;
-    },
-    set: function(value) { this._port = value; return this; },
-    enumerable: true
-  },
-
-// - **method**. The request method - `get`, `put`, `post`, etc. that will be
-//   used to make the request. Defaults to `get`.
-
-  method: {
-    get: function() {
-      return this._method = (this._method||"GET");
-    },
-    set: function(value) {
-      this._method = value; return this;
-    },
-    enumerable: true
-  },
-
-// - **query**. Can be set either with a query string or a hash (object). Get
-//   will always return a properly escaped query string or null if there is no
-//   query component for the request.
-
-  query: {
-    get: function() {return this._query;},
-    set: function(value) {
-      var stringify = function (hash) {
-        var query = "";
-        for (var key in hash) {
-          query += encodeURIComponent(key) + '=' + encodeURIComponent(hash[key]) + '&';
-        }
-        // Remove the last '&'
-        query = query.slice(0, -1);
-        return query;
-      }
-
-      if (value) {
-        if (typeof value === 'object') {
-          value = stringify(value);
-        }
-        this._query = value;
-      } else {
-        this._query = "";
-      }
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **parameters**. This will return the query parameters in the form of a hash
-//   (object).
-
-  parameters: {
-    get: function() { return QueryString.parse(this._query||""); },
-    enumerable: true
-  },
-
-// - **content**. (Aliased as `body`.) Set this to add a content entity to the
-//   request. Attempts to use the `content-type` header to determine what to do
-//   with the content value. Get this to get back a [`Content`
-//   object](./content.html).
-
-  body: {
-    get: function() { return this._body; },
-    set: function(value) {
-      this._body = new Content({
-        data: value,
-        type: this.getHeader("Content-Type")
-      });
-      this.setHeader("Content-Type",this.content.type);
-      this.setHeader("Content-Length",this.content.length);
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **timeout**. Used to determine how long to wait for a response. Does not
-//   distinguish between connect timeouts versus request timeouts. Set either in
-//   milliseconds or with an object with temporal attributes (hours, minutes,
-//   seconds) and convert it into milliseconds. Get will always return
-//   milliseconds.
-
-  timeout: {
-    get: function() { return this._timeout; }, // in milliseconds
-    set: function(timeout) {
-      var request = this
-        , milliseconds = 0;
-      ;
-      if (!timeout) return this;
-      if (typeof timeout==="number") { milliseconds = timeout; }
-      else {
-        milliseconds = (timeout.milliseconds||0) +
-          (1000 * ((timeout.seconds||0) +
-              (60 * ((timeout.minutes||0) +
-                (60 * (timeout.hours||0))))));
-      }
-      this._timeout = milliseconds;
-      return this;
-    },
-    enumerable: true
-  }
-});
-
-// Alias `body` property to `content`. Since the [content object](./content.html)
-// has a `body` attribute, it's preferable to use `content` since you can then
-// access the raw content data using `content.body`.
-
-Object.defineProperty(Request.prototype,"content",
-    Object.getOwnPropertyDescriptor(Request.prototype, "body"));
-
-// The `Request` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Request.prototype.inspect = function () {
-  var request = this;
-  var headers = this.format_headers();
-  var summary = ["<Shred Request> ", request.method.toUpperCase(),
-      request.url].join(" ")
-  return [ summary, "- Headers:", headers].join("\n");
-};
-
-Request.prototype.format_headers = function () {
-  var array = []
-  var headers = this._headers
-  for (var key in headers) {
-    if (headers.hasOwnProperty(key)) {
-      var value = headers[key]
-      array.push("\t" + key + ": " + value);
-    }
-  }
-  return array.join("\n");
-};
-
-// Allow chainable 'on's:  shred.get({ ... }).on( ... ).  You can pass in a
-// single function, a pair (event, function), or a hash:
-// { event: function, event: function }
-Request.prototype.on = function (eventOrHash, listener) {
-  var emitter = this.emitter;
-  // Pass in a single argument as a function then make it the default response handler
-  if (arguments.length === 1 && typeof(eventOrHash) === 'function') {
-    emitter.on('response', eventOrHash);
-  } else if (arguments.length === 1 && typeof(eventOrHash) === 'object') {
-    for (var key in eventOrHash) {
-      if (eventOrHash.hasOwnProperty(key)) {
-        emitter.on(key, eventOrHash[key]);
-      }
-    }
-  } else {
-    emitter.on(eventOrHash, listener);
-  }
-  return this;
-};
-
-// Add in the header methods. Again, these ensure we don't get the same header
-// multiple times with different case conventions.
-HeaderMixins.gettersAndSetters(Request);
-
-// `processOptions` is called from the constructor to handle all the work
-// associated with making sure we do our best to ensure we have a valid request.
-
-var processOptions = function(request,options) {
-
-  request.log.debug("Processing request options ..");
-
-  // We'll use `request.emitter` to manage the `on` event handlers.
-  request.emitter = (new Emitter);
-
-  request.agent = options.agent;
-
-  // Set up the handlers ...
-  if (options.on) {
-    for (var key in options.on) {
-      if (options.on.hasOwnProperty(key)) {
-        request.emitter.on(key, options.on[key]);
-      }
-    }
-  }
-
-  // Make sure we were give a URL or a host
-  if (!options.url && !options.host) {
-    request.emitter.emit("request_error",
-        new Error("No url or url options (host, port, etc.)"));
-    return;
-  }
-
-  // Allow for the [use of a proxy](http://www.jmarshall.com/easy/http/#proxies).
-
-  if (options.url) {
-    if (options.proxy) {
-      request.url = options.proxy;
-      request.path = options.url;
-    } else {
-      request.url = options.url;
-    }
-  }
-
-  // Set the remaining options.
-  request.query = options.query||options.parameters||request.query ;
-  request.method = options.method;
-  request.setHeader("user-agent",options.agent||"Shred");
-  request.setHeaders(options.headers);
-
-  if (request.cookieJar) {
-    var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
-    if (cookies.length) {
-      var cookieString = request.getHeader('cookie')||'';
-      for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
-          if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
-          {
-              cookieString += ';';
-          }
-          cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
-      }
-      request.setHeader("cookie", cookieString);
-    }
-  }
-  
-  // The content entity can be set either using the `body` or `content` attributes.
-  if (options.body||options.content) {
-    request.content = options.body||options.content;
-  }
-  request.timeout = options.timeout;
-
-};
-
-// `createRequest` is also called by the constructor, after `processOptions`.
-// This actually makes the request and processes the response, so `createRequest`
-// is a bit of a misnomer.
-
-var createRequest = function(request) {
-  var timeout ;
-
-  request.log.debug("Creating request ..");
-  request.log.debug(request);
-
-  var reqParams = {
-    host: request.host,
-    port: request.port,
-    method: request.method,
-    path: request.path + (request.query ? '?'+request.query : ""),
-    headers: request.getHeaders(),
-    // Node's HTTP/S modules will ignore this, but we are using the
-    // browserify-http module in the browser for both HTTP and HTTPS, and this
-    // is how you differentiate the two.
-    scheme: request.scheme,
-    // Use a provided agent.  'Undefined' is the default, which uses a global
-    // agent.
-    agent: request.agent
-  };
-
-  if (request.logCurl) {
-    logCurl(request);
-  }
-
-  var http = request.scheme == "http" ? HTTP : HTTPS;
-
-  // Set up the real request using the selected library. The request won't be
-  // sent until we call `.end()`.
-  request._raw = http.request(reqParams, function(response) {
-    request.log.debug("Received response ..");
-
-    // We haven't timed out and we have a response, so make sure we clear the
-    // timeout so it doesn't fire while we're processing the response.
-    clearTimeout(timeout);
-
-    // Construct a Shred `Response` object from the response. This will stream
-    // the response, thus the need for the callback. We can access the response
-    // entity safely once we're in the callback.
-    response = new Response(response, request, function(response) {
-
-      // Set up some event magic. The precedence is given first to
-      // status-specific handlers, then to responses for a given event, and then
-      // finally to the more general `response` handler. In the last case, we
-      // need to first make sure we're not dealing with a a redirect.
-      var emit = function(event) {
-        var emitter = request.emitter;
-        var textStatus = STATUS_CODES[response.status] ? STATUS_CODES[response.status].toLowerCase() : null;
-        if (emitter.listeners(response.status).length > 0 || emitter.listeners(textStatus).length > 0) {
-          emitter.emit(response.status, response);
-          emitter.emit(textStatus, response);
-        } else {
-          if (emitter.listeners(event).length>0) {
-            emitter.emit(event, response);
-          } else if (!response.isRedirect) {
-            emitter.emit("response", response);
-            //console.warn("Request has no event listener for status code " + response.status);
-          }
-        }
-      };
-
-      // Next, check for a redirect. We simply repeat the request with the URL
-      // given in the `Location` header. We fire a `redirect` event.
-      if (response.isRedirect) {
-        request.log.debug("Redirecting to "
-            + response.getHeader("Location"));
-        request.url = response.getHeader("Location");
-        emit("redirect");
-        createRequest(request);
-
-      // Okay, it's not a redirect. Is it an error of some kind?
-      } else if (response.isError) {
-        emit("error");
-      } else {
-      // It looks like we're good shape. Trigger the `success` event.
-        emit("success");
-      }
-    });
-  });
-
-  // We're still setting up the request. Next, we're going to handle error cases
-  // where we have no response. We don't emit an error event because that event
-  // takes a response. We don't response handlers to have to check for a null
-  // value. However, we [should introduce a different event
-  // type](https://github.com/spire-io/shred/issues/3) for this type of error.
-  request._raw.on("error", function(error) {
-    request.emitter.emit("request_error", error);
-  });
-
-  request._raw.on("socket", function(socket) {
-    request.emitter.emit("socket", socket);
-  });
-
-  // TCP timeouts should also trigger the "response_error" event.
-  request._raw.on('socket', function () {
-    request._raw.socket.on('timeout', function () {
-      // This should trigger the "error" event on the raw request, which will
-      // trigger the "response_error" on the shred request.
-      request._raw.abort();
-    });
-  });
-
-
-  // We're almost there. Next, we need to write the request entity to the
-  // underlying request object.
-  if (request.content) {
-    request.log.debug("Streaming body: '" +
-        request.content.data.slice(0,59) + "' ... ");
-    request._raw.write(request.content.data);
-  }
-
-  // Finally, we need to set up the timeout. We do this last so that we don't
-  // start the clock ticking until the last possible moment.
-  if (request.timeout) {
-    timeout = setTimeout(function() {
-      request.log.debug("Timeout fired, aborting request ...");
-      request._raw.abort();
-      request.emitter.emit("timeout", request);
-    },request.timeout);
-  }
-
-  // The `.end()` method will cause the request to fire. Technically, it might
-  // have already sent the headers and body.
-  request.log.debug("Sending request ...");
-  request._raw.end();
-};
-
-// Logs the curl command for the request.
-var logCurl = function (req) {
-  var headers = req.getHeaders();
-  var headerString = "";
-
-  for (var key in headers) {
-    headerString += '-H "' + key + ": " + headers[key] + '" ';
-  }
-
-  var bodyString = ""
-
-  if (req.content) {
-    bodyString += "-d '" + req.content.body + "' ";
-  }
-
-  var query = req.query ? '?' + req.query : "";
-
-  console.log("curl " +
-    "-X " + req.method.toUpperCase() + " " +
-    req.scheme + "://" + req.host + ":" + req.port + req.path + query + " " +
-    headerString +
-    bodyString
-  );
-};
-
-
-module.exports = Request;
-
-});
-
-require.define("http", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("https", function (require, module, exports, __dirname, __filename) {
-    // todo
-
-});
-
-require.define("/shred/parseUri.js", function (require, module, exports, __dirname, __filename) {
-    // parseUri 1.2.2
-// (c) Steven Levithan <stevenlevithan.com>
-// MIT License
-
-function parseUri (str) {
-  var o   = parseUri.options,
-    m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
-    uri = {},
-    i   = 14;
-
-  while (i--) uri[o.key[i]] = m[i] || "";
-
-  uri[o.q.name] = {};
-  uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
-    if ($1) uri[o.q.name][$1] = $2;
-  });
-
-  return uri;
-};
-
-parseUri.options = {
-  strictMode: false,
-  key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
-  q:   {
-    name:   "queryKey",
-    parser: /(?:^|&)([^&=]*)=?([^&]*)/g
-  },
-  parser: {
-    strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
-    loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
-  }
-};
-
-module.exports = parseUri;
-
-});
-
-require.define("events", function (require, module, exports, __dirname, __filename) {
-    if (!process.EventEmitter) process.EventEmitter = function () {};
-
-var EventEmitter = exports.EventEmitter = process.EventEmitter;
-var isArray = typeof Array.isArray === 'function'
-    ? Array.isArray
-    : function (xs) {
-        return Object.toString.call(xs) === '[object Array]'
-    }
-;
-
-// By default EventEmitters will print a warning if more than
-// 10 listeners are added to it. This is a useful default which
-// helps finding memory leaks.
-//
-// Obviously not all Emitters should be limited to 10. This function allows
-// that to be increased. Set to zero for unlimited.
-var defaultMaxListeners = 10;
-EventEmitter.prototype.setMaxListeners = function(n) {
-  if (!this._events) this._events = {};
-  this._events.maxListeners = n;
-};
-
-
-EventEmitter.prototype.emit = function(type) {
-  // If there is no 'error' event listener then throw.
-  if (type === 'error') {
-    if (!this._events || !this._events.error ||
-        (isArray(this._events.error) && !this._events.error.length))
-    {
-      if (arguments[1] instanceof Error) {
-        throw arguments[1]; // Unhandled 'error' event
-      } else {
-        throw new Error("Uncaught, unspecified 'error' event.");
-      }
-      return false;
-    }
-  }
-
-  if (!this._events) return false;
-  var handler = this._events[type];
-  if (!handler) return false;
-
-  if (typeof handler == 'function') {
-    switch (arguments.length) {
-      // fast cases
-      case 1:
-        handler.call(this);
-        break;
-      case 2:
-        handler.call(this, arguments[1]);
-        break;
-      case 3:
-        handler.call(this, arguments[1], arguments[2]);
-        break;
-      // slower
-      default:
-        var args = Array.prototype.slice.call(arguments, 1);
-        handler.apply(this, args);
-    }
-    return true;
-
-  } else if (isArray(handler)) {
-    var args = Array.prototype.slice.call(arguments, 1);
-
-    var listeners = handler.slice();
-    for (var i = 0, l = listeners.length; i < l; i++) {
-      listeners[i].apply(this, args);
-    }
-    return true;
-
-  } else {
-    return false;
-  }
-};
-
-// EventEmitter is defined in src/node_events.cc
-// EventEmitter.prototype.emit() is also defined there.
-EventEmitter.prototype.addListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('addListener only takes instances of Function');
-  }
-
-  if (!this._events) this._events = {};
-
-  // To avoid recursion in the case that type == "newListeners"! Before
-  // adding it to the listeners, first emit "newListeners".
-  this.emit('newListener', type, listener);
-
-  if (!this._events[type]) {
-    // Optimize the case of one listener. Don't need the extra array object.
-    this._events[type] = listener;
-  } else if (isArray(this._events[type])) {
-
-    // Check for listener leak
-    if (!this._events[type].warned) {
-      var m;
-      if (this._events.maxListeners !== undefined) {
-        m = this._events.maxListeners;
-      } else {
-        m = defaultMaxListeners;
-      }
-
-      if (m && m > 0 && this._events[type].length > m) {
-        this._events[type].warned = true;
-        console.error('(node) warning: possible EventEmitter memory ' +
-                      'leak detected. %d listeners added. ' +
-                      'Use emitter.setMaxListeners() to increase limit.',
-                      this._events[type].length);
-        console.trace();
-      }
-    }
-
-    // If we've already got an array, just append.
-    this._events[type].push(listener);
-  } else {
-    // Adding the second element, need to change to array.
-    this._events[type] = [this._events[type], listener];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.on = EventEmitter.prototype.addListener;
-
-EventEmitter.prototype.once = function(type, listener) {
-  var self = this;
-  self.on(type, function g() {
-    self.removeListener(type, g);
-    listener.apply(this, arguments);
-  });
-
-  return this;
-};
-
-EventEmitter.prototype.removeListener = function(type, listener) {
-  if ('function' !== typeof listener) {
-    throw new Error('removeListener only takes instances of Function');
-  }
-
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (!this._events || !this._events[type]) return this;
-
-  var list = this._events[type];
-
-  if (isArray(list)) {
-    var i = list.indexOf(listener);
-    if (i < 0) return this;
-    list.splice(i, 1);
-    if (list.length == 0)
-      delete this._events[type];
-  } else if (this._events[type] === listener) {
-    delete this._events[type];
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.removeAllListeners = function(type) {
-  // does not use listeners(), so no side effect of creating _events[type]
-  if (type && this._events && this._events[type]) this._events[type] = null;
-  return this;
-};
-
-EventEmitter.prototype.listeners = function(type) {
-  if (!this._events) this._events = {};
-  if (!this._events[type]) this._events[type] = [];
-  if (!isArray(this._events[type])) {
-    this._events[type] = [this._events[type]];
-  }
-  return this._events[type];
-};
-
-});
-
-require.define("/node_modules/sprintf/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"./lib/sprintf"}
-});
-
-require.define("/node_modules/sprintf/lib/sprintf.js", function (require, module, exports, __dirname, __filename) {
-    /**
-sprintf() for JavaScript 0.7-beta1
-http://www.diveintojavascript.com/projects/javascript-sprintf
-
-Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of sprintf() for JavaScript nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Changelog:
-2010.11.07 - 0.7-beta1-node
-  - converted it to a node.js compatible module
-
-2010.09.06 - 0.7-beta1
-  - features: vsprintf, support for named placeholders
-  - enhancements: format cache, reduced global namespace pollution
-
-2010.05.22 - 0.6:
- - reverted to 0.4 and fixed the bug regarding the sign of the number 0
- Note:
- Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
- who warned me about a bug in 0.5, I discovered that the last update was
- a regress. I appologize for that.
-
-2010.05.09 - 0.5:
- - bug fix: 0 is now preceeded with a + sign
- - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
- - switched from GPL to BSD license
-
-2007.10.21 - 0.4:
- - unit test and patch (David Baird)
-
-2007.09.17 - 0.3:
- - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
-
-2007.09.11 - 0.2:
- - feature: added argument swapping
-
-2007.04.03 - 0.1:
- - initial release
-**/
-
-var sprintf = (function() {
-  function get_type(variable) {
-    return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
-  }
-  function str_repeat(input, multiplier) {
-    for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
-    return output.join('');
-  }
-
-  var str_format = function() {
-    if (!str_format.cache.hasOwnProperty(arguments[0])) {
-      str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
-    }
-    return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
-  };
-
-  str_format.format = function(parse_tree, argv) {
-    var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
-    for (i = 0; i < tree_length; i++) {
-      node_type = get_type(parse_tree[i]);
-      if (node_type === 'string') {
-        output.push(parse_tree[i]);
-      }
-      else if (node_type === 'array') {
-        match = parse_tree[i]; // convenience purposes only
-        if (match[2]) { // keyword argument
-          arg = argv[cursor];
-          for (k = 0; k < match[2].length; k++) {
-            if (!arg.hasOwnProperty(match[2][k])) {
-              throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
-            }
-            arg = arg[match[2][k]];
-          }
-        }
-        else if (match[1]) { // positional argument (explicit)
-          arg = argv[match[1]];
-        }
-        else { // positional argument (implicit)
-          arg = argv[cursor++];
-        }
-
-        if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
-          throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
-        }
-        switch (match[8]) {
-          case 'b': arg = arg.toString(2); break;
-          case 'c': arg = String.fromCharCode(arg); break;
-          case 'd': arg = parseInt(arg, 10); break;
-          case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
-          case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
-          case 'o': arg = arg.toString(8); break;
-          case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
-          case 'u': arg = Math.abs(arg); break;
-          case 'x': arg = arg.toString(16); break;
-          case 'X': arg = arg.toString(16).toUpperCase(); break;
-        }
-        arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
-        pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
-        pad_length = match[6] - String(arg).length;
-        pad = match[6] ? str_repeat(pad_character, pad_length) : '';
-        output.push(match[5] ? arg + pad : pad + arg);
-      }
-    }
-    return output.join('');
-  };
-
-  str_format.cache = {};
-
-  str_format.parse = function(fmt) {
-    var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
-    while (_fmt) {
-      if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
-        parse_tree.push(match[0]);
-      }
-      else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
-        parse_tree.push('%');
-      }
-      else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
-        if (match[2]) {
-          arg_names |= 1;
-          var field_list = [], replacement_field = match[2], field_match = [];
-          if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-            field_list.push(field_match[1]);
-            while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
-              if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
-                field_list.push(field_match[1]);
-              }
-              else {
-                throw('[sprintf] huh?');
-              }
-            }
-          }
-          else {
-            throw('[sprintf] huh?');
-          }
-          match[2] = field_list;
-        }
-        else {
-          arg_names |= 2;
-        }
-        if (arg_names === 3) {
-          throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
-        }
-        parse_tree.push(match);
-      }
-      else {
-        throw('[sprintf] huh?');
-      }
-      _fmt = _fmt.substring(match[0].length);
-    }
-    return parse_tree;
-  };
-
-  return str_format;
-})();
-
-var vsprintf = function(fmt, argv) {
-  argv.unshift(fmt);
-  return sprintf.apply(null, argv);
-};
-
-exports.sprintf = sprintf;
-exports.vsprintf = vsprintf;
-});
-
-require.define("/shred/response.js", function (require, module, exports, __dirname, __filename) {
-    // The `Response object` encapsulates a Node.js HTTP response.
-
-var Content = require("./content")
-  , HeaderMixins = require("./mixins/headers")
-  , CookieJarLib = require( "cookiejar" )
-  , Cookie = CookieJarLib.Cookie
-;
-
-// Browser doesn't have zlib.
-var zlib = null;
-try {
-  zlib = require('zlib');
-} catch (e) {
-  console.warn("no zlib library");
-}
-
-// Iconv doesn't work in browser
-var Iconv = null;
-try {
-  Iconv = require('iconv-lite');
-} catch (e) {
-  console.warn("no iconv library");
-}
-
-// Construct a `Response` object. You should never have to do this directly. The
-// `Request` object handles this, getting the raw response object and passing it
-// in here, along with the request. The callback allows us to stream the response
-// and then use the callback to let the request know when it's ready.
-var Response = function(raw, request, callback) { 
-  var response = this;
-  this._raw = raw;
-
-  // The `._setHeaders` method is "private"; you can't otherwise set headers on
-  // the response.
-  this._setHeaders.call(this,raw.headers);
-  
-  // store any cookies
-  if (request.cookieJar && this.getHeader('set-cookie')) {
-    var cookieStrings = this.getHeader('set-cookie');
-    var cookieObjs = []
-      , cookie;
-
-    for (var i = 0; i < cookieStrings.length; i++) {
-      var cookieString = cookieStrings[i];
-      if (!cookieString) {
-        continue;
-      }
-
-      if (!cookieString.match(/domain\=/i)) {
-        cookieString += '; domain=' + request.host;
-      }
-
-      if (!cookieString.match(/path\=/i)) {
-        cookieString += '; path=' + request.path;
-      }
-
-      try {
-        cookie = new Cookie(cookieString);
-        if (cookie) {
-          cookieObjs.push(cookie);
-        }
-      } catch (e) {
-        console.warn("Tried to set bad cookie: " + cookieString);
-      }
-    }
-
-    request.cookieJar.setCookies(cookieObjs);
-  }
-
-  this.request = request;
-  this.client = request.client;
-  this.log = this.request.log;
-
-  // Stream the response content entity and fire the callback when we're done.
-  // Store the incoming data in a array of Buffers which we concatinate into one
-  // buffer at the end.  We need to use buffers instead of strings here in order
-  // to preserve binary data.
-  var chunkBuffers = [];
-  var dataLength = 0;
-  raw.on("data", function(chunk) {
-    chunkBuffers.push(chunk);
-    dataLength += chunk.length;
-  });
-  raw.on("end", function() {
-    var body;
-    if (typeof Buffer === 'undefined') {
-      // Just concatinate into a string
-      body = chunkBuffers.join('');
-    } else {
-      // Initialize new buffer and add the chunks one-at-a-time.
-      body = new Buffer(dataLength);
-      for (var i = 0, pos = 0; i < chunkBuffers.length; i++) {
-        chunkBuffers[i].copy(body, pos);
-        pos += chunkBuffers[i].length;
-      }
-    }
-
-    var setBodyAndFinish = function (body) {
-      response._body = new Content({ 
-        body: body,
-        type: response.getHeader("Content-Type")
-      });
-      callback(response);
-    }
-
-    if (zlib && response.getHeader("Content-Encoding") === 'gzip'){
-      zlib.gunzip(body, function (err, gunzippedBody) {
-        if (Iconv && response.request.encoding){
-          body = Iconv.fromEncoding(gunzippedBody,response.request.encoding);
-        } else {
-          body = gunzippedBody.toString();
-        }
-        setBodyAndFinish(body);
-      })
-    }
-    else{
-       if (response.request.encoding){
-            body = Iconv.fromEncoding(body,response.request.encoding);
-        }        
-      setBodyAndFinish(body);
-    }
-  });
-};
-
-// The `Response` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Response.prototype = {
-  inspect: function() {
-    var response = this;
-    var headers = this.format_headers();
-    var summary = ["<Shred Response> ", response.status].join(" ")
-    return [ summary, "- Headers:", headers].join("\n");
-  },
-  format_headers: function () {
-    var array = []
-    var headers = this._headers
-    for (var key in headers) {
-      if (headers.hasOwnProperty(key)) {
-        var value = headers[key]
-        array.push("\t" + key + ": " + value);
-      }
-    }
-    return array.join("\n");
-  }
-};
-
-// `Response` object properties, all of which are read-only:
-Object.defineProperties(Response.prototype, {
-  
-// - **status**. The HTTP status code for the response. 
-  status: {
-    get: function() { return this._raw.statusCode; },
-    enumerable: true
-  },
-
-// - **content**. The HTTP content entity, if any. Provided as a [content
-//   object](./content.html), which will attempt to convert the entity based upon
-//   the `content-type` header. The converted value is available as
-//   `content.data`. The original raw content entity is available as
-//   `content.body`.
-  body: {
-    get: function() { return this._body; }
-  },
-  content: {
-    get: function() { return this.body; },
-    enumerable: true
-  },
-
-// - **isRedirect**. Is the response a redirect? These are responses with 3xx
-//   status and a `Location` header.
-  isRedirect: {
-    get: function() {
-      return (this.status>299
-          &&this.status<400
-          &&this.getHeader("Location"));
-    },
-    enumerable: true
-  },
-
-// - **isError**. Is the response an error? These are responses with status of
-//   400 or greater.
-  isError: {
-    get: function() {
-      return (this.status === 0 || this.status > 399)
-    },
-    enumerable: true
-  }
-});
-
-// Add in the [getters for accessing the normalized headers](./headers.js).
-HeaderMixins.getters(Response);
-HeaderMixins.privateSetters(Response);
-
-// Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-// getAllResponseHeaders() to return {} if the response is a CORS request.
-// xhr.getHeader still works correctly.
-var getHeader = Response.prototype.getHeader;
-Response.prototype.getHeader = function (name) {
-  return (getHeader.call(this,name) ||
-    (typeof this._raw.getHeader === 'function' && this._raw.getHeader(name)));
-};
-
-module.exports = Response;
-
-});
-
-require.define("/shred/content.js", function (require, module, exports, __dirname, __filename) {
-    
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
-  //
-  //     toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-//   header associated with the request or response. If not passed as an options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-    get: function() {
-      if (this._type) {
-        return this._type;
-      } else {
-        if (this._data) {
-          switch(typeof this._data) {
-            case "string": return "text/plain";
-            case "object": return "application/json";
-          }
-        }
-      }
-      return "text/plain";
-    },
-    set: function(value) {
-      this._type = value;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-//   converted into Javascript data. This can be a string, if the `type` is, say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to infer
-//   the `body` attribute.
-  data: {
-    get: function() {
-      if (this._body) {
-        return this.processor.parser(this._body);
-      } else {
-        return this._data;
-      }
-    },
-    set: function(data) {
-      if (this._body&&data) Errors.setDataWithBody(this);
-      this._data = data;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-    get: function() {
-      if (this._data) {
-        return this.processor.stringify(this._data);
-      } else {
-        return this.processor.stringify(this._body);
-      }
-    },
-    set: function(body) {
-      if (this._data&&body) Errors.setBodyWithData(this);
-      this._body = body;
-      return this;
-    },
-    enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-//   `body` attributes. You can add processors. The two that are built-in are for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-    get: function() {
-      var processor = Content.processors[this.type];
-      if (processor) {
-        return processor;
-      } else {
-        // Return the first processor that matches any part of the
-        // content type. ex: application/vnd.foobar.baz+json will match json.
-        var main = this.type.split(";")[0];
-        var parts = main.split(/\+|\//);
-        for (var i=0, l=parts.length; i < l; i++) {
-          processor = Content.processors[parts[i]]
-        }
-        return processor || {parser:identity,stringify:toString};
-      }
-    },
-    enumerable: true
-  },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-//   bytes of the raw content entity.
-  length: {
-    get: function() {
-      if (typeof Buffer !== 'undefined') {
-        return Buffer.byteLength(this.body);
-      }
-      return this.body.length;
-    }
-  }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-//   into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-//   raw content entity.
-Content.registerProcessor = function(types,processor) {
-  
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
-  if (types.forEach) {
-    types.forEach(function(type) {
-      Content.processors[type] = processor;
-    });
-  } else {
-    // If you didn't pass an array, we just use what you pass in.
-    Content.processors[types] = processor;
-  }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
-  , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
-  ["text/html","text/plain","text"],
-  { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
-  ["application/json; charset=utf-8","application/json","json"],
-  {
-    parser: function(string) {
-      return JSON.parse(string);
-    },
-    stringify: function(data) {
-      return JSON.stringify(data); }});
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
-  setDataWithBody: function(object) {
-    throw new Error("Attempt to set data attribute of a content object " +
-        "when the body attributes was already set.");
-  },
-  setBodyWithData: function(object) {
-    throw new Error("Attempt to set body attribute of a content object " +
-        "when the data attributes was already set.");
-  }
-}
-module.exports = Content;
-
-});
-
-require.define("/shred/mixins/headers.js", function (require, module, exports, __dirname, __filename) {
-    // The header mixins allow you to add HTTP header support to any object. This
-// might seem pointless: why not simply use a hash? The main reason is that, per
-// the [HTTP spec](http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2),
-// headers are case-insensitive. So, for example, `content-type` is the same as
-// `CONTENT-TYPE` which is the same as `Content-Type`. Since there is no way to
-// overload the index operator in Javascript, using a hash to represent the
-// headers means it's possible to have two conflicting values for a single
-// header.
-// 
-// The solution to this is to provide explicit methods to set or get headers.
-// This also has the benefit of allowing us to introduce additional variations,
-// including snake case, which we automatically convert to what Matthew King has
-// dubbed "corset case" - the hyphen-separated names with initial caps:
-// `Content-Type`. We use corset-case just in case we're dealing with servers
-// that haven't properly implemented the spec.
-
-// Convert headers to corset-case. **Example:** `CONTENT-TYPE` will be converted
-// to `Content-Type`.
-
-var corsetCase = function(string) {
-  return string.toLowerCase()
-      //.replace("_","-")
-      .replace(/(^|-)(\w)/g, 
-          function(s) { return s.toUpperCase(); });
-};
-
-// We suspect that `initializeHeaders` was once more complicated ...
-var initializeHeaders = function(object) {
-  return {};
-};
-
-// Access the `_headers` property using lazy initialization. **Warning:** If you
-// mix this into an object that is using the `_headers` property already, you're
-// going to have trouble.
-var $H = function(object) {
-  return object._headers||(object._headers=initializeHeaders(object));
-};
-
-// Hide the implementations as private functions, separate from how we expose them.
-
-// The "real" `getHeader` function: get the header after normalizing the name.
-var getHeader = function(object,name) {
-  return $H(object)[corsetCase(name)];
-};
-
-// The "real" `getHeader` function: get one or more headers, or all of them
-// if you don't ask for any specifics. 
-var getHeaders = function(object,names) {
-  var keys = (names && names.length>0) ? names : Object.keys($H(object));
-  var hash = keys.reduce(function(hash,key) {
-    hash[key] = getHeader(object,key);
-    return hash;
-  },{});
-  // Freeze the resulting hash so you don't mistakenly think you're modifying
-  // the real headers.
-  Object.freeze(hash);
-  return hash;
-};
-
-// The "real" `setHeader` function: set a header, after normalizing the name.
-var setHeader = function(object,name,value) {
-  $H(object)[corsetCase(name)] = value;
-  return object;
-};
-
-// The "real" `setHeaders` function: set multiple headers based on a hash.
-var setHeaders = function(object,hash) {
-  for( var key in hash ) { setHeader(object,key,hash[key]); };
-  return this;
-};
-
-// Here's where we actually bind the functionality to an object. These mixins work by
-// exposing mixin functions. Each function mixes in a specific batch of features.
-module.exports = {
-  
-  // Add getters.
-  getters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-  },
-  // Add setters but as "private" methods.
-  privateSetters: function(constructor) {
-    constructor.prototype._setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype._setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add setters.
-  setters: function(constructor) {
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-  // Add both getters and setters.
-  gettersAndSetters: function(constructor) {
-    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
-    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
-    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
-    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
-  },
-};
-
-});
-
-require.define("/node_modules/iconv-lite/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {}
-});
-
-require.define("/node_modules/iconv-lite/index.js", function (require, module, exports, __dirname, __filename) {
-    // Module exports
-var iconv = module.exports = {
-    toEncoding: function(str, encoding) {
-        return iconv.getCodec(encoding).toEncoding(str);
-    },
-    fromEncoding: function(buf, encoding) {
-        return iconv.getCodec(encoding).fromEncoding(buf);
-    },
-    
-    defaultCharUnicode: '�',
-    defaultCharSingleByte: '?',
-    
-    // Get correct codec for given encoding.
-    getCodec: function(encoding) {
-        var enc = encoding || "utf8";
-        var codecOptions = undefined;
-        while (1) {
-            if (getType(enc) === "String")
-                enc = enc.replace(/[- ]/g, "").toLowerCase();
-            var codec = iconv.encodings[enc];
-            var type = getType(codec);
-            if (type === "String") {
-                // Link to other encoding.
-                codecOptions = {originalEncoding: enc};
-                enc = codec;
-            }
-            else if (type === "Object" && codec.type != undefined) {
-                // Options for other encoding.
-                codecOptions = codec;
-                enc = codec.type;
-            } 
-            else if (type === "Function")
-                // Codec itself.
-                return codec(codecOptions);
-            else
-                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
-        }
-    },
-    
-    // Define basic encodings
-    encodings: {
-        internal: function(options) {
-            return {
-                toEncoding: function(str) {
-                    return new Buffer(ensureString(str), options.originalEncoding);
-                },
-                fromEncoding: function(buf) {
-                    return ensureBuffer(buf).toString(options.originalEncoding);
-                }
-            };
-        },
-        utf8: "internal",
-        ucs2: "internal",
-        binary: "internal",
-        ascii: "internal",
-        base64: "internal",
-        
-        // Codepage single-byte encodings.
-        singlebyte: function(options) {
-            // Prepare chars if needed
-            if (!options.chars || (options.chars.length !== 128 && options.chars.length !== 256))
-                throw new Error("Encoding '"+options.type+"' has incorrect 'chars' (must be of len 128 or 256)");
-            
-            if (options.chars.length === 128)
-                options.chars = asciiString + options.chars;
-            
-            if (!options.charsBuf) {
-                options.charsBuf = new Buffer(options.chars, 'ucs2');
-            }
-            
-            if (!options.revCharsBuf) {
-                options.revCharsBuf = new Buffer(65536);
-                var defChar = iconv.defaultCharSingleByte.charCodeAt(0);
-                for (var i = 0; i < options.revCharsBuf.length; i++)
-                    options.revCharsBuf[i] = defChar;
-                for (var i = 0; i < options.chars.length; i++)
-                    options.revCharsBuf[options.chars.charCodeAt(i)] = i;
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    
-                    var buf = new Buffer(str.length);
-                    var revCharsBuf = options.revCharsBuf;
-                    for (var i = 0; i < str.length; i++)
-                        buf[i] = revCharsBuf[str.charCodeAt(i)];
-                    
-                    return buf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    
-                    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
-                    var charsBuf = options.charsBuf;
-                    var newBuf = new Buffer(buf.length*2);
-                    var idx1 = 0, idx2 = 0;
-                    for (var i = 0, _len = buf.length; i < _len; i++) {
-                        idx1 = buf[i]*2; idx2 = i*2;
-                        newBuf[idx2] = charsBuf[idx1];
-                        newBuf[idx2+1] = charsBuf[idx1+1];
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            };
-        },
-
-        // Codepage double-byte encodings.
-        table: function(options) {
-            var table = options.table, key, revCharsTable = options.revCharsTable;
-            if (!table) {
-                throw new Error("Encoding '" + options.type +"' has incorect 'table' option");
-            }
-            if(!revCharsTable) {
-                revCharsTable = options.revCharsTable = {};
-                for (key in table) {
-                    revCharsTable[table[key]] = parseInt(key);
-                }
-            }
-            
-            return {
-                toEncoding: function(str) {
-                    str = ensureString(str);
-                    var strLen = str.length;
-                    var bufLen = strLen;
-                    for (var i = 0; i < strLen; i++)
-                        if (str.charCodeAt(i) >> 7)
-                            bufLen++;
-
-                    var newBuf = new Buffer(bufLen), gbkcode, unicode, 
-                        defaultChar = revCharsTable[iconv.defaultCharUnicode.charCodeAt(0)];
-
-                    for (var i = 0, j = 0; i < strLen; i++) {
-                        unicode = str.charCodeAt(i);
-                        if (unicode >> 7) {
-                            gbkcode = revCharsTable[unicode] || defaultChar;
-                            newBuf[j++] = gbkcode >> 8; //high byte;
-                            newBuf[j++] = gbkcode & 0xFF; //low byte
-                        } else {//ascii
-                            newBuf[j++] = unicode;
-                        }
-                    }
-                    return newBuf;
-                },
-                fromEncoding: function(buf) {
-                    buf = ensureBuffer(buf);
-                    var bufLen = buf.length, strLen = 0;
-                    for (var i = 0; i < bufLen; i++) {
-                        strLen++;
-                        if (buf[i] & 0x80) //the high bit is 1, so this byte is gbkcode's high byte.skip next byte
-                            i++;
-                    }
-                    var newBuf = new Buffer(strLen*2), unicode, gbkcode,
-                        defaultChar = iconv.defaultCharUnicode.charCodeAt(0);
-                    
-                    for (var i = 0, j = 0; i < bufLen; i++, j+=2) {
-                        gbkcode = buf[i];
-                        if (gbkcode & 0x80) {
-                            gbkcode = (gbkcode << 8) + buf[++i];
-                            unicode = table[gbkcode] || defaultChar;
-                        } else {
-                            unicode = gbkcode;
-                        }
-                        newBuf[j] = unicode & 0xFF; //low byte
-                        newBuf[j+1] = unicode >> 8; //high byte
-                    }
-                    return newBuf.toString('ucs2');
-                }
-            }
-        }
-    }
-};
-
-// Add aliases to convert functions
-iconv.encode = iconv.toEncoding;
-iconv.decode = iconv.fromEncoding;
-
-// Load other encodings from files in /encodings dir.
-var encodingsDir = __dirname+"/encodings/",
-    fs = require('fs');
-fs.readdirSync(encodingsDir).forEach(function(file) {
-    if(fs.statSync(encodingsDir + file).isDirectory()) return;
-    var encodings = require(encodingsDir + file)
-    for (var key in encodings)
-        iconv.encodings[key] = encodings[key]
-});
-
-// Utilities
-var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+
-              ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f';
-
-var ensureBuffer = function(buf) {
-    buf = buf || new Buffer(0);
-    return (buf instanceof Buffer) ? buf : new Buffer(buf.toString(), "utf8");
-}
-
-var ensureString = function(str) {
-    str = str || "";
-    return (str instanceof String) ? str : str.toString((str instanceof Buffer) ? 'utf8' : undefined);
-}
-
-var getType = function(obj) {
-    return Object.prototype.toString.call(obj).slice(8, -1);
-}
-
-
-});
-
-require.define("/node_modules/http-browserify/package.json", function (require, module, exports, __dirname, __filename) {
-    module.exports = {"main":"index.js","browserify":"browser.js"}
-});
-
-require.define("/node_modules/http-browserify/browser.js", function (require, module, exports, __dirname, __filename) {
-    var http = module.exports;
-var EventEmitter = require('events').EventEmitter;
-var Request = require('./lib/request');
-
-http.request = function (params, cb) {
-    if (!params) params = {};
-    if (!params.host) params.host = window.location.host.split(':')[0];
-    if (!params.port) params.port = window.location.port;
-    
-    var req = new Request(new xhrHttp, params);
-    if (cb) req.on('response', cb);
-    return req;
-};
-
-http.get = function (params, cb) {
-    params.method = 'GET';
-    var req = http.request(params, cb);
-    req.end();
-    return req;
-};
-
-var xhrHttp = (function () {
-    if (typeof window === 'undefined') {
-        throw new Error('no window object present');
-    }
-    else if (window.XMLHttpRequest) {
-        return window.XMLHttpRequest;
-    }
-    else if (window.ActiveXObject) {
-        var axs = [
-            'Msxml2.XMLHTTP.6.0',
-            'Msxml2.XMLHTTP.3.0',
-            'Microsoft.XMLHTTP'
-        ];
-        for (var i = 0; i < axs.length; i++) {
-            try {
-                var ax = new(window.ActiveXObject)(axs[i]);
-                return function () {
-                    if (ax) {
-                        var ax_ = ax;
-                        ax = null;
-                        return ax_;
-                    }
-                    else {
-                        return new(window.ActiveXObject)(axs[i]);
-                    }
-                };
-            }
-            catch (e) {}
-        }
-        throw new Error('ajax not supported in this browser')
-    }
-    else {
-        throw new Error('ajax not supported in this browser');
-    }
-})();
-
-http.STATUS_CODES = {
-    100 : 'Continue',
-    101 : 'Switching Protocols',
-    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
-    200 : 'OK',
-    201 : 'Created',
-    202 : 'Accepted',
-    203 : 'Non-Authoritative Information',
-    204 : 'No Content',
-    205 : 'Reset Content',
-    206 : 'Partial Content',
-    207 : 'Multi-Status', // RFC 4918
-    300 : 'Multiple Choices',
-    301 : 'Moved Permanently',
-    302 : 'Moved Temporarily',
-    303 : 'See Other',
-    304 : 'Not Modified',
-    305 : 'Use Proxy',
-    307 : 'Temporary Redirect',
-    400 : 'Bad Request',
-    401 : 'Unauthorized',
-    402 : 'Payment Required',
-    403 : 'Forbidden',
-    404 : 'Not Found',
-    405 : 'Method Not Allowed',
-    406 : 'Not Acceptable',
-    407 : 'Proxy Authentication Required',
-    408 : 'Request Time-out',
-    409 : 'Conflict',
-    410 : 'Gone',
-    411 : 'Length Required',
-    412 : 'Precondition Failed',
-    413 : 'Request Entity Too Large',
-    414 : 'Request-URI Too Large',
-    415 : 'Unsupported Media Type',
-    416 : 'Requested Range Not Satisfiable',
-    417 : 'Expectation Failed',
-    418 : 'I\'m a teapot', // RFC 2324
-    422 : 'Unprocessable Entity', // RFC 4918
-    423 : 'Locked', // RFC 4918
-    424 : 'Failed Dependency', // RFC 4918
-    425 : 'Unordered Collection', // RFC 4918
-    426 : 'Upgrade Required', // RFC 2817
-    500 : 'Internal Server Error',
-    501 : 'Not Implemented',
-    502 : 'Bad Gateway',
-    503 : 'Service Unavailable',
-    504 : 'Gateway Time-out',
-    505 : 'HTTP Version not supported',
-    506 : 'Variant Also Negotiates', // RFC 2295
-    507 : 'Insufficient Storage', // RFC 4918
-    509 : 'Bandwidth Limit Exceeded',
-    510 : 'Not Extended' // RFC 2774
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/request.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var Response = require('./response');
-var isSafeHeader = require('./isSafeHeader');
-
-var Request = module.exports = function (xhr, params) {
-    var self = this;
-    self.xhr = xhr;
-    self.body = '';
-    
-    var uri = params.host + ':' + params.port + (params.path || '/');
-    
-    xhr.open(
-        params.method || 'GET',
-        (params.scheme || 'http') + '://' + uri,
-        true
-    );
-    
-    if (params.headers) {
-        Object.keys(params.headers).forEach(function (key) {
-            if (!isSafeHeader(key)) return;
-            var value = params.headers[key];
-            if (Array.isArray(value)) {
-                value.forEach(function (v) {
-                    xhr.setRequestHeader(key, v);
-                });
-            }
-            else xhr.setRequestHeader(key, value)
-        });
-    }
-    
-    var res = new Response(xhr);
-    res.on('ready', function () {
-        self.emit('response', res);
-    });
-    
-    xhr.onreadystatechange = function () {
-        res.handle(xhr);
-    };
-};
-
-Request.prototype = new EventEmitter;
-
-Request.prototype.setHeader = function (key, value) {
-    if ((Array.isArray && Array.isArray(value))
-    || value instanceof Array) {
-        for (var i = 0; i < value.length; i++) {
-            this.xhr.setRequestHeader(key, value[i]);
-        }
-    }
-    else {
-        this.xhr.setRequestHeader(key, value);
-    }
-};
-
-Request.prototype.write = function (s) {
-    this.body += s;
-};
-
-Request.prototype.end = function (s) {
-    if (s !== undefined) this.write(s);
-    this.xhr.send(this.body);
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/response.js", function (require, module, exports, __dirname, __filename) {
-    var EventEmitter = require('events').EventEmitter;
-var isSafeHeader = require('./isSafeHeader');
-
-var Response = module.exports = function (xhr) {
-    this.xhr = xhr;
-    this.offset = 0;
-};
-
-Response.prototype = new EventEmitter;
-
-var capable = {
-    streaming : true,
-    status2 : true
-};
-
-function parseHeaders (xhr) {
-    var lines = xhr.getAllResponseHeaders().split(/\r?\n/);
-    var headers = {};
-    for (var i = 0; i < lines.length; i++) {
-        var line = lines[i];
-        if (line === '') continue;
-        
-        var m = line.match(/^([^:]+):\s*(.*)/);
-        if (m) {
-            var key = m[1].toLowerCase(), value = m[2];
-            
-            if (headers[key] !== undefined) {
-                if ((Array.isArray && Array.isArray(headers[key]))
-                || headers[key] instanceof Array) {
-                    headers[key].push(value);
-                }
-                else {
-                    headers[key] = [ headers[key], value ];
-                }
-            }
-            else {
-                headers[key] = value;
-            }
-        }
-        else {
-            headers[line] = true;
-        }
-    }
-    return headers;
-}
-
-Response.prototype.getHeader = function (key) {
-    var header = this.headers ? this.headers[key.toLowerCase()] : null;
-    if (header) return header;
-
-    // Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-    // getAllResponseHeaders() to return {} if the response is a CORS request.
-    // xhr.getHeader still works correctly.
-    if (isSafeHeader(key)) {
-      return this.xhr.getResponseHeader(key);
-    }
-    return null;
-};
-
-Response.prototype.handle = function () {
-    var xhr = this.xhr;
-    if (xhr.readyState === 2 && capable.status2) {
-        try {
-            this.statusCode = xhr.status;
-            this.headers = parseHeaders(xhr);
-        }
-        catch (err) {
-            capable.status2 = false;
-        }
-        
-        if (capable.status2) {
-            this.emit('ready');
-        }
-    }
-    else if (capable.streaming && xhr.readyState === 3) {
-        try {
-            if (!this.statusCode) {
-                this.statusCode = xhr.status;
-                this.headers = parseHeaders(xhr);
-                this.emit('ready');
-            }
-        }
-        catch (err) {}
-        
-        try {
-            this.write();
-        }
-        catch (err) {
-            capable.streaming = false;
-        }
-    }
-    else if (xhr.readyState === 4) {
-        if (!this.statusCode) {
-            this.statusCode = xhr.status;
-            this.emit('ready');
-        }
-        this.write();
-        
-        if (xhr.error) {
-            this.emit('error', xhr.responseText);
-        }
-        else this.emit('end');
-    }
-};
-
-Response.prototype.write = function () {
-    var xhr = this.xhr;
-    if (xhr.responseText.length > this.offset) {
-        this.emit('data', xhr.responseText.slice(this.offset));
-        this.offset = xhr.responseText.length;
-    }
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/isSafeHeader.js", function (require, module, exports, __dirname, __filename) {
-    // Taken from http://dxr.mozilla.org/mozilla/mozilla-central/content/base/src/nsXMLHttpRequest.cpp.html
-var unsafeHeaders = [
-    "accept-charset",
-    "accept-encoding",
-    "access-control-request-headers",
-    "access-control-request-method",
-    "connection",
-    "content-length",
-    "cookie",
-    "cookie2",
-    "content-transfer-encoding",
-    "date",
-    "expect",
-    "host",
-    "keep-alive",
-    "origin",
-    "referer",
-    "set-cookie",
-    "te",
-    "trailer",
-    "transfer-encoding",
-    "upgrade",
-    "user-agent",
-    "via"
-];
-
-module.exports = function (headerName) {
-    if (!headerName) return false;
-    return (unsafeHeaders.indexOf(headerName.toLowerCase()) === -1)
-};
-
-});
-
-require.alias("http-browserify", "/node_modules/http");
-
-require.alias("http-browserify", "/node_modules/https");
\ No newline at end of file
diff --git a/api/files/swagger-oauth.js b/api/files/swagger-oauth.js
deleted file mode 100644
index 167c5ce3..00000000
--- a/api/files/swagger-oauth.js
+++ /dev/null
@@ -1,211 +0,0 @@
-var appName;
-var popupMask;
-var popupDialog;
-var clientId;
-var realm;
-
-function handleLogin() {
-  var scopes = [];
-
-  if(window.swaggerUi.api.authSchemes 
-    && window.swaggerUi.api.authSchemes.oauth2
-    && window.swaggerUi.api.authSchemes.oauth2.scopes) {
-    scopes = window.swaggerUi.api.authSchemes.oauth2.scopes;
-  }
-
-  if(window.swaggerUi.api
-    && window.swaggerUi.api.info) {
-    appName = window.swaggerUi.api.info.title;
-  }
-
-  if(popupDialog.length > 0)
-    popupDialog = popupDialog.last();
-  else {
-    popupDialog = $(
-      [
-        '<div class="api-popup-dialog">',
-        '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
-        '<div class="api-popup-content">',
-          '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
-            '<a href="#">Learn how to use</a>',
-          '</p>',
-          '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
-          '<ul class="api-popup-scopes">',
-          '</ul>',
-          '<p class="error-msg"></p>',
-          '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
-        '</div>',
-        '</div>'].join(''));
-    $(document.body).append(popupDialog);
-
-    popup = popupDialog.find('ul.api-popup-scopes').empty();
-    for (i = 0; i < scopes.length; i ++) {
-      scope = scopes[i];
-      str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"/>' + '<label for="scope_' + i + '">' + scope.scope;
-      if (scope.description) {
-        str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
-      }
-      str += '</label></li>';
-      popup.append(str);
-    }
-  }
-
-  var $win = $(window),
-    dw = $win.width(),
-    dh = $win.height(),
-    st = $win.scrollTop(),
-    dlgWd = popupDialog.outerWidth(),
-    dlgHt = popupDialog.outerHeight(),
-    top = (dh -dlgHt)/2 + st,
-    left = (dw - dlgWd)/2;
-
-  popupDialog.css({
-    top: (top < 0? 0 : top) + 'px',
-    left: (left < 0? 0 : left) + 'px'
-  });
-
-  popupDialog.find('button.api-popup-cancel').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-  });
-  popupDialog.find('button.api-popup-authbtn').click(function() {
-    popupMask.hide();
-    popupDialog.hide();
-
-    var authSchemes = window.swaggerUi.api.authSchemes;
-    var host = window.location;
-    var redirectUrl = host.protocol + '//' + host.host + "/o2c.html";
-    var url = null;
-
-    var p = window.swaggerUi.api.authSchemes;
-    for (var key in p) {
-      if (p.hasOwnProperty(key)) {
-        var o = p[key].grantTypes;
-        for(var t in o) {
-          if(o.hasOwnProperty(t) && t === 'implicit') {
-            var dets = o[t];
-            url = dets.loginEndpoint.url + "?response_type=token";
-            window.swaggerUi.tokenName = dets.tokenName;
-          }
-        }
-      }
-    }
-    var scopes = []
-    var o = $('.api-popup-scopes').find('input:checked');
-
-    for(k =0; k < o.length; k++) {
-      scopes.push($(o[k]).attr("scope"));
-    }
-
-    window.enabledScopes=scopes;
-
-    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
-    url += '&realm=' + encodeURIComponent(realm);
-    url += '&client_id=' + encodeURIComponent(clientId);
-    url += '&scope=' + encodeURIComponent(scopes);
-
-    window.open(url);
-  });
-
-  popupMask.show();
-  popupDialog.show();
-  return;
-}
-
-
-function handleLogout() {
-  for(key in window.authorizations.authz){
-    window.authorizations.remove(key)
-  }
-  window.enabledScopes = null;
-  $('.api-ic.ic-on').addClass('ic-off');
-  $('.api-ic.ic-on').removeClass('ic-on');
-
-  // set the info box
-  $('.api-ic.ic-warning').addClass('ic-error');
-  $('.api-ic.ic-warning').removeClass('ic-warning');
-}
-
-function initOAuth(opts) {
-  var o = (opts||{});
-  var errors = [];
-
-  appName = (o.appName||errors.push("missing appName"));
-  popupMask = (o.popupMask||$('#api-common-mask'));
-  popupDialog = (o.popupDialog||$('.api-popup-dialog'));
-  clientId = (o.clientId||errors.push("missing client id"));
-  realm = (o.realm||errors.push("missing realm"));
-
-  if(errors.length > 0){
-    log("auth unable initialize oauth: " + errors);
-    return;
-  }
-
-  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
-  $('.api-ic').click(function(s) {
-    if($(s.target).hasClass('ic-off'))
-      handleLogin();
-    else {
-      handleLogout();
-    }
-    false;
-  });
-}
-
-function onOAuthComplete(token) {
-  if(token) {
-    if(token.error) {
-      var checkbox = $('input[type=checkbox],.secured')
-      checkbox.each(function(pos){
-        checkbox[pos].checked = false;
-      });
-      alert(token.error);
-    }
-    else {
-      var b = token[window.swaggerUi.tokenName];
-      if(b){
-        // if all roles are satisfied
-        var o = null;
-        $.each($('.auth #api_information_panel'), function(k, v) {
-          var children = v;
-          if(children && children.childNodes) {
-            var requiredScopes = [];
-            $.each((children.childNodes), function (k1, v1){
-              var inner = v1.innerHTML;
-              if(inner)
-                requiredScopes.push(inner);
-            });
-            var diff = [];
-            for(var i=0; i < requiredScopes.length; i++) {
-              var s = requiredScopes[i];
-              if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
-                diff.push(s);
-              }
-            }
-            if(diff.length > 0){
-              o = v.parentNode;
-              $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
-              $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
-
-              // sorry, not all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');
-            }
-            else {
-              o = v.parentNode;
-              $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
-              $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
-
-              // all scopes are satisfied
-              $(o).find('.api-ic').addClass('ic-info');
-              $(o).find('.api-ic').removeClass('ic-warning');
-              $(o).find('.api-ic').removeClass('ic-error');          
-            }
-          }
-        });
-
-        window.authorizations.add("oauth2", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/api/files/swagger-ui.js b/api/files/swagger-ui.js
deleted file mode 100644
index f6598452..00000000
--- a/api/files/swagger-ui.js
+++ /dev/null
@@ -1,2315 +0,0 @@
-// swagger-ui.js
-// version 2.0.21
-$(function() {
-
-	// Helper function for vertically aligning DOM elements
-	// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
-	$.fn.vAlign = function() {
-		return this.each(function(i){
-		var ah = $(this).height();
-		var ph = $(this).parent().height();
-		var mh = (ph - ah) / 2;
-		$(this).css('margin-top', mh);
-		});
-	};
-
-	$.fn.stretchFormtasticInputWidthToParent = function() {
-		return this.each(function(i){
-		var p_width = $(this).closest("form").innerWidth();
-		var p_padding = parseInt($(this).closest("form").css('padding-left') ,10) + parseInt($(this).closest("form").css('padding-right'), 10);
-		var this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);
-		$(this).css('width', p_width - p_padding - this_padding);
-		});
-	};
-
-	$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();
-
-	// Vertically center these paragraphs
-	// Parent may need a min-height for this to work..
-	$('ul.downplayed li div.content p').vAlign();
-
-	// When a sandbox form is submitted..
-	$("form.sandbox").submit(function(){
-
-		var error_free = true;
-
-		// Cycle through the forms required inputs
- 		$(this).find("input.required").each(function() {
-
-			// Remove any existing error styles from the input
-			$(this).removeClass('error');
-
-			// Tack the error style on if the input is empty..
-			if ($(this).val() == '') {
-				$(this).addClass('error');
-				$(this).wiggle();
-				error_free = false;
-			}
-
-		});
-
-		return error_free;
-	});
-
-});
-
-function clippyCopiedCallback(a) {
-  $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
-  // var b = $("#clippy_tooltip_" + a);
-  // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), setTimeout(function() {
-  //   b.attr("title", "copy to clipboard")
-  // },
-  // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-};
-
-// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log == "object") {
-    [
-      "log","info","warn","error","assert","dir","clear","profile","profileEnd"
-    ].forEach(function (method) {
-        console[method] = this.bind(console[method], console);
-    }, Function.prototype.call);
-}
-
-var Docs = {
-
-	shebang: function() {
-
-		// If shebang has an operation nickname in it..
-		// e.g. /docs/#!/words/get_search
-		var fragments = $.param.fragment().split('/');
-		fragments.shift(); // get rid of the bang
-
-		switch (fragments.length) {
-			case 1:
-				// Expand all operations for the resource and scroll to it
-				log('shebang resource:' + fragments[0]);
-				var dom_id = 'resource_' + fragments[0];
-
-				Docs.expandEndpointListForResource(fragments[0]);
-				$("#"+dom_id).slideto({highlight: false});
-				break;
-			case 2:
-				// Refer to the endpoint DOM element, e.g. #words_get_search
-				log('shebang endpoint: ' + fragments.join('_'));
-
-        // Expand Resource
-        Docs.expandEndpointListForResource(fragments[0]);
-        $("#"+dom_id).slideto({highlight: false});
-
-        // Expand operation
-				var li_dom_id = fragments.join('_');
-				var li_content_dom_id = li_dom_id + "_content";
-
-        log("li_dom_id " + li_dom_id);
-        log("li_content_dom_id " + li_content_dom_id);
-
-				Docs.expandOperation($('#'+li_content_dom_id));
-				$('#'+li_dom_id).slideto({highlight: false});
-				break;
-		}
-
-	},
-
-	toggleEndpointListForResource: function(resource) {
-		var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
-		if (elem.is(':visible')) {
-			Docs.collapseEndpointListForResource(resource);
-		} else {
-			Docs.expandEndpointListForResource(resource);
-		}
-	},
-
-	// Expand resource
-	expandEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		if (resource == '') {
-			$('.resource ul.endpoints').slideDown();
-			return;
-		}
-		
-		$('li#resource_' + resource).addClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideDown();
-	},
-
-	// Collapse resource and mark as explicitly closed
-	collapseEndpointListForResource: function(resource) {
-		var resource = Docs.escapeResourceName(resource);
-		$('li#resource_' + resource).removeClass('active');
-
-		var elem = $('li#resource_' + resource + ' ul.endpoints');
-		elem.slideUp();
-	},
-
-	expandOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-		
-		if (resource == '') {
-			$('.resource ul.endpoints li.operation div.content').slideDown();
-			return;
-		}
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.expandOperation($(this));
-		});
-	},
-
-	collapseOperationsForResource: function(resource) {
-		// Make sure the resource container is open..
-		Docs.expandEndpointListForResource(resource);
-
-		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
-			Docs.collapseOperation($(this));
-		});
-	},
-
-	escapeResourceName: function(resource) {
-		return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
-	},
-
-	expandOperation: function(elem) {
-		elem.slideDown();
-	},
-
-	collapseOperation: function(elem) {
-		elem.slideUp();
-	}
-};(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n	<option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n	";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"contentType\"></label>\n<select name=\"contentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['main'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1, stack2;
-  buffer += "\n    <div class=\"info_title\">"
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</div>\n    <div class=\"info_description\">";
-  stack2 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.description)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</div>\n    ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    ";
-  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  ";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class=\"info_tos\"><a href=\""
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">Terms of service</a></div>";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class='info_contact'><a href=\"mailto:"
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "\">Contact the developer</a></div>";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "<div class='info_license'><a href='"
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.licenseUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "'>"
-    + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</a></div>";
-  return buffer;
-  }
-
-function program8(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        , <span style=\"font-variant: small-caps\">api version</span>: ";
-  if (stack1 = helpers.apiVersion) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.apiVersion; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  return buffer;
-  }
-
-  buffer += "<div class='info' id='api_info'>\n  ";
-  stack1 = helpers['if'].call(depth0, depth0.info, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</div>\n<div class='container' id='resources_container'>\n    <ul id='resources'>\n    </ul>\n\n    <div class=\"footer\">\n        <br>\n        <br>\n        <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";
-  if (stack1 = helpers.basePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.basePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.apiVersion, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "]</h4>\n    </div>\n</div>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['operation'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <h4>Implementation Notes</h4>\n        <p>";
-  if (stack1 = helpers.notes) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.notes; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</p>\n        ";
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  
-  return "\n        <div class=\"auth\">\n        <span class=\"api-ic ic-error\"></span>";
-  }
-
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n          <div id=\"api_information_panel\" style=\"top: 526px; left: 776px; display: none;\">\n          ";
-  stack1 = helpers.each.call(depth0, depth0, {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          </div>\n        ";
-  return buffer;
-  }
-function program6(depth0,data) {
-  
-  var buffer = "", stack1, stack2;
-  buffer += "\n            <div title='";
-  stack2 = ((stack1 = depth0.description),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "'>"
-    + escapeExpression(((stack1 = depth0.scope),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
-    + "</div>\n          ";
-  return buffer;
-  }
-
-function program8(depth0,data) {
-  
-  
-  return "</div>";
-  }
-
-function program10(depth0,data) {
-  
-  
-  return "\n        <div class='access'>\n          <span class=\"api-ic ic-off\" title=\"click to authenticate\"></span>\n        </div>\n        ";
-  }
-
-function program12(depth0,data) {
-  
-  
-  return "\n          <h4>Response Class</h4>\n          <p><span class=\"model-signature\" /></p>\n          <br/>\n          <div class=\"response-content-type\" />\n        ";
-  }
-
-function program14(depth0,data) {
-  
-  
-  return "\n          <h4>Parameters</h4>\n          <table class='fullwidth'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\">Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\">Value</th>\n            <th style=\"width: 200px; max-width: 200px\">Description</th>\n            <th style=\"width: 100px; max-width: 100px\">Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n          ";
-  }
-
-function program16(depth0,data) {
-  
-  
-  return "\n          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n          ";
-  }
-
-function program18(depth0,data) {
-  
-  
-  return "\n          ";
-  }
-
-function program20(depth0,data) {
-  
-  
-  return "\n          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n          </div>\n          ";
-  }
-
-  buffer += "\n  <ul class='operations' >\n    <li class='";
-  if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + " operation' id='";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation\">";
-  if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation\">";
-  if (stack1 = helpers.path) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.path; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "/";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' class=\"toggleOperation\">";
-  if (stack1 = helpers.summary) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.summary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='";
-  if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_";
-  if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_content' style='display:none'>\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.notes, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  stack1 = helpers.each.call(depth0, depth0.oauth, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data};
-  if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.type, {hash:{},inverse:self.noop,fn:self.program(12, program12, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.parameters, {hash:{},inverse:self.noop,fn:self.program(14, program14, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.responseMessages, {hash:{},inverse:self.noop,fn:self.program(16, program16, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n          ";
-  stack1 = helpers['if'].call(depth0, depth0.isReadOnly, {hash:{},inverse:self.program(20, program20, data),fn:self.program(18, program18, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input type=\"file\" name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			<div class=\"parameter-content-type\" />\n		";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n			";
-  return buffer;
-  }
-
-function program7(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n			";
-  return buffer;
-  }
-
-function program9(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(10, program10, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program10(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(13, program13, data),fn:self.program(11, program11, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program11(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter' minlength='0' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value='";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			";
-  return buffer;
-  }
-
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter' minlength='0' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='' type='text' value=''/>\n			";
-  return buffer;
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n\n	";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_list'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, stack2, options, self=this, helperMissing=helpers.helperMissing, functionType="function", escapeExpression=this.escapeExpression;
-
-function program1(depth0,data) {
-  
-  
-  return " multiple='multiple'";
-  }
-
-function program3(depth0,data) {
-  
-  
-  return "\n    ";
-  }
-
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(8, program8, data),fn:self.program(6, program6, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program6(depth0,data) {
-  
-  
-  return "\n      ";
-  }
-
-function program8(depth0,data) {
-  
-  var buffer = "", stack1, stack2, options;
-  buffer += "\n        ";
-  options = {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data};
-  stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      ";
-  return buffer;
-  }
-function program9(depth0,data) {
-  
-  
-  return "\n        ";
-  }
-
-function program11(depth0,data) {
-  
-  
-  return "\n          <option selected=\"\" value=''></option>\n        ";
-  }
-
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n      ";
-  stack1 = helpers['if'].call(depth0, depth0.isDefault, {hash:{},inverse:self.program(16, program16, data),fn:self.program(14, program14, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program14(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <option selected=\"\" value='";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + " (default)</option>\n      ";
-  return buffer;
-  }
-
-function program16(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <option value='";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</option>\n      ";
-  return buffer;
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n  <select ";
-  options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
-  stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += " class='parameter' name='";
-  if (stack2 = helpers.name) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.name; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  buffer += escapeExpression(stack2)
-    + "'>\n    ";
-  stack2 = helpers['if'].call(depth0, depth0.required, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    ";
-  stack2 = helpers.each.call(depth0, ((stack1 = depth0.allowableValues),stack1 == null || stack1 === false ? stack1 : stack1.descriptiveValues), {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  </select>\n</td>\n<td>";
-  if (stack2 = helpers.description) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.description; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</td>\n<td>";
-  if (stack2 = helpers.paramType) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
-  else { stack2 = depth0.paramType; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <textarea class='body-textarea' readonly='readonly' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n    ";
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n            ";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  
-  return "\n            (empty)\n        ";
-  }
-
-  buffer += "<td class='code'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n    ";
-  return buffer;
-  }
-
-function program3(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n        ";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    ";
-  return buffer;
-  }
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n            ";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\n        ";
-  return buffer;
-  }
-
-function program6(depth0,data) {
-  
-  
-  return "\n            (empty)\n        ";
-  }
-
-  buffer += "<td class='code required'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n    ";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input type=\"file\" name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n		";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program5(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</textarea>\n			";
-  return buffer;
-  }
-
-function program7(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<textarea class='body-textarea' placeholder='(required)' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n			";
-  return buffer;
-  }
-
-function program9(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n		";
-  stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n	";
-  return buffer;
-  }
-function program10(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			<input class='parameter' class='required' type='file' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n		";
-  return buffer;
-  }
-
-function program12(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n			";
-  stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(15, program15, data),fn:self.program(13, program13, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n		";
-  return buffer;
-  }
-function program13(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter required' minlength='1' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='(required)' type='text' value='";
-  if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'/>\n			";
-  return buffer;
-  }
-
-function program15(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n				<input class='parameter required' minlength='1' name='";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' placeholder='(required)' type='text' value=''/>\n			";
-  return buffer;
-  }
-
-  buffer += "<td class='code required'>";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>\n	";
-  stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</td>\n<td>\n	<strong>";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</strong>\n</td>\n<td>";
-  if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['parameter_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.consumes, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  <option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n  ";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"parameterContentType\"></label>\n<select name=\"parameterContentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.consumes, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['resource'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-  
-  
-  return " : ";
-  }
-
-  buffer += "<div class='heading'>\n  <h2>\n    <a href='#!/";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' onclick=\"Docs.toggleEndpointListForResource('";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "');\">";
-  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</a> ";
-  options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, options); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if (!helpers.description) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "' id='endpointListTogger_";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'\n         onclick=\"Docs.toggleEndpointListForResource('";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "');\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.collapseOperationsForResource('";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' onclick=\"Docs.expandOperationsForResource('";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'); return false;\">\n        Expand Operations\n      </a>\n    </li>\n    <li>\n      <a href='";
-  if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "'>Raw</a>\n    </li>\n  </ul>\n</div>\n<ul class='endpoints' id='";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['response_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n";
-  return buffer;
-  }
-function program2(depth0,data) {
-  
-  var buffer = "", stack1;
-  buffer += "\n  <option value=\"";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">";
-  stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</option>\n  ";
-  return buffer;
-  }
-
-function program4(depth0,data) {
-  
-  
-  return "\n  <option value=\"application/json\">application/json</option>\n";
-  }
-
-  buffer += "<label for=\"responseContentType\"></label>\n<select name=\"responseContentType\">\n";
-  stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n</select>\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['signature'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<div>\n<ul class=\"signature-nav\">\n    <li><a class=\"description-link\" href=\"#\">Model</a></li>\n    <li><a class=\"snippet-link\" href=\"#\">Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n    <div class=\"description\">\n        ";
-  if (stack1 = helpers.signature) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.signature; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n    </div>\n\n    <div class=\"snippet\">\n        <pre><code>";
-  if (stack1 = helpers.sampleJSON) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.sampleJSON; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</code></pre>\n        <small class=\"notice\"></small>\n    </div>\n</div>\n\n";
-  return buffer;
-  });
-})();
-
-(function() {
-  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['status_code'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<td width='15%' class='code'>";
-  if (stack1 = helpers.code) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.code; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "</td>\n<td>";
-  if (stack1 = helpers.message) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.message; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>";
-  return buffer;
-  });
-})();
-
-
-
-// Generated by CoffeeScript 1.6.3
-(function() {
-  var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-  SwaggerUi = (function(_super) {
-    __extends(SwaggerUi, _super);
-
-    function SwaggerUi() {
-      _ref = SwaggerUi.__super__.constructor.apply(this, arguments);
-      return _ref;
-    }
-
-    SwaggerUi.prototype.dom_id = "swagger_ui";
-
-    SwaggerUi.prototype.options = null;
-
-    SwaggerUi.prototype.api = null;
-
-    SwaggerUi.prototype.headerView = null;
-
-    SwaggerUi.prototype.mainView = null;
-
-    SwaggerUi.prototype.initialize = function(options) {
-      var _this = this;
-      if (options == null) {
-        options = {};
-      }
-      if (options.dom_id != null) {
-        this.dom_id = options.dom_id;
-        delete options.dom_id;
-      }
-      if ($('#' + this.dom_id) == null) {
-        $('body').append('<div id="' + this.dom_id + '"></div>');
-      }
-      this.options = options;
-      this.options.success = function() {
-        return _this.render();
-      };
-      this.options.progress = function(d) {
-        return _this.showMessage(d);
-      };
-      this.options.failure = function(d) {
-        return _this.onLoadFailure(d);
-      };
-      this.headerView = new HeaderView({
-        el: $('#header')
-      });
-      return this.headerView.on('update-swagger-ui', function(data) {
-        return _this.updateSwaggerUi(data);
-      });
-    };
-
-    SwaggerUi.prototype.updateSwaggerUi = function(data) {
-      this.options.url = data.url;
-      return this.load();
-    };
-
-    SwaggerUi.prototype.load = function() {
-      var url, _ref1;
-      if ((_ref1 = this.mainView) != null) {
-        _ref1.clear();
-      }
-      url = this.options.url;
-      if (url.indexOf("http") !== 0) {
-        url = this.buildUrl(window.location.href.toString(), url);
-      }
-      this.options.url = url;
-      this.headerView.update(url);
-      this.api = new SwaggerApi(this.options);
-      this.api.build();
-      return this.api;
-    };
-
-    SwaggerUi.prototype.render = function() {
-      var _this = this;
-      this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
-      this.mainView = new MainView({
-        model: this.api,
-        el: $('#' + this.dom_id),
-        swaggerOptions: this.options
-      }).render();
-      this.showMessage();
-      switch (this.options.docExpansion) {
-        case "full":
-          Docs.expandOperationsForResource('');
-          break;
-        case "list":
-          Docs.collapseOperationsForResource('');
-      }
-      if (this.options.onComplete) {
-        this.options.onComplete(this.api, this);
-      }
-      return setTimeout(function() {
-        return Docs.shebang();
-      }, 400);
-    };
-
-    SwaggerUi.prototype.buildUrl = function(base, url) {
-      var endOfPath, parts;
-      log("base is " + base);
-      if (url.indexOf("/") === 0) {
-        parts = base.split("/");
-        base = parts[0] + "//" + parts[2];
-        return base + url;
-      } else {
-        endOfPath = base.length;
-        if (base.indexOf("?") > -1) {
-          endOfPath = Math.min(endOfPath, base.indexOf("?"));
-        }
-        if (base.indexOf("#") > -1) {
-          endOfPath = Math.min(endOfPath, base.indexOf("#"));
-        }
-        base = base.substring(0, endOfPath);
-        if (base.indexOf("/", base.length - 1) !== -1) {
-          return base + url;
-        }
-        return base + "/" + url;
-      }
-    };
-
-    SwaggerUi.prototype.showMessage = function(data) {
-      if (data == null) {
-        data = '';
-      }
-      $('#message-bar').removeClass('message-fail');
-      $('#message-bar').addClass('message-success');
-      return $('#message-bar').html(data);
-    };
-
-    SwaggerUi.prototype.onLoadFailure = function(data) {
-      var val;
-      if (data == null) {
-        data = '';
-      }
-      $('#message-bar').removeClass('message-success');
-      $('#message-bar').addClass('message-fail');
-      val = $('#message-bar').html(data);
-      if (this.options.onFailure != null) {
-        this.options.onFailure(data);
-      }
-      return val;
-    };
-
-    return SwaggerUi;
-
-  })(Backbone.Router);
-
-  window.SwaggerUi = SwaggerUi;
-
-  HeaderView = (function(_super) {
-    __extends(HeaderView, _super);
-
-    function HeaderView() {
-      _ref1 = HeaderView.__super__.constructor.apply(this, arguments);
-      return _ref1;
-    }
-
-    HeaderView.prototype.events = {
-      'click #show-pet-store-icon': 'showPetStore',
-      'click #show-wordnik-dev-icon': 'showWordnikDev',
-      'click #explore': 'showCustom',
-      'keyup #input_baseUrl': 'showCustomOnKeyup',
-      'keyup #input_apiKey': 'showCustomOnKeyup'
-    };
-
-    HeaderView.prototype.initialize = function() {};
-
-    HeaderView.prototype.showPetStore = function(e) {
-      return this.trigger('update-swagger-ui', {
-        url: "http://petstore.swagger.wordnik.com/api/api-docs"
-      });
-    };
-
-    HeaderView.prototype.showWordnikDev = function(e) {
-      return this.trigger('update-swagger-ui', {
-        url: "http://api.wordnik.com/v4/resources.json"
-      });
-    };
-
-    HeaderView.prototype.showCustomOnKeyup = function(e) {
-      if (e.keyCode === 13) {
-        return this.showCustom();
-      }
-    };
-
-    HeaderView.prototype.showCustom = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      return this.trigger('update-swagger-ui', {
-        url: $('#input_baseUrl').val(),
-        apiKey: $('#input_apiKey').val()
-      });
-    };
-
-    HeaderView.prototype.update = function(url, apiKey, trigger) {
-      if (trigger == null) {
-        trigger = false;
-      }
-      $('#input_baseUrl').val(url);
-      if (trigger) {
-        return this.trigger('update-swagger-ui', {
-          url: url
-        });
-      }
-    };
-
-    return HeaderView;
-
-  })(Backbone.View);
-
-  MainView = (function(_super) {
-    var sorters;
-
-    __extends(MainView, _super);
-
-    function MainView() {
-      _ref2 = MainView.__super__.constructor.apply(this, arguments);
-      return _ref2;
-    }
-
-    sorters = {
-      'alpha': function(a, b) {
-        return a.path.localeCompare(b.path);
-      },
-      'method': function(a, b) {
-        return a.method.localeCompare(b.method);
-      }
-    };
-
-    MainView.prototype.initialize = function(opts) {
-      var route, sorter, sorterName, _i, _len, _ref3;
-      if (opts == null) {
-        opts = {};
-      }
-      if (opts.swaggerOptions.sorter) {
-        sorterName = opts.swaggerOptions.sorter;
-        sorter = sorters[sorterName];
-        _ref3 = this.model.apisArray;
-        for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
-          route = _ref3[_i];
-          route.operationsArray.sort(sorter);
-        }
-        if (sorterName === "alpha") {
-          return this.model.apisArray.sort(sorter);
-        }
-      }
-    };
-
-    MainView.prototype.render = function() {
-      var counter, id, resource, resources, _i, _len, _ref3;
-      $(this.el).html(Handlebars.templates.main(this.model));
-      resources = {};
-      counter = 0;
-      _ref3 = this.model.apisArray;
-      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
-        resource = _ref3[_i];
-        id = resource.name;
-        while (typeof resources[id] !== 'undefined') {
-          id = id + "_" + counter;
-          counter += 1;
-        }
-        resource.id = id;
-        resources[id] = resource;
-        this.addResource(resource);
-      }
-      return this;
-    };
-
-    MainView.prototype.addResource = function(resource) {
-      var resourceView;
-      resourceView = new ResourceView({
-        model: resource,
-        tagName: 'li',
-        id: 'resource_' + resource.id,
-        className: 'resource',
-        swaggerOptions: this.options.swaggerOptions
-      });
-      return $('#resources').append(resourceView.render().el);
-    };
-
-    MainView.prototype.clear = function() {
-      return $(this.el).html('');
-    };
-
-    return MainView;
-
-  })(Backbone.View);
-
-  ResourceView = (function(_super) {
-    __extends(ResourceView, _super);
-
-    function ResourceView() {
-      _ref3 = ResourceView.__super__.constructor.apply(this, arguments);
-      return _ref3;
-    }
-
-    ResourceView.prototype.initialize = function() {};
-
-    ResourceView.prototype.render = function() {
-      var counter, id, methods, operation, _i, _len, _ref4;
-      $(this.el).html(Handlebars.templates.resource(this.model));
-      methods = {};
-      _ref4 = this.model.operationsArray;
-      for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-        operation = _ref4[_i];
-        counter = 0;
-        id = operation.nickname;
-        while (typeof methods[id] !== 'undefined') {
-          id = id + "_" + counter;
-          counter += 1;
-        }
-        methods[id] = operation;
-        operation.nickname = id;
-        operation.parentId = this.model.id;
-        this.addOperation(operation);
-      }
-      return this;
-    };
-
-    ResourceView.prototype.addOperation = function(operation) {
-      var operationView;
-      operation.number = this.number;
-      operationView = new OperationView({
-        model: operation,
-        tagName: 'li',
-        className: 'endpoint',
-        swaggerOptions: this.options.swaggerOptions
-      });
-      $('.endpoints', $(this.el)).append(operationView.render().el);
-      return this.number++;
-    };
-
-    return ResourceView;
-
-  })(Backbone.View);
-
-  OperationView = (function(_super) {
-    __extends(OperationView, _super);
-
-    function OperationView() {
-      _ref4 = OperationView.__super__.constructor.apply(this, arguments);
-      return _ref4;
-    }
-
-    OperationView.prototype.invocationUrl = null;
-
-    OperationView.prototype.events = {
-      'submit .sandbox': 'submitOperation',
-      'click .submit': 'submitOperation',
-      'click .response_hider': 'hideResponse',
-      'click .toggleOperation': 'toggleOperationContent',
-      'mouseenter .api-ic': 'mouseEnter',
-      'mouseout .api-ic': 'mouseExit'
-    };
-
-    OperationView.prototype.initialize = function() {};
-
-    OperationView.prototype.mouseEnter = function(e) {
-      var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
-      elem = $(e.currentTarget.parentNode).find('#api_information_panel');
-      x = e.pageX;
-      y = e.pageY;
-      scX = $(window).scrollLeft();
-      scY = $(window).scrollTop();
-      scMaxX = scX + $(window).width();
-      scMaxY = scY + $(window).height();
-      wd = elem.width();
-      hgh = elem.height();
-      if (x + wd > scMaxX) {
-        x = scMaxX - wd;
-      }
-      if (x < scX) {
-        x = scX;
-      }
-      if (y + hgh > scMaxY) {
-        y = scMaxY - hgh;
-      }
-      if (y < scY) {
-        y = scY;
-      }
-      pos = {};
-      pos.top = y;
-      pos.left = x;
-      elem.css(pos);
-      return $(e.currentTarget.parentNode).find('#api_information_panel').show();
-    };
-
-    OperationView.prototype.mouseExit = function(e) {
-      return $(e.currentTarget.parentNode).find('#api_information_panel').hide();
-    };
-
-    OperationView.prototype.render = function() {
-      var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8;
-      isMethodSubmissionSupported = true;
-      if (!isMethodSubmissionSupported) {
-        this.model.isReadOnly = true;
-      }
-      this.model.oauth = null;
-      if (this.model.authorizations) {
-        _ref5 = this.model.authorizations;
-        for (k in _ref5) {
-          v = _ref5[k];
-          if (k === "oauth2") {
-            if (this.model.oauth === null) {
-              this.model.oauth = {};
-            }
-            if (this.model.oauth.scopes === void 0) {
-              this.model.oauth.scopes = [];
-            }
-            for (_i = 0, _len = v.length; _i < _len; _i++) {
-              o = v[_i];
-              this.model.oauth.scopes.push(o);
-            }
-          }
-        }
-      }
-      $(this.el).html(Handlebars.templates.operation(this.model));
-      if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {
-        signatureModel = {
-          sampleJSON: this.model.responseSampleJSON,
-          isParam: false,
-          signature: this.model.responseClassSignature
-        };
-        responseSignatureView = new SignatureView({
-          model: signatureModel,
-          tagName: 'div'
-        });
-        $('.model-signature', $(this.el)).append(responseSignatureView.render().el);
-      } else {
-        $('.model-signature', $(this.el)).html(this.model.type);
-      }
-      contentTypeModel = {
-        isParam: false
-      };
-      contentTypeModel.consumes = this.model.consumes;
-      contentTypeModel.produces = this.model.produces;
-      _ref6 = this.model.parameters;
-      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
-        param = _ref6[_j];
-        type = param.type || param.dataType;
-        if (type.toLowerCase() === 'file') {
-          if (!contentTypeModel.consumes) {
-            log("set content type ");
-            contentTypeModel.consumes = 'multipart/form-data';
-          }
-        }
-      }
-      responseContentTypeView = new ResponseContentTypeView({
-        model: contentTypeModel
-      });
-      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      _ref7 = this.model.parameters;
-      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
-        param = _ref7[_k];
-        this.addParameter(param, contentTypeModel.consumes);
-      }
-      _ref8 = this.model.responseMessages;
-      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
-        statusCode = _ref8[_l];
-        this.addStatusCode(statusCode);
-      }
-      return this;
-    };
-
-    OperationView.prototype.addParameter = function(param, consumes) {
-      var paramView;
-      param.consumes = consumes;
-      paramView = new ParameterView({
-        model: param,
-        tagName: 'tr',
-        readOnly: this.model.isReadOnly
-      });
-      return $('.operation-params', $(this.el)).append(paramView.render().el);
-    };
-
-    OperationView.prototype.addStatusCode = function(statusCode) {
-      var statusCodeView;
-      statusCodeView = new StatusCodeView({
-        model: statusCode,
-        tagName: 'tr'
-      });
-      return $('.operation-status', $(this.el)).append(statusCodeView.render().el);
-    };
-
-    OperationView.prototype.submitOperation = function(e) {
-      var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
-      if (e != null) {
-        e.preventDefault();
-      }
-      form = $('.sandbox', $(this.el));
-      error_free = true;
-      form.find("input.required").each(function() {
-        var _this = this;
-        $(this).removeClass("error");
-        if (jQuery.trim($(this).val()) === "") {
-          $(this).addClass("error");
-          $(this).wiggle({
-            callback: function() {
-              return $(_this).focus();
-            }
-          });
-          return error_free = false;
-        }
-      });
-      if (error_free) {
-        map = {};
-        opts = {
-          parent: this
-        };
-        isFileUpload = false;
-        _ref5 = form.find("input");
-        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-          o = _ref5[_i];
-          if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-            map[o.name] = o.value;
-          }
-          if (o.type === "file") {
-            isFileUpload = true;
-          }
-        }
-        _ref6 = form.find("textarea");
-        for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
-          o = _ref6[_j];
-          if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-            map["body"] = o.value;
-          }
-        }
-        _ref7 = form.find("select");
-        for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
-          o = _ref7[_k];
-          val = this.getSelectedValue(o);
-          if ((val != null) && jQuery.trim(val).length > 0) {
-            map[o.name] = val;
-          }
-        }
-        opts.responseContentType = $("div select[name=responseContentType]", $(this.el)).val();
-        opts.requestContentType = $("div select[name=parameterContentType]", $(this.el)).val();
-        $(".response_throbber", $(this.el)).show();
-        if (isFileUpload) {
-          return this.handleFileUpload(map, form);
-        } else {
-          return this.model["do"](map, opts, this.showCompleteStatus, this.showErrorStatus, this);
-        }
-      }
-    };
-
-    OperationView.prototype.success = function(response, parent) {
-      return parent.showCompleteStatus(response);
-    };
-
-    OperationView.prototype.handleFileUpload = function(map, form) {
-      var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
-        _this = this;
-      _ref5 = form.serializeArray();
-      for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-        o = _ref5[_i];
-        if ((o.value != null) && jQuery.trim(o.value).length > 0) {
-          map[o.name] = o.value;
-        }
-      }
-      bodyParam = new FormData();
-      params = 0;
-      _ref6 = this.model.parameters;
-      for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
-        param = _ref6[_j];
-        if (param.paramType === 'form') {
-          if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
-            bodyParam.append(param.name, map[param.name]);
-          }
-        }
-      }
-      headerParams = {};
-      _ref7 = this.model.parameters;
-      for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
-        param = _ref7[_k];
-        if (param.paramType === 'header') {
-          headerParams[param.name] = map[param.name];
-        }
-      }
-      log(headerParams);
-      _ref8 = form.find('input[type~="file"]');
-      for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
-        el = _ref8[_l];
-        if (typeof el.files[0] !== 'undefined') {
-          bodyParam.append($(el).attr('name'), el.files[0]);
-          params += 1;
-        }
-      }
-      this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
-      $(".request_url", $(this.el)).html("<pre>" + this.invocationUrl + "</pre>");
-      obj = {
-        type: this.model.method,
-        url: this.invocationUrl,
-        headers: headerParams,
-        data: bodyParam,
-        dataType: 'json',
-        contentType: false,
-        processData: false,
-        error: function(data, textStatus, error) {
-          return _this.showErrorStatus(_this.wrap(data), _this);
-        },
-        success: function(data) {
-          return _this.showResponse(data, _this);
-        },
-        complete: function(data) {
-          return _this.showCompleteStatus(_this.wrap(data), _this);
-        }
-      };
-      if (window.authorizations) {
-        window.authorizations.apply(obj);
-      }
-      if (params === 0) {
-        obj.data.append("fake", "true");
-      }
-      jQuery.ajax(obj);
-      return false;
-    };
-
-    OperationView.prototype.wrap = function(data) {
-      var h, headerArray, headers, i, o, _i, _len;
-      headers = {};
-      headerArray = data.getAllResponseHeaders().split("\r");
-      for (_i = 0, _len = headerArray.length; _i < _len; _i++) {
-        i = headerArray[_i];
-        h = i.split(':');
-        if (h[0] !== void 0 && h[1] !== void 0) {
-          headers[h[0].trim()] = h[1].trim();
-        }
-      }
-      o = {};
-      o.content = {};
-      o.content.data = data.responseText;
-      o.headers = headers;
-      o.request = {};
-      o.request.url = this.invocationUrl;
-      o.status = data.status;
-      return o;
-    };
-
-    OperationView.prototype.getSelectedValue = function(select) {
-      var opt, options, _i, _len, _ref5;
-      if (!select.multiple) {
-        return select.value;
-      } else {
-        options = [];
-        _ref5 = select.options;
-        for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-          opt = _ref5[_i];
-          if (opt.selected) {
-            options.push(opt.value);
-          }
-        }
-        if (options.length > 0) {
-          return options.join(",");
-        } else {
-          return null;
-        }
-      }
-    };
-
-    OperationView.prototype.hideResponse = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".response", $(this.el)).slideUp();
-      return $(".response_hider", $(this.el)).fadeOut();
-    };
-
-    OperationView.prototype.showResponse = function(response) {
-      var prettyJson;
-      prettyJson = JSON.stringify(response, null, "\t").replace(/\n/g, "<br>");
-      return $(".response_body", $(this.el)).html(escape(prettyJson));
-    };
-
-    OperationView.prototype.showErrorStatus = function(data, parent) {
-      return parent.showStatus(data);
-    };
-
-    OperationView.prototype.showCompleteStatus = function(data, parent) {
-      return parent.showStatus(data);
-    };
-
-    OperationView.prototype.formatXml = function(xml) {
-      var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
-      reg = /(>)(<)(\/*)/g;
-      wsexp = /[ ]*(.*)[ ]+\n/g;
-      contexp = /(<.+>)(.+\n)/g;
-      xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-      pad = 0;
-      formatted = '';
-      lines = xml.split('\n');
-      indent = 0;
-      lastType = 'other';
-      transitions = {
-        'single->single': 0,
-        'single->closing': -1,
-        'single->opening': 0,
-        'single->other': 0,
-        'closing->single': 0,
-        'closing->closing': -1,
-        'closing->opening': 0,
-        'closing->other': 0,
-        'opening->single': 1,
-        'opening->closing': 0,
-        'opening->opening': 1,
-        'opening->other': 1,
-        'other->single': 0,
-        'other->closing': -1,
-        'other->opening': 0,
-        'other->other': 0
-      };
-      _fn = function(ln) {
-        var fromTo, j, key, padding, type, types, value;
-        types = {
-          single: Boolean(ln.match(/<.+\/>/)),
-          closing: Boolean(ln.match(/<\/.+>/)),
-          opening: Boolean(ln.match(/<[^!?].*>/))
-        };
-        type = ((function() {
-          var _results;
-          _results = [];
-          for (key in types) {
-            value = types[key];
-            if (value) {
-              _results.push(key);
-            }
-          }
-          return _results;
-        })())[0];
-        type = type === void 0 ? 'other' : type;
-        fromTo = lastType + '->' + type;
-        lastType = type;
-        padding = '';
-        indent += transitions[fromTo];
-        padding = ((function() {
-          var _j, _ref5, _results;
-          _results = [];
-          for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
-            _results.push('  ');
-          }
-          return _results;
-        })()).join('');
-        if (fromTo === 'opening->closing') {
-          return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-        } else {
-          return formatted += padding + ln + '\n';
-        }
-      };
-      for (_i = 0, _len = lines.length; _i < _len; _i++) {
-        ln = lines[_i];
-        _fn(ln);
-      }
-      return formatted;
-    };
-
-    OperationView.prototype.showStatus = function(response) {
-      var code, content, contentType, headers, opts, pre, response_body, response_body_el, url;
-      if (response.content === void 0) {
-        content = response.data;
-        url = response.url;
-      } else {
-        content = response.content.data;
-        url = response.request.url;
-      }
-      headers = response.headers;
-      contentType = headers && headers["Content-Type"] ? headers["Content-Type"].split(";")[0].trim() : null;
-      if (!content) {
-        code = $('<code />').text("no content");
-        pre = $('<pre class="json" />').append(code);
-      } else if (contentType === "application/json" || /\+json$/.test(contentType)) {
-        code = $('<code />').text(JSON.stringify(JSON.parse(content), null, "  "));
-        pre = $('<pre class="json" />').append(code);
-      } else if (contentType === "application/xml" || /\+xml$/.test(contentType)) {
-        code = $('<code />').text(this.formatXml(content));
-        pre = $('<pre class="xml" />').append(code);
-      } else if (contentType === "text/html") {
-        code = $('<code />').html(content);
-        pre = $('<pre class="xml" />').append(code);
-      } else if (/^image\//.test(contentType)) {
-        pre = $('<img>').attr('src', url);
-      } else {
-        code = $('<code />').text(content);
-        pre = $('<pre class="json" />').append(code);
-      }
-      response_body = pre;
-      $(".request_url", $(this.el)).html("<pre>" + url + "</pre>");
-      $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
-      $(".response_body", $(this.el)).html(response_body);
-      $(".response_headers", $(this.el)).html("<pre>" + _.escape(JSON.stringify(response.headers, null, "  ")).replace(/\n/g, "<br>") + "</pre>");
-      $(".response", $(this.el)).slideDown();
-      $(".response_hider", $(this.el)).show();
-      $(".response_throbber", $(this.el)).hide();
-      response_body_el = $('.response_body', $(this.el))[0];
-      opts = this.options.swaggerOptions;
-      if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
-        return response_body_el;
-      } else {
-        return hljs.highlightBlock(response_body_el);
-      }
-    };
-
-    OperationView.prototype.toggleOperationContent = function() {
-      var elem;
-      elem = $('#' + Docs.escapeResourceName(this.model.parentId) + "_" + this.model.nickname + "_content");
-      if (elem.is(':visible')) {
-        return Docs.collapseOperation(elem);
-      } else {
-        return Docs.expandOperation(elem);
-      }
-    };
-
-    return OperationView;
-
-  })(Backbone.View);
-
-  StatusCodeView = (function(_super) {
-    __extends(StatusCodeView, _super);
-
-    function StatusCodeView() {
-      _ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
-      return _ref5;
-    }
-
-    StatusCodeView.prototype.initialize = function() {};
-
-    StatusCodeView.prototype.render = function() {
-      var responseModel, responseModelView, template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      if (swaggerUi.api.models.hasOwnProperty(this.model.responseModel)) {
-        responseModel = {
-          sampleJSON: JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(), null, 2),
-          isParam: false,
-          signature: swaggerUi.api.models[this.model.responseModel].getMockSignature()
-        };
-        responseModelView = new SignatureView({
-          model: responseModel,
-          tagName: 'div'
-        });
-        $('.model-signature', this.$el).append(responseModelView.render().el);
-      } else {
-        $('.model-signature', this.$el).html('');
-      }
-      return this;
-    };
-
-    StatusCodeView.prototype.template = function() {
-      return Handlebars.templates.status_code;
-    };
-
-    return StatusCodeView;
-
-  })(Backbone.View);
-
-  ParameterView = (function(_super) {
-    __extends(ParameterView, _super);
-
-    function ParameterView() {
-      _ref6 = ParameterView.__super__.constructor.apply(this, arguments);
-      return _ref6;
-    }
-
-    ParameterView.prototype.initialize = function() {
-      return Handlebars.registerHelper('isArray', function(param, opts) {
-        if (param.type.toLowerCase() === 'array' || param.allowMultiple) {
-          return opts.fn(this);
-        } else {
-          return opts.inverse(this);
-        }
-      });
-    };
-
-    ParameterView.prototype.render = function() {
-      var contentTypeModel, isParam, parameterContentTypeView, responseContentTypeView, signatureModel, signatureView, template, type;
-      type = this.model.type || this.model.dataType;
-      if (this.model.paramType === 'body') {
-        this.model.isBody = true;
-      }
-      if (type.toLowerCase() === 'file') {
-        this.model.isFile = true;
-      }
-      template = this.template();
-      $(this.el).html(template(this.model));
-      signatureModel = {
-        sampleJSON: this.model.sampleJSON,
-        isParam: true,
-        signature: this.model.signature
-      };
-      if (this.model.sampleJSON) {
-        signatureView = new SignatureView({
-          model: signatureModel,
-          tagName: 'div'
-        });
-        $('.model-signature', $(this.el)).append(signatureView.render().el);
-      } else {
-        $('.model-signature', $(this.el)).html(this.model.signature);
-      }
-      isParam = false;
-      if (this.model.isBody) {
-        isParam = true;
-      }
-      contentTypeModel = {
-        isParam: isParam
-      };
-      contentTypeModel.consumes = this.model.consumes;
-      if (isParam) {
-        parameterContentTypeView = new ParameterContentTypeView({
-          model: contentTypeModel
-        });
-        $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
-      } else {
-        responseContentTypeView = new ResponseContentTypeView({
-          model: contentTypeModel
-        });
-        $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
-      }
-      return this;
-    };
-
-    ParameterView.prototype.template = function() {
-      if (this.model.isList) {
-        return Handlebars.templates.param_list;
-      } else {
-        if (this.options.readOnly) {
-          if (this.model.required) {
-            return Handlebars.templates.param_readonly_required;
-          } else {
-            return Handlebars.templates.param_readonly;
-          }
-        } else {
-          if (this.model.required) {
-            return Handlebars.templates.param_required;
-          } else {
-            return Handlebars.templates.param;
-          }
-        }
-      }
-    };
-
-    return ParameterView;
-
-  })(Backbone.View);
-
-  SignatureView = (function(_super) {
-    __extends(SignatureView, _super);
-
-    function SignatureView() {
-      _ref7 = SignatureView.__super__.constructor.apply(this, arguments);
-      return _ref7;
-    }
-
-    SignatureView.prototype.events = {
-      'click a.description-link': 'switchToDescription',
-      'click a.snippet-link': 'switchToSnippet',
-      'mousedown .snippet': 'snippetToTextArea'
-    };
-
-    SignatureView.prototype.initialize = function() {};
-
-    SignatureView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      this.switchToSnippet();
-      this.isParam = this.model.isParam;
-      if (this.isParam) {
-        $('.notice', $(this.el)).text('Click to set as parameter value');
-      }
-      return this;
-    };
-
-    SignatureView.prototype.template = function() {
-      return Handlebars.templates.signature;
-    };
-
-    SignatureView.prototype.switchToDescription = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".snippet", $(this.el)).hide();
-      $(".description", $(this.el)).show();
-      $('.description-link', $(this.el)).addClass('selected');
-      return $('.snippet-link', $(this.el)).removeClass('selected');
-    };
-
-    SignatureView.prototype.switchToSnippet = function(e) {
-      if (e != null) {
-        e.preventDefault();
-      }
-      $(".description", $(this.el)).hide();
-      $(".snippet", $(this.el)).show();
-      $('.snippet-link', $(this.el)).addClass('selected');
-      return $('.description-link', $(this.el)).removeClass('selected');
-    };
-
-    SignatureView.prototype.snippetToTextArea = function(e) {
-      var textArea;
-      if (this.isParam) {
-        if (e != null) {
-          e.preventDefault();
-        }
-        textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
-        if ($.trim(textArea.val()) === '') {
-          return textArea.val(this.model.sampleJSON);
-        }
-      }
-    };
-
-    return SignatureView;
-
-  })(Backbone.View);
-
-  ContentTypeView = (function(_super) {
-    __extends(ContentTypeView, _super);
-
-    function ContentTypeView() {
-      _ref8 = ContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref8;
-    }
-
-    ContentTypeView.prototype.initialize = function() {};
-
-    ContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=contentType]', $(this.el)).text('Response Content Type');
-      return this;
-    };
-
-    ContentTypeView.prototype.template = function() {
-      return Handlebars.templates.content_type;
-    };
-
-    return ContentTypeView;
-
-  })(Backbone.View);
-
-  ResponseContentTypeView = (function(_super) {
-    __extends(ResponseContentTypeView, _super);
-
-    function ResponseContentTypeView() {
-      _ref9 = ResponseContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref9;
-    }
-
-    ResponseContentTypeView.prototype.initialize = function() {};
-
-    ResponseContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=responseContentType]', $(this.el)).text('Response Content Type');
-      return this;
-    };
-
-    ResponseContentTypeView.prototype.template = function() {
-      return Handlebars.templates.response_content_type;
-    };
-
-    return ResponseContentTypeView;
-
-  })(Backbone.View);
-
-  ParameterContentTypeView = (function(_super) {
-    __extends(ParameterContentTypeView, _super);
-
-    function ParameterContentTypeView() {
-      _ref10 = ParameterContentTypeView.__super__.constructor.apply(this, arguments);
-      return _ref10;
-    }
-
-    ParameterContentTypeView.prototype.initialize = function() {};
-
-    ParameterContentTypeView.prototype.render = function() {
-      var template;
-      template = this.template();
-      $(this.el).html(template(this.model));
-      $('label[for=parameterContentType]', $(this.el)).text('Parameter content type:');
-      return this;
-    };
-
-    ParameterContentTypeView.prototype.template = function() {
-      return Handlebars.templates.parameter_content_type;
-    };
-
-    return ParameterContentTypeView;
-
-  })(Backbone.View);
-
-}).call(this);
-
diff --git a/api/files/swagger.js b/api/files/swagger.js
deleted file mode 100644
index c126d21b..00000000
--- a/api/files/swagger.js
+++ /dev/null
@@ -1,1604 +0,0 @@
-// swagger.js
-// version 2.0.37
-
-var __bind = function(fn, me){
-  return function(){
-    return fn.apply(me, arguments);
-  };
-};
-
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-    console.log( Array.prototype.slice.call(arguments)[0] );
-  }
-};
-
-if (!Array.prototype.indexOf) {
-  Array.prototype.indexOf = function(obj, start) {
-    for (var i = (start || 0), j = this.length; i < j; i++) {
-      if (this[i] === obj) { return i; }
-    }
-    return -1;
-  }
-}
-
-if (!('filter' in Array.prototype)) {
-  Array.prototype.filter= function(filter, that /*opt*/) {
-    var other= [], v;
-    for (var i=0, n= this.length; i<n; i++)
-      if (i in this && filter.call(that, v= this[i], i, this))
-        other.push(v);
-    return other;
-  };
-}
-
-if (!('map' in Array.prototype)) {
-  Array.prototype.map= function(mapper, that /*opt*/) {
-    var other= new Array(this.length);
-    for (var i= 0, n= this.length; i<n; i++)
-      if (i in this)
-        other[i]= mapper.call(that, this[i], i, this);
-    return other;
-  };
-}
-
-Object.keys = Object.keys || (function () {
-  var hasOwnProperty = Object.prototype.hasOwnProperty,
-    hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
-    DontEnums = [
-      'toString',
-      'toLocaleString',
-      'valueOf',
-      'hasOwnProperty',
-      'isPrototypeOf',
-      'propertyIsEnumerable',
-      'constructor'
-    ],
-  DontEnumsLength = DontEnums.length;
-
-  return function (o) {
-    if (typeof o != "object" && typeof o != "function" || o === null)
-      throw new TypeError("Object.keys called on a non-object");
-
-    var result = [];
-    for (var name in o) {
-      if (hasOwnProperty.call(o, name))
-        result.push(name);
-    }
-
-    if (hasDontEnumBug) {
-      for (var i = 0; i < DontEnumsLength; i++) {
-        if (hasOwnProperty.call(o, DontEnums[i]))
-          result.push(DontEnums[i]);
-      }
-    }
-
-    return result;
-  };
-})();
-
-var SwaggerApi = function(url, options) {
-  this.url = null;
-  this.debug = false;
-  this.basePath = null;
-  this.authorizations = null;
-  this.authorizationScheme = null;
-  this.info = null;
-  this.useJQuery = false;
-
-  options = (options||{});
-  if (url)
-    if (url.url)
-      options = url;
-    else
-      this.url = url;
-  else
-    options = url;
-
-  if (options.url != null)
-    this.url = options.url;
-
-  if (options.success != null)
-    this.success = options.success;
-
-  if (typeof options.useJQuery === 'boolean')
-    this.useJQuery = options.useJQuery;
-
-  this.failure = options.failure != null ? options.failure : function() {};
-  this.progress = options.progress != null ? options.progress : function() {};
-  if (options.success != null)
-    this.build();
-}
-
-SwaggerApi.prototype.build = function() {
-  var _this = this;
-  this.progress('fetching resource list: ' + this.url);
-  var obj = {
-    useJQuery: this.useJQuery,
-    url: this.url,
-    method: "get",
-    headers: {
-      accept: "application/json"
-    },
-    on: {
-      error: function(response) {
-        if (_this.url.substring(0, 4) !== 'http') {
-          return _this.fail('Please specify the protocol for ' + _this.url);
-        } else if (response.status === 0) {
-          return _this.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
-        } else if (response.status === 404) {
-          return _this.fail('Can\'t read swagger JSON from ' + _this.url);
-        } else {
-          return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
-        }
-      },
-      response: function(resp) {
-        var responseObj = resp.obj || JSON.parse(resp.data);
-        _this.swaggerVersion = responseObj.swaggerVersion;
-        if (_this.swaggerVersion === "1.2") {
-          return _this.buildFromSpec(responseObj);
-        } else {
-          return _this.buildFrom1_1Spec(responseObj);
-        }
-      }
-    }
-  };
-  var e = (typeof window !== 'undefined' ? window : exports);
-  e.authorizations.apply(obj);
-  new SwaggerHttp().execute(obj);
-  return this;
-};
-
-SwaggerApi.prototype.buildFromSpec = function(response) {
-  if (response.apiVersion != null) {
-    this.apiVersion = response.apiVersion;
-  }
-  this.apis = {};
-  this.apisArray = [];
-  this.consumes = response.consumes;
-  this.produces = response.produces;
-  this.authSchemes = response.authorizations;
-  if (response.info != null) {
-    this.info = response.info;
-  }
-  var isApi = false;
-  var i;
-  for (i = 0; i < response.apis.length; i++) {
-    var api = response.apis[i];
-    if (api.operations) {
-      var j;
-      for (j = 0; j < api.operations.length; j++) {
-        operation = api.operations[j];
-        isApi = true;
-      }
-    }
-  }
-  if (response.basePath)
-    this.basePath = response.basePath;
-  else if (this.url.indexOf('?') > 0)
-    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  else
-    this.basePath = this.url;
-
-  if (isApi) {
-    var newName = response.resourcePath.replace(/\//g, '');
-    this.resourcePath = response.resourcePath;
-    res = new SwaggerResource(response, this);
-    this.apis[newName] = res;
-    this.apisArray.push(res);
-  } else {
-    var k;
-    for (k = 0; k < response.apis.length; k++) {
-      var resource = response.apis[k];
-      res = new SwaggerResource(resource, this);
-      this.apis[res.name] = res;
-      this.apisArray.push(res);
-    }
-  }
-  if (this.success) {
-    this.success();
-  }
-  return this;
-};
-
-SwaggerApi.prototype.buildFrom1_1Spec = function(response) {
-  log("This API is using a deprecated version of Swagger!  Please see http://github.com/wordnik/swagger-core/wiki for more info");
-  if (response.apiVersion != null)
-    this.apiVersion = response.apiVersion;
-  this.apis = {};
-  this.apisArray = [];
-  this.produces = response.produces;
-  if (response.info != null) {
-    this.info = response.info;
-  }
-  var isApi = false;
-  for (var i = 0; i < response.apis.length; i++) {
-    var api = response.apis[i];
-    if (api.operations) {
-      for (var j = 0; j < api.operations.length; j++) {
-        operation = api.operations[j];
-        isApi = true;
-      }
-    }
-  }
-  if (response.basePath) {
-    this.basePath = response.basePath;
-  } else if (this.url.indexOf('?') > 0) {
-    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
-  } else {
-    this.basePath = this.url;
-  }
-  if (isApi) {
-    var newName = response.resourcePath.replace(/\//g, '');
-    this.resourcePath = response.resourcePath;
-    var res = new SwaggerResource(response, this);
-    this.apis[newName] = res;
-    this.apisArray.push(res);
-  } else {
-    for (k = 0; k < response.apis.length; k++) {
-      resource = response.apis[k];
-      res = new SwaggerResource(resource, this);
-      this.apis[res.name] = res;
-      this.apisArray.push(res);
-    }
-  }
-  if (this.success) {
-    this.success();
-  }
-  return this;
-};
-
-SwaggerApi.prototype.selfReflect = function() {
-  var resource, resource_name, _ref;
-  if (this.apis == null) {
-    return false;
-  }
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    if (resource.ready == null) {
-      return false;
-    }
-  }
-  this.setConsolidatedModels();
-  this.ready = true;
-  if (this.success != null) {
-    return this.success();
-  }
-};
-
-SwaggerApi.prototype.fail = function(message) {
-  this.failure(message);
-  throw message;
-};
-
-SwaggerApi.prototype.setConsolidatedModels = function() {
-  var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
-  this.modelsArray = [];
-  this.models = {};
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    for (modelName in resource.models) {
-      if (this.models[modelName] == null) {
-        this.models[modelName] = resource.models[modelName];
-        this.modelsArray.push(resource.models[modelName]);
-      }
-    }
-  }
-  _ref1 = this.modelsArray;
-  _results = [];
-  for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-    model = _ref1[_i];
-    _results.push(model.setReferencedModels(this.models));
-  }
-  return _results;
-};
-
-SwaggerApi.prototype.help = function() {
-  var operation, operation_name, parameter, resource, resource_name, _i, _len, _ref, _ref1, _ref2;
-  _ref = this.apis;
-  for (resource_name in _ref) {
-    resource = _ref[resource_name];
-    log(resource_name);
-    _ref1 = resource.operations;
-    for (operation_name in _ref1) {
-      operation = _ref1[operation_name];
-      log("  " + operation.nickname);
-      _ref2 = operation.parameters;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        parameter = _ref2[_i];
-        log("    " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-      }
-    }
-  }
-  return this;
-};
-
-var SwaggerResource = function(resourceObj, api) {
-  var _this = this;
-  this.api = api;
-  this.api = this.api;
-  consumes = (this.consumes | []);
-  produces = (this.produces | []);
-  this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
-  this.description = resourceObj.description;
-
-  var parts = this.path.split("/");
-  this.name = parts[parts.length - 1].replace('.{format}', '');
-  this.basePath = this.api.basePath;
-  this.operations = {};
-  this.operationsArray = [];
-  this.modelsArray = [];
-  this.models = {};
-  this.rawModels = {};
-  this.useJQuery = (typeof api.useJQuery !== 'undefined' ? api.useJQuery : null);
-
-  if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
-    this.addApiDeclaration(resourceObj);
-  } else {
-    if (this.path == null) {
-      this.api.fail("SwaggerResources must have a path.");
-    }
-    if (this.path.substring(0, 4) === 'http') {
-      this.url = this.path.replace('{format}', 'json');
-    } else {
-      this.url = this.api.basePath + this.path.replace('{format}', 'json');
-    }
-    this.api.progress('fetching resource ' + this.name + ': ' + this.url);
-    obj = {
-      url: this.url,
-      method: "get",
-      useJQuery: this.useJQuery,
-      headers: {
-        accept: "application/json"
-      },
-      on: {
-        response: function(resp) {
-          var responseObj = resp.obj || JSON.parse(resp.data);
-          return _this.addApiDeclaration(responseObj);
-        },
-        error: function(response) {
-          return _this.api.fail("Unable to read api '" +
-            _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
-        }
-      }
-    };
-    var e = typeof window !== 'undefined' ? window : exports;
-    e.authorizations.apply(obj);
-    new SwaggerHttp().execute(obj);
-  }
-}
-
-SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
-  var pos, url;
-  url = this.api.basePath;
-  pos = url.lastIndexOf(relativeBasePath);
-  var parts = url.split("/");
-  var rootUrl = parts[0] + "//" + parts[2];
-
-  if(relativeBasePath.indexOf("http") === 0)
-    return relativeBasePath;
-  if(relativeBasePath === "/")
-    return rootUrl;
-  if(relativeBasePath.substring(0, 1) == "/") {
-    // use root + relative
-    return rootUrl + relativeBasePath;
-  }
-  else {
-    var pos = this.basePath.lastIndexOf("/");
-    var base = this.basePath.substring(0, pos);
-    if(base.substring(base.length - 1) == "/")
-      return base + relativeBasePath;
-    else
-      return base + "/" + relativeBasePath;
-  }
-};
-
-SwaggerResource.prototype.addApiDeclaration = function(response) {
-  if (response.produces != null)
-    this.produces = response.produces;
-  if (response.consumes != null)
-    this.consumes = response.consumes;
-  if ((response.basePath != null) && response.basePath.replace(/\s/g, '').length > 0)
-    this.basePath = response.basePath.indexOf("http") === -1 ? this.getAbsoluteBasePath(response.basePath) : response.basePath;
-
-  this.addModels(response.models);
-  if (response.apis) {
-    for (var i = 0 ; i < response.apis.length; i++) {
-      var endpoint = response.apis[i];
-      this.addOperations(endpoint.path, endpoint.operations, response.consumes, response.produces);
-    }
-  }
-  this.api[this.name] = this;
-  this.ready = true;
-  return this.api.selfReflect();
-};
-
-SwaggerResource.prototype.addModels = function(models) {
-  if (models != null) {
-    var modelName;
-    for (modelName in models) {
-      if (this.models[modelName] == null) {
-        var swaggerModel = new SwaggerModel(modelName, models[modelName]);
-        this.modelsArray.push(swaggerModel);
-        this.models[modelName] = swaggerModel;
-        this.rawModels[modelName] = models[modelName];
-      }
-    }
-    var output = [];
-    for (var i = 0; i < this.modelsArray.length; i++) {
-      model = this.modelsArray[i];
-      output.push(model.setReferencedModels(this.models));
-    }
-    return output;
-  }
-};
-
-SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes, produces) {
-  if (ops) {
-    output = [];
-    for (var i = 0; i < ops.length; i++) {
-      o = ops[i];
-      consumes = this.consumes;
-      produces = this.produces;
-      if (o.consumes != null)
-        consumes = o.consumes;
-      else
-        consumes = this.consumes;
-
-      if (o.produces != null)
-        produces = o.produces;
-      else
-        produces = this.produces;
-      type = (o.type||o.responseClass);
-
-      if (type === "array") {
-        ref = null;
-        if (o.items)
-          ref = o.items["type"] || o.items["$ref"];
-        type = "array[" + ref + "]";
-      }
-      responseMessages = o.responseMessages;
-      method = o.method;
-      if (o.httpMethod) {
-        method = o.httpMethod;
-      }
-      if (o.supportedContentTypes) {
-        consumes = o.supportedContentTypes;
-      }
-      if (o.errorResponses) {
-        responseMessages = o.errorResponses;
-        for (var j = 0; j < responseMessages.length; j++) {
-          r = responseMessages[j];
-          r.message = r.reason;
-          r.reason = null;
-        }
-      }
-      o.nickname = this.sanitize(o.nickname);
-      op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
-      this.operations[op.nickname] = op;
-      output.push(this.operationsArray.push(op));
-    }
-    return output;
-  }
-};
-
-SwaggerResource.prototype.sanitize = function(nickname) {
-  var op;
-  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
-  op = op.replace(/((_){2,})/g, '_');
-  op = op.replace(/^(_)*/g, '');
-  op = op.replace(/([_])*$/g, '');
-  return op;
-};
-
-SwaggerResource.prototype.help = function() {
-  var op = this.operations;
-  var output = [];
-  var operation_name;
-  for (operation_name in op) {
-    operation = op[operation_name];
-    var msg = "  " + operation.nickname;
-    for (var i = 0; i < operation.parameters; i++) {
-      parameter = operation.parameters[i];
-      msg.concat("    " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
-    }
-    output.push(msg);
-  }
-  return output;
-};
-
-var SwaggerModel = function(modelName, obj) {
-  this.name = obj.id != null ? obj.id : modelName;
-  this.properties = [];
-  var propertyName;
-  for (propertyName in obj.properties) {
-    if (obj.required != null) {
-      var value;
-      for (value in obj.required) {
-        if (propertyName === obj.required[value]) {
-          obj.properties[propertyName].required = true;
-        }
-      }
-    }
-    prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
-    this.properties.push(prop);
-  }
-}
-
-SwaggerModel.prototype.setReferencedModels = function(allModels) {
-  var results = [];
-  for (var i = 0; i < this.properties.length; i++) {
-    var property = this.properties[i];
-    var type = property.type || property.dataType;
-    if (allModels[type] != null)
-      results.push(property.refModel = allModels[type]);
-    else if ((property.refDataType != null) && (allModels[property.refDataType] != null))
-      results.push(property.refModel = allModels[property.refDataType]);
-    else
-      results.push(void 0);
-  }
-  return results;
-};
-
-SwaggerModel.prototype.getMockSignature = function(modelsToIgnore) {
-  var propertiesStr = [];
-  for (var i = 0; i < this.properties.length; i++) {
-    prop = this.properties[i];
-    propertiesStr.push(prop.toString());
-  }
-
-  var strong = '<span class="strong">';
-  var stronger = '<span class="stronger">';
-  var strongClose = '</span>';
-  var classOpen = strong + this.name + ' {' + strongClose;
-  var classClose = strong + '}' + strongClose;
-  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
-  if (!modelsToIgnore)
-    modelsToIgnore = [];
-  modelsToIgnore.push(this.name);
-
-  for (var i = 0; i < this.properties.length; i++) {
-    prop = this.properties[i];
-    if ((prop.refModel != null) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
-      returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
-    }
-  }
-  return returnVal;
-};
-
-SwaggerModel.prototype.createJSONSample = function(modelsToIgnore) {
-  if(sampleModels[this.name]) {
-    return sampleModels[this.name];
-  }
-  else {
-    var result = {};
-    var modelsToIgnore = (modelsToIgnore||[])
-    modelsToIgnore.push(this.name);
-    for (var i = 0; i < this.properties.length; i++) {
-      prop = this.properties[i];
-      result[prop.name] = prop.getSampleValue(modelsToIgnore);
-    }
-    modelsToIgnore.pop(this.name);
-    return result;
-  }
-};
-
-var SwaggerModelProperty = function(name, obj) {
-  this.name = name;
-  this.dataType = obj.type || obj.dataType || obj["$ref"];
-  this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
-  this.descr = obj.description;
-  this.required = obj.required;
-  if (obj.items != null) {
-    if (obj.items.type != null) {
-      this.refDataType = obj.items.type;
-    }
-    if (obj.items.$ref != null) {
-      this.refDataType = obj.items.$ref;
-    }
-  }
-  this.dataTypeWithRef = this.refDataType != null ? (this.dataType + '[' + this.refDataType + ']') : this.dataType;
-  if (obj.allowableValues != null) {
-    this.valueType = obj.allowableValues.valueType;
-    this.values = obj.allowableValues.values;
-    if (this.values != null) {
-      this.valuesString = "'" + this.values.join("' or '") + "'";
-    }
-  }
-  if (obj["enum"] != null) {
-    this.valueType = "string";
-    this.values = obj["enum"];
-    if (this.values != null) {
-      this.valueString = "'" + this.values.join("' or '") + "'";
-    }
-  }
-}
-
-SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
-  var result;
-  if ((this.refModel != null) && (modelsToIgnore.indexOf(prop.refModel.name) === -1)) {
-    result = this.refModel.createJSONSample(modelsToIgnore);
-  } else {
-    if (this.isCollection) {
-      result = this.toSampleValue(this.refDataType);
-    } else {
-      result = this.toSampleValue(this.dataType);
-    }
-  }
-  if (this.isCollection) {
-    return [result];
-  } else {
-    return result;
-  }
-};
-
-SwaggerModelProperty.prototype.toSampleValue = function(value) {
-  var result;
-  if (value === "integer") {
-    result = 0;
-  } else if (value === "boolean") {
-    result = false;
-  } else if (value === "double" || value === "number") {
-    result = 0.0;
-  } else if (value === "string") {
-    result = "";
-  } else {
-    result = value;
-  }
-  return result;
-};
-
-SwaggerModelProperty.prototype.toString = function() {
-  var req = this.required ? 'propReq' : 'propOpt';
-  var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
-  if (!this.required) {
-    str += ', <span class="propOptKey">optional</span>';
-  }
-  str += ')';
-  if (this.values != null) {
-    str += " = <span class='propVals'>['" + this.values.join("' or '") + "']</span>";
-  }
-  if (this.descr != null) {
-    str += ': <span class="propDesc">' + this.descr + '</span>';
-  }
-  return str;
-};
-
-var SwaggerOperation = function(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations) {
-  var _this = this;
-
-  var errors = [];
-  this.nickname = (nickname||errors.push("SwaggerOperations must have a nickname."));
-  this.path = (path||errors.push("SwaggerOperation " + nickname + " is missing path."));
-  this.method = (method||errors.push("SwaggerOperation " + nickname + " is missing method."));
-  this.parameters = parameters != null ? parameters : [];
-  this.summary = summary;
-  this.notes = notes;
-  this.type = type;
-  this.responseMessages = (responseMessages||[]);
-  this.resource = (resource||errors.push("Resource is required"));
-  this.consumes = consumes;
-  this.produces = produces;
-  this.authorizations = authorizations;
-  this["do"] = __bind(this["do"], this);
-
-  if (errors.length > 0)
-    this.resource.api.fail(errors);
-
-  this.path = this.path.replace('{format}', 'json');
-  this.method = this.method.toLowerCase();
-  this.isGetMethod = this.method === "get";
-
-  this.resourceName = this.resource.name;
-  if(typeof this.type !== 'undefined' && this.type === 'void')
-    this.type = null;
-  else {
-    this.responseClassSignature = this.getSignature(this.type, this.resource.models);
-    this.responseSampleJSON = this.getSampleJSON(this.type, this.resource.models);
-  }
-
-  for(var i = 0; i < this.parameters.length; i ++) {
-    var param = this.parameters[i];
-    // might take this away
-    param.name = param.name || param.type || param.dataType;
-
-    // for 1.1 compatibility
-    var type = param.type || param.dataType;
-    if(type === 'array') {
-      type = 'array[' + (param.items.$ref ? param.items.$ref : param.items.type) + ']';
-    }
-    param.type = type;
-
-    if(type.toLowerCase() === 'boolean') {
-      param.allowableValues = {};
-      param.allowableValues.values = ["true", "false"];
-    }
-    param.signature = this.getSignature(type, this.resource.models);
-    param.sampleJSON = this.getSampleJSON(type, this.resource.models);
-
-    var enumValue = param["enum"];
-    if(enumValue != null) {
-      param.isList = true;
-      param.allowableValues = {};
-      param.allowableValues.descriptiveValues = [];
-
-      for(var j = 0; j < enumValue.length; j++) {
-        var v = enumValue[j];
-        if(param.defaultValue != null) {
-          param.allowableValues.descriptiveValues.push ({
-            value: String(v),
-            isDefault: (v === param.defaultValue)
-          });
-        }
-        else {
-          param.allowableValues.descriptiveValues.push ({
-            value: String(v),
-            isDefault: false
-          });
-        }
-      }
-    }
-    else if(param.allowableValues != null) {
-      if(param.allowableValues.valueType === "RANGE")
-        param.isRange = true;
-      else
-        param.isList = true;
-      if(param.allowableValues != null) {
-        param.allowableValues.descriptiveValues = [];
-        if(param.allowableValues.values) {
-          for(var j = 0; j < param.allowableValues.values.length; j++){
-            var v = param.allowableValues.values[j];
-            if(param.defaultValue != null) {
-              param.allowableValues.descriptiveValues.push ({
-                value: String(v),
-                isDefault: (v === param.defaultValue)
-              });
-            }
-            else {
-              param.allowableValues.descriptiveValues.push ({
-                value: String(v),
-                isDefault: false
-              });
-            }
-          }
-        }
-      }
-    }
-  }
-  this.resource[this.nickname] = function(args, callback, error) {
-    return _this["do"](args, callback, error);
-  };
-  this.resource[this.nickname].help = function() {
-    return _this.help();
-  };
-}
-
-SwaggerOperation.prototype.isListType = function(type) {
-  if (type && type.indexOf('[') >= 0) {
-    return type.substring(type.indexOf('[') + 1, type.indexOf(']'));
-  } else {
-    return void 0;
-  }
-};
-
-SwaggerOperation.prototype.getSignature = function(type, models) {
-  var isPrimitive, listType;
-  listType = this.isListType(type);
-  isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-  if (isPrimitive) {
-    return type;
-  } else {
-    if (listType != null) {
-      return models[listType].getMockSignature();
-    } else {
-      return models[type].getMockSignature();
-    }
-  }
-};
-
-SwaggerOperation.prototype.getSampleJSON = function(type, models) {
-  var isPrimitive, listType, val;
-  listType = this.isListType(type);
-  isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
-  val = isPrimitive ? void 0 : (listType != null ? models[listType].createJSONSample() : models[type].createJSONSample());
-  if (val) {
-    val = listType ? [val] : val;
-    if(typeof val == "string")
-      return val;
-    else if(typeof val === "object") {
-      var t = val;
-      if(val instanceof Array && val.length > 0) {
-        t = val[0];
-      }
-      if(t.nodeName) {
-        var xmlString = new XMLSerializer().serializeToString(t);
-        return this.formatXml(xmlString);
-      }
-      else
-        return JSON.stringify(val, null, 2);
-    }
-    else
-      return val;
-  }
-};
-
-SwaggerOperation.prototype["do"] = function(args, opts, callback, error) {
-  var key, param, params, possibleParams, req, requestContentType, responseContentType, value, _i, _len, _ref;
-  if (args == null) {
-    args = {};
-  }
-  if (opts == null) {
-    opts = {};
-  }
-  requestContentType = null;
-  responseContentType = null;
-  if ((typeof args) === "function") {
-    error = opts;
-    callback = args;
-    args = {};
-  }
-  if ((typeof opts) === "function") {
-    error = callback;
-    callback = opts;
-  }
-  if (error == null) {
-    error = function(xhr, textStatus, error) {
-      return log(xhr, textStatus, error);
-    };
-  }
-  if (callback == null) {
-    callback = function(response) {
-      var content;
-      content = null;
-      if (response != null) {
-        content = response.data;
-      } else {
-        content = "no data";
-      }
-      return log("default callback: " + content);
-    };
-  }
-  params = {};
-  params.headers = [];
-  if (args.headers != null) {
-    params.headers = args.headers;
-    delete args.headers;
-  }
-
-  var possibleParams = [];
-  for(var i = 0; i < this.parameters.length; i++) {
-    var param = this.parameters[i];
-    if(param.paramType === 'header') {
-      if(args[param.name])
-        params.headers[param.name] = args[param.name];
-    }
-    else if(param.paramType === 'form' || param.paramType.toLowerCase() === 'file')
-      possibleParams.push(param);
-  }
-
-  if (args.body != null) {
-    params.body = args.body;
-    delete args.body;
-  }
-
-  if (possibleParams) {
-    var key;
-    for (key in possibleParams) {
-      value = possibleParams[key];
-      if (args[value.name]) {
-        params[value.name] = args[value.name];
-      }
-    }
-  }
-
-  req = new SwaggerRequest(this.method, this.urlify(args), params, opts, callback, error, this);
-  if (opts.mock != null) {
-    return req;
-  } else {
-    return true;
-  }
-};
-
-SwaggerOperation.prototype.pathJson = function() {
-  return this.path.replace("{format}", "json");
-};
-
-SwaggerOperation.prototype.pathXml = function() {
-  return this.path.replace("{format}", "xml");
-};
-
-SwaggerOperation.prototype.encodePathParam = function(pathParam) {
-  var encParts, part, parts, _i, _len;
-  pathParam = pathParam.toString();
-  if (pathParam.indexOf("/") === -1) {
-    return encodeURIComponent(pathParam);
-  } else {
-    parts = pathParam.split("/");
-    encParts = [];
-    for (_i = 0, _len = parts.length; _i < _len; _i++) {
-      part = parts[_i];
-      encParts.push(encodeURIComponent(part));
-    }
-    return encParts.join("/");
-  }
-};
-
-SwaggerOperation.prototype.urlify = function(args) {
-  var url = this.resource.basePath + this.pathJson();
-  var params = this.parameters;
-  for(var i = 0; i < params.length; i ++){
-    var param = params[i];
-    if (param.paramType === 'path') {
-      if(args[param.name]) {
-        // apply path params and remove from args
-        var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
-        url = url.replace(reg, this.encodePathParam(args[param.name]));
-        delete args[param.name];
-      }
-      else
-        throw "" + param.name + " is a required path param.";
-    }
-  }
-
-  var queryParams = "";
-  for(var i = 0; i < params.length; i ++){
-    var param = params[i];
-    if(param.paramType === 'query') {
-      if (args[param.name] !== undefined) {
-        if (queryParams !== '')
-          queryParams += "&";
-        queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
-      }
-    }
-  }
-  if ((queryParams != null) && queryParams.length > 0)
-    url += '?' + queryParams;
-  return url;
-};
-
-SwaggerOperation.prototype.supportHeaderParams = function() {
-  return this.resource.api.supportHeaderParams;
-};
-
-SwaggerOperation.prototype.supportedSubmitMethods = function() {
-  return this.resource.api.supportedSubmitMethods;
-};
-
-SwaggerOperation.prototype.getQueryParams = function(args) {
-  return this.getMatchingParams(['query'], args);
-};
-
-SwaggerOperation.prototype.getHeaderParams = function(args) {
-  return this.getMatchingParams(['header'], args);
-};
-
-SwaggerOperation.prototype.getMatchingParams = function(paramTypes, args) {
-  var matchingParams = {};
-  var params = this.parameters;
-  for (var i = 0; i < params.length; i++) {
-    param = params[i];
-    if (args && args[param.name])
-      matchingParams[param.name] = args[param.name];
-  }
-  var headers = this.resource.api.headers;
-  var name;
-  for (name in headers) {
-    var value = headers[name];
-    matchingParams[name] = value;
-  }
-  return matchingParams;
-};
-
-SwaggerOperation.prototype.help = function() {
-  var msg = "";
-  var params = this.parameters;
-  for (var i = 0; i < params.length; i++) {
-    var param = params[i];
-    if (msg !== "")
-      msg += "\n";
-    msg += "* " + param.name + (param.required ? ' (required)' : '') + " - " + param.description;
-  }
-  return msg;
-};
-
-
-SwaggerOperation.prototype.formatXml = function(xml) {
-  var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
-  reg = /(>)(<)(\/*)/g;
-  wsexp = /[ ]*(.*)[ ]+\n/g;
-  contexp = /(<.+>)(.+\n)/g;
-  xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
-  pad = 0;
-  formatted = '';
-  lines = xml.split('\n');
-  indent = 0;
-  lastType = 'other';
-  transitions = {
-    'single->single': 0,
-    'single->closing': -1,
-    'single->opening': 0,
-    'single->other': 0,
-    'closing->single': 0,
-    'closing->closing': -1,
-    'closing->opening': 0,
-    'closing->other': 0,
-    'opening->single': 1,
-    'opening->closing': 0,
-    'opening->opening': 1,
-    'opening->other': 1,
-    'other->single': 0,
-    'other->closing': -1,
-    'other->opening': 0,
-    'other->other': 0
-  };
-  _fn = function(ln) {
-    var fromTo, j, key, padding, type, types, value;
-    types = {
-      single: Boolean(ln.match(/<.+\/>/)),
-      closing: Boolean(ln.match(/<\/.+>/)),
-      opening: Boolean(ln.match(/<[^!?].*>/))
-    };
-    type = ((function() {
-      var _results;
-      _results = [];
-      for (key in types) {
-        value = types[key];
-        if (value) {
-          _results.push(key);
-        }
-      }
-      return _results;
-    })())[0];
-    type = type === void 0 ? 'other' : type;
-    fromTo = lastType + '->' + type;
-    lastType = type;
-    padding = '';
-    indent += transitions[fromTo];
-    padding = ((function() {
-      var _j, _ref5, _results;
-      _results = [];
-      for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
-        _results.push('  ');
-      }
-      return _results;
-    })()).join('');
-    if (fromTo === 'opening->closing') {
-      return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
-    } else {
-      return formatted += padding + ln + '\n';
-    }
-  };
-  for (_i = 0, _len = lines.length; _i < _len; _i++) {
-    ln = lines[_i];
-    _fn(ln);
-  }
-  return formatted;
-};
-
-var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
-  var _this = this;
-  var errors = [];
-  this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
-  this.type = (type||errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
-  this.url = (url||errors.push("SwaggerRequest url is required."));
-  this.params = params;
-  this.opts = opts;
-  this.successCallback = (successCallback||errors.push("SwaggerRequest successCallback is required."));
-  this.errorCallback = (errorCallback||errors.push("SwaggerRequest error callback is required."));
-  this.operation = (operation||errors.push("SwaggerRequest operation is required."));
-  this.execution = execution;
-  this.headers = (params.headers||{});
-
-  if(errors.length > 0) {
-    throw errors;
-  }
-
-  this.type = this.type.toUpperCase();
-
-  // set request, response content type headers
-  var headers = this.setHeaders(params, this.operation);
-  var body = params.body;
-
-  // encode the body for form submits
-  if (headers["Content-Type"]) {
-    var values = {};
-    var i;
-    var operationParams = this.operation.parameters;
-    for(i = 0; i < operationParams.length; i++) {
-      var param = operationParams[i];
-      if(param.paramType === "form")
-        values[param.name] = param;
-    }
-
-    if(headers["Content-Type"].indexOf("application/x-www-form-urlencoded") === 0) {
-      var encoded = "";
-      var key;
-      for(key in values) {
-        value = this.params[key];
-        if(typeof value !== 'undefined'){
-          if(encoded !== "")
-            encoded += "&";
-          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
-        }
-      }
-      body = encoded;
-    }
-    else if (headers["Content-Type"].indexOf("multipart/form-data") === 0) {
-      // encode the body for form submits
-      var data = "";
-      var boundary = "----SwaggerFormBoundary" + Date.now();
-      var key;
-      for(key in values) {
-        value = this.params[key];
-        if(typeof value !== 'undefined') {
-          data += '--' + boundary + '\n';
-          data += 'Content-Disposition: form-data; name="' + key + '"';
-          data += '\n\n';
-          data += value + "\n";
-        }
-      }
-      data += "--" + boundary + "--\n";
-      headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
-      body = data;
-    }
-  }
-
-  if (!((this.headers != null) && (this.headers.mock != null))) {
-    obj = {
-      url: this.url,
-      method: this.type,
-      headers: headers,
-      body: body,
-      useJQuery: this.useJQuery,
-      on: {
-        error: function(response) {
-          return _this.errorCallback(response, _this.opts.parent);
-        },
-        redirect: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        },
-        307: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        },
-        response: function(response) {
-          return _this.successCallback(response, _this.opts.parent);
-        }
-      }
-    };
-    var e;
-    if (typeof window !== 'undefined') {
-      e = window;
-    } else {
-      e = exports;
-    }
-    status = e.authorizations.apply(obj, this.operation.authorizations);
-    if (opts.mock == null) {
-      if (status !== false) {
-        new SwaggerHttp().execute(obj);
-      } else {
-        obj.canceled = true;
-      }
-    } else {
-      return obj;
-    }
-  }
-};
-
-SwaggerRequest.prototype.setHeaders = function(params, operation) {
-  // default type
-  var accepts = "application/json";
-  var consumes = "application/json";
-
-  var allDefinedParams = this.operation.parameters;
-  var definedFormParams = [];
-  var definedFileParams = [];
-  var body = params.body;
-  var headers = {};
-
-  // get params from the operation and set them in definedFileParams, definedFormParams, headers
-  var i;
-  for(i = 0; i < allDefinedParams.length; i++) {
-    var param = allDefinedParams[i];
-    if(param.paramType === "form")
-      definedFormParams.push(param);
-    else if(param.paramType === "file")
-      definedFileParams.push(param);
-    else if(param.paramType === "header" && this.params.headers) {
-      var key = param.name;
-      var headerValue = this.params.headers[param.name];
-      if(typeof this.params.headers[param.name] !== 'undefined')
-        headers[key] = headerValue;
-    }
-  }
-
-  // if there's a body, need to set the accepts header via requestContentType
-  if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH" || this.type === "DELETE")) {
-    if (this.opts.requestContentType)
-      accepts = this.opts.requestContentType;
-  } else {
-    // if any form params, content type must be set
-    if(definedFormParams.length > 0) {
-      if(definedFileParams.length > 0)
-        consumes = "multipart/form-data";
-      else
-        consumes = "application/x-www-form-urlencoded";
-    }
-    else if (this.type == "DELETE")
-      body = "{}";
-    else if (this.type != "DELETE")
-      accepts = null;
-  }
-
-  if (consumes && this.operation.consumes) {
-    if (this.operation.consumes.indexOf(consumes) === -1) {
-      log("server doesn't consume " + consumes + ", try " + JSON.stringify(this.operation.consumes));
-      consumes = this.operation.consumes[0];
-    }
-  }
-
-  if (this.opts.responseContentType) {
-    accepts = this.opts.responseContentType;
-  } else {
-    accepts = "application/json";
-  }
-  if (accepts && this.operation.produces) {
-    if (this.operation.produces.indexOf(accepts) === -1) {
-      log("server can't produce " + accepts);
-      accepts = this.operation.produces[0];
-    }
-  }
-
-  if ((consumes && body !== "") || (consumes === "application/x-www-form-urlencoded"))
-    headers["Content-Type"] = consumes;
-  if (accepts)
-    headers["Accept"] = accepts;
-  return headers;
-}
-
-SwaggerRequest.prototype.asCurl = function() {
-  var results = [];
-  if(this.headers) {
-    var key;
-    for(key in this.headers) {
-      results.push("--header \"" + key + ": " + this.headers[v] + "\"");
-    }
-  }
-  return "curl " + (results.join(" ")) + " " + this.url;
-};
-
-/**
- * SwaggerHttp is a wrapper for executing requests
- */
-var SwaggerHttp = function() {};
-
-SwaggerHttp.prototype.execute = function(obj) {
-  if(obj && (typeof obj.useJQuery === 'boolean'))
-    this.useJQuery = obj.useJQuery;
-  else
-    this.useJQuery = this.isIE8();
-
-  if(this.useJQuery)
-    return new JQueryHttpClient().execute(obj);
-  else
-    return new ShredHttpClient().execute(obj);
-}
-
-SwaggerHttp.prototype.isIE8 = function() {
-  var detectedIE = false;
-  if (typeof navigator !== 'undefined' && navigator.userAgent) {
-    nav = navigator.userAgent.toLowerCase();
-    if (nav.indexOf('msie') !== -1) {
-      var version = parseInt(nav.split('msie')[1]);
-      if (version <= 8) {
-        detectedIE = true;
-      }
-    }
-  }
-  return detectedIE;
-};
-
-/*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
- * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
- *       Since we are using closures here we need to alias it for internal use.
- */
-var JQueryHttpClient = function(options) {
-  "use strict";
-  if(!jQuery){
-    var jQuery = window.jQuery;
-  }
-}
-
-JQueryHttpClient.prototype.execute = function(obj) {
-  var cb = obj.on;
-  var request = obj;
-
-  obj.type = obj.method;
-  obj.cache = false;
-
-  obj.beforeSend = function(xhr) {
-    var key, results;
-    if (obj.headers) {
-      results = [];
-      var key;
-      for (key in obj.headers) {
-        if (key.toLowerCase() === "content-type") {
-          results.push(obj.contentType = obj.headers[key]);
-        } else if (key.toLowerCase() === "accept") {
-          results.push(obj.accepts = obj.headers[key]);
-        } else {
-          results.push(xhr.setRequestHeader(key, obj.headers[key]));
-        }
-      }
-      return results;
-    }
-  };
-
-  obj.data = obj.body;
-  obj.complete = function(response, textStatus, opts) {
-    var headers = {},
-        headerArray = response.getAllResponseHeaders().split("\n");
-
-    for(var i = 0; i < headerArray.length; i++) {
-      var toSplit = headerArray[i].trim();
-      if(toSplit.length === 0)
-        continue;
-      var separator = toSplit.indexOf(":");
-      if(separator === -1) {
-        // Name but no value in the header
-        headers[toSplit] = null;
-        continue;
-      }
-      var name = toSplit.substring(0, separator).trim(),
-          value = toSplit.substring(separator + 1).trim();
-      headers[name] = value;
-    }
-
-    var out = {
-      url: request.url,
-      method: request.method,
-      status: response.status,
-      data: response.responseText,
-      headers: headers
-    };
-
-    var contentType = (headers["content-type"]||headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.responseText && response.responseText !== "")
-          out.obj = JSON.parse(response.responseText);
-        else
-          out.obj = {}
-      }
-    }
-
-    if(response.status >= 200 && response.status < 300)
-      cb.response(out);
-    else if(response.status === 0 || (response.status >= 400 && response.status < 599))
-      cb.error(out);
-    else
-      return cb.response(out);
-  };
-
-  jQuery.support.cors = true;
-  return jQuery.ajax(obj);
-}
-
-/*
- * ShredHttpClient is a light-weight, node or browser HTTP client
- */
-var ShredHttpClient = function(options) {
-  this.options = (options||{});
-  this.isInitialized = false;
-
-  var identity, toString;
-
-  if (typeof window !== 'undefined') {
-    this.Shred = require("./shred");
-    this.content = require("./shred/content");
-  }
-  else
-    this.Shred = require("shred");
-  this.shred = new this.Shred();
-}
-
-ShredHttpClient.prototype.initShred = function () {
-  this.isInitialized = true;
-  this.registerProcessors(this.shred);
-}
-
-ShredHttpClient.prototype.registerProcessors = function(shred) {
-  var identity = function(x) {
-    return x;
-  };
-  var toString = function(x) {
-    return x.toString();
-  };
-
-  if (typeof window !== 'undefined') {
-    this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  } else {
-    this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
-      parser: identity,
-      stringify: toString
-    });
-  }
-}
-
-ShredHttpClient.prototype.execute = function(obj) {
-  if(!this.isInitialized)
-    this.initShred();
-
-  var cb = obj.on, res;
-
-  var transform = function(response) {
-    var out = {
-      headers: response._headers,
-      url: response.request.url,
-      method: response.request.method,
-      status: response.status,
-      data: response.content.data
-    };
-
-    var contentType = (response._headers["content-type"]||response._headers["Content-Type"]||null)
-
-    if(contentType != null) {
-      if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
-        if(response.content.data && response.content.data !== "")
-          out.obj = JSON.parse(response.content.data);
-        else
-          out.obj = {}
-      }
-    }
-    return out;
-  };
-
-  res = {
-    error: function(response) {
-      if (obj)
-        return cb.error(transform(response));
-    },
-    redirect: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    307: function(response) {
-      if (obj)
-        return cb.redirect(transform(response));
-    },
-    response: function(response) {
-      if (obj)
-        return cb.response(transform(response));
-    }
-  };
-  if (obj) {
-    obj.on = res;
-  }
-  return this.shred.request(obj);
-};
-
-/**
- * SwaggerAuthorizations applys the correct authorization to an operation being executed
- */
-var SwaggerAuthorizations = function() {
-  this.authz = {};
-};
-
-SwaggerAuthorizations.prototype.add = function(name, auth) {
-  this.authz[name] = auth;
-  return auth;
-};
-
-SwaggerAuthorizations.prototype.remove = function(name) {
-  return delete this.authz[name];
-};
-
-SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
-  var status = null;
-  var key;
-
-  // if the "authorizations" key is undefined, or has an empty array, add all keys
-  if(typeof authorizations === 'undefined' || Object.keys(authorizations).length == 0) {
-    for (key in this.authz) {
-      value = this.authz[key];
-      result = value.apply(obj, authorizations);
-      if (result === true)
-        status = true;
-    }
-  }
-  else {
-    for(name in authorizations) {
-      for (key in this.authz) {
-        if(key == name) {
-          value = this.authz[key];
-          result = value.apply(obj, authorizations);
-          if (result === true)
-            status = true;
-        }
-      }      
-    }
-  }
-
-  return status;
-};
-
-/**
- * ApiKeyAuthorization allows a query param or header to be injected
- */
-var ApiKeyAuthorization = function(name, value, type) {
-  this.name = name;
-  this.value = value;
-  this.type = type;
-};
-
-ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
-  if (this.type === "query") {
-    if (obj.url.indexOf('?') > 0)
-      obj.url = obj.url + "&" + this.name + "=" + this.value;
-    else
-      obj.url = obj.url + "?" + this.name + "=" + this.value;
-    return true;
-  } else if (this.type === "header") {
-    obj.headers[this.name] = this.value;
-    return true;
-  }
-};
-
-var CookieAuthorization = function(cookie) {
-  this.cookie = cookie;
-}
-
-CookieAuthorization.prototype.apply = function(obj, authorizations) {
-  obj.cookieJar = obj.cookieJar || CookieJar();
-  obj.cookieJar.setCookie(this.cookie);
-  return true;
-}
-
-/**
- * Password Authorization is a basic auth implementation
- */
-var PasswordAuthorization = function(name, username, password) {
-  this.name = name;
-  this.username = username;
-  this.password = password;
-  this._btoa = null;
-  if (typeof window !== 'undefined')
-    this._btoa = btoa;
-  else
-    this._btoa = require("btoa");
-};
-
-PasswordAuthorization.prototype.apply = function(obj, authorizations) {
-  var base64encoder = this._btoa;
-  obj.headers["Authorization"] = "Basic " + base64encoder(this.username + ":" + this.password);
-  return true;
-};
-
-var e = (typeof window !== 'undefined' ? window : exports);
-
-var sampleModels = {};
-var cookies = {};
-
-e.SampleModels = sampleModels;
-e.SwaggerHttp = SwaggerHttp;
-e.SwaggerRequest = SwaggerRequest;
-e.authorizations = new SwaggerAuthorizations();
-e.ApiKeyAuthorization = ApiKeyAuthorization;
-e.PasswordAuthorization = PasswordAuthorization;
-e.CookieAuthorization = CookieAuthorization;
-e.JQueryHttpClient = JQueryHttpClient;
-e.ShredHttpClient = ShredHttpClient;
-e.SwaggerOperation = SwaggerOperation;
-e.SwaggerModel = SwaggerModel;
-e.SwaggerModelProperty = SwaggerModelProperty;
-e.SwaggerResource = SwaggerResource;
-e.SwaggerApi = SwaggerApi;
-
diff --git a/api/files/underscore-min.js b/api/files/underscore-min.js
deleted file mode 100644
index 5a0cb3b0..00000000
--- a/api/files/underscore-min.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Underscore.js 1.3.3
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break;
-g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a,
-c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===o)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===o)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.map===z)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(A&&
-a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,
-c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,
-a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&
-(e={value:a,computed:b})});return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){d=Math.floor(Math.random()*(f+1));b[f]=b[d];b[d]=a});return b};b.sortBy=function(a,c,d){var e=b.isFunction(c)?c:function(a){return a[c]};return b.pluck(b.map(a,function(a,b,c){return{value:a,criteria:e.call(d,a,b,c)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c===void 0?1:d===void 0?-1:c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};
-j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:b.isArray(a)||b.isArguments(a)?i.call(a):a.toArray&&b.isFunction(a.toArray)?a.toArray():b.values(a)};b.size=function(a){return b.isArray(a)?a.length:b.keys(a).length};b.first=b.head=b.take=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,
-0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,
-e=[];a.length<3&&(c=true);b.reduce(d,function(d,g,h){if(c?b.last(d)!==g||!d.length:!b.include(d,g)){d.push(g);e.push(a[h])}return d},[]);return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=
-i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d){d=b.sortedIndex(a,c);return a[d]===c?d:-1}if(q&&a.indexOf===q)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(F&&a.lastIndexOf===F)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){if(arguments.length<=
-1){b=a||0;a=0}for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;){g[f++]=a;a=a+d}return g};var H=function(){};b.bind=function(a,c){var d,e;if(a.bind===t&&t)return t.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));H.prototype=a.prototype;var b=new H,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=
-i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(null,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i,j=b.debounce(function(){h=
-g=false},c);return function(){d=this;e=arguments;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);j()},c));g?h=true:i=a.apply(d,e);j();g=true;return i}};b.debounce=function(a,b,d){var e;return function(){var f=this,g=arguments;d&&!e&&a.apply(f,g);clearTimeout(e);e=setTimeout(function(){e=null;d||a.apply(f,g)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));
-return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&
-c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=
-function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"};
-b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,
-b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId=
-function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape||
-u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c};
-b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d,
-this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/api/package.json b/api/package.json
deleted file mode 100644
index 84b9dd7b..00000000
--- a/api/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "swagger-cli-validator",
-  "version": "0.0.1",
-  "description": "",
-  "main": "validator.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "nopt": "^3.0.2",
-    "swagger-parser": "^3.2.1"
-  }
-}
diff --git a/api/validator.js b/api/validator.js
deleted file mode 100644
index c20dd993..00000000
--- a/api/validator.js
+++ /dev/null
@@ -1,86 +0,0 @@
-"use strict";
-var fs = require("fs");
-var nopt = require("nopt");
-var parser = require("swagger-parser");
-var path = require("path");
-
-var opts = nopt({
-    "help": Boolean,
-    "schema": path
-}, {
-    "h": "--help",
-    "s": "--schema"
-});
-
-if (opts.help) {
-    console.log(
-        "Use swagger-parser to validate against Swagger 2.0\n"+
-        "Usage:\n"+
-        "  node validator.js -s <schema_file_or_folder>"
-    );
-    process.exit(0);
-}
-if (!opts.schema) {
-    console.error("No [s]chema specified.");
-    process.exit(1);
-}
-
-
-var errFn = function(err, api) {
-    if (!err) {
-        return;
-    }
-    console.error(err);
-    process.exit(1);
-};
-
-/**
- * @brief Produce a handler for parser.validate().
- * Recommended usage: `parser.validate(filename, makeHandler(filename));`
- * or `parser.validate(schema, makeHandler());`.
- * @param scope - usually a filename, this will be used to denote
- *                an (in)valid schema in console output; "Schema" if undefined
- * @returns {function} the handler that can be passed to parser.validate
- */
-function makeHandler(scope) {
-    if (!scope)
-        scope = "Schema";
-    return function(err, api, metadata) {
-        if (err) {
-            console.error("%s is not valid.", scope || "Schema");
-            errFn(err, api, metadata); // Won't return
-        }
-
-        Object.keys(api.paths).forEach(function (endpoint) {
-            var operationsMap = api.paths[endpoint];
-            Object.keys(operationsMap).forEach(function (verb) {
-                if (!operationsMap[verb]["operationId"]) {
-                    console.error("%s is not valid", scope);
-                    errFn("operationId is missing in " + endpoint + ", verb " + verb, api);
-                }
-            })
-        });
-
-        console.log("%s is valid.", scope);
-    }
-}
-
-var isDir = fs.lstatSync(opts.schema).isDirectory();
-if (isDir) {
-    console.log("Checking directory %s for .yaml files...", opts.schema);
-    fs.readdir(opts.schema, function(err, files) {
-        if (err) {
-            errFn(err); // Won't return
-        }
-        files.forEach(function(f) {
-            var suffix = ".yaml";
-            if (f.indexOf(suffix, f.length - suffix.length) > 0) {
-                parser.validate(path.join(opts.schema, f), makeHandler(f));
-            }
-        });
-    });
-}
-else{
-    parser.validate(opts.schema, makeHandler(opts.schema));
-}
-
diff --git a/api/application-service/definitions/location.yaml b/data/api/application-service/definitions/location.yaml
similarity index 100%
rename from api/application-service/definitions/location.yaml
rename to data/api/application-service/definitions/location.yaml
diff --git a/api/application-service/definitions/location_batch.yaml b/data/api/application-service/definitions/location_batch.yaml
similarity index 100%
rename from api/application-service/definitions/location_batch.yaml
rename to data/api/application-service/definitions/location_batch.yaml
diff --git a/api/application-service/definitions/protocol.yaml b/data/api/application-service/definitions/protocol.yaml
similarity index 100%
rename from api/application-service/definitions/protocol.yaml
rename to data/api/application-service/definitions/protocol.yaml
diff --git a/api/application-service/definitions/protocol_metadata.yaml b/data/api/application-service/definitions/protocol_metadata.yaml
similarity index 100%
rename from api/application-service/definitions/protocol_metadata.yaml
rename to data/api/application-service/definitions/protocol_metadata.yaml
diff --git a/api/application-service/definitions/security.yaml b/data/api/application-service/definitions/security.yaml
similarity index 100%
rename from api/application-service/definitions/security.yaml
rename to data/api/application-service/definitions/security.yaml
diff --git a/api/application-service/definitions/user.yaml b/data/api/application-service/definitions/user.yaml
similarity index 100%
rename from api/application-service/definitions/user.yaml
rename to data/api/application-service/definitions/user.yaml
diff --git a/api/application-service/definitions/user_batch.yaml b/data/api/application-service/definitions/user_batch.yaml
similarity index 100%
rename from api/application-service/definitions/user_batch.yaml
rename to data/api/application-service/definitions/user_batch.yaml
diff --git a/api/application-service/protocols.yaml b/data/api/application-service/protocols.yaml
similarity index 100%
rename from api/application-service/protocols.yaml
rename to data/api/application-service/protocols.yaml
diff --git a/api/application-service/query_room.yaml b/data/api/application-service/query_room.yaml
similarity index 100%
rename from api/application-service/query_room.yaml
rename to data/api/application-service/query_room.yaml
diff --git a/api/application-service/query_user.yaml b/data/api/application-service/query_user.yaml
similarity index 100%
rename from api/application-service/query_user.yaml
rename to data/api/application-service/query_user.yaml
diff --git a/api/application-service/transactions.yaml b/data/api/application-service/transactions.yaml
similarity index 98%
rename from api/application-service/transactions.yaml
rename to data/api/application-service/transactions.yaml
index a557325c..20eace85 100644
--- a/api/application-service/transactions.yaml
+++ b/data/api/application-service/transactions.yaml
@@ -55,8 +55,8 @@ paths:
             type: object
             example: {
               "events": [
-                {"$ref": "../../event-schemas/examples/m.room.member"},
-                {"$ref": "../../event-schemas/examples/m.room.message$m.text"}
+                {"$ref": "../../event-schemas/examples/m.room.member.yaml"},
+                {"$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"}
               ]
             }
             properties:
diff --git a/api/client-server/account-data.yaml b/data/api/client-server/account-data.yaml
similarity index 100%
rename from api/client-server/account-data.yaml
rename to data/api/client-server/account-data.yaml
diff --git a/api/client-server/admin.yaml b/data/api/client-server/admin.yaml
similarity index 100%
rename from api/client-server/admin.yaml
rename to data/api/client-server/admin.yaml
diff --git a/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml
similarity index 100%
rename from api/client-server/administrative_contact.yaml
rename to data/api/client-server/administrative_contact.yaml
diff --git a/api/client-server/appservice_room_directory.yaml b/data/api/client-server/appservice_room_directory.yaml
similarity index 100%
rename from api/client-server/appservice_room_directory.yaml
rename to data/api/client-server/appservice_room_directory.yaml
diff --git a/api/client-server/banning.yaml b/data/api/client-server/banning.yaml
similarity index 100%
rename from api/client-server/banning.yaml
rename to data/api/client-server/banning.yaml
diff --git a/api/client-server/capabilities.yaml b/data/api/client-server/capabilities.yaml
similarity index 100%
rename from api/client-server/capabilities.yaml
rename to data/api/client-server/capabilities.yaml
diff --git a/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
similarity index 100%
rename from api/client-server/content-repo.yaml
rename to data/api/client-server/content-repo.yaml
diff --git a/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml
similarity index 100%
rename from api/client-server/create_room.yaml
rename to data/api/client-server/create_room.yaml
diff --git a/api/client-server/cross_signing.yaml b/data/api/client-server/cross_signing.yaml
similarity index 100%
rename from api/client-server/cross_signing.yaml
rename to data/api/client-server/cross_signing.yaml
diff --git a/api/client-server/definitions/auth_data.yaml b/data/api/client-server/definitions/auth_data.yaml
similarity index 100%
rename from api/client-server/definitions/auth_data.yaml
rename to data/api/client-server/definitions/auth_data.yaml
diff --git a/api/client-server/definitions/auth_response.yaml b/data/api/client-server/definitions/auth_response.yaml
similarity index 100%
rename from api/client-server/definitions/auth_response.yaml
rename to data/api/client-server/definitions/auth_response.yaml
diff --git a/api/client-server/definitions/client_device.yaml b/data/api/client-server/definitions/client_device.yaml
similarity index 100%
rename from api/client-server/definitions/client_device.yaml
rename to data/api/client-server/definitions/client_device.yaml
diff --git a/api/client-server/definitions/cross_signing_key.yaml b/data/api/client-server/definitions/cross_signing_key.yaml
similarity index 100%
rename from api/client-server/definitions/cross_signing_key.yaml
rename to data/api/client-server/definitions/cross_signing_key.yaml
diff --git a/api/client-server/definitions/device_keys.yaml b/data/api/client-server/definitions/device_keys.yaml
similarity index 100%
rename from api/client-server/definitions/device_keys.yaml
rename to data/api/client-server/definitions/device_keys.yaml
diff --git a/api/client-server/definitions/errors/error.yaml b/data/api/client-server/definitions/errors/error.yaml
similarity index 100%
rename from api/client-server/definitions/errors/error.yaml
rename to data/api/client-server/definitions/errors/error.yaml
diff --git a/api/client-server/definitions/errors/rate_limited.yaml b/data/api/client-server/definitions/errors/rate_limited.yaml
similarity index 100%
rename from api/client-server/definitions/errors/rate_limited.yaml
rename to data/api/client-server/definitions/errors/rate_limited.yaml
diff --git a/api/client-server/definitions/event.yaml b/data/api/client-server/definitions/event.yaml
similarity index 100%
rename from api/client-server/definitions/event.yaml
rename to data/api/client-server/definitions/event.yaml
diff --git a/api/client-server/definitions/event_batch.yaml b/data/api/client-server/definitions/event_batch.yaml
similarity index 90%
rename from api/client-server/definitions/event_batch.yaml
rename to data/api/client-server/definitions/event_batch.yaml
index d169c355..1694652c 100644
--- a/api/client-server/definitions/event_batch.yaml
+++ b/data/api/client-server/definitions/event_batch.yaml
@@ -17,7 +17,7 @@ properties:
     description: List of events.
     items:
       allOf:
-      - $ref: event-schemas/schema/core-event-schema/event.yaml
+      - $ref: ../../../event-schemas/schema/core-event-schema/event.yaml
       type: object
     type: array
 type: object
diff --git a/api/client-server/definitions/event_filter.yaml b/data/api/client-server/definitions/event_filter.yaml
similarity index 100%
rename from api/client-server/definitions/event_filter.yaml
rename to data/api/client-server/definitions/event_filter.yaml
diff --git a/api/client-server/definitions/key_backup_data.yaml b/data/api/client-server/definitions/key_backup_data.yaml
similarity index 100%
rename from api/client-server/definitions/key_backup_data.yaml
rename to data/api/client-server/definitions/key_backup_data.yaml
diff --git a/api/client-server/definitions/openid_token.yaml b/data/api/client-server/definitions/openid_token.yaml
similarity index 100%
rename from api/client-server/definitions/openid_token.yaml
rename to data/api/client-server/definitions/openid_token.yaml
diff --git a/api/client-server/definitions/public_rooms_response.yaml b/data/api/client-server/definitions/public_rooms_response.yaml
similarity index 100%
rename from api/client-server/definitions/public_rooms_response.yaml
rename to data/api/client-server/definitions/public_rooms_response.yaml
diff --git a/api/client-server/definitions/push_condition.yaml b/data/api/client-server/definitions/push_condition.yaml
similarity index 100%
rename from api/client-server/definitions/push_condition.yaml
rename to data/api/client-server/definitions/push_condition.yaml
diff --git a/api/client-server/definitions/push_rule.yaml b/data/api/client-server/definitions/push_rule.yaml
similarity index 100%
rename from api/client-server/definitions/push_rule.yaml
rename to data/api/client-server/definitions/push_rule.yaml
diff --git a/api/client-server/definitions/push_ruleset.yaml b/data/api/client-server/definitions/push_ruleset.yaml
similarity index 100%
rename from api/client-server/definitions/push_ruleset.yaml
rename to data/api/client-server/definitions/push_ruleset.yaml
diff --git a/api/client-server/definitions/request_email_validation.yaml b/data/api/client-server/definitions/request_email_validation.yaml
similarity index 100%
rename from api/client-server/definitions/request_email_validation.yaml
rename to data/api/client-server/definitions/request_email_validation.yaml
diff --git a/api/client-server/definitions/request_msisdn_validation.yaml b/data/api/client-server/definitions/request_msisdn_validation.yaml
similarity index 100%
rename from api/client-server/definitions/request_msisdn_validation.yaml
rename to data/api/client-server/definitions/request_msisdn_validation.yaml
diff --git a/api/client-server/definitions/request_token_response.yaml b/data/api/client-server/definitions/request_token_response.yaml
similarity index 100%
rename from api/client-server/definitions/request_token_response.yaml
rename to data/api/client-server/definitions/request_token_response.yaml
diff --git a/api/client-server/definitions/room_event_batch.yaml b/data/api/client-server/definitions/room_event_batch.yaml
similarity index 90%
rename from api/client-server/definitions/room_event_batch.yaml
rename to data/api/client-server/definitions/room_event_batch.yaml
index 7367198f..45bcb423 100644
--- a/api/client-server/definitions/room_event_batch.yaml
+++ b/data/api/client-server/definitions/room_event_batch.yaml
@@ -16,7 +16,7 @@ properties:
     description: List of events.
     items:
       allOf:
-      - $ref: event-schemas/schema/core-event-schema/sync_room_event.yaml
+      - $ref: ../../../event-schemas/schema/core-event-schema/sync_room_event.yaml
       type: object
       required:
       - event_id
diff --git a/api/client-server/definitions/room_event_filter.yaml b/data/api/client-server/definitions/room_event_filter.yaml
similarity index 100%
rename from api/client-server/definitions/room_event_filter.yaml
rename to data/api/client-server/definitions/room_event_filter.yaml
diff --git a/api/client-server/definitions/room_key_backup.yaml b/data/api/client-server/definitions/room_key_backup.yaml
similarity index 100%
rename from api/client-server/definitions/room_key_backup.yaml
rename to data/api/client-server/definitions/room_key_backup.yaml
diff --git a/api/client-server/definitions/security.yaml b/data/api/client-server/definitions/security.yaml
similarity index 100%
rename from api/client-server/definitions/security.yaml
rename to data/api/client-server/definitions/security.yaml
diff --git a/api/client-server/definitions/state_event_batch.yaml b/data/api/client-server/definitions/state_event_batch.yaml
similarity index 90%
rename from api/client-server/definitions/state_event_batch.yaml
rename to data/api/client-server/definitions/state_event_batch.yaml
index db01ecb1..9518300f 100644
--- a/api/client-server/definitions/state_event_batch.yaml
+++ b/data/api/client-server/definitions/state_event_batch.yaml
@@ -16,7 +16,7 @@ properties:
     description: List of events.
     items:
       allOf:
-      - $ref: event-schemas/schema/core-event-schema/sync_state_event.yaml
+      - $ref: ../../../event-schemas/schema/core-event-schema/sync_state_event.yaml
       type: object
       required:
       - event_id
diff --git a/api/client-server/definitions/sync_filter.yaml b/data/api/client-server/definitions/sync_filter.yaml
similarity index 100%
rename from api/client-server/definitions/sync_filter.yaml
rename to data/api/client-server/definitions/sync_filter.yaml
diff --git a/api/client-server/definitions/third_party_signed.yaml b/data/api/client-server/definitions/third_party_signed.yaml
similarity index 100%
rename from api/client-server/definitions/third_party_signed.yaml
rename to data/api/client-server/definitions/third_party_signed.yaml
diff --git a/api/client-server/definitions/timeline_batch.yaml b/data/api/client-server/definitions/timeline_batch.yaml
similarity index 100%
rename from api/client-server/definitions/timeline_batch.yaml
rename to data/api/client-server/definitions/timeline_batch.yaml
diff --git a/api/client-server/definitions/user_identifier.yaml b/data/api/client-server/definitions/user_identifier.yaml
similarity index 100%
rename from api/client-server/definitions/user_identifier.yaml
rename to data/api/client-server/definitions/user_identifier.yaml
diff --git a/api/client-server/definitions/wellknown/full.yaml b/data/api/client-server/definitions/wellknown/full.yaml
similarity index 100%
rename from api/client-server/definitions/wellknown/full.yaml
rename to data/api/client-server/definitions/wellknown/full.yaml
diff --git a/api/client-server/definitions/wellknown/homeserver.yaml b/data/api/client-server/definitions/wellknown/homeserver.yaml
similarity index 100%
rename from api/client-server/definitions/wellknown/homeserver.yaml
rename to data/api/client-server/definitions/wellknown/homeserver.yaml
diff --git a/api/client-server/definitions/wellknown/identity_server.yaml b/data/api/client-server/definitions/wellknown/identity_server.yaml
similarity index 100%
rename from api/client-server/definitions/wellknown/identity_server.yaml
rename to data/api/client-server/definitions/wellknown/identity_server.yaml
diff --git a/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml
similarity index 100%
rename from api/client-server/device_management.yaml
rename to data/api/client-server/device_management.yaml
diff --git a/api/client-server/directory.yaml b/data/api/client-server/directory.yaml
similarity index 100%
rename from api/client-server/directory.yaml
rename to data/api/client-server/directory.yaml
diff --git a/api/client-server/event_context.yaml b/data/api/client-server/event_context.yaml
similarity index 85%
rename from api/client-server/event_context.yaml
rename to data/api/client-server/event_context.yaml
index 5fbfc198..da43bf9e 100644
--- a/api/client-server/event_context.yaml
+++ b/data/api/client-server/event_context.yaml
@@ -65,8 +65,8 @@ paths:
           description: |-
             A JSON ``RoomEventFilter`` to filter the returned events with. The
             filter is only applied to ``events_before``, ``events_after``, and
-            ``state``. It is not applied to the ``event`` itself. The filter may 
-            be applied before or/and after the ``limit`` parameter - whichever the 
+            ``state``. It is not applied to the ``event`` itself. The filter may
+            be applied before or/and after the ``limit`` parameter - whichever the
             homeserver prefers.
 
             See `Filtering <#filtering>`_ for more information.
@@ -93,12 +93,12 @@ paths:
                   requested event, in reverse-chronological order.
                 items:
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
               event:
                 description: |-
                   Details of the requested event.
                 allOf:
-                  - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                  - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
               events_after:
                 type: array
                 description: |-
@@ -106,43 +106,43 @@ paths:
                   requested event, in chronological order.
                 items:
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
               state:
                 type: array
                 description: |-
                   The state of the room at the last event returned.
                 items:
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/state_event.yaml"
           examples:
             application/json: {
               "end": "t29-57_2_0_2",
               "events_after": [
                 {
                   "room_id": "!636q39766251:example.com",
-                  "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                  "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                 }
               ],
               "event": {
                 "event_id": "$f3h4d129462ha:example.com",
                 "room_id": "!636q39766251:example.com",
-                "$ref": "definitions/event-schemas/examples/m.room.message$m.image"
+                "$ref": "../../event-schemas/examples/m.room.message$m.image.yaml"
               },
               "events_before": [
                 {
                   "room_id": "!636q39766251:example.com",
-                  "$ref": "definitions/event-schemas/examples/m.room.message$m.file"
+                  "$ref": "../../event-schemas/examples/m.room.message$m.file.yaml"
                 }
               ],
               "start": "t27-54_2_0_2",
               "state": [
                 {
                   "room_id": "!636q39766251:example.com",
-                  "$ref": "definitions/event-schemas/examples/m.room.create"
+                  "$ref": "../../event-schemas/examples/m.room.create.yaml"
                 },
                 {
                   "room_id": "!636q39766251:example.com",
-                  "$ref": "definitions/event-schemas/examples/m.room.member"
+                  "$ref": "../../event-schemas/examples/m.room.member.yaml"
                 }
               ]
             }
diff --git a/api/client-server/filter.yaml b/data/api/client-server/filter.yaml
similarity index 100%
rename from api/client-server/filter.yaml
rename to data/api/client-server/filter.yaml
diff --git a/api/client-server/inviting.yaml b/data/api/client-server/inviting.yaml
similarity index 100%
rename from api/client-server/inviting.yaml
rename to data/api/client-server/inviting.yaml
diff --git a/api/client-server/joining.yaml b/data/api/client-server/joining.yaml
similarity index 100%
rename from api/client-server/joining.yaml
rename to data/api/client-server/joining.yaml
diff --git a/api/client-server/key_backup.yaml b/data/api/client-server/key_backup.yaml
similarity index 100%
rename from api/client-server/key_backup.yaml
rename to data/api/client-server/key_backup.yaml
diff --git a/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
similarity index 100%
rename from api/client-server/keys.yaml
rename to data/api/client-server/keys.yaml
diff --git a/api/client-server/kicking.yaml b/data/api/client-server/kicking.yaml
similarity index 100%
rename from api/client-server/kicking.yaml
rename to data/api/client-server/kicking.yaml
diff --git a/api/client-server/leaving.yaml b/data/api/client-server/leaving.yaml
similarity index 100%
rename from api/client-server/leaving.yaml
rename to data/api/client-server/leaving.yaml
diff --git a/api/client-server/list_joined_rooms.yaml b/data/api/client-server/list_joined_rooms.yaml
similarity index 100%
rename from api/client-server/list_joined_rooms.yaml
rename to data/api/client-server/list_joined_rooms.yaml
diff --git a/api/client-server/list_public_rooms.yaml b/data/api/client-server/list_public_rooms.yaml
similarity index 100%
rename from api/client-server/list_public_rooms.yaml
rename to data/api/client-server/list_public_rooms.yaml
diff --git a/api/client-server/login.yaml b/data/api/client-server/login.yaml
similarity index 100%
rename from api/client-server/login.yaml
rename to data/api/client-server/login.yaml
diff --git a/api/client-server/logout.yaml b/data/api/client-server/logout.yaml
similarity index 100%
rename from api/client-server/logout.yaml
rename to data/api/client-server/logout.yaml
diff --git a/api/client-server/message_pagination.yaml b/data/api/client-server/message_pagination.yaml
similarity index 92%
rename from api/client-server/message_pagination.yaml
rename to data/api/client-server/message_pagination.yaml
index 425240e3..66e1d9c2 100644
--- a/api/client-server/message_pagination.yaml
+++ b/data/api/client-server/message_pagination.yaml
@@ -111,7 +111,7 @@ paths:
                   for ``dir=f`` in chronological order, so that events start
                   at the ``from`` point.
                 items:
-                  "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                  "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
               state:
                 type: array
                 description: |-
@@ -124,7 +124,7 @@ paths:
                   sent to the client in prior calls to this endpoint, assuming
                   the membership of those members has not changed.
                 items:
-                  $ref: "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                  $ref: "../../event-schemas/schema/core-event-schema/state_event.yaml"
           examples:
             application/json: {
                 "start": "t47429-4392820_219380_26003_2265",
@@ -132,15 +132,15 @@ paths:
                 "chunk": [
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                    "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                   },
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.name"
+                    "$ref": "../../event-schemas/examples/m.room.name.yaml"
                   },
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.message$m.video"
+                    "$ref": "../../event-schemas/examples/m.room.message$m.video.yaml"
                   }
                 ]
               }
diff --git a/api/client-server/notifications.yaml b/data/api/client-server/notifications.yaml
similarity index 98%
rename from api/client-server/notifications.yaml
rename to data/api/client-server/notifications.yaml
index 8679cb91..434b3be2 100644
--- a/api/client-server/notifications.yaml
+++ b/data/api/client-server/notifications.yaml
@@ -75,7 +75,7 @@ paths:
                     "room_id": "!abcdefg:example.com",
                     "ts": 1475508881945,
                     "event": {
-                      "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                      "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                     }
                   }
                 ]
diff --git a/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml
similarity index 88%
rename from api/client-server/old_sync.yaml
rename to data/api/client-server/old_sync.yaml
index a79c3b32..7caad40e 100644
--- a/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@@ -64,7 +64,7 @@ paths:
                 "start": "s3456_9_0",
                 "end": "s3457_9_0",
                 "chunk": [
-                  {"$ref": "definitions/event-schemas/examples/m.room.message$m.text"}
+                  {"$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"}
                 ]
               }
           schema:
@@ -87,7 +87,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
         400:
           description: "Bad pagination ``from`` parameter."
       tags:
@@ -131,7 +131,7 @@ paths:
             application/json: {
                   "end": "s3456_9_0",
                   "presence": [
-                      {"$ref": "definitions/event-schemas/examples/m.presence"}
+                      {"$ref": "../../event-schemas/examples/m.presence.yaml"}
                   ],
                   "account_data": [
                     {
@@ -148,11 +148,11 @@ paths:
                               "chunk": [
                                   {
                                     "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                    "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                                    "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                                   },
                                   {
                                     "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                    "$ref": "definitions/event-schemas/examples/m.room.message$m.video"
+                                    "$ref": "../../event-schemas/examples/m.room.message$m.video.yaml"
                                   }
                               ],
                               "end": "s3456_9_0",
@@ -162,19 +162,19 @@ paths:
                           "state": [
                               {
                                 "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                "$ref": "definitions/event-schemas/examples/m.room.join_rules"
+                                "$ref": "../../event-schemas/examples/m.room.join_rules.yaml"
                               },
                               {
                                 "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                "$ref": "definitions/event-schemas/examples/m.room.member"
+                                "$ref": "../../event-schemas/examples/m.room.member.yaml"
                               },
                               {
                                 "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                "$ref": "definitions/event-schemas/examples/m.room.create"
+                                "$ref": "../../event-schemas/examples/m.room.create.yaml"
                               },
                               {
                                 "room_id": "!TmaZBKYIFrIPVGoUYp:localhost",
-                                "$ref": "definitions/event-schemas/examples/m.room.power_levels"
+                                "$ref": "../../event-schemas/examples/m.room.power_levels.yaml"
                               }
                           ],
                           "visibility": "private",
@@ -209,7 +209,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
               rooms:
                 type: array
                 items:
@@ -228,7 +228,7 @@ paths:
                         title: "InviteEvent"
                         description: "The invite event if ``membership`` is ``invite``"
                         allOf:
-                          - "$ref": "definitions/event-schemas/schema/m.room.member"
+                          - "$ref": "../../event-schemas/schema/m.room.member.yaml"
                     messages:
                       type: object
                       title: PaginationChunk
@@ -256,7 +256,7 @@ paths:
                             type: object
                             title: RoomEvent
                             allOf:
-                              - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                              - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
                       required: ["start", "end", "chunk"]
                     state:
                       type: array
@@ -269,7 +269,7 @@ paths:
                         title: StateEvent
                         type: object
                         allOf:
-                          - "$ref": "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/state_event.yaml"
                     visibility:
                       type: string
                       enum: ["private", "public"]
@@ -285,7 +285,7 @@ paths:
                         title: Event
                         type: object
                         allOf:
-                          - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
                   required: ["room_id", "membership"]
               account_data:
                 type: array
@@ -295,7 +295,7 @@ paths:
                   title: Event
                   type: object
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
             required: ["end", "rooms", "presence"]
         404:
           description: There is no avatar URL for this user or this user does not exist.
@@ -326,10 +326,10 @@ paths:
         200:
           description: The full event.
           examples:
-            application/json: {"$ref": "definitions/event-schemas/examples/m.room.message$m.text"}
+            application/json: {"$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"}
           schema:
             allOf:
-              - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+              - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
         404:
           description: The event was not found or you do not have permission to read this event.
       tags:
diff --git a/api/client-server/openid.yaml b/data/api/client-server/openid.yaml
similarity index 100%
rename from api/client-server/openid.yaml
rename to data/api/client-server/openid.yaml
diff --git a/api/client-server/peeking_events.yaml b/data/api/client-server/peeking_events.yaml
similarity index 95%
rename from api/client-server/peeking_events.yaml
rename to data/api/client-server/peeking_events.yaml
index feac36f4..462b0191 100644
--- a/api/client-server/peeking_events.yaml
+++ b/data/api/client-server/peeking_events.yaml
@@ -76,7 +76,7 @@ paths:
                 "chunk": [
                   {
                     "room_id": "!somewhere:over.the.rainbow",
-                    "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                    "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                   }
                 ]
               }
@@ -100,7 +100,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
         400:
           description: "Bad pagination ``from`` parameter."
         # No tags to exclude this from the swagger UI - use the normal version instead.
diff --git a/api/client-server/presence.yaml b/data/api/client-server/presence.yaml
similarity index 100%
rename from api/client-server/presence.yaml
rename to data/api/client-server/presence.yaml
diff --git a/api/client-server/profile.yaml b/data/api/client-server/profile.yaml
similarity index 100%
rename from api/client-server/profile.yaml
rename to data/api/client-server/profile.yaml
diff --git a/api/client-server/pusher.yaml b/data/api/client-server/pusher.yaml
similarity index 100%
rename from api/client-server/pusher.yaml
rename to data/api/client-server/pusher.yaml
diff --git a/api/client-server/pushrules.yaml b/data/api/client-server/pushrules.yaml
similarity index 100%
rename from api/client-server/pushrules.yaml
rename to data/api/client-server/pushrules.yaml
diff --git a/api/client-server/read_markers.yaml b/data/api/client-server/read_markers.yaml
similarity index 100%
rename from api/client-server/read_markers.yaml
rename to data/api/client-server/read_markers.yaml
diff --git a/api/client-server/receipts.yaml b/data/api/client-server/receipts.yaml
similarity index 100%
rename from api/client-server/receipts.yaml
rename to data/api/client-server/receipts.yaml
diff --git a/api/client-server/redaction.yaml b/data/api/client-server/redaction.yaml
similarity index 100%
rename from api/client-server/redaction.yaml
rename to data/api/client-server/redaction.yaml
diff --git a/api/client-server/registration.yaml b/data/api/client-server/registration.yaml
similarity index 100%
rename from api/client-server/registration.yaml
rename to data/api/client-server/registration.yaml
diff --git a/api/client-server/report_content.yaml b/data/api/client-server/report_content.yaml
similarity index 100%
rename from api/client-server/report_content.yaml
rename to data/api/client-server/report_content.yaml
diff --git a/api/client-server/room_initial_sync.yaml b/data/api/client-server/room_initial_sync.yaml
similarity index 86%
rename from api/client-server/room_initial_sync.yaml
rename to data/api/client-server/room_initial_sync.yaml
index 72e56ba9..fd8412a4 100644
--- a/api/client-server/room_initial_sync.yaml
+++ b/data/api/client-server/room_initial_sync.yaml
@@ -44,11 +44,11 @@ paths:
                   "chunk": [
                     {
                       "room_id": "!636q39766251:example.com",
-                      "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                      "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                     },
                     {
                       "room_id": "!636q39766251:example.com",
-                      "$ref": "definitions/event-schemas/examples/m.room.message$m.file"
+                      "$ref": "../../event-schemas/examples/m.room.message$m.file.yaml"
                     }
                   ],
                   "end": "s3456_9_0",
@@ -58,19 +58,19 @@ paths:
                 "state": [
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.join_rules"
+                    "$ref": "../../event-schemas/examples/m.room.join_rules.yaml"
                   },
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.member"
+                    "$ref": "../../event-schemas/examples/m.room.member.yaml"
                   },
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.create"
+                    "$ref": "../../event-schemas/examples/m.room.create.yaml"
                   },
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.power_levels"
+                    "$ref": "../../event-schemas/examples/m.room.power_levels.yaml"
                   }
                 ],
                 "visibility": "private",
@@ -117,7 +117,7 @@ paths:
                       type: object
                       title: RoomEvent
                       allOf:
-                        - "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                        - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
                 required: ["start", "end", "chunk"]
               state:
                 type: array
@@ -130,7 +130,7 @@ paths:
                   title: StateEvent
                   type: object
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/state_event.yaml"
               visibility:
                 type: string
                 enum: ["private", "public"]
@@ -145,7 +145,7 @@ paths:
                   title: Event
                   type: object
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
             required: ["room_id"]
         403:
           description: >
diff --git a/api/client-server/room_send.yaml b/data/api/client-server/room_send.yaml
similarity index 100%
rename from api/client-server/room_send.yaml
rename to data/api/client-server/room_send.yaml
diff --git a/api/client-server/room_state.yaml b/data/api/client-server/room_state.yaml
similarity index 100%
rename from api/client-server/room_state.yaml
rename to data/api/client-server/room_state.yaml
diff --git a/api/client-server/room_upgrades.yaml b/data/api/client-server/room_upgrades.yaml
similarity index 100%
rename from api/client-server/room_upgrades.yaml
rename to data/api/client-server/room_upgrades.yaml
diff --git a/api/client-server/rooms.yaml b/data/api/client-server/rooms.yaml
similarity index 93%
rename from api/client-server/rooms.yaml
rename to data/api/client-server/rooms.yaml
index 566e695a..7ead7f41 100644
--- a/api/client-server/rooms.yaml
+++ b/data/api/client-server/rooms.yaml
@@ -55,11 +55,11 @@ paths:
           examples:
             application/json: {
               "room_id": "!636q39766251:matrix.org",
-              "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+              "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
             }
           schema:
             allOf:
-              - "$ref": "definitions/event-schemas/schema/core-event-schema/event.yaml"
+              - "$ref": "../../event-schemas/schema/core-event-schema/event.yaml"
         404:
           description: The event was not found or you do not have permission to read this event.
           examples:
@@ -144,19 +144,19 @@ paths:
             application/json: [
               {
                 "room_id": "!636q39766251:example.com",
-                "$ref": "definitions/event-schemas/examples/m.room.join_rules"
+                "$ref": "../../event-schemas/examples/m.room.join_rules.yaml"
               },
               {
                 "room_id": "!636q39766251:example.com",
-                "$ref": "definitions/event-schemas/examples/m.room.member"
+                "$ref": "../../event-schemas/examples/m.room.member.yaml"
               },
               {
                 "room_id": "!636q39766251:example.com",
-                "$ref": "definitions/event-schemas/examples/m.room.create"
+                "$ref": "../../event-schemas/examples/m.room.create.yaml"
               },
               {
                 "room_id": "!636q39766251:example.com",
-                "$ref": "definitions/event-schemas/examples/m.room.power_levels"
+                "$ref": "../../event-schemas/examples/m.room.power_levels.yaml"
               }
             ]
           schema:
@@ -171,7 +171,7 @@ paths:
               title: StateEvent
               type: object
               allOf:
-                - "$ref": "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                - "$ref": "../../event-schemas/schema/core-event-schema/state_event.yaml"
         403:
           description: >
             You aren't a member of the room and weren't previously a
@@ -242,7 +242,7 @@ paths:
                 "chunk": [
                   {
                     "room_id": "!636q39766251:example.com",
-                    "$ref": "definitions/event-schemas/examples/m.room.member"
+                    "$ref": "../../event-schemas/examples/m.room.member.yaml"
                   }
                 ]
               }
@@ -255,7 +255,7 @@ paths:
                   title: MemberEvent
                   type: object
                   allOf:
-                    - "$ref": "definitions/event-schemas/schema/m.room.member"
+                    - "$ref": "../../event-schemas/schema/m.room.member.yaml"
         403:
           description: >
             You aren't a member of the room and weren't previously a
diff --git a/api/client-server/search.yaml b/data/api/client-server/search.yaml
similarity index 97%
rename from api/client-server/search.yaml
rename to data/api/client-server/search.yaml
index 27e06727..6647f955 100644
--- a/api/client-server/search.yaml
+++ b/data/api/client-server/search.yaml
@@ -208,7 +208,7 @@ paths:
                               type: object
                               title: Event
                               description: The event that matched.
-                              "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                              "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
                             context:
                               type: object
                               title: Event Context
@@ -250,7 +250,7 @@ paths:
                                   items:
                                     title: Event
                                     type: object
-                                    "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                                    "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
                                 events_after:
                                   type: array
                                   title: Events After
@@ -258,7 +258,7 @@ paths:
                                   items:
                                     title: Event
                                     type: object
-                                    "$ref": "definitions/event-schemas/schema/core-event-schema/room_event.yaml"
+                                    "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
                       state:
                         type: object
                         title: Current state
@@ -274,7 +274,7 @@ paths:
                           title: Room State
                           items:
                             type: object
-                            "$ref": "definitions/event-schemas/schema/core-event-schema/state_event.yaml"
+                            "$ref": "../../event-schemas/schema/core-event-schema/state_event.yaml"
                       groups:
                         type: object
                         title: Groups
@@ -351,7 +351,7 @@ paths:
                           "result": {
                             "room_id": "!qPewotXpIctQySfjSy:localhost",
                             "event_id": "$144429830826TWwbB:localhost",
-                            "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                            "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                           }
                         }
                       ]
diff --git a/api/client-server/sso_login_redirect.yaml b/data/api/client-server/sso_login_redirect.yaml
similarity index 100%
rename from api/client-server/sso_login_redirect.yaml
rename to data/api/client-server/sso_login_redirect.yaml
diff --git a/api/client-server/sync.yaml b/data/api/client-server/sync.yaml
similarity index 97%
rename from api/client-server/sync.yaml
rename to data/api/client-server/sync.yaml
index 35134fad..7a923eca 100644
--- a/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@@ -279,7 +279,7 @@ paths:
                             events:
                               description: The StrippedState events that form the invite state.
                               items:
-                                $ref: "definitions/event-schemas/schema/stripped_state.yaml"
+                                $ref: "../../event-schemas/schema/stripped_state.yaml"
                               type: array
                   leave:
                     title: Left rooms
@@ -355,7 +355,7 @@ paths:
                 "next_batch": "s72595_4483_1934",
                 "presence": {
                   "events": [
-                    {"$ref": "definitions/event-schemas/examples/m.presence"}
+                    {"$ref": "../../event-schemas/examples/m.presence.yaml"}
                   ]
                 },
                 "account_data": {
@@ -382,17 +382,17 @@ paths:
                       "state": {
                         "events": [
                           {
-                            "$ref": "definitions/event-schemas/examples/m.room.member"
+                            "$ref": "../../event-schemas/examples/m.room.member.yaml"
                           }
                         ]
                       },
                       "timeline": {
                         "events": [
                           {
-                            "$ref": "definitions/event-schemas/examples/m.room.member"
+                            "$ref": "../../event-schemas/examples/m.room.member.yaml"
                           },
                           {
-                            "$ref": "definitions/event-schemas/examples/m.room.message$m.text"
+                            "$ref": "../../event-schemas/examples/m.room.message$m.text.yaml"
                           }
                         ],
                         "limited": true,
@@ -400,12 +400,12 @@ paths:
                       },
                       "ephemeral": {
                         "events": [
-                          {"$ref": "definitions/event-schemas/examples/m.typing"}
+                          {"$ref": "../../event-schemas/examples/m.typing.yaml"}
                         ]
                       },
                       "account_data": {
                         "events": [
-                          {"$ref": "definitions/event-schemas/examples/m.tag"},
+                          {"$ref": "../../event-schemas/examples/m.tag.yaml"},
                           {
                             "type": "org.example.custom.room.config",
                             "content": {
diff --git a/api/client-server/tags.yaml b/data/api/client-server/tags.yaml
similarity index 100%
rename from api/client-server/tags.yaml
rename to data/api/client-server/tags.yaml
diff --git a/api/client-server/third_party_lookup.yaml b/data/api/client-server/third_party_lookup.yaml
similarity index 100%
rename from api/client-server/third_party_lookup.yaml
rename to data/api/client-server/third_party_lookup.yaml
diff --git a/api/client-server/third_party_membership.yaml b/data/api/client-server/third_party_membership.yaml
similarity index 100%
rename from api/client-server/third_party_membership.yaml
rename to data/api/client-server/third_party_membership.yaml
diff --git a/api/client-server/to_device.yaml b/data/api/client-server/to_device.yaml
similarity index 100%
rename from api/client-server/to_device.yaml
rename to data/api/client-server/to_device.yaml
diff --git a/api/client-server/typing.yaml b/data/api/client-server/typing.yaml
similarity index 100%
rename from api/client-server/typing.yaml
rename to data/api/client-server/typing.yaml
diff --git a/api/client-server/users.yaml b/data/api/client-server/users.yaml
similarity index 100%
rename from api/client-server/users.yaml
rename to data/api/client-server/users.yaml
diff --git a/api/client-server/versions.yaml b/data/api/client-server/versions.yaml
similarity index 100%
rename from api/client-server/versions.yaml
rename to data/api/client-server/versions.yaml
diff --git a/api/client-server/voip.yaml b/data/api/client-server/voip.yaml
similarity index 100%
rename from api/client-server/voip.yaml
rename to data/api/client-server/voip.yaml
diff --git a/api/client-server/wellknown.yaml b/data/api/client-server/wellknown.yaml
similarity index 100%
rename from api/client-server/wellknown.yaml
rename to data/api/client-server/wellknown.yaml
diff --git a/api/client-server/whoami.yaml b/data/api/client-server/whoami.yaml
similarity index 100%
rename from api/client-server/whoami.yaml
rename to data/api/client-server/whoami.yaml
diff --git a/api/identity/associations.yaml b/data/api/identity/associations.yaml
similarity index 100%
rename from api/identity/associations.yaml
rename to data/api/identity/associations.yaml
diff --git a/api/identity/definitions/request_email_validation.yaml b/data/api/identity/definitions/request_email_validation.yaml
similarity index 100%
rename from api/identity/definitions/request_email_validation.yaml
rename to data/api/identity/definitions/request_email_validation.yaml
diff --git a/api/identity/definitions/request_msisdn_validation.yaml b/data/api/identity/definitions/request_msisdn_validation.yaml
similarity index 100%
rename from api/identity/definitions/request_msisdn_validation.yaml
rename to data/api/identity/definitions/request_msisdn_validation.yaml
diff --git a/api/identity/definitions/security.yaml b/data/api/identity/definitions/security.yaml
similarity index 100%
rename from api/identity/definitions/security.yaml
rename to data/api/identity/definitions/security.yaml
diff --git a/api/identity/definitions/sid.yaml b/data/api/identity/definitions/sid.yaml
similarity index 100%
rename from api/identity/definitions/sid.yaml
rename to data/api/identity/definitions/sid.yaml
diff --git a/api/identity/email_associations.yaml b/data/api/identity/email_associations.yaml
similarity index 100%
rename from api/identity/email_associations.yaml
rename to data/api/identity/email_associations.yaml
diff --git a/api/identity/invitation_signing.yaml b/data/api/identity/invitation_signing.yaml
similarity index 100%
rename from api/identity/invitation_signing.yaml
rename to data/api/identity/invitation_signing.yaml
diff --git a/api/identity/lookup.yaml b/data/api/identity/lookup.yaml
similarity index 100%
rename from api/identity/lookup.yaml
rename to data/api/identity/lookup.yaml
diff --git a/api/identity/phone_associations.yaml b/data/api/identity/phone_associations.yaml
similarity index 100%
rename from api/identity/phone_associations.yaml
rename to data/api/identity/phone_associations.yaml
diff --git a/api/identity/ping.yaml b/data/api/identity/ping.yaml
similarity index 100%
rename from api/identity/ping.yaml
rename to data/api/identity/ping.yaml
diff --git a/api/identity/pubkey.yaml b/data/api/identity/pubkey.yaml
similarity index 100%
rename from api/identity/pubkey.yaml
rename to data/api/identity/pubkey.yaml
diff --git a/api/identity/store_invite.yaml b/data/api/identity/store_invite.yaml
similarity index 100%
rename from api/identity/store_invite.yaml
rename to data/api/identity/store_invite.yaml
diff --git a/api/identity/v2_associations.yaml b/data/api/identity/v2_associations.yaml
similarity index 100%
rename from api/identity/v2_associations.yaml
rename to data/api/identity/v2_associations.yaml
diff --git a/api/identity/v2_auth.yaml b/data/api/identity/v2_auth.yaml
similarity index 100%
rename from api/identity/v2_auth.yaml
rename to data/api/identity/v2_auth.yaml
diff --git a/api/identity/v2_email_associations.yaml b/data/api/identity/v2_email_associations.yaml
similarity index 100%
rename from api/identity/v2_email_associations.yaml
rename to data/api/identity/v2_email_associations.yaml
diff --git a/api/identity/v2_invitation_signing.yaml b/data/api/identity/v2_invitation_signing.yaml
similarity index 100%
rename from api/identity/v2_invitation_signing.yaml
rename to data/api/identity/v2_invitation_signing.yaml
diff --git a/api/identity/v2_lookup.yaml b/data/api/identity/v2_lookup.yaml
similarity index 100%
rename from api/identity/v2_lookup.yaml
rename to data/api/identity/v2_lookup.yaml
diff --git a/api/identity/v2_phone_associations.yaml b/data/api/identity/v2_phone_associations.yaml
similarity index 100%
rename from api/identity/v2_phone_associations.yaml
rename to data/api/identity/v2_phone_associations.yaml
diff --git a/api/identity/v2_ping.yaml b/data/api/identity/v2_ping.yaml
similarity index 100%
rename from api/identity/v2_ping.yaml
rename to data/api/identity/v2_ping.yaml
diff --git a/api/identity/v2_pubkey.yaml b/data/api/identity/v2_pubkey.yaml
similarity index 100%
rename from api/identity/v2_pubkey.yaml
rename to data/api/identity/v2_pubkey.yaml
diff --git a/api/identity/v2_store_invite.yaml b/data/api/identity/v2_store_invite.yaml
similarity index 100%
rename from api/identity/v2_store_invite.yaml
rename to data/api/identity/v2_store_invite.yaml
diff --git a/api/identity/v2_terms.yaml b/data/api/identity/v2_terms.yaml
similarity index 100%
rename from api/identity/v2_terms.yaml
rename to data/api/identity/v2_terms.yaml
diff --git a/api/push-gateway/push_notifier.yaml b/data/api/push-gateway/push_notifier.yaml
similarity index 100%
rename from api/push-gateway/push_notifier.yaml
rename to data/api/push-gateway/push_notifier.yaml
diff --git a/api/server-server/backfill.yaml b/data/api/server-server/backfill.yaml
similarity index 100%
rename from api/server-server/backfill.yaml
rename to data/api/server-server/backfill.yaml
diff --git a/api/server-server/definitions/edu.yaml b/data/api/server-server/definitions/edu.yaml
similarity index 100%
rename from api/server-server/definitions/edu.yaml
rename to data/api/server-server/definitions/edu.yaml
diff --git a/api/server-server/definitions/event-schemas/m.device_list_update.yaml b/data/api/server-server/definitions/event-schemas/m.device_list_update.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.device_list_update.yaml
rename to data/api/server-server/definitions/event-schemas/m.device_list_update.yaml
diff --git a/api/server-server/definitions/event-schemas/m.direct_to_device.yaml b/data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.direct_to_device.yaml
rename to data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml
diff --git a/api/server-server/definitions/event-schemas/m.presence.yaml b/data/api/server-server/definitions/event-schemas/m.presence.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.presence.yaml
rename to data/api/server-server/definitions/event-schemas/m.presence.yaml
diff --git a/api/server-server/definitions/event-schemas/m.receipt.yaml b/data/api/server-server/definitions/event-schemas/m.receipt.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.receipt.yaml
rename to data/api/server-server/definitions/event-schemas/m.receipt.yaml
diff --git a/api/server-server/definitions/event-schemas/m.signing_key_update.yaml b/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.signing_key_update.yaml
rename to data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
diff --git a/api/server-server/definitions/event-schemas/m.typing.yaml b/data/api/server-server/definitions/event-schemas/m.typing.yaml
similarity index 100%
rename from api/server-server/definitions/event-schemas/m.typing.yaml
rename to data/api/server-server/definitions/event-schemas/m.typing.yaml
diff --git a/api/server-server/definitions/invite_event.yaml b/data/api/server-server/definitions/invite_event.yaml
similarity index 100%
rename from api/server-server/definitions/invite_event.yaml
rename to data/api/server-server/definitions/invite_event.yaml
diff --git a/api/server-server/definitions/keys.yaml b/data/api/server-server/definitions/keys.yaml
similarity index 100%
rename from api/server-server/definitions/keys.yaml
rename to data/api/server-server/definitions/keys.yaml
diff --git a/api/server-server/definitions/keys_query_response.yaml b/data/api/server-server/definitions/keys_query_response.yaml
similarity index 100%
rename from api/server-server/definitions/keys_query_response.yaml
rename to data/api/server-server/definitions/keys_query_response.yaml
diff --git a/api/server-server/definitions/pdu.yaml b/data/api/server-server/definitions/pdu.yaml
similarity index 100%
rename from api/server-server/definitions/pdu.yaml
rename to data/api/server-server/definitions/pdu.yaml
diff --git a/api/server-server/definitions/pdu_v3.yaml b/data/api/server-server/definitions/pdu_v3.yaml
similarity index 100%
rename from api/server-server/definitions/pdu_v3.yaml
rename to data/api/server-server/definitions/pdu_v3.yaml
diff --git a/api/server-server/definitions/pdu_v4.yaml b/data/api/server-server/definitions/pdu_v4.yaml
similarity index 100%
rename from api/server-server/definitions/pdu_v4.yaml
rename to data/api/server-server/definitions/pdu_v4.yaml
diff --git a/api/server-server/definitions/security.yaml b/data/api/server-server/definitions/security.yaml
similarity index 100%
rename from api/server-server/definitions/security.yaml
rename to data/api/server-server/definitions/security.yaml
diff --git a/api/server-server/definitions/send_join_response.yaml b/data/api/server-server/definitions/send_join_response.yaml
similarity index 100%
rename from api/server-server/definitions/send_join_response.yaml
rename to data/api/server-server/definitions/send_join_response.yaml
diff --git a/api/server-server/definitions/single_pdu_transaction.yaml b/data/api/server-server/definitions/single_pdu_transaction.yaml
similarity index 100%
rename from api/server-server/definitions/single_pdu_transaction.yaml
rename to data/api/server-server/definitions/single_pdu_transaction.yaml
diff --git a/api/server-server/definitions/transaction.yaml b/data/api/server-server/definitions/transaction.yaml
similarity index 100%
rename from api/server-server/definitions/transaction.yaml
rename to data/api/server-server/definitions/transaction.yaml
diff --git a/api/server-server/definitions/unlimited_pdu_transaction.yaml b/data/api/server-server/definitions/unlimited_pdu_transaction.yaml
similarity index 100%
rename from api/server-server/definitions/unlimited_pdu_transaction.yaml
rename to data/api/server-server/definitions/unlimited_pdu_transaction.yaml
diff --git a/api/server-server/definitions/unsigned_pdu.yaml b/data/api/server-server/definitions/unsigned_pdu.yaml
similarity index 100%
rename from api/server-server/definitions/unsigned_pdu.yaml
rename to data/api/server-server/definitions/unsigned_pdu.yaml
diff --git a/api/server-server/definitions/unsigned_pdu_base.yaml b/data/api/server-server/definitions/unsigned_pdu_base.yaml
similarity index 100%
rename from api/server-server/definitions/unsigned_pdu_base.yaml
rename to data/api/server-server/definitions/unsigned_pdu_base.yaml
diff --git a/api/server-server/event_auth.yaml b/data/api/server-server/event_auth.yaml
similarity index 100%
rename from api/server-server/event_auth.yaml
rename to data/api/server-server/event_auth.yaml
diff --git a/api/server-server/events.yaml b/data/api/server-server/events.yaml
similarity index 100%
rename from api/server-server/events.yaml
rename to data/api/server-server/events.yaml
diff --git a/api/server-server/examples/edu.json b/data/api/server-server/examples/edu.json
similarity index 100%
rename from api/server-server/examples/edu.json
rename to data/api/server-server/examples/edu.json
diff --git a/api/server-server/examples/minimal_pdu.json b/data/api/server-server/examples/minimal_pdu.json
similarity index 100%
rename from api/server-server/examples/minimal_pdu.json
rename to data/api/server-server/examples/minimal_pdu.json
diff --git a/api/server-server/examples/pdu.json b/data/api/server-server/examples/pdu.json
similarity index 100%
rename from api/server-server/examples/pdu.json
rename to data/api/server-server/examples/pdu.json
diff --git a/api/server-server/examples/pdu_v3.json b/data/api/server-server/examples/pdu_v3.json
similarity index 100%
rename from api/server-server/examples/pdu_v3.json
rename to data/api/server-server/examples/pdu_v3.json
diff --git a/api/server-server/examples/pdu_v4.json b/data/api/server-server/examples/pdu_v4.json
similarity index 100%
rename from api/server-server/examples/pdu_v4.json
rename to data/api/server-server/examples/pdu_v4.json
diff --git a/api/server-server/examples/server_key.json b/data/api/server-server/examples/server_key.json
similarity index 100%
rename from api/server-server/examples/server_key.json
rename to data/api/server-server/examples/server_key.json
diff --git a/api/server-server/examples/server_key_notary_signed.json b/data/api/server-server/examples/server_key_notary_signed.json
similarity index 100%
rename from api/server-server/examples/server_key_notary_signed.json
rename to data/api/server-server/examples/server_key_notary_signed.json
diff --git a/api/server-server/examples/transaction.json b/data/api/server-server/examples/transaction.json
similarity index 100%
rename from api/server-server/examples/transaction.json
rename to data/api/server-server/examples/transaction.json
diff --git a/api/server-server/examples/unsigned_pdu.json b/data/api/server-server/examples/unsigned_pdu.json
similarity index 100%
rename from api/server-server/examples/unsigned_pdu.json
rename to data/api/server-server/examples/unsigned_pdu.json
diff --git a/api/server-server/examples/unsigned_pdu_base.json b/data/api/server-server/examples/unsigned_pdu_base.json
similarity index 100%
rename from api/server-server/examples/unsigned_pdu_base.json
rename to data/api/server-server/examples/unsigned_pdu_base.json
diff --git a/api/server-server/invites-v1.yaml b/data/api/server-server/invites-v1.yaml
similarity index 98%
rename from api/server-server/invites-v1.yaml
rename to data/api/server-server/invites-v1.yaml
index c62d8e3d..c054bdd5 100644
--- a/api/server-server/invites-v1.yaml
+++ b/data/api/server-server/invites-v1.yaml
@@ -135,7 +135,7 @@ paths:
                   "sender": "@someone:example.org",
                   "unsigned": {
                     "invite_room_state": {
-                      "$ref": "../../../event-schemas/examples/invite_room_state.json"
+                      "$ref": "../../event-schemas/examples/invite_room_state.json"
                     }
                   },
                   "content": {
diff --git a/api/server-server/invites-v2.yaml b/data/api/server-server/invites-v2.yaml
similarity index 98%
rename from api/server-server/invites-v2.yaml
rename to data/api/server-server/invites-v2.yaml
index cae14bb4..28cbccca 100644
--- a/api/server-server/invites-v2.yaml
+++ b/data/api/server-server/invites-v2.yaml
@@ -131,7 +131,7 @@ paths:
                 "sender": "@someone:example.org",
                 "unsigned": {
                   "invite_room_state": {
-                    "$ref": "../../../event-schemas/examples/invite_room_state.json"
+                    "$ref": "../../event-schemas/examples/invite_room_state.json"
                   }
                 },
                 "content": {
diff --git a/api/server-server/joins-v1.yaml b/data/api/server-server/joins-v1.yaml
similarity index 100%
rename from api/server-server/joins-v1.yaml
rename to data/api/server-server/joins-v1.yaml
diff --git a/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml
similarity index 100%
rename from api/server-server/joins-v2.yaml
rename to data/api/server-server/joins-v2.yaml
diff --git a/api/server-server/keys_query.yaml b/data/api/server-server/keys_query.yaml
similarity index 100%
rename from api/server-server/keys_query.yaml
rename to data/api/server-server/keys_query.yaml
diff --git a/api/server-server/keys_server.yaml b/data/api/server-server/keys_server.yaml
similarity index 100%
rename from api/server-server/keys_server.yaml
rename to data/api/server-server/keys_server.yaml
diff --git a/api/server-server/leaving-v1.yaml b/data/api/server-server/leaving-v1.yaml
similarity index 100%
rename from api/server-server/leaving-v1.yaml
rename to data/api/server-server/leaving-v1.yaml
diff --git a/api/server-server/leaving-v2.yaml b/data/api/server-server/leaving-v2.yaml
similarity index 100%
rename from api/server-server/leaving-v2.yaml
rename to data/api/server-server/leaving-v2.yaml
diff --git a/api/server-server/openid.yaml b/data/api/server-server/openid.yaml
similarity index 100%
rename from api/server-server/openid.yaml
rename to data/api/server-server/openid.yaml
diff --git a/api/server-server/public_rooms.yaml b/data/api/server-server/public_rooms.yaml
similarity index 100%
rename from api/server-server/public_rooms.yaml
rename to data/api/server-server/public_rooms.yaml
diff --git a/api/server-server/query.yaml b/data/api/server-server/query.yaml
similarity index 100%
rename from api/server-server/query.yaml
rename to data/api/server-server/query.yaml
diff --git a/api/server-server/third_party_invite.yaml b/data/api/server-server/third_party_invite.yaml
similarity index 100%
rename from api/server-server/third_party_invite.yaml
rename to data/api/server-server/third_party_invite.yaml
diff --git a/api/server-server/transactions.yaml b/data/api/server-server/transactions.yaml
similarity index 100%
rename from api/server-server/transactions.yaml
rename to data/api/server-server/transactions.yaml
diff --git a/api/server-server/user_devices.yaml b/data/api/server-server/user_devices.yaml
similarity index 100%
rename from api/server-server/user_devices.yaml
rename to data/api/server-server/user_devices.yaml
diff --git a/api/server-server/user_keys.yaml b/data/api/server-server/user_keys.yaml
similarity index 100%
rename from api/server-server/user_keys.yaml
rename to data/api/server-server/user_keys.yaml
diff --git a/api/server-server/version.yaml b/data/api/server-server/version.yaml
similarity index 100%
rename from api/server-server/version.yaml
rename to data/api/server-server/version.yaml
diff --git a/api/server-server/wellknown.yaml b/data/api/server-server/wellknown.yaml
similarity index 100%
rename from api/server-server/wellknown.yaml
rename to data/api/server-server/wellknown.yaml
diff --git a/event-schemas/examples/core/event.json b/data/event-schemas/examples/core/event.json
similarity index 100%
rename from event-schemas/examples/core/event.json
rename to data/event-schemas/examples/core/event.json
diff --git a/event-schemas/examples/core/room_edu.json b/data/event-schemas/examples/core/room_edu.json
similarity index 100%
rename from event-schemas/examples/core/room_edu.json
rename to data/event-schemas/examples/core/room_edu.json
diff --git a/event-schemas/examples/core/room_event.json b/data/event-schemas/examples/core/room_event.json
similarity index 100%
rename from event-schemas/examples/core/room_event.json
rename to data/event-schemas/examples/core/room_event.json
diff --git a/event-schemas/examples/core/state_event.json b/data/event-schemas/examples/core/state_event.json
similarity index 100%
rename from event-schemas/examples/core/state_event.json
rename to data/event-schemas/examples/core/state_event.json
diff --git a/event-schemas/examples/invite_room_state.json b/data/event-schemas/examples/invite_room_state.json
similarity index 100%
rename from event-schemas/examples/invite_room_state.json
rename to data/event-schemas/examples/invite_room_state.json
diff --git a/event-schemas/examples/m.accepted_terms b/data/event-schemas/examples/m.accepted_terms.yaml
similarity index 100%
rename from event-schemas/examples/m.accepted_terms
rename to data/event-schemas/examples/m.accepted_terms.yaml
diff --git a/event-schemas/examples/m.call.answer b/data/event-schemas/examples/m.call.answer.yaml
similarity index 100%
rename from event-schemas/examples/m.call.answer
rename to data/event-schemas/examples/m.call.answer.yaml
diff --git a/event-schemas/examples/m.call.candidates b/data/event-schemas/examples/m.call.candidates.yaml
similarity index 100%
rename from event-schemas/examples/m.call.candidates
rename to data/event-schemas/examples/m.call.candidates.yaml
diff --git a/event-schemas/examples/m.call.hangup b/data/event-schemas/examples/m.call.hangup.yaml
similarity index 100%
rename from event-schemas/examples/m.call.hangup
rename to data/event-schemas/examples/m.call.hangup.yaml
diff --git a/event-schemas/examples/m.call.invite b/data/event-schemas/examples/m.call.invite.yaml
similarity index 100%
rename from event-schemas/examples/m.call.invite
rename to data/event-schemas/examples/m.call.invite.yaml
diff --git a/event-schemas/examples/m.direct b/data/event-schemas/examples/m.direct.yaml
similarity index 100%
rename from event-schemas/examples/m.direct
rename to data/event-schemas/examples/m.direct.yaml
diff --git a/event-schemas/examples/m.dummy b/data/event-schemas/examples/m.dummy.yaml
similarity index 100%
rename from event-schemas/examples/m.dummy
rename to data/event-schemas/examples/m.dummy.yaml
diff --git a/event-schemas/examples/m.forwarded_room_key b/data/event-schemas/examples/m.forwarded_room_key.yaml
similarity index 100%
rename from event-schemas/examples/m.forwarded_room_key
rename to data/event-schemas/examples/m.forwarded_room_key.yaml
diff --git a/event-schemas/examples/m.fully_read b/data/event-schemas/examples/m.fully_read.yaml
similarity index 100%
rename from event-schemas/examples/m.fully_read
rename to data/event-schemas/examples/m.fully_read.yaml
diff --git a/event-schemas/examples/m.identity_server b/data/event-schemas/examples/m.identity_server.yaml
similarity index 100%
rename from event-schemas/examples/m.identity_server
rename to data/event-schemas/examples/m.identity_server.yaml
diff --git a/event-schemas/examples/m.ignored_user_list b/data/event-schemas/examples/m.ignored_user_list.yaml
similarity index 100%
rename from event-schemas/examples/m.ignored_user_list
rename to data/event-schemas/examples/m.ignored_user_list.yaml
diff --git a/event-schemas/examples/m.key.verification.accept b/data/event-schemas/examples/m.key.verification.accept.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.accept
rename to data/event-schemas/examples/m.key.verification.accept.yaml
diff --git a/event-schemas/examples/m.key.verification.cancel b/data/event-schemas/examples/m.key.verification.cancel.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.cancel
rename to data/event-schemas/examples/m.key.verification.cancel.yaml
diff --git a/event-schemas/examples/m.key.verification.key b/data/event-schemas/examples/m.key.verification.key.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.key
rename to data/event-schemas/examples/m.key.verification.key.yaml
diff --git a/event-schemas/examples/m.key.verification.mac b/data/event-schemas/examples/m.key.verification.mac.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.mac
rename to data/event-schemas/examples/m.key.verification.mac.yaml
diff --git a/event-schemas/examples/m.key.verification.request b/data/event-schemas/examples/m.key.verification.request.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.request
rename to data/event-schemas/examples/m.key.verification.request.yaml
diff --git a/event-schemas/examples/m.key.verification.start$m.sas.v1 b/data/event-schemas/examples/m.key.verification.start$m.sas.v1.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.start$m.sas.v1
rename to data/event-schemas/examples/m.key.verification.start$m.sas.v1.yaml
diff --git a/event-schemas/examples/m.key.verification.start b/data/event-schemas/examples/m.key.verification.start.yaml
similarity index 100%
rename from event-schemas/examples/m.key.verification.start
rename to data/event-schemas/examples/m.key.verification.start.yaml
diff --git a/event-schemas/examples/m.policy.rule.room b/data/event-schemas/examples/m.policy.rule.room.yaml
similarity index 100%
rename from event-schemas/examples/m.policy.rule.room
rename to data/event-schemas/examples/m.policy.rule.room.yaml
diff --git a/event-schemas/examples/m.policy.rule.server b/data/event-schemas/examples/m.policy.rule.server.yaml
similarity index 100%
rename from event-schemas/examples/m.policy.rule.server
rename to data/event-schemas/examples/m.policy.rule.server.yaml
diff --git a/event-schemas/examples/m.policy.rule.user b/data/event-schemas/examples/m.policy.rule.user.yaml
similarity index 100%
rename from event-schemas/examples/m.policy.rule.user
rename to data/event-schemas/examples/m.policy.rule.user.yaml
diff --git a/event-schemas/examples/m.presence b/data/event-schemas/examples/m.presence.yaml
similarity index 100%
rename from event-schemas/examples/m.presence
rename to data/event-schemas/examples/m.presence.yaml
diff --git a/event-schemas/examples/m.push_rules b/data/event-schemas/examples/m.push_rules.yaml
similarity index 100%
rename from event-schemas/examples/m.push_rules
rename to data/event-schemas/examples/m.push_rules.yaml
diff --git a/event-schemas/examples/m.receipt b/data/event-schemas/examples/m.receipt.yaml
similarity index 100%
rename from event-schemas/examples/m.receipt
rename to data/event-schemas/examples/m.receipt.yaml
diff --git a/event-schemas/examples/m.room.avatar b/data/event-schemas/examples/m.room.avatar.yaml
similarity index 100%
rename from event-schemas/examples/m.room.avatar
rename to data/event-schemas/examples/m.room.avatar.yaml
diff --git a/event-schemas/examples/m.room.canonical_alias b/data/event-schemas/examples/m.room.canonical_alias.yaml
similarity index 100%
rename from event-schemas/examples/m.room.canonical_alias
rename to data/event-schemas/examples/m.room.canonical_alias.yaml
diff --git a/event-schemas/examples/m.room.create b/data/event-schemas/examples/m.room.create.yaml
similarity index 100%
rename from event-schemas/examples/m.room.create
rename to data/event-schemas/examples/m.room.create.yaml
diff --git a/event-schemas/examples/m.room.encrypted$megolm b/data/event-schemas/examples/m.room.encrypted$megolm.yaml
similarity index 100%
rename from event-schemas/examples/m.room.encrypted$megolm
rename to data/event-schemas/examples/m.room.encrypted$megolm.yaml
diff --git a/event-schemas/examples/m.room.encrypted$olm b/data/event-schemas/examples/m.room.encrypted$olm.yaml
similarity index 100%
rename from event-schemas/examples/m.room.encrypted$olm
rename to data/event-schemas/examples/m.room.encrypted$olm.yaml
diff --git a/event-schemas/examples/m.room.encryption b/data/event-schemas/examples/m.room.encryption.yaml
similarity index 100%
rename from event-schemas/examples/m.room.encryption
rename to data/event-schemas/examples/m.room.encryption.yaml
diff --git a/event-schemas/examples/m.room.guest_access b/data/event-schemas/examples/m.room.guest_access.yaml
similarity index 100%
rename from event-schemas/examples/m.room.guest_access
rename to data/event-schemas/examples/m.room.guest_access.yaml
diff --git a/event-schemas/examples/m.room.history_visibility b/data/event-schemas/examples/m.room.history_visibility.yaml
similarity index 100%
rename from event-schemas/examples/m.room.history_visibility
rename to data/event-schemas/examples/m.room.history_visibility.yaml
diff --git a/event-schemas/examples/m.room.join_rules b/data/event-schemas/examples/m.room.join_rules.yaml
similarity index 100%
rename from event-schemas/examples/m.room.join_rules
rename to data/event-schemas/examples/m.room.join_rules.yaml
diff --git a/event-schemas/examples/m.room.member$invite_room_state b/data/event-schemas/examples/m.room.member$invite_room_state.yaml
similarity index 90%
rename from event-schemas/examples/m.room.member$invite_room_state
rename to data/event-schemas/examples/m.room.member$invite_room_state.yaml
index d2c465aa..38a4951c 100644
--- a/event-schemas/examples/m.room.member$invite_room_state
+++ b/data/event-schemas/examples/m.room.member$invite_room_state.yaml
@@ -1,5 +1,5 @@
 {
-  "$ref": "m.room.member",
+  "$ref": "m.room.member.yaml",
   "content": {
     "membership": "invite",
     "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
diff --git a/event-schemas/examples/m.room.member$third_party_invite b/data/event-schemas/examples/m.room.member$third_party_invite.yaml
similarity index 93%
rename from event-schemas/examples/m.room.member$third_party_invite
rename to data/event-schemas/examples/m.room.member$third_party_invite.yaml
index a40d44f9..ead4cbee 100644
--- a/event-schemas/examples/m.room.member$third_party_invite
+++ b/data/event-schemas/examples/m.room.member$third_party_invite.yaml
@@ -1,5 +1,5 @@
 {
-  "$ref": "m.room.member",
+  "$ref": "m.room.member.yaml",
   "content": {
     "membership": "invite",
     "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
diff --git a/event-schemas/examples/m.room.member b/data/event-schemas/examples/m.room.member.yaml
similarity index 100%
rename from event-schemas/examples/m.room.member
rename to data/event-schemas/examples/m.room.member.yaml
diff --git a/event-schemas/examples/m.room.message$m.audio b/data/event-schemas/examples/m.room.message$m.audio.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.audio
rename to data/event-schemas/examples/m.room.message$m.audio.yaml
diff --git a/event-schemas/examples/m.room.message$m.emote b/data/event-schemas/examples/m.room.message$m.emote.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.emote
rename to data/event-schemas/examples/m.room.message$m.emote.yaml
diff --git a/event-schemas/examples/m.room.message$m.file b/data/event-schemas/examples/m.room.message$m.file.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.file
rename to data/event-schemas/examples/m.room.message$m.file.yaml
diff --git a/event-schemas/examples/m.room.message$m.image b/data/event-schemas/examples/m.room.message$m.image.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.image
rename to data/event-schemas/examples/m.room.message$m.image.yaml
diff --git a/event-schemas/examples/m.room.message$m.location b/data/event-schemas/examples/m.room.message$m.location.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.location
rename to data/event-schemas/examples/m.room.message$m.location.yaml
diff --git a/event-schemas/examples/m.room.message$m.notice b/data/event-schemas/examples/m.room.message$m.notice.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.notice
rename to data/event-schemas/examples/m.room.message$m.notice.yaml
diff --git a/event-schemas/examples/m.room.message$m.server_notice b/data/event-schemas/examples/m.room.message$m.server_notice.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.server_notice
rename to data/event-schemas/examples/m.room.message$m.server_notice.yaml
diff --git a/event-schemas/examples/m.room.message$m.text b/data/event-schemas/examples/m.room.message$m.text.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.text
rename to data/event-schemas/examples/m.room.message$m.text.yaml
diff --git a/event-schemas/examples/m.room.message$m.video b/data/event-schemas/examples/m.room.message$m.video.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message$m.video
rename to data/event-schemas/examples/m.room.message$m.video.yaml
diff --git a/event-schemas/examples/m.room.message.feedback b/data/event-schemas/examples/m.room.message.feedback.yaml
similarity index 100%
rename from event-schemas/examples/m.room.message.feedback
rename to data/event-schemas/examples/m.room.message.feedback.yaml
diff --git a/event-schemas/examples/m.room.name b/data/event-schemas/examples/m.room.name.yaml
similarity index 100%
rename from event-schemas/examples/m.room.name
rename to data/event-schemas/examples/m.room.name.yaml
diff --git a/event-schemas/examples/m.room.pinned_events b/data/event-schemas/examples/m.room.pinned_events.yaml
similarity index 100%
rename from event-schemas/examples/m.room.pinned_events
rename to data/event-schemas/examples/m.room.pinned_events.yaml
diff --git a/event-schemas/examples/m.room.power_levels b/data/event-schemas/examples/m.room.power_levels.yaml
similarity index 100%
rename from event-schemas/examples/m.room.power_levels
rename to data/event-schemas/examples/m.room.power_levels.yaml
diff --git a/event-schemas/examples/m.room.redaction b/data/event-schemas/examples/m.room.redaction.yaml
similarity index 100%
rename from event-schemas/examples/m.room.redaction
rename to data/event-schemas/examples/m.room.redaction.yaml
diff --git a/event-schemas/examples/m.room.server_acl b/data/event-schemas/examples/m.room.server_acl.yaml
similarity index 100%
rename from event-schemas/examples/m.room.server_acl
rename to data/event-schemas/examples/m.room.server_acl.yaml
diff --git a/event-schemas/examples/m.room.third_party_invite b/data/event-schemas/examples/m.room.third_party_invite.yaml
similarity index 100%
rename from event-schemas/examples/m.room.third_party_invite
rename to data/event-schemas/examples/m.room.third_party_invite.yaml
diff --git a/event-schemas/examples/m.room.tombstone b/data/event-schemas/examples/m.room.tombstone.yaml
similarity index 100%
rename from event-schemas/examples/m.room.tombstone
rename to data/event-schemas/examples/m.room.tombstone.yaml
diff --git a/event-schemas/examples/m.room.topic b/data/event-schemas/examples/m.room.topic.yaml
similarity index 100%
rename from event-schemas/examples/m.room.topic
rename to data/event-schemas/examples/m.room.topic.yaml
diff --git a/event-schemas/examples/m.room_key.withheld b/data/event-schemas/examples/m.room_key.withheld.yaml
similarity index 100%
rename from event-schemas/examples/m.room_key.withheld
rename to data/event-schemas/examples/m.room_key.withheld.yaml
diff --git a/event-schemas/examples/m.room_key b/data/event-schemas/examples/m.room_key.yaml
similarity index 100%
rename from event-schemas/examples/m.room_key
rename to data/event-schemas/examples/m.room_key.yaml
diff --git a/event-schemas/examples/m.room_key_request$cancel_request b/data/event-schemas/examples/m.room_key_request$cancel_request.yaml
similarity index 100%
rename from event-schemas/examples/m.room_key_request$cancel_request
rename to data/event-schemas/examples/m.room_key_request$cancel_request.yaml
diff --git a/event-schemas/examples/m.room_key_request$request b/data/event-schemas/examples/m.room_key_request$request.yaml
similarity index 100%
rename from event-schemas/examples/m.room_key_request$request
rename to data/event-schemas/examples/m.room_key_request$request.yaml
diff --git a/event-schemas/examples/m.sticker b/data/event-schemas/examples/m.sticker.yaml
similarity index 100%
rename from event-schemas/examples/m.sticker
rename to data/event-schemas/examples/m.sticker.yaml
diff --git a/event-schemas/examples/m.tag b/data/event-schemas/examples/m.tag.yaml
similarity index 100%
rename from event-schemas/examples/m.tag
rename to data/event-schemas/examples/m.tag.yaml
diff --git a/event-schemas/examples/m.typing b/data/event-schemas/examples/m.typing.yaml
similarity index 100%
rename from event-schemas/examples/m.typing
rename to data/event-schemas/examples/m.typing.yaml
diff --git a/event-schemas/moderation_policy_rule.yaml b/data/event-schemas/moderation_policy_rule.yaml
similarity index 100%
rename from event-schemas/moderation_policy_rule.yaml
rename to data/event-schemas/moderation_policy_rule.yaml
diff --git a/event-schemas/schema/core-event-schema/event.yaml b/data/event-schemas/schema/core-event-schema/event.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/event.yaml
rename to data/event-schemas/schema/core-event-schema/event.yaml
diff --git a/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml b/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
rename to data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
diff --git a/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml b/data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
rename to data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
diff --git a/event-schemas/schema/core-event-schema/room_event.yaml b/data/event-schemas/schema/core-event-schema/room_event.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/room_event.yaml
rename to data/event-schemas/schema/core-event-schema/room_event.yaml
diff --git a/event-schemas/schema/core-event-schema/state_event.yaml b/data/event-schemas/schema/core-event-schema/state_event.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/state_event.yaml
rename to data/event-schemas/schema/core-event-schema/state_event.yaml
diff --git a/event-schemas/schema/core-event-schema/sync_room_event.yaml b/data/event-schemas/schema/core-event-schema/sync_room_event.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/sync_room_event.yaml
rename to data/event-schemas/schema/core-event-schema/sync_room_event.yaml
diff --git a/event-schemas/schema/core-event-schema/sync_state_event.yaml b/data/event-schemas/schema/core-event-schema/sync_state_event.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/sync_state_event.yaml
rename to data/event-schemas/schema/core-event-schema/sync_state_event.yaml
diff --git a/event-schemas/schema/core-event-schema/unsigned_prop.yaml b/data/event-schemas/schema/core-event-schema/unsigned_prop.yaml
similarity index 100%
rename from event-schemas/schema/core-event-schema/unsigned_prop.yaml
rename to data/event-schemas/schema/core-event-schema/unsigned_prop.yaml
diff --git a/event-schemas/schema/m.accepted_terms b/data/event-schemas/schema/m.accepted_terms.yaml
similarity index 100%
rename from event-schemas/schema/m.accepted_terms
rename to data/event-schemas/schema/m.accepted_terms.yaml
diff --git a/event-schemas/schema/m.call.answer b/data/event-schemas/schema/m.call.answer.yaml
similarity index 100%
rename from event-schemas/schema/m.call.answer
rename to data/event-schemas/schema/m.call.answer.yaml
diff --git a/event-schemas/schema/m.call.candidates b/data/event-schemas/schema/m.call.candidates.yaml
similarity index 100%
rename from event-schemas/schema/m.call.candidates
rename to data/event-schemas/schema/m.call.candidates.yaml
diff --git a/event-schemas/schema/m.call.hangup b/data/event-schemas/schema/m.call.hangup.yaml
similarity index 100%
rename from event-schemas/schema/m.call.hangup
rename to data/event-schemas/schema/m.call.hangup.yaml
diff --git a/event-schemas/schema/m.call.invite b/data/event-schemas/schema/m.call.invite.yaml
similarity index 100%
rename from event-schemas/schema/m.call.invite
rename to data/event-schemas/schema/m.call.invite.yaml
diff --git a/event-schemas/schema/m.direct b/data/event-schemas/schema/m.direct.yaml
similarity index 100%
rename from event-schemas/schema/m.direct
rename to data/event-schemas/schema/m.direct.yaml
diff --git a/event-schemas/schema/m.dummy b/data/event-schemas/schema/m.dummy.yaml
similarity index 100%
rename from event-schemas/schema/m.dummy
rename to data/event-schemas/schema/m.dummy.yaml
diff --git a/event-schemas/schema/m.forwarded_room_key b/data/event-schemas/schema/m.forwarded_room_key.yaml
similarity index 100%
rename from event-schemas/schema/m.forwarded_room_key
rename to data/event-schemas/schema/m.forwarded_room_key.yaml
diff --git a/event-schemas/schema/m.fully_read b/data/event-schemas/schema/m.fully_read.yaml
similarity index 100%
rename from event-schemas/schema/m.fully_read
rename to data/event-schemas/schema/m.fully_read.yaml
diff --git a/event-schemas/schema/m.identity_server b/data/event-schemas/schema/m.identity_server.yaml
similarity index 100%
rename from event-schemas/schema/m.identity_server
rename to data/event-schemas/schema/m.identity_server.yaml
diff --git a/event-schemas/schema/m.ignored_user_list b/data/event-schemas/schema/m.ignored_user_list.yaml
similarity index 100%
rename from event-schemas/schema/m.ignored_user_list
rename to data/event-schemas/schema/m.ignored_user_list.yaml
diff --git a/event-schemas/schema/m.key.verification.accept b/data/event-schemas/schema/m.key.verification.accept.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.accept
rename to data/event-schemas/schema/m.key.verification.accept.yaml
diff --git a/event-schemas/schema/m.key.verification.cancel b/data/event-schemas/schema/m.key.verification.cancel.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.cancel
rename to data/event-schemas/schema/m.key.verification.cancel.yaml
diff --git a/event-schemas/schema/m.key.verification.key b/data/event-schemas/schema/m.key.verification.key.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.key
rename to data/event-schemas/schema/m.key.verification.key.yaml
diff --git a/event-schemas/schema/m.key.verification.mac b/data/event-schemas/schema/m.key.verification.mac.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.mac
rename to data/event-schemas/schema/m.key.verification.mac.yaml
diff --git a/event-schemas/schema/m.key.verification.request b/data/event-schemas/schema/m.key.verification.request.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.request
rename to data/event-schemas/schema/m.key.verification.request.yaml
diff --git a/event-schemas/schema/m.key.verification.start$m.sas.v1 b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.start$m.sas.v1
rename to data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
diff --git a/event-schemas/schema/m.key.verification.start b/data/event-schemas/schema/m.key.verification.start.yaml
similarity index 100%
rename from event-schemas/schema/m.key.verification.start
rename to data/event-schemas/schema/m.key.verification.start.yaml
diff --git a/event-schemas/schema/m.policy.rule.room b/data/event-schemas/schema/m.policy.rule.room.yaml
similarity index 100%
rename from event-schemas/schema/m.policy.rule.room
rename to data/event-schemas/schema/m.policy.rule.room.yaml
diff --git a/event-schemas/schema/m.policy.rule.server b/data/event-schemas/schema/m.policy.rule.server.yaml
similarity index 100%
rename from event-schemas/schema/m.policy.rule.server
rename to data/event-schemas/schema/m.policy.rule.server.yaml
diff --git a/event-schemas/schema/m.policy.rule.user b/data/event-schemas/schema/m.policy.rule.user.yaml
similarity index 100%
rename from event-schemas/schema/m.policy.rule.user
rename to data/event-schemas/schema/m.policy.rule.user.yaml
diff --git a/event-schemas/schema/m.presence b/data/event-schemas/schema/m.presence.yaml
similarity index 100%
rename from event-schemas/schema/m.presence
rename to data/event-schemas/schema/m.presence.yaml
diff --git a/event-schemas/schema/m.push_rules b/data/event-schemas/schema/m.push_rules.yaml
similarity index 100%
rename from event-schemas/schema/m.push_rules
rename to data/event-schemas/schema/m.push_rules.yaml
diff --git a/event-schemas/schema/m.receipt b/data/event-schemas/schema/m.receipt.yaml
similarity index 100%
rename from event-schemas/schema/m.receipt
rename to data/event-schemas/schema/m.receipt.yaml
diff --git a/event-schemas/schema/m.room.avatar b/data/event-schemas/schema/m.room.avatar.yaml
similarity index 100%
rename from event-schemas/schema/m.room.avatar
rename to data/event-schemas/schema/m.room.avatar.yaml
diff --git a/event-schemas/schema/m.room.canonical_alias b/data/event-schemas/schema/m.room.canonical_alias.yaml
similarity index 100%
rename from event-schemas/schema/m.room.canonical_alias
rename to data/event-schemas/schema/m.room.canonical_alias.yaml
diff --git a/event-schemas/schema/m.room.create b/data/event-schemas/schema/m.room.create.yaml
similarity index 100%
rename from event-schemas/schema/m.room.create
rename to data/event-schemas/schema/m.room.create.yaml
diff --git a/event-schemas/schema/m.room.encrypted b/data/event-schemas/schema/m.room.encrypted.yaml
similarity index 100%
rename from event-schemas/schema/m.room.encrypted
rename to data/event-schemas/schema/m.room.encrypted.yaml
diff --git a/event-schemas/schema/m.room.encryption b/data/event-schemas/schema/m.room.encryption.yaml
similarity index 100%
rename from event-schemas/schema/m.room.encryption
rename to data/event-schemas/schema/m.room.encryption.yaml
diff --git a/event-schemas/schema/m.room.guest_access b/data/event-schemas/schema/m.room.guest_access.yaml
similarity index 100%
rename from event-schemas/schema/m.room.guest_access
rename to data/event-schemas/schema/m.room.guest_access.yaml
diff --git a/event-schemas/schema/m.room.history_visibility b/data/event-schemas/schema/m.room.history_visibility.yaml
similarity index 100%
rename from event-schemas/schema/m.room.history_visibility
rename to data/event-schemas/schema/m.room.history_visibility.yaml
diff --git a/event-schemas/schema/m.room.join_rules b/data/event-schemas/schema/m.room.join_rules.yaml
similarity index 100%
rename from event-schemas/schema/m.room.join_rules
rename to data/event-schemas/schema/m.room.join_rules.yaml
diff --git a/event-schemas/schema/m.room.member b/data/event-schemas/schema/m.room.member.yaml
similarity index 100%
rename from event-schemas/schema/m.room.member
rename to data/event-schemas/schema/m.room.member.yaml
diff --git a/event-schemas/schema/m.room.message$m.audio b/data/event-schemas/schema/m.room.message$m.audio.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.audio
rename to data/event-schemas/schema/m.room.message$m.audio.yaml
diff --git a/event-schemas/schema/m.room.message$m.emote b/data/event-schemas/schema/m.room.message$m.emote.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.emote
rename to data/event-schemas/schema/m.room.message$m.emote.yaml
diff --git a/event-schemas/schema/m.room.message$m.file b/data/event-schemas/schema/m.room.message$m.file.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.file
rename to data/event-schemas/schema/m.room.message$m.file.yaml
diff --git a/event-schemas/schema/m.room.message$m.image b/data/event-schemas/schema/m.room.message$m.image.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.image
rename to data/event-schemas/schema/m.room.message$m.image.yaml
diff --git a/event-schemas/schema/m.room.message$m.location b/data/event-schemas/schema/m.room.message$m.location.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.location
rename to data/event-schemas/schema/m.room.message$m.location.yaml
diff --git a/event-schemas/schema/m.room.message$m.notice b/data/event-schemas/schema/m.room.message$m.notice.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.notice
rename to data/event-schemas/schema/m.room.message$m.notice.yaml
diff --git a/event-schemas/schema/m.room.message$m.server_notice b/data/event-schemas/schema/m.room.message$m.server_notice.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.server_notice
rename to data/event-schemas/schema/m.room.message$m.server_notice.yaml
diff --git a/event-schemas/schema/m.room.message$m.text b/data/event-schemas/schema/m.room.message$m.text.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.text
rename to data/event-schemas/schema/m.room.message$m.text.yaml
diff --git a/event-schemas/schema/m.room.message$m.video b/data/event-schemas/schema/m.room.message$m.video.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message$m.video
rename to data/event-schemas/schema/m.room.message$m.video.yaml
diff --git a/event-schemas/schema/m.room.message.feedback b/data/event-schemas/schema/m.room.message.feedback.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message.feedback
rename to data/event-schemas/schema/m.room.message.feedback.yaml
diff --git a/event-schemas/schema/m.room.message b/data/event-schemas/schema/m.room.message.yaml
similarity index 100%
rename from event-schemas/schema/m.room.message
rename to data/event-schemas/schema/m.room.message.yaml
diff --git a/event-schemas/schema/m.room.name b/data/event-schemas/schema/m.room.name.yaml
similarity index 100%
rename from event-schemas/schema/m.room.name
rename to data/event-schemas/schema/m.room.name.yaml
diff --git a/event-schemas/schema/m.room.pinned_events b/data/event-schemas/schema/m.room.pinned_events.yaml
similarity index 100%
rename from event-schemas/schema/m.room.pinned_events
rename to data/event-schemas/schema/m.room.pinned_events.yaml
diff --git a/event-schemas/schema/m.room.power_levels b/data/event-schemas/schema/m.room.power_levels.yaml
similarity index 100%
rename from event-schemas/schema/m.room.power_levels
rename to data/event-schemas/schema/m.room.power_levels.yaml
diff --git a/event-schemas/schema/m.room.redaction b/data/event-schemas/schema/m.room.redaction.yaml
similarity index 100%
rename from event-schemas/schema/m.room.redaction
rename to data/event-schemas/schema/m.room.redaction.yaml
diff --git a/event-schemas/schema/m.room.server_acl b/data/event-schemas/schema/m.room.server_acl.yaml
similarity index 100%
rename from event-schemas/schema/m.room.server_acl
rename to data/event-schemas/schema/m.room.server_acl.yaml
diff --git a/event-schemas/schema/m.room.third_party_invite b/data/event-schemas/schema/m.room.third_party_invite.yaml
similarity index 100%
rename from event-schemas/schema/m.room.third_party_invite
rename to data/event-schemas/schema/m.room.third_party_invite.yaml
diff --git a/event-schemas/schema/m.room.tombstone b/data/event-schemas/schema/m.room.tombstone.yaml
similarity index 100%
rename from event-schemas/schema/m.room.tombstone
rename to data/event-schemas/schema/m.room.tombstone.yaml
diff --git a/event-schemas/schema/m.room.topic b/data/event-schemas/schema/m.room.topic.yaml
similarity index 100%
rename from event-schemas/schema/m.room.topic
rename to data/event-schemas/schema/m.room.topic.yaml
diff --git a/event-schemas/schema/m.room_key.withheld b/data/event-schemas/schema/m.room_key.withheld.yaml
similarity index 100%
rename from event-schemas/schema/m.room_key.withheld
rename to data/event-schemas/schema/m.room_key.withheld.yaml
diff --git a/event-schemas/schema/m.room_key b/data/event-schemas/schema/m.room_key.yaml
similarity index 100%
rename from event-schemas/schema/m.room_key
rename to data/event-schemas/schema/m.room_key.yaml
diff --git a/event-schemas/schema/m.room_key_request b/data/event-schemas/schema/m.room_key_request.yaml
similarity index 100%
rename from event-schemas/schema/m.room_key_request
rename to data/event-schemas/schema/m.room_key_request.yaml
diff --git a/event-schemas/schema/m.sticker b/data/event-schemas/schema/m.sticker.yaml
similarity index 100%
rename from event-schemas/schema/m.sticker
rename to data/event-schemas/schema/m.sticker.yaml
diff --git a/event-schemas/schema/m.tag b/data/event-schemas/schema/m.tag.yaml
similarity index 100%
rename from event-schemas/schema/m.tag
rename to data/event-schemas/schema/m.tag.yaml
diff --git a/event-schemas/schema/m.typing b/data/event-schemas/schema/m.typing.yaml
similarity index 100%
rename from event-schemas/schema/m.typing
rename to data/event-schemas/schema/m.typing.yaml
diff --git a/event-schemas/schema/stripped_state.yaml b/data/event-schemas/schema/stripped_state.yaml
similarity index 100%
rename from event-schemas/schema/stripped_state.yaml
rename to data/event-schemas/schema/stripped_state.yaml
diff --git a/schemas/server-signatures.yaml b/data/schemas/server-signatures.yaml
similarity index 100%
rename from schemas/server-signatures.yaml
rename to data/schemas/server-signatures.yaml
diff --git a/event-schemas/README.md b/event-schemas/README.md
deleted file mode 100644
index c833b9c3..00000000
--- a/event-schemas/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Checking the event schemas
-==========================
-
-To validate the event schemas, and check the example events, run
-
-   ./check-examples.py
diff --git a/api/openapi_extensions.md b/openapi_extensions.md
similarity index 100%
rename from api/openapi_extensions.md
rename to openapi_extensions.md
diff --git a/scripts/check-event-schema-examples.py b/scripts/check-event-schema-examples.py
index 50f9de7b..0eca7abf 100755
--- a/scripts/check-event-schema-examples.py
+++ b/scripts/check-event-schema-examples.py
@@ -117,6 +117,11 @@ def check_example_dir(exampledir, schemadir):
             schemapath = examplepath.replace(exampledir, schemadir)
             if schemapath.find("$") >= 0:
                 schemapath = schemapath[:schemapath.find("$")]
+            # Automatically correct for file extension being stripped off
+            if not schemapath.endswith(".yaml"):
+                schemapath += ".yaml"
+            if not examplepath.endswith(".yaml"):
+                examplepath += ".yaml"
             try:
                 check_example_file(examplepath, schemapath)
             except Exception as e:
@@ -132,8 +137,8 @@ if __name__ == '__main__':
     script_directory = os.path.dirname(os.path.realpath(__file__))
 
     # Resolve the directories to check, relative to the script path
-    examples_directory = os.path.join(script_directory, "../event-schemas/examples")
-    schema_directory = os.path.join(script_directory, "../event-schemas/schema")
+    examples_directory = os.path.join(script_directory, "../data/event-schemas/examples")
+    schema_directory = os.path.join(script_directory, "../data/event-schemas/schema")
 
     try:
         check_example_dir(examples_directory, schema_directory)

From c7cf90abfa1e7805d37d90c8d07b86f2f4f5475f Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Wed, 27 Jan 2021 10:44:02 -0800
Subject: [PATCH 05/19] Remove RST alert directives, replace with simple
 Markdown formatting

---
 .../client-server/administrative_contact.yaml | 10 ++---
 data/api/client-server/content-repo.yaml      | 10 ++---
 data/api/client-server/directory.yaml         | 20 +++++-----
 data/api/server-server/backfill.yaml          | 12 +++---
 data/api/server-server/invites-v2.yaml        |  6 +--
 data/api/server-server/joins-v1.yaml          |  7 ++--
 data/api/server-server/joins-v2.yaml          |  6 +--
 data/api/server-server/leaving-v1.yaml        |  5 +--
 data/api/server-server/leaving-v2.yaml        |  6 +--
 .../schema/m.room.power_levels.yaml           | 16 ++++----
 .../schema/m.room.server_acl.yaml             | 40 +++++++++----------
 11 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/data/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml
index f8cdf5a0..61f9e8eb 100644
--- a/data/api/client-server/administrative_contact.yaml
+++ b/data/api/client-server/administrative_contact.yaml
@@ -96,11 +96,11 @@ paths:
         This endpoint is deprecated in favour of the more specific ``/3pid/add``
         and ``/3pid/bind`` endpoints.
 
-        .. Note::
-           Previously this endpoint supported a ``bind`` parameter. This parameter
-           has been removed, making this endpoint behave as though it was ``false``.
-           This results in this endpoint being an equivalent to ``/3pid/bind`` rather
-           than dual-purpose.
+        **Note:**
+        Previously this endpoint supported a ``bind`` parameter. This parameter
+        has been removed, making this endpoint behave as though it was ``false``.
+        This results in this endpoint being an equivalent to ``/3pid/bind`` rather
+        than dual-purpose.
       operationId: post3PIDs
       deprecated: true
       security:
diff --git a/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
index 38a739ec..b827e8d2 100644
--- a/data/api/client-server/content-repo.yaml
+++ b/data/api/client-server/content-repo.yaml
@@ -347,11 +347,11 @@ paths:
         Get information about a URL for the client. Typically this is called when a
         client sees a URL in a message and wants to render a preview for the user.
 
-        .. Note::
-          Clients should consider avoiding this endpoint for URLs posted in encrypted
-          rooms. Encrypted rooms often contain more sensitive information the users
-          do not want to share with the homeserver, and this can mean that the URLs
-          being shared should also not be shared with the homeserver.
+        **Note:**
+        Clients should consider avoiding this endpoint for URLs posted in encrypted
+        rooms. Encrypted rooms often contain more sensitive information the users
+        do not want to share with the homeserver, and this can mean that the URLs
+        being shared should also not be shared with the homeserver.
 
       operationId: getUrlPreview
       produces: ["application/json"]
diff --git a/data/api/client-server/directory.yaml b/data/api/client-server/directory.yaml
index 7a08faf2..f470c730 100644
--- a/data/api/client-server/directory.yaml
+++ b/data/api/client-server/directory.yaml
@@ -132,12 +132,12 @@ paths:
         Servers may choose to implement additional access control checks here, for instance that
         room aliases can only be deleted by their creator or a server administrator.
 
-        .. Note::
-           Servers may choose to update the ``alt_aliases`` for the ``m.room.canonical_alias``
-           state event in the room when an alias is removed. Servers which choose to update the
-           canonical alias event are recommended to, in addition to their other relevant permission
-           checks, delete the alias and return a successful response even if the user does not
-           have permission to update the ``m.room.canonical_alias`` event.
+        **Note:**
+        Servers may choose to update the ``alt_aliases`` for the ``m.room.canonical_alias``
+        state event in the room when an alias is removed. Servers which choose to update the
+        canonical alias event are recommended to, in addition to their other relevant permission
+        checks, delete the alias and return a successful response even if the user does not
+        have permission to update the ``m.room.canonical_alias`` event.
 
       operationId: deleteRoomAlias
       security:
@@ -184,10 +184,10 @@ paths:
         such as allowing server administrators to view aliases regardless of
         membership.
 
-        .. Note::
-           Clients are recommended not to display this list of aliases prominently
-           as they are not curated, unlike those listed in the ``m.room.canonical_alias``
-           state event.
+        **Note:**
+        Clients are recommended not to display this list of aliases prominently
+        as they are not curated, unlike those listed in the ``m.room.canonical_alias``
+        state event.
 
       operationId: getLocalAliases
       security:
diff --git a/data/api/server-server/backfill.yaml b/data/api/server-server/backfill.yaml
index 4bf62663..74067a80 100644
--- a/data/api/server-server/backfill.yaml
+++ b/data/api/server-server/backfill.yaml
@@ -64,13 +64,13 @@ paths:
             A transaction containing the PDUs that preceded the given event(s), including the given
             event(s), up to the given limit.
 
-            .. Note::
-               Though the PDU definitions require that ``prev_events`` and ``auth_events`` be limited
-               in number, the response of backfill MUST NOT be validated on these specific restrictions.
+            **Note:**
+            Though the PDU definitions require that ``prev_events`` and ``auth_events`` be limited
+            in number, the response of backfill MUST NOT be validated on these specific restrictions.
 
-               Due to historical reasons, it is possible that events which were previously accepted
-               would now be rejected by these limitations. The events should be rejected per usual by
-               the ``/send``, ``/get_missing_events``, and remaining endpoints.
+            Due to historical reasons, it is possible that events which were previously accepted
+            would now be rejected by these limitations. The events should be rejected per usual by
+            the ``/send``, ``/get_missing_events``, and remaining endpoints.
           schema:
             $ref: "definitions/unlimited_pdu_transaction.yaml"
   "/get_missing_events/{roomId}":
diff --git a/data/api/server-server/invites-v2.yaml b/data/api/server-server/invites-v2.yaml
index 28cbccca..58d32049 100644
--- a/data/api/server-server/invites-v2.yaml
+++ b/data/api/server-server/invites-v2.yaml
@@ -31,9 +31,9 @@ paths:
     put:
       summary: Invites a remote user to a room
       description: |-
-        .. Note::
-           This API is nearly identical to the v1 API with the exception of the request
-           body being different, and the response format fixed.
+        **Note:**
+        This API is nearly identical to the v1 API with the exception of the request
+        body being different, and the response format fixed.
 
         Invites a remote user to a room. Once the event has been  signed by both the inviting
         homeserver and the invited homeserver, it can be sent to all of the servers in the
diff --git a/data/api/server-server/joins-v1.yaml b/data/api/server-server/joins-v1.yaml
index d4fc8f24..e9654cd8 100644
--- a/data/api/server-server/joins-v1.yaml
+++ b/data/api/server-server/joins-v1.yaml
@@ -171,14 +171,13 @@ paths:
               "errcode": "M_NOT_FOUND",
               "error": "Unknown room",
             }
-  
+
   "/send_join/{roomId}/{eventId}":
     put:
       summary: Submit a signed join event to a resident server
       description: |-
-        .. Note::
-           Servers should instead prefer to use the v2 ``/send_join``
-           endpoint.
+        **Note:**
+        Servers should instead prefer to use the v2 ``/send_join`` endpoint.
 
         Submits a signed join event to the resident server for it
         to accept it into the room's graph. Note that events have
diff --git a/data/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml
index b5a1544c..7f1d675e 100644
--- a/data/api/server-server/joins-v2.yaml
+++ b/data/api/server-server/joins-v2.yaml
@@ -33,9 +33,9 @@ paths:
     put:
       summary: Submit a signed join event to a resident server
       description: |-
-        .. Note::
-           This API is nearly identical to the v1 API with the
-           exception of the response format being fixed.
+        **Note:**
+        This API is nearly identical to the v1 API with the
+        exception of the response format being fixed.
 
         This endpoint is preferred over the v1 API as it provides
         a more standarised response format. Senders which receive
diff --git a/data/api/server-server/leaving-v1.yaml b/data/api/server-server/leaving-v1.yaml
index c92b7920..ff12bbce 100644
--- a/data/api/server-server/leaving-v1.yaml
+++ b/data/api/server-server/leaving-v1.yaml
@@ -143,9 +143,8 @@ paths:
     put:
       summary: Submit a signed leave event to a resident server
       description: |-
-        .. Note::
-           Servers should instead prefer to use the v2 ``/send_leave``
-           endpoint.
+        **Note:**
+        Servers should instead prefer to use the v2 ``/send_leave`` endpoint.
 
         Submits a signed leave event to the resident server for it
         to accept it into the room's graph. Note that events have
diff --git a/data/api/server-server/leaving-v2.yaml b/data/api/server-server/leaving-v2.yaml
index 3e82c414..7069b6c0 100644
--- a/data/api/server-server/leaving-v2.yaml
+++ b/data/api/server-server/leaving-v2.yaml
@@ -33,9 +33,9 @@ paths:
     put:
       summary: Submit a signed leave event to a resident server
       description: |-
-        .. Note::
-           This API is nearly identical to the v1 API with the
-           exception of the response format being fixed.
+        **Note:**
+        This API is nearly identical to the v1 API with the
+        exception of the response format being fixed.
 
         This endpoint is preferred over the v1 API as it provides
         a more standarised response format. Senders which receive
diff --git a/data/event-schemas/schema/m.room.power_levels.yaml b/data/event-schemas/schema/m.room.power_levels.yaml
index 8e94bcc0..6e026d6c 100644
--- a/data/event-schemas/schema/m.room.power_levels.yaml
+++ b/data/event-schemas/schema/m.room.power_levels.yaml
@@ -31,16 +31,16 @@ description: |-
   ``m.room.power_levels`` event, or if the room contains no ``m.room.power_levels``
   event.
 
-  .. NOTE::
+  **Note:**
 
-    As noted above, in the absence of an ``m.room.power_levels`` event, the
-    ``state_default`` is 0, and all users are considered to have power level 0.
-    That means that **any** member of the room can send an
-    ``m.room.power_levels`` event, changing the permissions in the room.
+  As noted above, in the absence of an ``m.room.power_levels`` event, the
+  ``state_default`` is 0, and all users are considered to have power level 0.
+  That means that **any** member of the room can send an
+  ``m.room.power_levels`` event, changing the permissions in the room.
 
-    Server implementations should therefore ensure that each room has an
-    ``m.room.power_levels`` event as soon as it is created. See also the
-    documentation of the ``/createRoom`` API.
+  Server implementations should therefore ensure that each room has an
+  ``m.room.power_levels`` event as soon as it is created. See also the
+  documentation of the ``/createRoom`` API.
 
 properties:
   content:
diff --git a/data/event-schemas/schema/m.room.server_acl.yaml b/data/event-schemas/schema/m.room.server_acl.yaml
index 86d83832..60424cc6 100644
--- a/data/event-schemas/schema/m.room.server_acl.yaml
+++ b/data/event-schemas/schema/m.room.server_acl.yaml
@@ -22,26 +22,26 @@ description: |-
   #. If the server name matches an entry in the ``allow`` list, allow.
   #. Otherwise, deny.
 
-  .. Note::
-     Server ACLs do not restrict the events relative to the room DAG via authorisation
-     rules, but instead act purely at the network layer to determine which servers are
-     allowed to connect and interact with a given room.
+  **Note:**
+  Server ACLs do not restrict the events relative to the room DAG via authorisation
+  rules, but instead act purely at the network layer to determine which servers are
+  allowed to connect and interact with a given room.
 
-  .. WARNING::
-     Failing to provide an ``allow`` rule of some kind will prevent **all**
-     servers from participating in the room, including the sender. This renders
-     the room unusable. A common allow rule is ``[ "*" ]`` which would still
-     permit the use of the ``deny`` list without losing the room.
-  
-  .. WARNING::
-     All compliant servers must implement server ACLs.  However, legacy or noncompliant
-     servers exist which do not uphold ACLs, and these MUST be manually appended to
-     the denied hosts list when setting an ACL to prevent them from leaking events from
-     banned servers into a room. Currently, the only way to determine noncompliant hosts is
-     to check the ``prev_events`` of leaked events, therefore detecting servers which
-     are not upholding the ACLs. Server versions can also be used to try to detect hosts that
-     will not uphold the ACLs, although this is not comprehensive. Server ACLs were added
-     in Synapse v0.32.0, although other server implementations and versions exist in the world.
+  **Warning:**
+  Failing to provide an ``allow`` rule of some kind will prevent **all**
+  servers from participating in the room, including the sender. This renders
+  the room unusable. A common allow rule is ``[ "*" ]`` which would still
+  permit the use of the ``deny`` list without losing the room.
+
+  **Warning:**
+  All compliant servers must implement server ACLs.  However, legacy or noncompliant
+  servers exist which do not uphold ACLs, and these MUST be manually appended to
+  the denied hosts list when setting an ACL to prevent them from leaking events from
+  banned servers into a room. Currently, the only way to determine noncompliant hosts is
+  to check the ``prev_events`` of leaked events, therefore detecting servers which
+  are not upholding the ACLs. Server versions can also be used to try to detect hosts that
+  will not uphold the ACLs, although this is not comprehensive. Server ACLs were added
+  in Synapse v0.32.0, although other server implementations and versions exist in the world.
 allOf:
   - $ref: core-event-schema/state_event.yaml
 type: object
@@ -55,7 +55,7 @@ properties:
           deny. Defaults to true if missing or otherwise not a boolean.
 
           This is strongly recommended to be set to ``false`` as servers running
-          with IP literal names are strongly discouraged in order to require 
+          with IP literal names are strongly discouraged in order to require
           legitimate homeservers to be backed by a valid registered domain name.
       allow:
         type: array

From 27f8867aa0ec47a4026d0351bdcb229576cc5e16 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Wed, 27 Jan 2021 12:14:31 -0800
Subject: [PATCH 06/19] Change RST code formatting markup to Markdown

---
 .../definitions/protocol.yaml                 |  8 +-
 .../definitions/security.yaml                 |  2 +-
 data/api/application-service/query_room.yaml  |  2 +-
 data/api/application-service/query_user.yaml  |  2 +-
 .../api/application-service/transactions.yaml |  2 +-
 data/api/client-server/account-data.yaml      |  4 +-
 .../client-server/administrative_contact.yaml | 44 ++++-----
 .../appservice_room_directory.yaml            |  2 +-
 data/api/client-server/banning.yaml           |  8 +-
 data/api/client-server/content-repo.yaml      | 16 ++--
 data/api/client-server/create_room.yaml       | 96 +++++++++----------
 data/api/client-server/cross_signing.yaml     |  8 +-
 .../definitions/cross_signing_key.yaml        |  2 +-
 .../definitions/device_keys.yaml              |  4 +-
 data/api/client-server/definitions/event.yaml |  4 +-
 .../definitions/event_filter.yaml             |  6 +-
 .../definitions/openid_token.yaml             |  4 +-
 .../definitions/push_condition.yaml           | 12 +--
 .../client-server/definitions/push_rule.yaml  |  4 +-
 .../definitions/request_email_validation.yaml |  4 +-
 .../request_msisdn_validation.yaml            |  4 +-
 .../definitions/request_token_response.yaml   |  6 +-
 .../definitions/room_event_filter.yaml        | 16 ++--
 .../client-server/definitions/security.yaml   |  2 +-
 .../definitions/sync_filter.yaml              | 10 +-
 .../definitions/third_party_signed.yaml       |  2 +-
 .../definitions/timeline_batch.yaml           |  4 +-
 data/api/client-server/directory.yaml         | 10 +-
 data/api/client-server/event_context.yaml     |  8 +-
 data/api/client-server/filter.yaml            |  2 +-
 data/api/client-server/inviting.yaml          | 14 +--
 data/api/client-server/joining.yaml           | 22 ++---
 data/api/client-server/key_backup.yaml        | 40 ++++----
 data/api/client-server/keys.yaml              | 26 ++---
 data/api/client-server/kicking.yaml           | 14 +--
 data/api/client-server/leaving.yaml           |  2 +-
 data/api/client-server/list_joined_rooms.yaml |  2 +-
 data/api/client-server/list_public_rooms.yaml | 12 +--
 data/api/client-server/login.yaml             | 28 +++---
 .../api/client-server/message_pagination.yaml | 30 +++---
 data/api/client-server/notifications.yaml     |  6 +-
 data/api/client-server/old_sync.yaml          | 38 ++++----
 data/api/client-server/openid.yaml            |  4 +-
 data/api/client-server/peeking_events.yaml    | 16 ++--
 data/api/client-server/presence.yaml          |  2 +-
 data/api/client-server/profile.yaml           |  6 +-
 data/api/client-server/pusher.yaml            | 28 +++---
 data/api/client-server/pushrules.yaml         | 34 +++----
 data/api/client-server/read_markers.yaml      |  2 +-
 data/api/client-server/receipts.yaml          |  4 +-
 data/api/client-server/redaction.yaml         |  4 +-
 data/api/client-server/registration.yaml      | 96 +++++++++----------
 data/api/client-server/room_initial_sync.yaml |  8 +-
 data/api/client-server/room_state.yaml        | 14 +--
 data/api/client-server/rooms.yaml             | 10 +-
 data/api/client-server/search.yaml            | 22 ++---
 data/api/client-server/sync.yaml              | 62 ++++++------
 data/api/client-server/tags.yaml              |  4 +-
 .../client-server/third_party_membership.yaml | 10 +-
 data/api/client-server/typing.yaml            |  6 +-
 data/api/client-server/users.yaml             |  4 +-
 data/api/client-server/versions.yaml          |  8 +-
 data/api/client-server/wellknown.yaml         |  2 +-
 data/api/client-server/whoami.yaml            | 14 +--
 data/api/identity/associations.yaml           | 38 ++++----
 .../definitions/request_email_validation.yaml |  6 +-
 .../request_msisdn_validation.yaml            |  8 +-
 data/api/identity/definitions/security.yaml   |  2 +-
 data/api/identity/definitions/sid.yaml        |  2 +-
 data/api/identity/email_associations.yaml     | 36 +++----
 data/api/identity/invitation_signing.yaml     |  6 +-
 data/api/identity/lookup.yaml                 |  8 +-
 data/api/identity/phone_associations.yaml     | 38 ++++----
 data/api/identity/store_invite.yaml           | 32 +++----
 data/api/identity/v2_associations.yaml        | 44 ++++-----
 data/api/identity/v2_auth.yaml                |  6 +-
 data/api/identity/v2_email_associations.yaml  | 42 ++++----
 data/api/identity/v2_invitation_signing.yaml  |  8 +-
 data/api/identity/v2_lookup.yaml              | 28 +++---
 data/api/identity/v2_phone_associations.yaml  | 44 ++++-----
 data/api/identity/v2_store_invite.yaml        | 34 +++----
 data/api/identity/v2_terms.yaml               |  4 +-
 data/api/push-gateway/push_notifier.yaml      | 16 ++--
 data/api/server-server/backfill.yaml          | 18 ++--
 .../event-schemas/m.device_list_update.yaml   |  6 +-
 .../event-schemas/m.direct_to_device.yaml     |  4 +-
 .../definitions/event-schemas/m.presence.yaml |  6 +-
 .../definitions/event-schemas/m.receipt.yaml  |  2 +-
 .../event-schemas/m.signing_key_update.yaml   |  2 +-
 .../definitions/event-schemas/m.typing.yaml   |  2 +-
 .../definitions/invite_event.yaml             |  8 +-
 data/api/server-server/definitions/keys.yaml  | 14 +--
 .../server-server/definitions/security.yaml   |  2 +-
 .../definitions/transaction.yaml              |  2 +-
 .../definitions/unsigned_pdu_base.yaml        |  8 +-
 data/api/server-server/events.yaml            |  2 +-
 data/api/server-server/invites-v1.yaml        |  6 +-
 data/api/server-server/invites-v2.yaml        |  6 +-
 data/api/server-server/joins-v1.yaml          | 20 ++--
 data/api/server-server/joins-v2.yaml          |  4 +-
 data/api/server-server/keys_query.yaml        |  6 +-
 data/api/server-server/leaving-v1.yaml        | 14 +--
 data/api/server-server/leaving-v2.yaml        |  4 +-
 data/api/server-server/public_rooms.yaml      |  6 +-
 data/api/server-server/query.yaml             |  6 +-
 .../api/server-server/third_party_invite.yaml | 12 +--
 data/api/server-server/transactions.yaml      |  2 +-
 data/api/server-server/user_devices.yaml      |  4 +-
 data/api/server-server/user_keys.yaml         | 10 +-
 data/api/server-server/wellknown.yaml         |  4 +-
 .../event-schemas/moderation_policy_rule.yaml |  6 +-
 .../msgtype_infos/image_info.yaml             |  4 +-
 .../msgtype_infos/thumbnail_info.yaml         |  2 +-
 .../schema/core-event-schema/room_event.yaml  |  2 +-
 .../core-event-schema/sync_state_event.yaml   |  4 +-
 .../core-event-schema/unsigned_prop.yaml      |  2 +-
 data/event-schemas/schema/m.call.hangup.yaml  |  2 +-
 data/event-schemas/schema/m.direct.yaml       |  2 +-
 data/event-schemas/schema/m.dummy.yaml        |  6 +-
 .../schema/m.forwarded_room_key.yaml          |  6 +-
 .../schema/m.identity_server.yaml             |  6 +-
 .../schema/m.ignored_user_list.yaml           |  4 +-
 .../schema/m.key.verification.accept.yaml     | 14 +--
 .../schema/m.key.verification.cancel.yaml     | 30 +++---
 .../schema/m.key.verification.key.yaml        |  2 +-
 .../schema/m.key.verification.mac.yaml        |  4 +-
 .../m.key.verification.start$m.sas.v1.yaml    | 14 +--
 .../schema/m.key.verification.start.yaml      | 10 +-
 data/event-schemas/schema/m.receipt.yaml      |  2 +-
 data/event-schemas/schema/m.room.avatar.yaml  |  2 +-
 .../schema/m.room.canonical_alias.yaml        |  2 +-
 data/event-schemas/schema/m.room.create.yaml  |  6 +-
 .../schema/m.room.encryption.yaml             |  4 +-
 .../schema/m.room.join_rules.yaml             |  2 +-
 data/event-schemas/schema/m.room.member.yaml  | 48 +++++-----
 .../schema/m.room.message$m.audio.yaml        |  4 +-
 .../schema/m.room.message$m.emote.yaml        |  8 +-
 .../schema/m.room.message$m.file.yaml         |  6 +-
 .../schema/m.room.message$m.image.yaml        |  2 +-
 .../schema/m.room.message$m.location.yaml     |  2 +-
 .../schema/m.room.message$m.notice.yaml       |  8 +-
 .../m.room.message$m.server_notice.yaml       |  4 +-
 .../schema/m.room.message$m.text.yaml         |  6 +-
 .../schema/m.room.message$m.video.yaml        |  6 +-
 .../schema/m.room.message.feedback.yaml       |  2 +-
 data/event-schemas/schema/m.room.message.yaml |  4 +-
 data/event-schemas/schema/m.room.name.yaml    |  6 +-
 .../schema/m.room.power_levels.yaml           | 50 +++++-----
 .../schema/m.room.redaction.yaml              |  2 +-
 .../schema/m.room.server_acl.yaml             | 34 +++----
 .../schema/m.room.third_party_invite.yaml     |  2 +-
 data/event-schemas/schema/m.room.topic.yaml   |  2 +-
 .../schema/m.room_key.withheld.yaml           | 30 +++---
 data/event-schemas/schema/m.room_key.yaml     |  2 +-
 .../schema/m.room_key_request.yaml            |  4 +-
 data/event-schemas/schema/m.sticker.yaml      |  4 +-
 data/event-schemas/schema/m.tag.yaml          |  2 +-
 data/event-schemas/schema/stripped_state.yaml | 12 +--
 158 files changed, 931 insertions(+), 931 deletions(-)

diff --git a/data/api/application-service/definitions/protocol.yaml b/data/api/application-service/definitions/protocol.yaml
index 851091d6..b16eedfc 100644
--- a/data/api/application-service/definitions/protocol.yaml
+++ b/data/api/application-service/definitions/protocol.yaml
@@ -43,9 +43,9 @@ properties:
   field_types:
     title: Field Types
     description: |-
-      The type definitions for the fields defined in the ``user_fields`` and 
-      ``location_fields``. Each entry in those arrays MUST have an entry here. The
-      ``string`` key for this object is field name itself.
+      The type definitions for the fields defined in the `user_fields` and
+      `location_fields`. Each entry in those arrays MUST have an entry here. The
+      `string` key for this object is field name itself.
 
       May be an empty object if no fields are defined.
     type: object
@@ -101,7 +101,7 @@ properties:
           example: "mxc://example.org/JkLmNoPq"
         fields:
           type: object
-          description: Preset values for ``fields`` the client may use to search by.
+          description: Preset values for `fields` the client may use to search by.
           example: {
             "network": "freenode"
           }
diff --git a/data/api/application-service/definitions/security.yaml b/data/api/application-service/definitions/security.yaml
index bcfc69c0..6d7edd3a 100644
--- a/data/api/application-service/definitions/security.yaml
+++ b/data/api/application-service/definitions/security.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 homeserverAccessToken:
   type: apiKey
-  description: The ``hs_token`` provided by the application service's registration.
+  description: The `hs_token` provided by the application service's registration.
   name: access_token
   in: query
diff --git a/data/api/application-service/query_room.yaml b/data/api/application-service/query_room.yaml
index 2fbc87d1..6ddc6234 100644
--- a/data/api/application-service/query_room.yaml
+++ b/data/api/application-service/query_room.yaml
@@ -34,7 +34,7 @@ paths:
       description: |-
         This endpoint is invoked by the homeserver on an application service to query
         the existence of a given room alias. The homeserver will only query room
-        aliases inside the application service's ``aliases`` namespace. The
+        aliases inside the application service's `aliases` namespace. The
         homeserver will send this request when it receives a request to join a
         room alias within the application service's namespace.
       operationId: queryRoomByAlias
diff --git a/data/api/application-service/query_user.yaml b/data/api/application-service/query_user.yaml
index da363382..f8fc4ef1 100644
--- a/data/api/application-service/query_user.yaml
+++ b/data/api/application-service/query_user.yaml
@@ -34,7 +34,7 @@ paths:
       description: |-
         This endpoint is invoked by the homeserver on an application service to query
         the existence of a given user ID. The homeserver will only query user IDs
-        inside the application service's ``users`` namespace. The homeserver will
+        inside the application service's `users` namespace. The homeserver will
         send this request when it receives an event for an unknown user ID in
         the application service's namespace, such as a room invite.
       operationId: queryUserById
diff --git a/data/api/application-service/transactions.yaml b/data/api/application-service/transactions.yaml
index 20eace85..e4b62e01 100644
--- a/data/api/application-service/transactions.yaml
+++ b/data/api/application-service/transactions.yaml
@@ -34,7 +34,7 @@ paths:
         (or batch of events) to the application service.
 
         Note that the application service should distinguish state events
-        from message events via the presence of a ``state_key``, rather than
+        from message events via the presence of a `state_key`, rather than
         via the event type.
       operationId: sendTransaction
       security:
diff --git a/data/api/client-server/account-data.yaml b/data/api/client-server/account-data.yaml
index ae845b25..ec0d017f 100644
--- a/data/api/client-server/account-data.yaml
+++ b/data/api/client-server/account-data.yaml
@@ -33,7 +33,7 @@ paths:
       description: |-
         Set some account_data for the client. This config is only visible to the user
         that set the account_data. The config will be synced to clients in the
-        top-level ``account_data``.
+        top-level `account_data`.
       operationId: setAccountData
       security:
         - accessToken: []
@@ -110,7 +110,7 @@ paths:
       description: |-
         Set some account_data for the client on a given room. This config is only
         visible to the user that set the account_data. The config will be synced to
-        clients in the per-room ``account_data``.
+        clients in the per-room `account_data`.
       operationId: setAccountDataPerRoom
       security:
         - accessToken: []
diff --git a/data/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml
index 61f9e8eb..8a709f54 100644
--- a/data/api/client-server/administrative_contact.yaml
+++ b/data/api/client-server/administrative_contact.yaml
@@ -93,13 +93,13 @@ paths:
       description: |-
         Adds contact information to the user's account.
 
-        This endpoint is deprecated in favour of the more specific ``/3pid/add``
-        and ``/3pid/bind`` endpoints.
+        This endpoint is deprecated in favour of the more specific `/3pid/add`
+        and `/3pid/bind` endpoints.
 
         **Note:**
-        Previously this endpoint supported a ``bind`` parameter. This parameter
-        has been removed, making this endpoint behave as though it was ``false``.
-        This results in this endpoint being an equivalent to ``/3pid/bind`` rather
+        Previously this endpoint supported a `bind` parameter. This parameter
+        has been removed, making this endpoint behave as though it was `false`.
+        This results in this endpoint being an equivalent to `/3pid/bind` rather
         than dual-purpose.
       operationId: post3PIDs
       deprecated: true
@@ -157,8 +157,8 @@ paths:
                   description: |-
                     An optional field containing a URL where the client must
                     submit the validation token to, with identical parameters
-                    to the Identity Service API's ``POST
-                    /validate/email/submitToken`` endpoint (without the requirement
+                    to the Identity Service API's `POST
+                    /validate/email/submitToken` endpoint (without the requirement
                     for an access token). The homeserver must send this token to the
                     user (if applicable), who should then be prompted to provide it
                     to the client.
@@ -166,7 +166,7 @@ paths:
                     If this field is not present, the client can assume that
                     verification will happen without the client's involvement
                     provided the homeserver advertises this specification version
-                    in the ``/versions`` response (ie: r0.5.0).
+                    in the `/versions` response (ie: r0.5.0).
                   example: "https://example.org/path/to/submitToken"
         403:
           description: The credentials could not be verified with the identity server.
@@ -294,7 +294,7 @@ paths:
         Removes a third party identifier from the user's account. This might not
         cause an unbind of the identifier from the identity server.
 
-        Unlike other endpoints, this endpoint does not take an ``id_access_token``
+        Unlike other endpoints, this endpoint does not take an `id_access_token`
         parameter because the homeserver is expected to sign the request to the
         identity server instead.
       operationId: delete3pidFromAccount
@@ -311,9 +311,9 @@ paths:
                 type: string
                 description: |-
                     The identity server to unbind from. If not provided, the homeserver
-                    MUST use the ``id_server`` the identifier was added through. If the
-                    homeserver does not know the original ``id_server``, it MUST return
-                    a ``id_server_unbind_result`` of ``no-support``.
+                    MUST use the `id_server` the identifier was added through. If the
+                    homeserver does not know the original `id_server`, it MUST return
+                    a `id_server_unbind_result` of `no-support`.
                 example: "example.org"
               medium:
                 type: string
@@ -342,8 +342,8 @@ paths:
                   - "success"
                 description: |-
                   An indicator as to whether or not the homeserver was able to unbind
-                  the 3PID from the identity server. ``success`` indicates that the
-                  indentity server has unbound the identifier whereas ``no-support``
+                  the 3PID from the identity server. `success` indicates that the
+                  indentity server has unbound the identifier whereas `no-support`
                   indicates that the identity server refuses to support the request
                   or the homeserver was not able to determine an identity server to
                   unbind from.
@@ -359,7 +359,7 @@ paths:
         Removes a user's third party identifier from the provided identity server
         without removing it from the homeserver.
 
-        Unlike other endpoints, this endpoint does not take an ``id_access_token``
+        Unlike other endpoints, this endpoint does not take an `id_access_token`
         parameter because the homeserver is expected to sign the request to the
         identity server instead.
       operationId: unbind3pidFromAccount
@@ -376,9 +376,9 @@ paths:
                 type: string
                 description: |-
                     The identity server to unbind from. If not provided, the homeserver
-                    MUST use the ``id_server`` the identifier was added through. If the
-                    homeserver does not know the original ``id_server``, it MUST return
-                    a ``id_server_unbind_result`` of ``no-support``.
+                    MUST use the `id_server` the identifier was added through. If the
+                    homeserver does not know the original `id_server`, it MUST return
+                    a `id_server_unbind_result` of `no-support`.
                 example: "example.org"
               medium:
                 type: string
@@ -407,8 +407,8 @@ paths:
                   - "success"
                 description: |-
                   An indicator as to whether or not the identity server was able to unbind
-                  the 3PID. ``success`` indicates that the identity server has unbound the
-                  identifier whereas ``no-support`` indicates that the identity server
+                  the 3PID. `success` indicates that the identity server has unbound the
+                  identifier whereas `no-support` indicates that the identity server
                   refuses to support the request or the homeserver was not able to determine
                   an identity server to unbind from.
                 example: "success"
@@ -456,7 +456,7 @@ paths:
         400:
           description: |-
             The third party identifier is already in use on the homeserver, or
-            the request was invalid. The error code ``M_SERVER_NOT_TRUSTED``
+            the request was invalid. The error code `M_SERVER_NOT_TRUSTED`
             can be returned if the server does not trust/support the identity server
             provided in the request.
           schema:
@@ -503,7 +503,7 @@ paths:
         400:
           description: |-
             The third party identifier is already in use on the homeserver, or
-            the request was invalid. The error code ``M_SERVER_NOT_TRUSTED``
+            the request was invalid. The error code `M_SERVER_NOT_TRUSTED`
             can be returned if the server does not trust/support the identity server
             provided in the request.
           schema:
diff --git a/data/api/client-server/appservice_room_directory.yaml b/data/api/client-server/appservice_room_directory.yaml
index 63783cfd..ec0470c3 100644
--- a/data/api/client-server/appservice_room_directory.yaml
+++ b/data/api/client-server/appservice_room_directory.yaml
@@ -40,7 +40,7 @@ paths:
         This API is similar to the room directory visibility API used by clients
         to update the homeserver's more general room directory.
 
-        This API requires the use of an application service access token (``as_token``)
+        This API requires the use of an application service access token (`as_token`)
         instead of a typical client's access_token. This API cannot be invoked by
         users who are not identified as application services.
       operationId: updateAppserviceRoomDirectoryVsibility
diff --git a/data/api/client-server/banning.yaml b/data/api/client-server/banning.yaml
index 4e9a62ef..8b3cb80d 100644
--- a/data/api/client-server/banning.yaml
+++ b/data/api/client-server/banning.yaml
@@ -62,7 +62,7 @@ paths:
               reason:
                 type: string
                 description: The reason the user has been banned. This will be supplied as the
-                  ``reason`` on the target's updated `m.room.member`_ event.
+                  `reason` on the target's updated `m.room.member`_ event.
             required: ["user_id"]
       responses:
         200:
@@ -74,7 +74,7 @@ paths:
             type: object
         403:
           description: |-
-            You do not have permission to ban the user from the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejections are:
+            You do not have permission to ban the user from the room. A meaningful `errcode` and description error text will be returned. Example reasons for rejections are:
 
             - The banner is not currently in the room.
             - The banner's power level is insufficient to ban users from the room.
@@ -121,7 +121,7 @@ paths:
               reason:
                 type: string
                 description: |-
-                  Optional reason to be included as the ``reason`` on the subsequent
+                  Optional reason to be included as the `reason` on the subsequent
                   membership event.
             required: ["user_id"]
       responses:
@@ -134,7 +134,7 @@ paths:
             type: object
         403:
           description: |-
-            You do not have permission to unban the user from the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejections are:
+            You do not have permission to unban the user from the room. A meaningful `errcode` and description error text will be returned. Example reasons for rejections are:
 
             - The unbanner's power level is insufficient to unban users from the room.
           examples:
diff --git a/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
index b827e8d2..220115b0 100644
--- a/data/api/client-server/content-repo.yaml
+++ b/data/api/client-server/content-repo.yaml
@@ -112,14 +112,14 @@ paths:
           x-example: matrix.org
           required: true
           description: |
-            The server name from the ``mxc://`` URI (the authoritory component)
+            The server name from the `mxc://` URI (the authoritory component)
         - in: path
           type: string
           name: mediaId
           x-example: ascERGshawAWawugaAcauga
           required: true
           description: |
-            The media ID from the ``mxc://`` URI (the path component)
+            The media ID from the `mxc://` URI (the path component)
         - in: query
           type: boolean
           name: allow_remote
@@ -177,20 +177,20 @@ paths:
           x-example: matrix.org
           required: true
           description: |
-            The server name from the ``mxc://`` URI (the authoritory component)
+            The server name from the `mxc://` URI (the authoritory component)
         - in: path
           type: string
           name: mediaId
           x-example: ascERGshawAWawugaAcauga
           required: true
           description: |
-            The media ID from the ``mxc://`` URI (the path component)
+            The media ID from the `mxc://` URI (the path component)
         - in: path
           type: string
           name: fileName
           x-example: filename.jpg
           required: true
-          description: A filename to give in the ``Content-Disposition`` header.
+          description: A filename to give in the `Content-Disposition` header.
         - in: query
           type: boolean
           name: allow_remote
@@ -210,7 +210,7 @@ paths:
               type: "string"
             Content-Disposition:
               description: |-
-                The ``fileName`` requested or the name of the file that was previously
+                The `fileName` requested or the name of the file that was previously
                 uploaded, if set.
               type: "string"
           schema:
@@ -248,14 +248,14 @@ paths:
           required: true
           x-example: example.org
           description: |
-            The server name from the ``mxc://`` URI (the authoritory component)
+            The server name from the `mxc://` URI (the authoritory component)
         - in: path
           type: string
           name: mediaId
           x-example: ascERGshawAWawugaAcauga
           required: true
           description: |
-            The media ID from the ``mxc://`` URI (the path component)
+            The media ID from the `mxc://` URI (the path component)
         - in: query
           type: integer
           x-example: 64
diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml
index 8b4cf9e9..0330d955 100644
--- a/data/api/client-server/create_room.yaml
+++ b/data/api/client-server/create_room.yaml
@@ -38,41 +38,41 @@ paths:
         the new room, including checking power levels for each event. It MUST
         apply the events implied by the request in the following order:
 
-        1. The ``m.room.create`` event itself. Must be the first event in the
+        1. The `m.room.create` event itself. Must be the first event in the
            room.
 
-        2. An ``m.room.member`` event for the creator to join the room. This is
+        2. An `m.room.member` event for the creator to join the room. This is
            needed so the remaining events can be sent.
 
-        3. A default ``m.room.power_levels`` event, giving the room creator
+        3. A default `m.room.power_levels` event, giving the room creator
            (and not other members) permission to send state events. Overridden
-           by the ``power_level_content_override`` parameter.
+           by the `power_level_content_override` parameter.
 
-        4. Events set by the ``preset``. Currently these are the ``m.room.join_rules``,
-           ``m.room.history_visibility``, and ``m.room.guest_access`` state events.
+        4. Events set by the `preset`. Currently these are the `m.room.join_rules`,
+           `m.room.history_visibility`, and `m.room.guest_access` state events.
 
-        5. Events listed in ``initial_state``, in the order that they are
+        5. Events listed in `initial_state`, in the order that they are
            listed.
 
-        6. Events implied by ``name`` and ``topic`` (``m.room.name`` and ``m.room.topic``
+        6. Events implied by `name` and `topic` (`m.room.name` and `m.room.topic`
            state events).
 
-        7. Invite events implied by ``invite`` and ``invite_3pid`` (``m.room.member`` with
-           ``membership: invite`` and ``m.room.third_party_invite``).
+        7. Invite events implied by `invite` and `invite_3pid` (`m.room.member` with
+           `membership: invite` and `m.room.third_party_invite`).
 
         The available presets do the following with respect to room state:
 
         ========================  ==============  ======================  ================  =========
-                 Preset           ``join_rules``  ``history_visibility``  ``guest_access``  Other
+                 Preset           `join_rules`  `history_visibility`  `guest_access`  Other
         ========================  ==============  ======================  ================  =========
-        ``private_chat``          ``invite``      ``shared``              ``can_join``
-        ``trusted_private_chat``  ``invite``      ``shared``              ``can_join``      All invitees are given the same power level as the room creator.
-        ``public_chat``           ``public``      ``shared``              ``forbidden``
+        `private_chat`          `invite`      `shared`              `can_join`
+        `trusted_private_chat`  `invite`      `shared`              `can_join`      All invitees are given the same power level as the room creator.
+        `public_chat`           `public`      `shared`              `forbidden`
         ========================  ==============  ======================  ================  =========
 
-        The server will create a ``m.room.create`` event in the room with the
+        The server will create a `m.room.create` event in the room with the
         requesting user as the creator, alongside other keys provided in the
-        ``creation_content``.
+        `creation_content`.
       operationId: createRoom
       security:
         - accessToken: []
@@ -97,12 +97,12 @@ paths:
                 type: string
                 enum: ["public", "private"]
                 description: |-
-                  A ``public`` visibility indicates that the room will be shown
-                  in the published room list. A ``private`` visibility will hide
+                  A `public` visibility indicates that the room will be shown
+                  in the published room list. A `private` visibility will hide
                   the room from the published room list. Rooms default to
-                  ``private`` visibility if this key is not included. NB: This
-                  should not be confused with ``join_rules`` which also uses the
-                  word ``public``.
+                  `private` visibility if this key is not included. NB: This
+                  should not be confused with `join_rules` which also uses the
+                  word `public`.
               room_alias_name:
                 type: string
                 description: |-
@@ -111,22 +111,22 @@ paths:
                   room. The alias will belong on the *same* homeserver which
                   created the room. For example, if this was set to "foo" and
                   sent to the homeserver "example.com" the complete room alias
-                  would be ``#foo:example.com``.
+                  would be `#foo:example.com`.
 
                   The complete room alias will become the canonical alias for
                   the room.
               name:
                 type: string
                 description: |-
-                  If this is included, an ``m.room.name`` event will be sent
+                  If this is included, an `m.room.name` event will be sent
                   into the room to indicate the name of the room. See Room
-                  Events for more information on ``m.room.name``.
+                  Events for more information on `m.room.name`.
               topic:
                 type: string
                 description: |-
-                  If this is included, an ``m.room.topic`` event will be sent
+                  If this is included, an `m.room.topic` event will be sent
                   into the room to indicate the topic for the room. See Room
-                  Events for more information on ``m.room.topic``.
+                  Events for more information on `m.room.topic`.
               invite:
                 type: array
                 description: |-
@@ -155,7 +155,7 @@ paths:
                     medium:
                       type: string
                       # TODO: Link to Identity Service spec when it eixsts
-                      description: The kind of address being passed in the address field, for example ``email``.
+                      description: The kind of address being passed in the address field, for example `email`.
                     address:
                       type: string
                       description: The invitee's third party identifier.
@@ -165,16 +165,16 @@ paths:
                 description: |-
                   The room version to set for the room. If not provided, the homeserver is
                   to use its configured default. If provided, the homeserver will return a
-                  400 error with the errcode ``M_UNSUPPORTED_ROOM_VERSION`` if it does not
+                  400 error with the errcode `M_UNSUPPORTED_ROOM_VERSION` if it does not
                   support the room version.
                 example: "1"
               creation_content:
                 title: CreationContent
                 type: object
                 description: |-
-                  Extra keys, such as ``m.federate``, to be added to the content
+                  Extra keys, such as `m.federate`, to be added to the content
                   of the `m.room.create`_ event. The server will clobber the following
-                  keys: ``creator``, ``room_version``. Future versions of the specification
+                  keys: `creator`, `room_version`. Future versions of the specification
                   may allow the server to clobber other keys.
               initial_state:
                 type: array
@@ -184,8 +184,8 @@ paths:
                   room. The expected format of the state events are an object
                   with type, state_key and content keys set.
 
-                  Takes precedence over events set by ``preset``, but gets
-                  overriden by ``name`` and ``topic`` keys.
+                  Takes precedence over events set by `preset`, but gets
+                  overriden by `name` and `topic` keys.
                 items:
                   type: object
                   title: StateEvent
@@ -207,16 +207,16 @@ paths:
                   Convenience parameter for setting various default state events
                   based on a preset.
 
-                  If unspecified, the server should use the ``visibility`` to determine
-                  which preset to use. A visbility of ``public`` equates to a preset of
-                  ``public_chat`` and ``private`` visibility equates to a preset of
-                  ``private_chat``.
+                  If unspecified, the server should use the `visibility` to determine
+                  which preset to use. A visbility of `public` equates to a preset of
+                  `public_chat` and `private` visibility equates to a preset of
+                  `private_chat`.
               is_direct:
                 type: boolean
                 description: |-
-                  This flag makes the server set the ``is_direct`` flag on the
-                  ``m.room.member`` events sent to the users in ``invite`` and
-                  ``invite_3pid``. See `Direct Messaging`_ for more information.
+                  This flag makes the server set the `is_direct` flag on the
+                  `m.room.member` events sent to the users in `invite` and
+                  `invite_3pid`. See `Direct Messaging`_ for more information.
               power_level_content_override:
                 title: Power Level Event Content
                 type: object
@@ -244,24 +244,24 @@ paths:
         400:
           description: |-
 
-            The request is invalid. A meaningful ``errcode`` and description
+            The request is invalid. A meaningful `errcode` and description
             error text will be returned. Example reasons for rejection include:
 
-            - The request body is malformed (``errcode`` set to ``M_BAD_JSON``
-              or ``M_NOT_JSON``).
+            - The request body is malformed (`errcode` set to `M_BAD_JSON`
+              or `M_NOT_JSON`).
 
-            - The room alias specified is already taken (``errcode`` set to
-              ``M_ROOM_IN_USE``).
+            - The room alias specified is already taken (`errcode` set to
+              `M_ROOM_IN_USE`).
 
             - The initial state implied by the parameters to the request is
-              invalid: for example, the user's ``power_level`` is set below
-              that necessary to set the room name (``errcode`` set to
-              ``M_INVALID_ROOM_STATE``).
+              invalid: for example, the user's `power_level` is set below
+              that necessary to set the room name (`errcode` set to
+              `M_INVALID_ROOM_STATE`).
 
             - The homeserver doesn't support the requested room version, or
               one or more users being invited to the new room are residents
               of a homeserver which does not support the requested room version.
-              The ``errcode`` will be ``M_UNSUPPORTED_ROOM_VERSION`` in these
+              The `errcode` will be `M_UNSUPPORTED_ROOM_VERSION` in these
               cases.
           schema:
             "$ref": "definitions/errors/error.yaml"
diff --git a/data/api/client-server/cross_signing.yaml b/data/api/client-server/cross_signing.yaml
index f1a0cc41..981262c6 100644
--- a/data/api/client-server/cross_signing.yaml
+++ b/data/api/client-server/cross_signing.yaml
@@ -110,9 +110,9 @@ paths:
             The input was invalid in some way. This can include one of the
             following error codes:
 
-            * ``M_INVALID_SIGNATURE``: For example, the self-signing or
+            * `M_INVALID_SIGNATURE`: For example, the self-signing or
               user-signing key had an incorrect signature.
-            * ``M_MISSING_PARAM``: No master key is available.
+            * `M_MISSING_PARAM`: No master key is available.
           schema:
             type: object
             example: {
@@ -207,8 +207,8 @@ paths:
                 type: object
                 description: |-
                   A map from user ID to key ID to an error for any signatures
-                  that failed.  If a signature was invalid, the ``errcode`` will
-                  be set to ``M_INVALID_SIGNATURE``.
+                  that failed.  If a signature was invalid, the `errcode` will
+                  be set to `M_INVALID_SIGNATURE`.
                 additionalProperties:
                   type: object
                   additionalProperties:
diff --git a/data/api/client-server/definitions/cross_signing_key.yaml b/data/api/client-server/definitions/cross_signing_key.yaml
index aa8dea2e..d445d93d 100644
--- a/data/api/client-server/definitions/cross_signing_key.yaml
+++ b/data/api/client-server/definitions/cross_signing_key.yaml
@@ -33,7 +33,7 @@ properties:
       type: string
     description: |-
       The public key.  The object must have exactly one property, whose name is
-      in the form ``<algorithm>:<unpadded_base64_public_key>``, and whose value
+      in the form `<algorithm>:<unpadded_base64_public_key>`, and whose value
       is the unpadded base64 public key.
     example:
       "ed25519:alice+base64+public+key": "alice+base64+public+key"
diff --git a/data/api/client-server/definitions/device_keys.yaml b/data/api/client-server/definitions/device_keys.yaml
index 4f7cffe7..f24dedd7 100644
--- a/data/api/client-server/definitions/device_keys.yaml
+++ b/data/api/client-server/definitions/device_keys.yaml
@@ -38,7 +38,7 @@ properties:
     type: object
     description: |-
        Public identity keys. The names of the properties should be in the
-       format ``<algorithm>:<device_id>``. The keys themselves should be
+       format `<algorithm>:<device_id>`. The keys themselves should be
        encoded as specified by the key algorithm.
     additionalProperties:
        type: string
@@ -50,7 +50,7 @@ properties:
     title: Signatures
     description: |-
        Signatures for the device key object. A map from user ID, to a map from
-       ``<algorithm>:<device_id>`` to the signature.
+       `<algorithm>:<device_id>` to the signature.
 
        The signature is calculated using the process described at `Signing
        JSON`_.
diff --git a/data/api/client-server/definitions/event.yaml b/data/api/client-server/definitions/event.yaml
index 7d5808b1..54af96f5 100644
--- a/data/api/client-server/definitions/event.yaml
+++ b/data/api/client-server/definitions/event.yaml
@@ -44,8 +44,8 @@ properties:
         format: int64
         type: integer
       prev_content:
-        description: Optional. The previous ``content`` for this state. This will
-          be present only for state events appearing in the ``timeline``. If this
+        description: Optional. The previous `content` for this state. This will
+          be present only for state events appearing in the `timeline`. If this
           is not a state event, or there is no previous content, this key will be
           missing.
         title: EventContent
diff --git a/data/api/client-server/definitions/event_filter.yaml b/data/api/client-server/definitions/event_filter.yaml
index 8c96917f..b6888693 100644
--- a/data/api/client-server/definitions/event_filter.yaml
+++ b/data/api/client-server/definitions/event_filter.yaml
@@ -19,14 +19,14 @@ properties:
   not_senders:
     description: A list of sender IDs to exclude. If this list is absent then no senders
       are excluded. A matching sender will be excluded even if it is listed in the
-      ``'senders'`` filter.
+      `'senders'` filter.
     items:
       type: string
     type: array
   not_types:
     description: A list of event types to exclude. If this list is absent then no
       event types are excluded. A matching type will be excluded even if it is listed
-      in the ``'types'`` filter. A '*' can be used as a wildcard to match any sequence
+      in the `'types'` filter. A '*' can be used as a wildcard to match any sequence
       of characters.
     items:
       type: string
@@ -39,7 +39,7 @@ properties:
     type: array
   types:
     description: A list of event types to include. If this list is absent then all
-      event types are included. A ``'*'`` can be used as a wildcard to match any sequence
+      event types are included. A `'*'` can be used as a wildcard to match any sequence
       of characters.
     items:
       type: string
diff --git a/data/api/client-server/definitions/openid_token.yaml b/data/api/client-server/definitions/openid_token.yaml
index b50fcd54..32929ef6 100644
--- a/data/api/client-server/definitions/openid_token.yaml
+++ b/data/api/client-server/definitions/openid_token.yaml
@@ -19,10 +19,10 @@ properties:
     description: |-
       An access token the consumer may use to verify the identity of
       the person who generated the token. This is given to the federation
-      API ``GET /openid/userinfo`` to verify the user's identity.
+      API `GET /openid/userinfo` to verify the user's identity.
   token_type:
     type: string
-    description: The string ``Bearer``.
+    description: The string `Bearer`.
   matrix_server_name:
     type: string
     description: |-
diff --git a/data/api/client-server/definitions/push_condition.yaml b/data/api/client-server/definitions/push_condition.yaml
index 8752274e..a97786ff 100644
--- a/data/api/client-server/definitions/push_condition.yaml
+++ b/data/api/client-server/definitions/push_condition.yaml
@@ -23,25 +23,25 @@ properties:
   key:
     type: string
     description: |-
-      Required for ``event_match`` conditions. The dot-separated field of the
+      Required for `event_match` conditions. The dot-separated field of the
       event to match.
 
-      Required for ``sender_notification_permission`` conditions. The field in
+      Required for `sender_notification_permission` conditions. The field in
       the power level event the user needs a minimum power level for. Fields
-      must be specified under the ``notifications`` property in the power level
-      event's ``content``.
+      must be specified under the `notifications` property in the power level
+      event's `content`.
     x-example: content.body
   pattern:
     type: string
     description: |-
-      Required for ``event_match`` conditions. The glob-style pattern to
+      Required for `event_match` conditions. The glob-style pattern to
       match against. Patterns with no special glob characters should be
       treated as having asterisks prepended and appended when testing the
       condition.
   is:
     type: string
     description: |-
-      Required for ``room_member_count`` conditions. A decimal integer
+      Required for `room_member_count` conditions. A decimal integer
       optionally prefixed by one of, ==, <, >, >= or <=. A prefix of < matches
       rooms where the member count is strictly less than the given number and
       so forth. If no prefix is present, this parameter defaults to ==.
diff --git a/data/api/client-server/definitions/push_rule.yaml b/data/api/client-server/definitions/push_rule.yaml
index 14a9b7d4..06efad74 100644
--- a/data/api/client-server/definitions/push_rule.yaml
+++ b/data/api/client-server/definitions/push_rule.yaml
@@ -43,11 +43,11 @@ properties:
     description: |-
       The conditions that must hold true for an event in order for a rule to be
       applied to an event. A rule with no conditions always matches. Only
-      applicable to ``underride`` and ``override`` rules.
+      applicable to `underride` and `override` rules.
   pattern:
     type: string
     description: |-
-      The glob-style pattern to match against.  Only applicable to ``content``
+      The glob-style pattern to match against.  Only applicable to `content`
       rules.
 required:
   - actions
diff --git a/data/api/client-server/definitions/request_email_validation.yaml b/data/api/client-server/definitions/request_email_validation.yaml
index d24c42b5..d52ea18e 100644
--- a/data/api/client-server/definitions/request_email_validation.yaml
+++ b/data/api/client-server/definitions/request_email_validation.yaml
@@ -24,7 +24,7 @@ allOf:
         3PID verification.
 
         This parameter is deprecated with a plan to be removed in a future specification
-        version for ``/account/password`` and ``/register`` requests.
+        version for `/account/password` and `/register` requests.
       example: "id.example.com"
     id_access_token:
       type: string
@@ -33,4 +33,4 @@ allOf:
         can treat this as optional to distinguish between r0.5-compatible clients
         and this specification version.
 
-        Required if an ``id_server`` is supplied.
+        Required if an `id_server` is supplied.
diff --git a/data/api/client-server/definitions/request_msisdn_validation.yaml b/data/api/client-server/definitions/request_msisdn_validation.yaml
index 54897e63..fba3a615 100644
--- a/data/api/client-server/definitions/request_msisdn_validation.yaml
+++ b/data/api/client-server/definitions/request_msisdn_validation.yaml
@@ -24,7 +24,7 @@ allOf:
         3PID verification.
 
         This parameter is deprecated with a plan to be removed in a future specification
-        version for ``/account/password`` and ``/register`` requests.
+        version for `/account/password` and `/register` requests.
       example: "id.example.com"
     id_access_token:
       type: string
@@ -33,4 +33,4 @@ allOf:
         can treat this as optional to distinguish between r0.5-compatible clients
         and this specification version.
 
-        Required if an ``id_server`` is supplied.
+        Required if an `id_server` is supplied.
diff --git a/data/api/client-server/definitions/request_token_response.yaml b/data/api/client-server/definitions/request_token_response.yaml
index 45201a20..b801af98 100644
--- a/data/api/client-server/definitions/request_token_response.yaml
+++ b/data/api/client-server/definitions/request_token_response.yaml
@@ -17,7 +17,7 @@ properties:
     type: string
     description: |-
       The session ID. Session IDs are opaque strings that must consist entirely
-      of the characters ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255
+      of the characters `[0-9a-zA-Z.=_-]`. Their length must not exceed 255
       characters and they must not be empty.
     example: "123abc"
   submit_url:
@@ -25,13 +25,13 @@ properties:
     description: |-
       An optional field containing a URL where the client must submit the
       validation token to, with identical parameters to the Identity Service
-      API's ``POST /validate/email/submitToken`` endpoint (without the requirement
+      API's `POST /validate/email/submitToken` endpoint (without the requirement
       for an access token). The homeserver must send this token to the user (if
       applicable), who should then be prompted to provide it to the client.
 
       If this field is not present, the client can assume that verification
       will happen without the client's involvement provided the homeserver
-      advertises this specification version in the ``/versions`` response
+      advertises this specification version in the `/versions` response
       (ie: r0.5.0).
     example: "https://example.org/path/to/submitToken"
 required: ['sid']
diff --git a/data/api/client-server/definitions/room_event_filter.yaml b/data/api/client-server/definitions/room_event_filter.yaml
index 880cb173..2c4fddc6 100644
--- a/data/api/client-server/definitions/room_event_filter.yaml
+++ b/data/api/client-server/definitions/room_event_filter.yaml
@@ -19,20 +19,20 @@ allOf:
     lazy_load_members:
       type: boolean
       description: |-
-        If ``true``, enables lazy-loading of membership events. See
+        If `true`, enables lazy-loading of membership events. See
         `Lazy-loading room members <#lazy-loading-room-members>`_
-        for more information. Defaults to ``false``.
+        for more information. Defaults to `false`.
     include_redundant_members:
       type: boolean
       description: |-
-        If ``true``, sends all membership events for all events, even if they have already
+        If `true`, sends all membership events for all events, even if they have already
         been sent to the client. Does not
-        apply unless ``lazy_load_members`` is ``true``. See
+        apply unless `lazy_load_members` is `true`. See
         `Lazy-loading room members <#lazy-loading-room-members>`_
-        for more information. Defaults to ``false``.
+        for more information. Defaults to `false`.
     not_rooms:
       description: A list of room IDs to exclude. If this list is absent then no rooms
-        are excluded. A matching room will be excluded even if it is listed in the ``'rooms'``
+        are excluded. A matching room will be excluded even if it is listed in the `'rooms'`
         filter.
       items:
         type: string
@@ -45,5 +45,5 @@ allOf:
       type: array
     contains_url:
       type: boolean
-      description: If ``true``, includes only events with a ``url`` key in their content. If
-        ``false``, excludes those events. If omitted, ``url`` key is not considered for filtering.
+      description: If `true`, includes only events with a `url` key in their content. If
+        `false`, excludes those events. If omitted, `url` key is not considered for filtering.
diff --git a/data/api/client-server/definitions/security.yaml b/data/api/client-server/definitions/security.yaml
index bb78f0e3..963e1d43 100644
--- a/data/api/client-server/definitions/security.yaml
+++ b/data/api/client-server/definitions/security.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 accessToken:
   type: apiKey
-  description: The access_token returned by a call to ``/login`` or ``/register``
+  description: The access_token returned by a call to `/login` or `/register`
   name: access_token
   in: query
diff --git a/data/api/client-server/definitions/sync_filter.yaml b/data/api/client-server/definitions/sync_filter.yaml
index fc37fb48..0b4a8dca 100644
--- a/data/api/client-server/definitions/sync_filter.yaml
+++ b/data/api/client-server/definitions/sync_filter.yaml
@@ -46,16 +46,16 @@ properties:
     properties:
       not_rooms:
         description: A list of room IDs to exclude. If this list is absent then no rooms
-          are excluded. A matching room will be excluded even if it is listed in the ``'rooms'``
-          filter. This filter is applied before the filters in ``ephemeral``,
-          ``state``, ``timeline`` or ``account_data``
+          are excluded. A matching room will be excluded even if it is listed in the `'rooms'`
+          filter. This filter is applied before the filters in `ephemeral`,
+          `state`, `timeline` or `account_data`
         items:
           type: string
         type: array
       rooms:
         description: A list of room IDs to include. If this list is absent then all rooms
-          are included. This filter is applied before the filters in ``ephemeral``,
-          ``state``, ``timeline`` or ``account_data``
+          are included. This filter is applied before the filters in `ephemeral`,
+          `state`, `timeline` or `account_data`
         items:
           type: string
         type: array
diff --git a/data/api/client-server/definitions/third_party_signed.yaml b/data/api/client-server/definitions/third_party_signed.yaml
index 7ce1a1d1..4af422b4 100644
--- a/data/api/client-server/definitions/third_party_signed.yaml
+++ b/data/api/client-server/definitions/third_party_signed.yaml
@@ -14,7 +14,7 @@
 type: object
 title: Third Party Signed
 description: |-
-  A signature of an ``m.third_party_invite`` token to prove that this user
+  A signature of an `m.third_party_invite` token to prove that this user
   owns a third party identity which has been invited to the room.
 properties:
   sender:
diff --git a/data/api/client-server/definitions/timeline_batch.yaml b/data/api/client-server/definitions/timeline_batch.yaml
index abf93830..e243b485 100644
--- a/data/api/client-server/definitions/timeline_batch.yaml
+++ b/data/api/client-server/definitions/timeline_batch.yaml
@@ -16,11 +16,11 @@ allOf:
 - $ref: room_event_batch.yaml
 properties:
   limited:
-    description: True if the number of events returned was limited by the ``limit``
+    description: True if the number of events returned was limited by the `limit`
       on the filter.
     type: boolean
   prev_batch:
-    description: A token that can be supplied to the ``from`` parameter of the
+    description: A token that can be supplied to the `from` parameter of the
       rooms/{roomId}/messages endpoint.
     type: string
 type: object
diff --git a/data/api/client-server/directory.yaml b/data/api/client-server/directory.yaml
index f470c730..1b01242d 100644
--- a/data/api/client-server/directory.yaml
+++ b/data/api/client-server/directory.yaml
@@ -133,11 +133,11 @@ paths:
         room aliases can only be deleted by their creator or a server administrator.
 
         **Note:**
-        Servers may choose to update the ``alt_aliases`` for the ``m.room.canonical_alias``
+        Servers may choose to update the `alt_aliases` for the `m.room.canonical_alias`
         state event in the room when an alias is removed. Servers which choose to update the
         canonical alias event are recommended to, in addition to their other relevant permission
         checks, delete the alias and return a successful response even if the user does not
-        have permission to update the ``m.room.canonical_alias`` event.
+        have permission to update the `m.room.canonical_alias` event.
 
       operationId: deleteRoomAlias
       security:
@@ -176,8 +176,8 @@ paths:
         given room.
 
         This endpoint can be called by users who are in the room (external
-        users receive an ``M_FORBIDDEN`` error response). If the room's
-        ``m.room.history_visibility`` maps to ``world_readable``, any
+        users receive an `M_FORBIDDEN` error response). If the room's
+        `m.room.history_visibility` maps to `world_readable`, any
         user can call this endpoint.
 
         Servers may choose to implement additional access control checks here,
@@ -186,7 +186,7 @@ paths:
 
         **Note:**
         Clients are recommended not to display this list of aliases prominently
-        as they are not curated, unlike those listed in the ``m.room.canonical_alias``
+        as they are not curated, unlike those listed in the `m.room.canonical_alias`
         state event.
 
       operationId: getLocalAliases
diff --git a/data/api/client-server/event_context.yaml b/data/api/client-server/event_context.yaml
index da43bf9e..872356e4 100644
--- a/data/api/client-server/event_context.yaml
+++ b/data/api/client-server/event_context.yaml
@@ -63,10 +63,10 @@ paths:
           name: filter
           type: string
           description: |-
-            A JSON ``RoomEventFilter`` to filter the returned events with. The
-            filter is only applied to ``events_before``, ``events_after``, and
-            ``state``. It is not applied to the ``event`` itself. The filter may
-            be applied before or/and after the ``limit`` parameter - whichever the
+            A JSON `RoomEventFilter` to filter the returned events with. The
+            filter is only applied to `events_before`, `events_after`, and
+            `state`. It is not applied to the `event` itself. The filter may
+            be applied before or/and after the `limit` parameter - whichever the
             homeserver prefers.
 
             See `Filtering <#filtering>`_ for more information.
diff --git a/data/api/client-server/filter.yaml b/data/api/client-server/filter.yaml
index bf9396e2..0a12e2bb 100644
--- a/data/api/client-server/filter.yaml
+++ b/data/api/client-server/filter.yaml
@@ -88,7 +88,7 @@ paths:
                 type: string
                 description: |-
                   The ID of the filter that was created. Cannot start
-                  with a ``{`` as this character is used to determine
+                  with a `{` as this character is used to determine
                   if the filter provided is inline JSON or a previously
                   declared filter by homeservers on some APIs.
                 example: "66696p746572"
diff --git a/data/api/client-server/inviting.yaml b/data/api/client-server/inviting.yaml
index ae352d9d..5df5b4de 100644
--- a/data/api/client-server/inviting.yaml
+++ b/data/api/client-server/inviting.yaml
@@ -48,7 +48,7 @@ paths:
         join that room.
 
         If the user was invited to the room, the homeserver will append a
-        ``m.room.member`` event to the room.
+        `m.room.member` event to the room.
 
         .. _third party invites section: `invite-by-third-party-id-endpoint`_
       operationId: inviteUser
@@ -77,7 +77,7 @@ paths:
               reason:
                 type: string
                 description: |-
-                  Optional reason to be included as the ``reason`` on the subsequent
+                  Optional reason to be included as the `reason` on the subsequent
                   membership event.
             required: ["user_id"]
       responses:
@@ -91,20 +91,20 @@ paths:
         400:
           description: |-
 
-            The request is invalid. A meaningful ``errcode`` and description
+            The request is invalid. A meaningful `errcode` and description
             error text will be returned. Example reasons for rejection include:
 
-            - The request body is malformed (``errcode`` set to ``M_BAD_JSON``
-              or ``M_NOT_JSON``).
+            - The request body is malformed (`errcode` set to `M_BAD_JSON`
+              or `M_NOT_JSON`).
 
             - One or more users being invited to the room are residents of a
               homeserver which does not support the requested room version. The
-              ``errcode`` will be ``M_UNSUPPORTED_ROOM_VERSION`` in these cases.
+              `errcode` will be `M_UNSUPPORTED_ROOM_VERSION` in these cases.
           schema:
             "$ref": "definitions/errors/error.yaml"
         403:
           description: |-
-            You do not have permission to invite the user to the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejections are:
+            You do not have permission to invite the user to the room. A meaningful `errcode` and description error text will be returned. Example reasons for rejections are:
 
             - The invitee has been banned from the room.
             - The invitee is already a member of the room.
diff --git a/data/api/client-server/joining.yaml b/data/api/client-server/joining.yaml
index 3cd3d6b5..0f18a571 100644
--- a/data/api/client-server/joining.yaml
+++ b/data/api/client-server/joining.yaml
@@ -32,7 +32,7 @@ paths:
       summary: Start the requesting user participating in a particular room.
       description: |-
         *Note that this API requires a room ID, not alias.*
-        ``/join/{roomIdOrAlias}`` *exists if you have a room alias.*
+        `/join/{roomIdOrAlias}` *exists if you have a room alias.*
 
         This API starts a user participating in a particular room, if that user
         is allowed to participate in that room. After this call, the client is
@@ -62,12 +62,12 @@ paths:
                 - $ref: "definitions/third_party_signed.yaml"
                 description: |-
                   If supplied, the homeserver must verify that it matches a pending
-                  ``m.room.third_party_invite`` event in the room, and perform
+                  `m.room.third_party_invite` event in the room, and perform
                   key validity checking if required by the event.
               reason:
                 type: string
                 description: |-
-                  Optional reason to be included as the ``reason`` on the subsequent
+                  Optional reason to be included as the `reason` on the subsequent
                   membership event.
                 example: "Looking for support"
       responses:
@@ -75,7 +75,7 @@ paths:
           description: |-
             The room has been joined.
 
-            The joined room ID must be returned in the ``room_id`` field.
+            The joined room ID must be returned in the `room_id` field.
           examples:
             application/json: {
               "room_id": "!d41d8cd:matrix.org"}
@@ -88,7 +88,7 @@ paths:
             required: ["room_id"]
         403:
           description: |-
-            You do not have permission to join the room. A meaningful ``errcode``
+            You do not have permission to join the room. A meaningful `errcode`
             and description error text will be returned. Example reasons for rejection are:
 
             - The room is invite-only and the user was not invited.
@@ -108,7 +108,7 @@ paths:
     post:
       summary: Start the requesting user participating in a particular room.
       description: |-
-        *Note that this API takes either a room ID or alias, unlike* ``/room/{roomId}/join``.
+        *Note that this API takes either a room ID or alias, unlike* `/room/{roomId}/join`.
 
         This API starts a user participating in a particular room, if that user
         is allowed to participate in that room. After this call, the client is
@@ -146,13 +146,13 @@ paths:
                 allOf:
                   - $ref: "definitions/third_party_signed.yaml"
                 description: |-
-                  If a ``third_party_signed`` was supplied, the homeserver must verify
-                  that it matches a pending ``m.room.third_party_invite`` event in the
+                  If a `third_party_signed` was supplied, the homeserver must verify
+                  that it matches a pending `m.room.third_party_invite` event in the
                   room, and perform key validity checking if required by the event.
               reason:
                 type: string
                 description: |-
-                  Optional reason to be included as the ``reason`` on the subsequent
+                  Optional reason to be included as the `reason` on the subsequent
                   membership event.
                 example: "Looking for support"
       responses:
@@ -160,7 +160,7 @@ paths:
           description: |-
             The room has been joined.
 
-            The joined room ID must be returned in the ``room_id`` field.
+            The joined room ID must be returned in the `room_id` field.
           examples:
             application/json: {
               "room_id": "!d41d8cd:matrix.org"}
@@ -173,7 +173,7 @@ paths:
             required: ["room_id"]
         403:
           description: |-
-            You do not have permission to join the room. A meaningful ``errcode``
+            You do not have permission to join the room. A meaningful `errcode`
             and description error text will be returned. Example reasons for rejection are:
 
             - The room is invite-only and the user was not invited.
diff --git a/data/api/client-server/key_backup.yaml b/data/api/client-server/key_backup.yaml
index 682372d7..ba3ec85f 100644
--- a/data/api/client-server/key_backup.yaml
+++ b/data/api/client-server/key_backup.yaml
@@ -124,7 +124,7 @@ paths:
               etag:
                 description: |-
                   An opaque string representing stored keys in the backup.
-                  Clients can compare it with the ``etag`` value they received
+                  Clients can compare it with the `etag` value they received
                   in the request of their last key storage request.  If not
                   equal, another client has modified the backup.
                 type: string
@@ -168,7 +168,7 @@ paths:
           type: string
           name: version
           description: |-
-            The backup version to get, as returned in the ``version`` parameter
+            The backup version to get, as returned in the `version` parameter
             of the response in `POST /_matrix/client/r0/room_keys/version`_ or
             this endpoint.
           required: true
@@ -206,7 +206,7 @@ paths:
               etag:
                 description: |-
                   An opaque string representing stored keys in the backup.
-                  Clients can compare it with the ``etag`` value they received
+                  Clients can compare it with the `etag` value they received
                   in the request of their last key storage request.  If not
                   equal, another client has modified the backup.
                 type: string
@@ -240,7 +240,7 @@ paths:
     put:
       summary: Update information about an existing backup.
       description: |-
-        Update information about an existing backup.  Only ``auth_data`` can be modified.
+        Update information about an existing backup.  Only `auth_data` can be modified.
       operationId: putRoomKeysVersion
       security:
         - accessToken: []
@@ -249,7 +249,7 @@ paths:
           type: string
           name: version
           description: |-
-            The backup version to update, as returned in the ``version``
+            The backup version to update, as returned in the `version`
             parameter in the response of `POST
             /_matrix/client/r0/room_keys/version`_ or `GET
             /_matrix/client/r0/room_keys/version/{version}`_.
@@ -300,9 +300,9 @@ paths:
             properties: {}
         400:
           description: |-
-            A parameter was incorrect.  For example, the ``algorithm`` does not
-            match the current backup algorithm, or the ``version`` in the body
-            does not match the ``version`` in the path.
+            A parameter was incorrect.  For example, the `algorithm` does not
+            match the current backup algorithm, or the `version` in the body
+            does not match the `version` in the path.
           examples:
             application/json: {
               "errcode": "M_INVALID_PARAM",
@@ -338,7 +338,7 @@ paths:
           type: string
           name: version
           description: |-
-            The backup version to delete, as returned in the ``version``
+            The backup version to delete, as returned in the `version`
             parameter in the response of `POST
             /_matrix/client/r0/room_keys/version`_ or `GET
             /_matrix/client/r0/room_keys/version/{version}`_.
@@ -412,7 +412,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
@@ -425,7 +425,7 @@ paths:
         403:
           description: |-
             The version specified does not match the current backup version.
-            The current version will be included in the ``current_version``
+            The current version will be included in the `current_version`
             field.
           examples:
             application/json: {
@@ -522,7 +522,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
@@ -583,7 +583,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
@@ -596,7 +596,7 @@ paths:
         403:
           description: |-
             The version specified does not match the current backup version.
-            The current version will be included in the ``current_version``
+            The current version will be included in the `current_version`
             field.
           examples:
             application/json: {
@@ -647,7 +647,7 @@ paths:
         200:
           description: |-
             The key data.  If no keys are found, then an object with an empty
-            ``sessions`` property will be returned (``{"sessions": {}}``).
+            `sessions` property will be returned (`{"sessions": {}}`).
           schema:
             type: object
             $ref: "definitions/room_key_backup.yaml"
@@ -695,7 +695,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
@@ -776,7 +776,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
@@ -789,7 +789,7 @@ paths:
         403:
           description: |-
             The version specified does not match the current backup version.
-            The current version will be included in the ``current_version``
+            The current version will be included in the `current_version`
             field.
           examples:
             application/json: {
@@ -834,7 +834,7 @@ paths:
         200:
           description: |-
             The key data.  If no keys are found, then an object with an empty
-            ``rooms`` property will be returned (``{"rooms": {}}``).
+            `rooms` property will be returned (`{"rooms": {}}`).
           schema:
             type: object
             properties:
@@ -898,7 +898,7 @@ paths:
               etag:
                 description: |-
                   The new etag value representing stored keys in the backup.
-                  See ``GET /room_keys/version/{version}`` for more details.
+                  See `GET /room_keys/version/{version}` for more details.
                 type: string
                 example: "abcdefg"
               count:
diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
index 5c1e5ffb..b3a8b219 100644
--- a/data/api/client-server/keys.yaml
+++ b/data/api/client-server/keys.yaml
@@ -57,7 +57,7 @@ paths:
                 description: |-
                   One-time public keys for "pre-key" messages.  The names of
                   the properties should be in the format
-                  ``<algorithm>:<key_id>``. The format of the key is determined
+                  `<algorithm>:<key_id>`. The format of the key is determined
                   by the `key algorithm <#key-algorithms>`_.
 
                   May be absent if no new one-time keys are required.
@@ -184,7 +184,7 @@ paths:
 
                   If the homeserver could be reached, but the user or device
                   was unknown, no failure is recorded. Instead, the corresponding
-                  user or device is missing from the ``device_keys`` result.
+                  user or device is missing from the `device_keys` result.
                 additionalProperties:
                   type: object
                 example: {}
@@ -194,7 +194,7 @@ paths:
                   Information on the queried devices. A map from user ID, to a
                   map from device ID to device information.  For each device,
                   the information returned will be the same as uploaded via
-                  ``/keys/upload``, with the addition of an ``unsigned``
+                  `/keys/upload`, with the addition of an `unsigned`
                   property.
                 additionalProperties:
                   type: object
@@ -243,8 +243,8 @@ paths:
                   Information on the master cross-signing keys of the queried users.
                   A map from user ID, to master key information.  For each key, the
                   information returned will be the same as uploaded via
-                  ``/keys/device_signing/upload``, along with the signatures
-                  uploaded via ``/keys/signatures/upload`` that the requesting user
+                  `/keys/device_signing/upload`, along with the signatures
+                  uploaded via `/keys/signatures/upload` that the requesting user
                   is allowed to see.
                 additionalProperties:
                   allOf:
@@ -264,7 +264,7 @@ paths:
                   Information on the self-signing keys of the queried users. A map
                   from user ID, to self-signing key information.  For each key, the
                   information returned will be the same as uploaded via
-                  ``/keys/device_signing/upload``.
+                  `/keys/device_signing/upload`.
                 additionalProperties:
                   allOf:
                     - $ref: definitions/cross_signing_key.yaml
@@ -289,7 +289,7 @@ paths:
                   request, if they queried their own device information. A map
                   from user ID, to user-signing key information.  The
                   information returned will be the same as uploaded via
-                  ``/keys/device_signing/upload``.
+                  `/keys/device_signing/upload`.
                 additionalProperties:
                   allOf:
                     - $ref: definitions/cross_signing_key.yaml
@@ -364,7 +364,7 @@ paths:
 
                   If the homeserver could be reached, but the user or device
                   was unknown, no failure is recorded. Instead, the corresponding
-                  user or device is missing from the ``one_time_keys`` result.
+                  user or device is missing from the `one_time_keys` result.
                 additionalProperties:
                   type: object
                 example: {}
@@ -372,7 +372,7 @@ paths:
                 type: object
                 description: |-
                   One-time keys for the queried devices. A map from user ID, to a
-                  map from devices to a map from ``<algorithm>:<key_id>`` to the key object.
+                  map from devices to a map from `<algorithm>:<key_id>` to the key object.
 
                   See the `key algorithms <#key-algorithms>`_ section for information
                   on the Key Object format.
@@ -425,9 +425,9 @@ paths:
         The server should include in the results any users who:
 
         * currently share a room with the calling user (ie, both users have
-          membership state ``join``); *and*
+          membership state `join`); *and*
         * added new device identity keys or removed an existing device with
-          identity keys, between ``from`` and ``to``.
+          identity keys, between `from` and `to`.
       operationId: getKeysChanges
       security:
         - accessToken: []
@@ -436,7 +436,7 @@ paths:
           name: from
           type: string
           description: |-
-             The desired start point of the list. Should be the ``next_batch`` field
+             The desired start point of the list. Should be the `next_batch` field
              from a response to an earlier call to |/sync|. Users who have not
              uploaded new device identity keys since this point, nor deleted
              existing devices with identity keys since then, will be excluded
@@ -447,7 +447,7 @@ paths:
           name: to
           type: string
           description: |-
-             The desired end point of the list. Should be the ``next_batch``
+             The desired end point of the list. Should be the `next_batch`
              field from a recent call to |/sync| - typically the most recent
              such call. This may be used by the server as a hint to check its
              caches are up to date.
diff --git a/data/api/client-server/kicking.yaml b/data/api/client-server/kicking.yaml
index fd3f1698..728406fe 100644
--- a/data/api/client-server/kicking.yaml
+++ b/data/api/client-server/kicking.yaml
@@ -34,10 +34,10 @@ paths:
         Kick a user from the room.
 
         The caller must have the required power level in order to perform this operation.
-        
-        Kicking a user adjusts the target member's membership state to be ``leave`` with an
-        optional ``reason``. Like with other membership changes, a user can directly adjust
-        the target member's state by making a request to ``/rooms/<room id>/state/m.room.member/<user id>``.
+
+        Kicking a user adjusts the target member's membership state to be `leave` with an
+        optional `reason`. Like with other membership changes, a user can directly adjust
+        the target member's state by making a request to `/rooms/<room id>/state/m.room.member/<user id>`.
       operationId: kick
       security:
         - accessToken: []
@@ -64,8 +64,8 @@ paths:
               reason:
                 type: string
                 description: |-
-                  The reason the user has been kicked. This will be supplied as the 
-                  ``reason`` on the target's updated `m.room.member`_ event.
+                  The reason the user has been kicked. This will be supplied as the
+                  `reason` on the target's updated `m.room.member`_ event.
             required: ["user_id"]
       responses:
         200:
@@ -77,7 +77,7 @@ paths:
             type: object
         403:
           description: |-
-            You do not have permission to kick the user from the room. A meaningful ``errcode`` and
+            You do not have permission to kick the user from the room. A meaningful `errcode` and
             description error text will be returned. Example reasons for rejections are:
 
             - The kicker is not currently in the room.
diff --git a/data/api/client-server/leaving.yaml b/data/api/client-server/leaving.yaml
index 56b2b8c8..f3d3b486 100644
--- a/data/api/client-server/leaving.yaml
+++ b/data/api/client-server/leaving.yaml
@@ -64,7 +64,7 @@ paths:
               reason:
                 type: string
                 description: |-
-                  Optional reason to be included as the ``reason`` on the subsequent
+                  Optional reason to be included as the `reason` on the subsequent
                   membership event.
       responses:
         200:
diff --git a/data/api/client-server/list_joined_rooms.yaml b/data/api/client-server/list_joined_rooms.yaml
index 19ad8649..b34f3d5d 100644
--- a/data/api/client-server/list_joined_rooms.yaml
+++ b/data/api/client-server/list_joined_rooms.yaml
@@ -45,7 +45,7 @@ paths:
               joined_rooms:
                 type: array
                 description: |-
-                  The ID of each room in which the user has ``joined`` membership.
+                  The ID of each room in which the user has `joined` membership.
                 items:
                   type: string
           examples:
diff --git a/data/api/client-server/list_public_rooms.yaml b/data/api/client-server/list_public_rooms.yaml
index 222b412a..4175b0a9 100644
--- a/data/api/client-server/list_public_rooms.yaml
+++ b/data/api/client-server/list_public_rooms.yaml
@@ -48,7 +48,7 @@ paths:
                 type: string
                 enum: ['private', 'public']
                 description: The visibility of the room in the directory.
-          examples: 
+          examples:
             application/json: {
               "visibility": "public"
             }
@@ -68,7 +68,7 @@ paths:
         directory.
 
         Servers may choose to implement additional access control checks
-        here, for instance that room visibility can only be changed by 
+        here, for instance that room visibility can only be changed by
         the room creator or a server administrator.
       operationId: setRoomVisibilityOnDirectory
       security:
@@ -92,7 +92,7 @@ paths:
                 type: string
                 enum: ["private", "public"]
                 description: |-
-                  The new visibility setting for the room. 
+                  The new visibility setting for the room.
                   Defaults to 'public'.
             example: {
                "visibility": "public"
@@ -100,7 +100,7 @@ paths:
       responses:
         200:
           description: The visibility was updated, or no change was needed.
-          examples: 
+          examples:
             application/json: {}
         404:
           description: The room is not known to the server
@@ -204,10 +204,10 @@ paths:
                 type: string
                 description: |-
                   The specific third party network/protocol to request from the
-                  homeserver. Can only be used if ``include_all_networks`` is false.
+                  homeserver. Can only be used if `include_all_networks` is false.
                 example: "irc"
             example: {
-              "limit": 10, 
+              "limit": 10,
               "filter": {
                 "generic_search_term": "foo"
               },
diff --git a/data/api/client-server/login.yaml b/data/api/client-server/login.yaml
index 557f2075..b68094c6 100644
--- a/data/api/client-server/login.yaml
+++ b/data/api/client-server/login.yaml
@@ -33,7 +33,7 @@ paths:
       summary: Get the supported login types to authenticate users
       description: |-
         Gets the homeserver's supported login types to authenticate users. Clients
-        should pick one of these and supply it as the ``type`` when logging in.
+        should pick one of these and supply it as the `type` when logging in.
       operationId: getLoginFlows
       responses:
         200:
@@ -56,7 +56,7 @@ paths:
                   properties:
                     type:
                       description: |-
-                        The login type. This is supplied as the ``type`` when
+                        The login type. This is supplied as the `type` when
                         logging in.
                       type: string
         429:
@@ -71,10 +71,10 @@ paths:
         Authenticates the user, and issues an access token they can
         use to authorize themself in subsequent requests.
 
-        If the client does not supply a ``device_id``, the server must
+        If the client does not supply a `device_id`, the server must
         auto-generate one.
 
-        The returned access token must be associated with the ``device_id``
+        The returned access token must be associated with the `device_id`
         supplied by the client or generated by the server. The server may
         invalidate any access token previously associated with that device. See
         `Relationship between access tokens and devices`_.
@@ -103,22 +103,22 @@ paths:
                 "$ref": "definitions/user_identifier.yaml"
               user:
                 type: string
-                description: The fully qualified user ID or just local part of the user ID, to log in.  Deprecated in favour of ``identifier``.
+                description: The fully qualified user ID or just local part of the user ID, to log in.  Deprecated in favour of `identifier`.
               medium:
                 type: string
-                description: When logging in using a third party identifier, the medium of the identifier. Must be 'email'.  Deprecated in favour of ``identifier``.
+                description: When logging in using a third party identifier, the medium of the identifier. Must be 'email'.  Deprecated in favour of `identifier`.
               address:
                 type: string
-                description: Third party identifier for the user.  Deprecated in favour of ``identifier``.
+                description: Third party identifier for the user.  Deprecated in favour of `identifier`.
               password:
                 type: string
                 description: |-
-                  Required when ``type`` is ``m.login.password``. The user's
+                  Required when `type` is `m.login.password`. The user's
                   password.
               token:
                 type: string
                 description: |-
-                  Required when ``type`` is ``m.login.token``. Part of `Token-based`_ login.
+                  Required when `type` is `m.login.token`. Part of `Token-based`_ login.
               device_id:
                 type: string
                 description: |-
@@ -131,7 +131,7 @@ paths:
                 type: string
                 description: |-
                   A display name to assign to the newly-created device. Ignored
-                  if ``device_id`` corresponds to a known device.
+                  if `device_id` corresponds to a known device.
             required: ["type"]
 
       responses:
@@ -169,8 +169,8 @@ paths:
                   been registered.
 
                   **Deprecated**. Clients should extract the server_name from
-                  ``user_id`` (by splitting at the first colon) if they require
-                  it. Note also that ``homeserver`` is not spelt this way.
+                  `user_id` (by splitting at the first colon) if they require
+                  it. Note also that `homeserver` is not spelt this way.
               device_id:
                 type: string
                 description: |-
@@ -197,10 +197,10 @@ paths:
         403:
           description: |-
             The login attempt failed. This can include one of the following error codes:
-              * ``M_FORBIDDEN``: The provided authentication data was incorrect
+              * `M_FORBIDDEN`: The provided authentication data was incorrect
                 or the requested device ID is the same as a cross-signing key
                 ID.
-              * ``M_USER_DEACTIVATED``: The user has been deactivated.
+              * `M_USER_DEACTIVATED`: The user has been deactivated.
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN"
diff --git a/data/api/client-server/message_pagination.yaml b/data/api/client-server/message_pagination.yaml
index 66e1d9c2..5e5a99c2 100644
--- a/data/api/client-server/message_pagination.yaml
+++ b/data/api/client-server/message_pagination.yaml
@@ -51,8 +51,8 @@ paths:
           name: from
           description: |-
             The token to start returning events from. This token can be obtained
-            from a ``prev_batch`` token returned for each room by the sync API,
-            or from a ``start`` or ``end`` token returned by a previous request
+            from a `prev_batch` token returned for each room by the sync API,
+            or from a `start` or `end` token returned by a previous request
             to this endpoint.
           required: true
           x-example: "s345_678_333"
@@ -61,8 +61,8 @@ paths:
           name: to
           description: |-
             The token to stop returning events at. This token can be obtained from
-            a ``prev_batch`` token returned for each room by the sync endpoint,
-            or from a ``start`` or ``end`` token returned by a previous request to
+            a `prev_batch` token returned for each room by the sync endpoint,
+            or from a `start` or `end` token returned by a previous request to
             this endpoint.
           required: false
         - in: query
@@ -96,30 +96,30 @@ paths:
               start:
                 type: string
                 description: |-
-                  The token the pagination starts from. If ``dir=b`` this will be
-                  the token supplied in ``from``.
+                  The token the pagination starts from. If `dir=b` this will be
+                  the token supplied in `from`.
               end:
                 type: string
                 description: |-
-                  The token the pagination ends at. If ``dir=b`` this token should
+                  The token the pagination ends at. If `dir=b` this token should
                   be used again to request even earlier events.
               chunk:
                 type: array
                 description: |-
-                  A list of room events. The order depends on the ``dir`` parameter.
-                  For ``dir=b`` events will be in reverse-chronological order,
-                  for ``dir=f`` in chronological order, so that events start
-                  at the ``from`` point.
+                  A list of room events. The order depends on the `dir` parameter.
+                  For `dir=b` events will be in reverse-chronological order,
+                  for `dir=f` in chronological order, so that events start
+                  at the `from` point.
                 items:
                   "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
               state:
                 type: array
                 description: |-
-                  A list of state events relevant to showing the ``chunk``. For example, if
-                  ``lazy_load_members`` is enabled in the filter then this may contain
-                  the membership events for the senders of events in the ``chunk``.
+                  A list of state events relevant to showing the `chunk`. For example, if
+                  `lazy_load_members` is enabled in the filter then this may contain
+                  the membership events for the senders of events in the `chunk`.
 
-                  Unless ``include_redundant_members`` is ``true``, the server
+                  Unless `include_redundant_members` is `true`, the server
                   may remove membership events which would have already been
                   sent to the client in prior calls to this endpoint, assuming
                   the membership of those members has not changed.
diff --git a/data/api/client-server/notifications.yaml b/data/api/client-server/notifications.yaml
index 434b3be2..86f17a13 100644
--- a/data/api/client-server/notifications.yaml
+++ b/data/api/client-server/notifications.yaml
@@ -54,7 +54,7 @@ paths:
           name: only
           type: string
           description: |-
-            Allows basic filtering of events returned. Supply ``highlight``
+            Allows basic filtering of events returned. Supply `highlight`
             to return only events where the notification had the highlight
             tweak set.
           required: false
@@ -87,8 +87,8 @@ paths:
               next_token:
                 type: string
                 description: |-
-                  The token to supply in the ``from`` param of the next
-                  ``/notifications`` request in order to request more
+                  The token to supply in the `from` param of the next
+                  `/notifications` request in order to request more
                   events. If this is absent, there are no more results.
               notifications:
                 type: array
diff --git a/data/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml
index 7caad40e..6c65c1b0 100644
--- a/data/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@@ -32,10 +32,10 @@ paths:
       summary: Listen on the event stream.
       description: |-
         This will listen for new events and return them to the caller. This will
-        block until an event is received, or until the ``timeout`` is reached.
+        block until an event is received, or until the `timeout` is reached.
 
         This endpoint was deprecated in r0 of this specification. Clients
-        should instead call the |/sync|_ API with a ``since`` parameter. See
+        should instead call the |/sync|_ API with a `since` parameter. See
         the `migration guide
         <https://matrix.org/docs/guides/client-server-migrating-from-v1.html#deprecated-endpoints>`_.
       operationId: getEvents
@@ -73,13 +73,13 @@ paths:
               start:
                 type: string
                 description: |-
-                  A token which correlates to the first value in ``chunk``. This
-                  is usually the same token supplied to ``from=``.
+                  A token which correlates to the first value in `chunk`. This
+                  is usually the same token supplied to `from=`.
               end:
                 type: string
                 description: |-
-                  A token which correlates to the last value in ``chunk``. This
-                  token should be used in the next request to ``/events``.
+                  A token which correlates to the last value in `chunk`. This
+                  token should be used in the next request to `/events`.
               chunk:
                 type: array
                 description: "An array of events."
@@ -89,7 +89,7 @@ paths:
                   allOf:
                     - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
         400:
-          description: "Bad pagination ``from`` parameter."
+          description: "Bad pagination `from` parameter."
       tags:
         - Room participation
       deprecated: true
@@ -101,7 +101,7 @@ paths:
         number of messages per room to return.
 
         This endpoint was deprecated in r0 of this specification. Clients
-        should instead call the |/sync|_ API with no ``since`` parameter. See
+        should instead call the |/sync|_ API with no `since` parameter. See
         the `migration guide
         <https://matrix.org/docs/guides/client-server-migrating-from-v1.html#deprecated-endpoints>`_.
       operationId: initialSync
@@ -118,10 +118,10 @@ paths:
           type: boolean
           name: archived
           description: |-
-            Whether to include rooms that the user has left. If ``false`` then
+            Whether to include rooms that the user has left. If `false` then
             only rooms that the user has been invited to or has joined are
-            included. If set to ``true`` then rooms that the user has left are
-            included as well. By default this is ``false``.
+            included. If set to `true` then rooms that the user has left are
+            included as well. By default this is `false`.
           required: false
           x-example: "true"
       responses:
@@ -199,8 +199,8 @@ paths:
               end:
                 type: string
                 description: |-
-                  A token which correlates to the last value in ``chunk``. This
-                  token should be used with the ``/events`` API to listen for new
+                  A token which correlates to the last value in `chunk`. This
+                  token should be used with the `/events` API to listen for new
                   events.
               presence:
                 type: array
@@ -226,7 +226,7 @@ paths:
                     invite:
                         type: object
                         title: "InviteEvent"
-                        description: "The invite event if ``membership`` is ``invite``"
+                        description: "The invite event if `membership` is `invite`"
                         allOf:
                           - "$ref": "../../event-schemas/schema/m.room.member.yaml"
                     messages:
@@ -237,12 +237,12 @@ paths:
                         start:
                           type: string
                           description: |-
-                            A token which correlates to the first value in ``chunk``.
+                            A token which correlates to the first value in `chunk`.
                             Used for pagination.
                         end:
                           type: string
                           description: |-
-                            A token which correlates to the last value in ``chunk``.
+                            A token which correlates to the last value in `chunk`.
                             Used for pagination.
                         chunk:
                           type: array
@@ -251,7 +251,7 @@ paths:
                             list of the most recent messages for this room. If
                             the user has left the room this will be the
                             messages that preceeded them leaving. This array
-                            will consist of at most ``limit`` elements.
+                            will consist of at most `limit` elements.
                           items:
                             type: object
                             title: RoomEvent
@@ -274,7 +274,7 @@ paths:
                       type: string
                       enum: ["private", "public"]
                       description: |-
-                        Whether this room is visible to the ``/publicRooms`` API
+                        Whether this room is visible to the `/publicRooms` API
                         or not."
                     account_data:
                       type: array
@@ -306,7 +306,7 @@ paths:
     get:
       summary: Get a single event by event ID.
       description: |-
-        Get a single event based on ``event_id``. You must have permission to
+        Get a single event based on `event_id`. You must have permission to
         retrieve this event e.g. by being a member in the room for this event.
 
         This endpoint was deprecated in r0 of this specification. Clients
diff --git a/data/api/client-server/openid.yaml b/data/api/client-server/openid.yaml
index 98a2449e..ec6f8818 100644
--- a/data/api/client-server/openid.yaml
+++ b/data/api/client-server/openid.yaml
@@ -37,7 +37,7 @@ paths:
         OpenID.
 
         The access token generated is only valid for the OpenID API. It cannot
-        be used to request another OpenID access token or call ``/sync``, for
+        be used to request another OpenID access token or call `/sync`, for
         example.
       operationId: requestOpenIdToken
       security:
@@ -63,7 +63,7 @@ paths:
           description: |-
             OpenID token information. This response is nearly compatible with the
             response documented in the `OpenID Connect 1.0 Specification <http://openid.net/specs/openid-connect-core-1_0.html#TokenResponse>`_
-            with the only difference being the lack of an ``id_token``. Instead,
+            with the only difference being the lack of an `id_token`. Instead,
             the Matrix homeserver's name is provided.
           examples:
             application/json: {
diff --git a/data/api/client-server/peeking_events.yaml b/data/api/client-server/peeking_events.yaml
index 462b0191..85eb8768 100644
--- a/data/api/client-server/peeking_events.yaml
+++ b/data/api/client-server/peeking_events.yaml
@@ -33,12 +33,12 @@ paths:
       description: |-
         This will listen for new events related to a particular room and return
         them to the caller. This will block until an event is received, or until
-        the ``timeout`` is reached.
+        the `timeout` is reached.
 
-        This API is the same as the normal ``/events`` endpoint, but can be
+        This API is the same as the normal `/events` endpoint, but can be
         called by users who have not joined the room.
 
-        Note that the normal ``/events`` endpoint has been deprecated. This
+        Note that the normal `/events` endpoint has been deprecated. This
         API will also be deprecated at some point, but its replacement is not
         yet known.
       operationId: peekEvents
@@ -86,13 +86,13 @@ paths:
               start:
                 type: string
                 description: |-
-                  A token which correlates to the first value in ``chunk``. This
-                  is usually the same token supplied to ``from=``.
+                  A token which correlates to the first value in `chunk`. This
+                  is usually the same token supplied to `from=`.
               end:
                 type: string
                 description: |-
-                  A token which correlates to the last value in ``chunk``. This
-                  token should be used in the next request to ``/events``.
+                  A token which correlates to the last value in `chunk`. This
+                  token should be used in the next request to `/events`.
               chunk:
                 type: array
                 description: "An array of events."
@@ -102,5 +102,5 @@ paths:
                   allOf:
                     - "$ref": "../../event-schemas/schema/core-event-schema/room_event.yaml"
         400:
-          description: "Bad pagination ``from`` parameter."
+          description: "Bad pagination `from` parameter."
         # No tags to exclude this from the swagger UI - use the normal version instead.
diff --git a/data/api/client-server/presence.yaml b/data/api/client-server/presence.yaml
index b3a8bb02..003de8ca 100644
--- a/data/api/client-server/presence.yaml
+++ b/data/api/client-server/presence.yaml
@@ -33,7 +33,7 @@ paths:
       description: |-
         This API sets the given user's presence state. When setting the status,
         the activity time is updated to reflect that activity; the client does
-        not need to specify the ``last_active_ago`` field. You cannot set the
+        not need to specify the `last_active_ago` field. You cannot set the
         presence state of another user.
       operationId: setPresence
       security:
diff --git a/data/api/client-server/profile.yaml b/data/api/client-server/profile.yaml
index db998e6c..6a8d6a77 100644
--- a/data/api/client-server/profile.yaml
+++ b/data/api/client-server/profile.yaml
@@ -32,7 +32,7 @@ paths:
       summary: Set the user's display name.
       description: |-
         This API sets the given user's display name. You must have permission to
-        set this user's display name, e.g. you need to have their ``access_token``.
+        set this user's display name, e.g. you need to have their `access_token`.
       operationId: setDisplayName
       security:
         - accessToken: []
@@ -106,7 +106,7 @@ paths:
       summary: Set the user's avatar URL.
       description: |-
         This API sets the given user's avatar URL. You must have permission to
-        set this user's avatar URL, e.g. you need to have their ``access_token``.
+        set this user's avatar URL, e.g. you need to have their `access_token`.
       operationId: setAvatarUrl
       security:
         - accessToken: []
@@ -182,7 +182,7 @@ paths:
         Get the combined profile information for this user. This API may be used
         to fetch the user's own profile information or other users; either
         locally or on remote homeservers. This API may return keys which are not
-        limited to ``displayname`` or ``avatar_url``.
+        limited to `displayname` or `avatar_url`.
       operationId: getUserProfile
       parameters:
         - in: path
diff --git a/data/api/client-server/pusher.yaml b/data/api/client-server/pusher.yaml
index d232baf9..e274c3b3 100644
--- a/data/api/client-server/pusher.yaml
+++ b/data/api/client-server/pusher.yaml
@@ -71,13 +71,13 @@ paths:
                     pushkey:
                       type: string
                       description: |-
-                        This is a unique identifier for this pusher. See ``/set`` for
+                        This is a unique identifier for this pusher. See `/set` for
                         more detail.
                         Max length, 512 bytes.
                     kind:
                       type: string
                       description: |-
-                        The kind of pusher. ``"http"`` is a pusher that
+                        The kind of pusher. `"http"` is a pusher that
                         sends HTTP pokes.
                     app_id:
                       type: string
@@ -114,7 +114,7 @@ paths:
                         url:
                           type: string
                           description: |-
-                            Required if ``kind`` is ``http``. The URL to use to send
+                            Required if `kind` is `http`. The URL to use to send
                             notifications to.
                         format:
                           type: string
@@ -173,14 +173,14 @@ paths:
                   client has no such concept, use any unique identifier.
                   Max length, 512 bytes.
 
-                  If the ``kind`` is ``"email"``, this is the email address to
+                  If the `kind` is `"email"`, this is the email address to
                   send notifications to.
               kind:
                 type: string
                 description: |-
-                  The kind of pusher to configure. ``"http"`` makes a pusher that
-                  sends HTTP pokes. ``"email"`` makes a pusher that emails the
-                  user with unread notifications. ``null`` deletes the pusher.
+                  The kind of pusher to configure. `"http"` makes a pusher that
+                  sends HTTP pokes. `"email"` makes a pusher that emails the
+                  user with unread notifications. `null` deletes the pusher.
               app_id:
                 type: string
                 description: |-
@@ -189,7 +189,7 @@ paths:
                   different platform versions get different app identifiers.
                   Max length, 64 chars.
 
-                  If the ``kind`` is ``"email"``, this is ``"m.email"``.
+                  If the `kind` is `"email"`, this is `"m.email"`.
               app_display_name:
                 type: string
                 description: |-
@@ -214,22 +214,22 @@ paths:
                 type: object
                 description: |-
                   A dictionary of information for the pusher implementation
-                  itself. If ``kind`` is ``http``, this should contain ``url``
+                  itself. If `kind` is `http`, this should contain `url`
                   which is the URL to use to send notifications to.
                 title: PusherData
                 properties:
                   url:
                     type: string
                     description: |-
-                      Required if ``kind`` is ``http``. The URL to use to send
-                      notifications to. MUST be an HTTPS URL with a path of 
-                      ``/_matrix/push/v1/notify``.
+                      Required if `kind` is `http`. The URL to use to send
+                      notifications to. MUST be an HTTPS URL with a path of
+                      `/_matrix/push/v1/notify`.
                     example: "https://push-gateway.location.here/_matrix/push/v1/notify"
                   format:
                     type: string
                     description: |-
                       The format to send notifications in to Push Gateways if the
-                      ``kind`` is ``http``. The details about what fields the
+                      `kind` is `http`. The details about what fields the
                       homeserver should send to the push gateway are defined in the
                       `Push Gateway Specification`_. Currently the only format
                       available is 'event_id_only'.
@@ -240,7 +240,7 @@ paths:
                   given pushkey and App ID in addition to any others with
                   different user IDs. Otherwise, the homeserver must remove any
                   other pushers with the same App ID and pushkey for different
-                  users. The default is ``false``.
+                  users. The default is `false`.
             required: ['kind', 'app_id', 'app_display_name',
                 'device_display_name', 'pushkey', 'lang', 'data']
       responses:
diff --git a/data/api/client-server/pushrules.yaml b/data/api/client-server/pushrules.yaml
index bd0c80b8..9a595271 100644
--- a/data/api/client-server/pushrules.yaml
+++ b/data/api/client-server/pushrules.yaml
@@ -32,9 +32,9 @@ paths:
       summary: Retrieve all push rulesets.
       description: |-
         Retrieve all push rulesets for this user. Clients can "drill-down" on
-        the rulesets by suffixing a ``scope`` to this path e.g.
-        ``/pushrules/global/``. This will return a subset of this data under the
-        specified key e.g. the ``global`` key.
+        the rulesets by suffixing a `scope` to this path e.g.
+        `/pushrules/global/`. This will return a subset of this data under the
+        specified key e.g. the `global` key.
       operationId: getPushRules
       security:
         - accessToken: []
@@ -263,7 +263,7 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            ``global`` to specify global rules.
+            `global` to specify global rules.
         - in: path
           type: string
           name: kind
@@ -283,7 +283,7 @@ paths:
         200:
           description: |-
             The specific push rule. This will also include keys specific to the
-            rule itself such as the rule's ``actions`` and ``conditions`` if set.
+            rule itself such as the rule's `actions` and `conditions` if set.
           examples:
             application/json: {
                 "actions": [
@@ -326,7 +326,7 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            ``global`` to specify global rules.
+            `global` to specify global rules.
         - in: path
           type: string
           name: kind
@@ -380,7 +380,7 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            ``global`` to specify global rules.
+            `global` to specify global rules.
         - in: path
           type: string
           name: kind
@@ -402,7 +402,7 @@ paths:
           required: false
           x-example: someRuleId
           description: |-
-            Use 'before' with a ``rule_id`` as its value to make the new rule the
+            Use 'before' with a `rule_id` as its value to make the new rule the
             next-most important rule with respect to the given user defined rule.
             It is not possible to add a rule relative to a predefined server rule.
         - in: query
@@ -418,7 +418,7 @@ paths:
           name: pushrule
           description: |-
             The push rule data. Additional top-level keys may be present depending
-            on the parameters for the rule ``kind``.
+            on the parameters for the rule `kind`.
           required: true
           schema:
             type: object
@@ -440,14 +440,14 @@ paths:
                 description: |-
                   The conditions that must hold true for an event in order for a
                   rule to be applied to an event. A rule with no conditions
-                  always matches. Only applicable to ``underride`` and ``override`` rules.
+                  always matches. Only applicable to `underride` and `override` rules.
                 items:
                   type: object
                   allOf: [ "$ref": "definitions/push_condition.yaml" ]
               pattern:
                 type: string
                 description: |-
-                  Only applicable to ``content`` rules. The glob-style pattern to match against.
+                  Only applicable to `content` rules. The glob-style pattern to match against.
             required: ["actions"]
       responses:
         200:
@@ -497,8 +497,8 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            Either ``global`` or ``device/<profile_tag>`` to specify global
-            rules or device rules for the given ``profile_tag``.
+            Either `global` or `device/<profile_tag>` to specify global
+            rules or device rules for the given `profile_tag`.
         - in: path
           type: string
           name: kind
@@ -554,7 +554,7 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            ``global`` to specify global rules.
+            `global` to specify global rules.
         - in: path
           type: string
           name: kind
@@ -620,8 +620,8 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            Either ``global`` or ``device/<profile_tag>`` to specify global
-            rules or device rules for the given ``profile_tag``.
+            Either `global` or `device/<profile_tag>` to specify global
+            rules or device rules for the given `profile_tag`.
         - in: path
           type: string
           name: kind
@@ -685,7 +685,7 @@ paths:
           required: true
           x-example: "global"
           description: |-
-            ``global`` to specify global rules.
+            `global` to specify global rules.
         - in: path
           type: string
           name: kind
diff --git a/data/api/client-server/read_markers.yaml b/data/api/client-server/read_markers.yaml
index 4f5d43ce..aa9d0ecb 100644
--- a/data/api/client-server/read_markers.yaml
+++ b/data/api/client-server/read_markers.yaml
@@ -60,7 +60,7 @@ paths:
                 type: string
                 description: |-
                   The event ID to set the read receipt location at. This is
-                  equivalent to calling ``/receipt/m.read/$elsewhere:example.org``
+                  equivalent to calling `/receipt/m.read/$elsewhere:example.org`
                   and is provided here to save that extra call.
                 example: "$elsewhere:example.org"
             required: ['m.fully_read']
diff --git a/data/api/client-server/receipts.yaml b/data/api/client-server/receipts.yaml
index a3e9789e..716946ac 100644
--- a/data/api/client-server/receipts.yaml
+++ b/data/api/client-server/receipts.yaml
@@ -59,8 +59,8 @@ paths:
         - in: body
           name: receipt
           description: |-
-            Extra receipt information to attach to ``content`` if any. The
-            server will automatically set the ``ts`` field.
+            Extra receipt information to attach to `content` if any. The
+            server will automatically set the `ts` field.
           schema:
             type: object
             example: {
diff --git a/data/api/client-server/redaction.yaml b/data/api/client-server/redaction.yaml
index 1dbdf76e..aeef07a5 100644
--- a/data/api/client-server/redaction.yaml
+++ b/data/api/client-server/redaction.yaml
@@ -36,9 +36,9 @@ paths:
 
         This cannot be undone.
 
-        Any user with a power level greater than or equal to the ``m.room.redaction``
+        Any user with a power level greater than or equal to the `m.room.redaction`
         event power level may send redaction events in the room. If the user's power
-        level greater is also greater than or equal to the ``redact`` power level
+        level greater is also greater than or equal to the `redact` power level
         of the room, the user may redact events sent by other users.
 
         Server administrators may redact events sent by users on their server.
diff --git a/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml
index 69316b8f..26203320 100644
--- a/data/api/client-server/registration.yaml
+++ b/data/api/client-server/registration.yaml
@@ -43,27 +43,27 @@ paths:
         If registration is successful, this endpoint will issue an access token
         the client can use to authorize itself in subsequent requests.
 
-        If the client does not supply a ``device_id``, the server must
+        If the client does not supply a `device_id`, the server must
         auto-generate one.
 
         The server SHOULD register an account with a User ID based on the
-        ``username`` provided, if any. Note that the grammar of Matrix User ID
+        `username` provided, if any. Note that the grammar of Matrix User ID
         localparts is restricted, so the server MUST either map the provided
-        ``username`` onto a ``user_id`` in a logical manner, or reject
-        ``username``\s which do not comply to the grammar, with
-        ``M_INVALID_USERNAME``.
+        `username` onto a `user_id` in a logical manner, or reject
+        `username`\s which do not comply to the grammar, with
+        `M_INVALID_USERNAME`.
 
         Matrix clients MUST NOT assume that localpart of the registered
-        ``user_id`` matches the provided ``username``.
+        `user_id` matches the provided `username`.
 
-        The returned access token must be associated with the ``device_id``
+        The returned access token must be associated with the `device_id`
         supplied by the client or generated by the server. The server may
         invalidate any access token previously associated with that device. See
         `Relationship between access tokens and devices`_.
 
         When registering a guest account, all parameters in the request body
-        with the exception of ``initial_device_display_name`` MUST BE ignored
-        by the server. The server MUST pick a ``device_id`` for the account
+        with the exception of `initial_device_display_name` MUST BE ignored
+        by the server. The server MUST pick a `device_id` for the account
         regardless of input.
 
         Any user ID returned by this API must conform to the grammar given in the
@@ -81,7 +81,7 @@ paths:
           enum:
             - guest
             - user
-          description: The kind of account to register. Defaults to ``user``.
+          description: The kind of account to register. Defaults to `user`.
         - in: body
           name: body
           required: true
@@ -94,7 +94,7 @@ paths:
                     user-interactive authentication API. Note that this
                     information is *not* used to define how the registered user
                     should be authenticated, but is instead used to
-                    authenticate the ``register`` call itself.
+                    authenticate the `register` call itself.
                 allOf:
                 - "$ref": "definitions/auth_data.yaml"
               username:
@@ -118,12 +118,12 @@ paths:
                 type: string
                 description: |-
                   A display name to assign to the newly-created device. Ignored
-                  if ``device_id`` corresponds to a known device.
+                  if `device_id` corresponds to a known device.
                 example: Jungle Phone
               inhibit_login:
                 type: boolean
                 description: |-
-                  If true, an ``access_token`` and ``device_id`` should not be
+                  If true, an `access_token` and `device_id` should not be
                   returned from this call, therefore preventing an automatic
                   login. Defaults to false.
                 example: false
@@ -151,7 +151,7 @@ paths:
                 description: |-
                   An access token for the account.
                   This access token can then be used to authorize other requests.
-                  Required if the ``inhibit_login`` option is false.
+                  Required if the `inhibit_login` option is false.
               home_server:
                 type: string
                 description: |-
@@ -159,22 +159,22 @@ paths:
                   been registered.
 
                   **Deprecated**. Clients should extract the server_name from
-                  ``user_id`` (by splitting at the first colon) if they require
-                  it. Note also that ``homeserver`` is not spelt this way.
+                  `user_id` (by splitting at the first colon) if they require
+                  it. Note also that `homeserver` is not spelt this way.
               device_id:
                 type: string
                 description: |-
                   ID of the registered device. Will be the same as the
                   corresponding parameter in the request, if one was specified.
-                  Required if the ``inhibit_login`` option is false.
+                  Required if the `inhibit_login` option is false.
             required: ['user_id']
         400:
           description: |-
             Part of the request was invalid. This may include one of the following error codes:
 
-            * ``M_USER_IN_USE`` : The desired user ID is already taken.
-            * ``M_INVALID_USERNAME`` : The desired user ID is not a valid user name.
-            * ``M_EXCLUSIVE`` : The desired user ID is in the exclusive namespace
+            * `M_USER_IN_USE` : The desired user ID is already taken.
+            * `M_INVALID_USERNAME` : The desired user ID is not a valid user name.
+            * `M_EXCLUSIVE` : The desired user ID is in the exclusive namespace
               claimed by an application service.
 
             These errors may be returned at any stage of the registration process,
@@ -200,7 +200,7 @@ paths:
         403:
           description: |-
             The homeserver does not permit registering the account. This response
-            can be used to identify that a particular ``kind`` of account is not
+            can be used to identify that a particular `kind` of account is not
             allowed, or that registration is generally not supported by the homeserver.
           examples:
             application/json: {
@@ -251,12 +251,12 @@ paths:
           description: |-
             Part of the request was invalid. This may include one of the following error codes:
 
-            * ``M_THREEPID_IN_USE`` : The email address is already registered to an account on this server.
+            * `M_THREEPID_IN_USE` : The email address is already registered to an account on this server.
               However, if the homeserver has the ability to send email, it is recommended that the server
               instead send an email to the user with instructions on how to reset their password.
               This prevents malicious parties from being able to determine if a given email address
               has an account on the homeserver in question.
-            * ``M_SERVER_NOT_TRUSTED`` : The ``id_server`` parameter refers to an identity server
+            * `M_SERVER_NOT_TRUSTED` : The `id_server` parameter refers to an identity server
               that is not trusted by this homeserver.
           examples:
             application/json: {
@@ -301,12 +301,12 @@ paths:
           description: |-
             Part of the request was invalid. This may include one of the following error codes:
 
-            * ``M_THREEPID_IN_USE`` : The phone number is already registered to an account on this server.
+            * `M_THREEPID_IN_USE` : The phone number is already registered to an account on this server.
               However, if the homeserver has the ability to send SMS message, it is recommended that the server
               instead send an SMS message to the user with instructions on how to reset their password.
               This prevents malicious parties from being able to determine if a given phone number
               has an account on the homeserver in question.
-            * ``M_SERVER_NOT_TRUSTED`` : The ``id_server`` parameter refers to an identity server
+            * `M_SERVER_NOT_TRUSTED` : The `id_server` parameter refers to an identity server
               that is not trusted by this homeserver.
           examples:
             application/json: {
@@ -352,7 +352,7 @@ paths:
                   Whether the user's other access tokens, and their associated devices, should be
                   revoked if the request succeeds. Defaults to true.
 
-                  When ``false``, the server can still take advantage of `the soft logout method <#soft-logout>`_
+                  When `false`, the server can still take advantage of `the soft logout method <#soft-logout>`_
                   for the user's remaining devices.
                 example: true
               auth:
@@ -386,20 +386,20 @@ paths:
         The homeserver must check that the given email address **is
         associated** with an account on this homeserver. This API should be
         used to request validation tokens when authenticating for the
-        ``/account/password`` endpoint.
+        `/account/password` endpoint.
 
         This API's parameters and response are identical to that of the
         |/register/email/requestToken|_ endpoint, except that
-        ``M_THREEPID_NOT_FOUND`` may be returned if no account matching the
+        `M_THREEPID_NOT_FOUND` may be returned if no account matching the
         given email address could be found. The server may instead send an
         email to the given address prompting the user to create an account.
-        ``M_THREEPID_IN_USE`` may not be returned.
+        `M_THREEPID_IN_USE` may not be returned.
 
         The homeserver should validate the email itself, either by sending a
         validation email itself or by using a service it has control over.
 
 
-        .. |/register/email/requestToken| replace:: ``/register/email/requestToken``
+        .. |/register/email/requestToken| replace:: `/register/email/requestToken`
 
         .. _/register/email/requestToken: #post-matrix-client-%CLIENT_MAJOR_VERSION%-register-email-requesttoken
       operationId: requestTokenToResetPasswordEmail
@@ -428,7 +428,7 @@ paths:
         400:
           description: |-
             The referenced third party identifier is not recognised by the
-            homeserver, or the request was invalid. The error code ``M_SERVER_NOT_TRUSTED``
+            homeserver, or the request was invalid. The error code `M_SERVER_NOT_TRUSTED`
             can be returned if the server does not trust/support the identity server
             provided in the request.
           schema:
@@ -445,19 +445,19 @@ paths:
         The homeserver must check that the given phone number **is
         associated** with an account on this homeserver. This API should be
         used to request validation tokens when authenticating for the
-        ``/account/password`` endpoint.
+        `/account/password` endpoint.
 
         This API's parameters and response are identical to that of the
         |/register/msisdn/requestToken|_ endpoint, except that
-        ``M_THREEPID_NOT_FOUND`` may be returned if no account matching the
+        `M_THREEPID_NOT_FOUND` may be returned if no account matching the
         given phone number could be found. The server may instead send the SMS
         to the given phone number prompting the user to create an account.
-        ``M_THREEPID_IN_USE`` may not be returned.
+        `M_THREEPID_IN_USE` may not be returned.
 
         The homeserver should validate the phone number itself, either by sending a
         validation message itself or by using a service it has control over.
 
-        .. |/register/msisdn/requestToken| replace:: ``/register/msisdn/requestToken``
+        .. |/register/msisdn/requestToken| replace:: `/register/msisdn/requestToken`
 
         .. _/register/msisdn/requestToken: #post-matrix-client-%CLIENT_MAJOR_VERSION%-register-email-requesttoken
       operationId: requestTokenToResetPasswordMSISDN
@@ -486,7 +486,7 @@ paths:
         400:
           description: |-
             The referenced third party identifier is not recognised by the
-            homeserver, or the request was invalid. The error code ``M_SERVER_NOT_TRUSTED``
+            homeserver, or the request was invalid. The error code `M_SERVER_NOT_TRUSTED`
             can be returned if the server does not trust/support the identity server
             provided in the request.
           schema:
@@ -511,7 +511,7 @@ paths:
         The homeserver may change the flows available depending on whether a
         valid access token is provided.
 
-        Unlike other endpoints, this endpoint does not take an ``id_access_token``
+        Unlike other endpoints, this endpoint does not take an `id_access_token`
         parameter because the homeserver is expected to sign the request to the
         identity server instead.
       security:
@@ -533,11 +533,11 @@ paths:
                 type: string
                 description: |-
                   The identity server to unbind all of the user's 3PIDs from.
-                  If not provided, the homeserver MUST use the ``id_server``
+                  If not provided, the homeserver MUST use the `id_server`
                   that was originally use to bind each identifier. If the
-                  homeserver does not know which ``id_server`` that was,
-                  it must return an ``id_server_unbind_result`` of
-                  ``no-support``.
+                  homeserver does not know which `id_server` that was,
+                  it must return an `id_server_unbind_result` of
+                  `no-support`.
                 example: "example.org"
       responses:
         200:
@@ -552,12 +552,12 @@ paths:
                   - "no-support"
                 description: |-
                   An indicator as to whether or not the homeserver was able to unbind
-                  the user's 3PIDs from the identity server(s). ``success`` indicates
+                  the user's 3PIDs from the identity server(s). `success` indicates
                   that all identifiers have been unbound from the identity server while
-                  ``no-support`` indicates that one or more identifiers failed to unbind
+                  `no-support` indicates that one or more identifiers failed to unbind
                   due to the identity server refusing the request or the homeserver
                   being unable to determine an identity server to unbind from. This
-                  must be ``success`` if the homeserver has no identifiers to unbind
+                  must be `success` if the homeserver has no identifiers to unbind
                   for the user.
                 example: "success"
             required:
@@ -612,15 +612,15 @@ paths:
                 type: boolean
                 description: |-
                   A flag to indicate that the username is available. This should always
-                  be ``true`` when the server replies with 200 OK.
+                  be `true` when the server replies with 200 OK.
         400:
           description: |-
             Part of the request was invalid or the username is not available. This may
             include one of the following error codes:
 
-            * ``M_USER_IN_USE`` : The desired username is already taken.
-            * ``M_INVALID_USERNAME`` : The desired username is not a valid user name.
-            * ``M_EXCLUSIVE`` : The desired username is in the exclusive namespace
+            * `M_USER_IN_USE` : The desired username is already taken.
+            * `M_INVALID_USERNAME` : The desired username is not a valid user name.
+            * `M_EXCLUSIVE` : The desired username is in the exclusive namespace
               claimed by an application service.
           examples:
             application/json: {
diff --git a/data/api/client-server/room_initial_sync.yaml b/data/api/client-server/room_initial_sync.yaml
index fd8412a4..48f3176c 100644
--- a/data/api/client-server/room_initial_sync.yaml
+++ b/data/api/client-server/room_initial_sync.yaml
@@ -98,12 +98,12 @@ paths:
                   start:
                     type: string
                     description: |-
-                      A token which correlates to the first value in ``chunk``.
+                      A token which correlates to the first value in `chunk`.
                       Used for pagination.
                   end:
                     type: string
                     description: |-
-                      A token which correlates to the last value in ``chunk``.
+                      A token which correlates to the last value in `chunk`.
                       Used for pagination.
                   chunk:
                     type: array
@@ -112,7 +112,7 @@ paths:
                       list of the most recent messages for this room. If
                       the user has left the room this will be the
                       messages that preceeded them leaving. This array
-                      will consist of at most ``limit`` elements.
+                      will consist of at most `limit` elements.
                     items:
                       type: object
                       title: RoomEvent
@@ -135,7 +135,7 @@ paths:
                 type: string
                 enum: ["private", "public"]
                 description: |-
-                  Whether this room is visible to the ``/publicRooms`` API
+                  Whether this room is visible to the `/publicRooms` API
                   or not."
               account_data:
                 type: array
diff --git a/data/api/client-server/room_state.yaml b/data/api/client-server/room_state.yaml
index 20b9c1fd..2b6fffd4 100644
--- a/data/api/client-server/room_state.yaml
+++ b/data/api/client-server/room_state.yaml
@@ -35,18 +35,18 @@ paths:
         .. _`put-matrix-client-%CLIENT_MAJOR_VERSION%-rooms-roomid-state-eventtype`:
 
         State events can be sent using this endpoint.  These events will be
-        overwritten if ``<room id>``, ``<event type>`` and ``<state key>`` all
+        overwritten if `<room id>`, `<event type>` and `<state key>` all
         match.
 
         Requests to this endpoint **cannot use transaction IDs**
-        like other ``PUT`` paths because they cannot be differentiated from the
-        ``state_key``. Furthermore, ``POST`` is unsupported on state paths.
+        like other `PUT` paths because they cannot be differentiated from the
+        `state_key`. Furthermore, `POST` is unsupported on state paths.
 
         The body of the request should be the content object of the event; the
         fields in this object will vary depending on the type of event. See
-        `Room Events`_ for the ``m.`` event specification.
+        `Room Events`_ for the `m.` event specification.
 
-        If the event type being sent is ``m.room.canonical_alias`` servers
+        If the event type being sent is `m.room.canonical_alias` servers
         SHOULD ensure that any new aliases being listed in the event are valid
         per their grammar/syntax and that they point to the room ID where the
         state event is to be sent. Servers do not validate aliases which are
@@ -116,10 +116,10 @@ paths:
 
             Some example error codes include:
 
-            * ``M_INVALID_PARAMETER``: One or more aliases within the ``m.room.canonical_alias``
+            * `M_INVALID_PARAMETER`: One or more aliases within the `m.room.canonical_alias`
               event have invalid syntax.
 
-            * ``M_BAD_ALIAS``: One or more aliases within the ``m.room.canonical_alias`` event
+            * `M_BAD_ALIAS`: One or more aliases within the `m.room.canonical_alias` event
               do not point to the room ID for which the state event is to be sent to.
           schema:
             $ref: "definitions/errors/error.yaml"
diff --git a/data/api/client-server/rooms.yaml b/data/api/client-server/rooms.yaml
index 7ead7f41..3d4aed93 100644
--- a/data/api/client-server/rooms.yaml
+++ b/data/api/client-server/rooms.yaml
@@ -31,7 +31,7 @@ paths:
     get:
       summary: Get a single event by event ID.
       description: |-
-        Get a single event based on ``roomId/eventId``. You must have permission to
+        Get a single event based on `roomId/eventId`. You must have permission to
         retrieve this event e.g. by being a member in the room for this event.
       operationId: getOneRoomEvent
       security:
@@ -196,7 +196,7 @@ paths:
           type: string
           description: |-
             The point in time (pagination token) to return members for in the room.
-            This token can be obtained from a ``prev_batch`` token returned for
+            This token can be obtained from a `prev_batch` token returned for
             each room by the sync API. Defaults to the current state of the room,
             as determined by the server.
           x-example: "YWxsCgpOb25lLDM1ODcwOA"
@@ -213,9 +213,9 @@ paths:
             - ban
           description: |-
             The kind of membership to filter for. Defaults to no filtering if
-            unspecified. When specified alongside ``not_membership``, the two
+            unspecified. When specified alongside `not_membership`, the two
             parameters create an 'or' condition: either the membership *is*
-            the same as ``membership`` **or** *is not* the same as ``not_membership``.
+            the same as `membership` **or** *is not* the same as `not_membership`.
           x-example: "join"
         - in: query
           name: not_membership
@@ -267,7 +267,7 @@ paths:
       summary: Gets the list of currently joined users and their profile data.
       description:
         This API returns a map of MXIDs to member info objects for members of the room. The current user must be in the room for it to work, unless it is an Application Service in which case any of the AS's users must be in the room.
-        This API is primarily for Application Services and should be faster to respond than ``/members`` as it can be implemented more efficiently on the server.
+        This API is primarily for Application Services and should be faster to respond than `/members` as it can be implemented more efficiently on the server.
       operationId: getJoinedMembersByRoom
       parameters:
         - in: path
diff --git a/data/api/client-server/search.yaml b/data/api/client-server/search.yaml
index 6647f955..33d946b0 100644
--- a/data/api/client-server/search.yaml
+++ b/data/api/client-server/search.yaml
@@ -41,7 +41,7 @@ paths:
           type: string
           description: |-
             The point to return events from. If given, this should be a
-            ``next_batch`` result from a previous call to this endpoint.
+            `next_batch` result from a previous call to this endpoint.
           x-example: "YWxsCgpOb25lLDM1ODcwOA"
         - in: body
           name: body
@@ -104,7 +104,7 @@ paths:
                         enum: ["recent", "rank"]
                         description: |-
                           The order in which to search for results.
-                          By default, this is ``"rank"``.
+                          By default, this is `"rank"`.
                       event_context:
                         title: Include Event Context
                         type: object
@@ -117,13 +117,13 @@ paths:
                                 title: "Before limit"
                                 description: |-
                                   How many events before the result are
-                                  returned. By default, this is ``5``.
+                                  returned. By default, this is `5`.
                             after_limit:
                                 type: integer
                                 title: "After limit"
                                 description: |-
                                   How many events after the result are
-                                  returned. By default, this is ``5``.
+                                  returned. By default, this is `5`.
                             include_profile:
                                 type: boolean
                                 title: "Return profile information"
@@ -131,7 +131,7 @@ paths:
                                   Requests that the server returns the
                                   historic profile information for the users
                                   that sent the events that were returned.
-                                  By default, this is ``false``.
+                                  By default, this is `false`.
                       include_state:
                         type: boolean
                         title: Include current state
@@ -231,7 +231,7 @@ paths:
                                     The historic profile information of the
                                     users that sent the events returned.
 
-                                    The ``string`` key is the user ID for which
+                                    The `string` key is the user ID for which
                                     the profile belongs to.
                                   additionalProperties:
                                     type: object
@@ -265,10 +265,10 @@ paths:
                         description: |-
                           The current state for every room in the results.
                           This is included if the request had the
-                          ``include_state`` key set with a value of ``true``.
+                          `include_state` key set with a value of `true`.
 
-                          The ``string`` key is the room ID for which the ``State
-                          Event`` array belongs to.
+                          The `string` key is the room ID for which the `State
+                          Event` array belongs to.
                         additionalProperties:
                           type: array
                           title: Room State
@@ -281,8 +281,8 @@ paths:
                         description: |-
                           Any groups that were requested.
 
-                          The outer ``string`` key is the group key requested (eg: ``room_id``
-                          or ``sender``). The inner ``string`` key is the grouped value (eg:
+                          The outer `string` key is the group key requested (eg: `room_id`
+                          or `sender`). The inner `string` key is the grouped value (eg:
                           a room's ID or a user's ID).
                         additionalProperties:
                           type: object
diff --git a/data/api/client-server/sync.yaml b/data/api/client-server/sync.yaml
index 7a923eca..3a965b56 100644
--- a/data/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@@ -36,20 +36,20 @@ paths:
         incremental deltas to the state, and to receive new messages.
 
         *Note*: This endpoint supports lazy-loading. See `Filtering <#filtering>`_
-        for more information. Lazy-loading members is only supported on a ``StateFilter``
+        for more information. Lazy-loading members is only supported on a `StateFilter`
         for this endpoint. When lazy-loading is enabled, servers MUST include the
         syncing user's own membership event when they join a room, or when the
         full state of rooms is requested, to aid discovering the user's avatar &
         displayname.
 
         Further, like other members, the user's own membership event is eligible
-        for being considered redundant by the server. When a sync is ``limited``,
+        for being considered redundant by the server. When a sync is `limited`,
         the server MUST return membership events for events in the gap
-        (between ``since`` and the start of the returned timeline), regardless
+        (between `since` and the start of the returned timeline), regardless
         as to whether or not they are redundant. This ensures that joins/leaves
         and profile changes which occur during the gap are not lost.
 
-        Note that the default behaviour of ``state`` is to include all membership
+        Note that the default behaviour of `state` is to include all membership
         events, alongside other state, when lazy-loading is not enabled.
       operationId: sync
       security:
@@ -61,7 +61,7 @@ paths:
           description: |-
             The ID of a filter created using the filter API or a filter JSON
             object encoded as a string. The server will detect whether it is
-            an ID or a JSON object by whether the first character is a ``"{"``
+            an ID or a JSON object by whether the first character is a `"{"`
             open brace. Passing the JSON inline is best suited to one off
             requests. Creating a filter using the filter API is recommended for
             clients that reuse the same filter multiple times, for example in
@@ -82,16 +82,16 @@ paths:
             Controls whether to include the full state for all rooms the user
             is a member of.
 
-            If this is set to ``true``, then all state events will be returned,
-            even if ``since`` is non-empty. The timeline will still be limited
-            by the ``since`` parameter. In this case, the ``timeout`` parameter
+            If this is set to `true`, then all state events will be returned,
+            even if `since` is non-empty. The timeline will still be limited
+            by the `since` parameter. In this case, the `timeout` parameter
             will be ignored and the query will return immediately, possibly with
             an empty timeline.
 
-            If ``false``, and ``since`` is non-empty, only state which has
-            changed since the point indicated by ``since`` will be returned.
+            If `false`, and `since` is non-empty, only state which has
+            changed since the point indicated by `since` will be returned.
 
-            By default, this is ``false``.
+            By default, this is `false`.
           x-example: "false"
         - in: query
           name: set_presence
@@ -113,7 +113,7 @@ paths:
             request. If no events (or other data) become available before this
             time elapses, the server will return a response with empty fields.
 
-            By default, this is ``0``, so the server will return immediately
+            By default, this is `0`, so the server will return immediately
             even if the response is empty.
           x-example: 30000
       responses:
@@ -127,8 +127,8 @@ paths:
               next_batch:
                 type: string
                 description: |-
-                  The batch token to supply in the ``since`` param of the next
-                  ``/sync`` request.
+                  The batch token to supply in the `since` param of the next
+                  `/sync` request.
               rooms:
                 title: Rooms
                 type: object
@@ -157,7 +157,7 @@ paths:
                               description: |-
                                 The users which can be used to generate a room name
                                 if the room does not have one. Required if the room's
-                                ``m.room.name`` or ``m.room.canonical_alias`` state events
+                                `m.room.name` or `m.room.canonical_alias` state events
                                 are unset or empty.
 
                                 This should be the first 5 members of the room, ordered
@@ -169,7 +169,7 @@ paths:
                                 when there are less than 5 members to represent.
 
                                 When lazy-loading room members is enabled, the membership
-                                events for the heroes MUST be included in the ``state``,
+                                events for the heroes MUST be included in the `state`,
                                 unless they are redundant. When the list of users changes,
                                 the server notifies the client by sending a fresh list of
                                 heroes. If there are no changes since the last sync, this
@@ -179,14 +179,14 @@ paths:
                             "m.joined_member_count":
                               type: integer
                               description: |-
-                                 The number of users with ``membership`` of ``join``,
+                                 The number of users with `membership` of `join`,
                                  including the client's own user ID. If this field has
                                  not changed since the last sync, it may be omitted.
                                  Required otherwise.
                             "m.invited_member_count":
                               type: integer
                               description: |-
-                                 The number of users with ``membership`` of ``invite``.
+                                 The number of users with `membership` of `invite`.
                                  If this field has not changed since the last sync, it
                                  may be omitted. Required otherwise.
                         state:
@@ -194,14 +194,14 @@ paths:
                           type: object
                           description: |-
                             Updates to the state, between the time indicated by
-                            the ``since`` parameter, and the start of the
-                            ``timeline`` (or all state up to the start of the
-                            ``timeline``, if ``since`` is not given, or
-                            ``full_state`` is true).
+                            the `since` parameter, and the start of the
+                            `timeline` (or all state up to the start of the
+                            `timeline`, if `since` is not given, or
+                            `full_state` is true).
 
-                            N.B. state updates for ``m.room.member`` events will
-                            be incomplete if ``lazy_load_members`` is enabled in
-                            the ``/sync`` filter, and only return the member events
+                            N.B. state updates for `m.room.member` events will
+                            be incomplete if `lazy_load_members` is enabled in
+                            the `/sync` filter, and only return the member events
                             required to display the senders of the timeline events
                             in this response.
                           allOf:
@@ -264,17 +264,17 @@ paths:
                           type: object
                           description: |-
                             The state of a room that the user has been invited
-                            to. These state events may only have the ``sender``,
-                            ``type``, ``state_key`` and ``content`` keys
+                            to. These state events may only have the `sender`,
+                            `type`, `state_key` and `content` keys
                             present. These events do not replace any state that
                             the client already has for the room, for example if
                             the client has archived the room. Instead the
                             client should keep two separate copies of the
-                            state: the one from the ``invite_state`` and one
-                            from the archived ``state``. If the client joins
+                            state: the one from the `invite_state` and one
+                            from the archived `state`. If the client joins
                             the room then the current state will be given as a
-                            delta against the archived ``state`` not the
-                            ``invite_state``.
+                            delta against the archived `state` not the
+                            `invite_state`.
                           properties:
                             events:
                               description: The StrippedState events that form the invite state.
diff --git a/data/api/client-server/tags.yaml b/data/api/client-server/tags.yaml
index 081d8a84..94e7be07 100644
--- a/data/api/client-server/tags.yaml
+++ b/data/api/client-server/tags.yaml
@@ -69,7 +69,7 @@ paths:
                       type: number
                       format: float
                       description: |-
-                        A number in a range ``[0,1]`` describing a relative
+                        A number in a range `[0,1]` describing a relative
                         position of the room under the given tag.
                   additionalProperties: true
           examples:
@@ -125,7 +125,7 @@ paths:
                 type: number
                 format: float
                 description: |-
-                  A number in a range ``[0,1]`` describing a relative
+                  A number in a range `[0,1]` describing a relative
                   position of the room under the given tag.
             additionalProperties: true
             example: {
diff --git a/data/api/client-server/third_party_membership.yaml b/data/api/client-server/third_party_membership.yaml
index 4c5890d1..d56fd99c 100644
--- a/data/api/client-server/third_party_membership.yaml
+++ b/data/api/client-server/third_party_membership.yaml
@@ -48,7 +48,7 @@ paths:
         join that room.
 
         If the identity server did know the Matrix user identifier for the
-        third party identifier, the homeserver will append a ``m.room.member``
+        third party identifier, the homeserver will append a `m.room.member`
         event to the room.
 
         If the identity server does not know a Matrix user identifier for the
@@ -56,7 +56,7 @@ paths:
         which can be accepted upon providing proof of ownership of the third
         party identifier. This is achieved by the identity server generating a
         token, which it gives to the inviting homeserver. The homeserver will
-        add an ``m.room.third_party_invite`` event into the graph for the room,
+        add an `m.room.third_party_invite` event into the graph for the room,
         containing that token.
 
         When the invitee binds the invited third party identifier to a Matrix
@@ -72,7 +72,7 @@ paths:
         - The matrix user ID who invited them to the room
 
         If a token is requested from the identity server, the homeserver will
-        append a ``m.room.third_party_invite`` event to the room.
+        append a `m.room.third_party_invite` event to the room.
 
         .. _joining rooms section: `invite-by-user-id-endpoint`_
       operationId: inviteBy3PID
@@ -109,7 +109,7 @@ paths:
               medium:
                 type: string
                 # TODO: Link to Identity Service spec when it eixsts
-                description: The kind of address being passed in the address field, for example ``email``.
+                description: The kind of address being passed in the address field, for example `email`.
               address:
                 type: string
                 description: The invitee's third party identifier.
@@ -124,7 +124,7 @@ paths:
             type: object
         403:
           description: |-
-            You do not have permission to invite the user to the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejections are:
+            You do not have permission to invite the user to the room. A meaningful `errcode` and description error text will be returned. Example reasons for rejections are:
 
             - The invitee has been banned from the room.
             - The invitee is already a member of the room.
diff --git a/data/api/client-server/typing.yaml b/data/api/client-server/typing.yaml
index e7cbe2d7..c7138950 100644
--- a/data/api/client-server/typing.yaml
+++ b/data/api/client-server/typing.yaml
@@ -32,8 +32,8 @@ paths:
       summary: Informs the server that the user has started or stopped typing.
       description: |-
         This tells the server that the user is typing for the next N
-        milliseconds where N is the value specified in the ``timeout`` key.
-        Alternatively, if ``typing`` is ``false``, it tells the server that the
+        milliseconds where N is the value specified in the `timeout` key.
+        Alternatively, if `typing` is `false`, it tells the server that the
         user has stopped typing.
       operationId: setTyping
       security:
@@ -65,7 +65,7 @@ paths:
               typing:
                 type: boolean
                 description: |-
-                  Whether the user is typing or not. If ``false``, the ``timeout``
+                  Whether the user is typing or not. If `false`, the `timeout`
                   key can be omitted.
               timeout:
                 type: integer
diff --git a/data/api/client-server/users.yaml b/data/api/client-server/users.yaml
index da8cf03f..255c538b 100644
--- a/data/api/client-server/users.yaml
+++ b/data/api/client-server/users.yaml
@@ -39,8 +39,8 @@ paths:
         query remote users as part of the search.
 
         The search is performed case-insensitively on user IDs and display
-        names preferably using a collation determined based upon the 
-        ``Accept-Language`` header provided in the request, if present.
+        names preferably using a collation determined based upon the
+        `Accept-Language` header provided in the request, if present.
       operationId: searchUserDirectory
       security:
         - accessToken: []
diff --git a/data/api/client-server/versions.yaml b/data/api/client-server/versions.yaml
index 2464af1d..e359de3c 100644
--- a/data/api/client-server/versions.yaml
+++ b/data/api/client-server/versions.yaml
@@ -29,13 +29,13 @@ paths:
       description: |-
         Gets the versions of the specification supported by the server.
 
-        Values will take the form ``rX.Y.Z``.
+        Values will take the form `rX.Y.Z`.
 
-        Only the latest ``Z`` value will be reported for each supported ``X.Y`` value.
-        i.e. if the server implements ``r0.0.0``, ``r0.0.1``, and ``r1.2.0``, it will report ``r0.0.1`` and ``r1.2.0``.
+        Only the latest `Z` value will be reported for each supported `X.Y` value.
+        i.e. if the server implements `r0.0.0`, `r0.0.1`, and `r1.2.0`, it will report `r0.0.1` and `r1.2.0`.
 
         The server may additionally advertise experimental features it supports
-        through ``unstable_features``. These features should be namespaced and
+        through `unstable_features`. These features should be namespaced and
         may optionally include version information within their name if desired.
         Features listed here are not for optionally toggling parts of the Matrix
         specification and should only be used to advertise support for a feature
diff --git a/data/api/client-server/wellknown.yaml b/data/api/client-server/wellknown.yaml
index 3d1c0ae0..9fff7ea7 100644
--- a/data/api/client-server/wellknown.yaml
+++ b/data/api/client-server/wellknown.yaml
@@ -28,7 +28,7 @@ paths:
       description: |-
         Gets discovery information about the domain. The file may include
         additional keys, which MUST follow the Java package naming convention,
-        e.g. ``com.example.myapp.property``. This ensures property names are
+        e.g. `com.example.myapp.property`. This ensures property names are
         suitably namespaced for each application and reduces the risk of
         clashes.
 
diff --git a/data/api/client-server/whoami.yaml b/data/api/client-server/whoami.yaml
index ad40eb86..713ed370 100644
--- a/data/api/client-server/whoami.yaml
+++ b/data/api/client-server/whoami.yaml
@@ -29,13 +29,13 @@ paths:
     get:
       summary: Gets information about the owner of an access token.
       description: |-
-        Gets information about the owner of a given access token. 
-        
-        Note that, as with the rest of the Client-Server API, 
-        Application Services may masquerade as users within their 
-        namespace by giving a ``user_id`` query parameter. In this 
-        situation, the server should verify that the given ``user_id``
-        is registered by the appservice, and return it in the response 
+        Gets information about the owner of a given access token.
+
+        Note that, as with the rest of the Client-Server API,
+        Application Services may masquerade as users within their
+        namespace by giving a `user_id` query parameter. In this
+        situation, the server should verify that the given `user_id`
+        is registered by the appservice, and return it in the response
         body.
       operationId: getTokenOwner
       security:
diff --git a/data/api/identity/associations.yaml b/data/api/identity/associations.yaml
index 82c70fb8..084ccded 100644
--- a/data/api/identity/associations.yaml
+++ b/data/api/identity/associations.yaml
@@ -35,13 +35,13 @@ paths:
         - in: query
           type: string
           name: sid
-          description: The Session ID generated by the ``requestToken`` call.
+          description: The Session ID generated by the `requestToken` call.
           required: true
           x-example: 1234
         - in: query
           type: string
           name: client_secret
-          description: The client secret passed to the ``requestToken`` call.
+          description: The client secret passed to the `requestToken` call.
           required: true
           x-example: monkeys_are_GREAT
       responses:
@@ -72,9 +72,9 @@ paths:
           description: |-
             The session has not been validated.
 
-            If the session has not been validated, then ``errcode`` will be
-            ``M_SESSION_NOT_VALIDATED``.  If the session has timed out, then
-            ``errcode`` will be ``M_SESSION_EXPIRED``.
+            If the session has not been validated, then `errcode` will be
+            `M_SESSION_NOT_VALIDATED`.  If the session has timed out, then
+            `errcode` will be `M_SESSION_EXPIRED`.
           examples:
             application/json: {
               "errcode": "M_SESSION_NOT_VALIDATED",
@@ -97,12 +97,12 @@ paths:
       description: |-
         Publish an association between a session and a Matrix user ID.
 
-        Future calls to ``/lookup`` for any of the session\'s 3pids will return
+        Future calls to `/lookup` for any of the session\'s 3pids will return
         this association.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: bind
       deprecated: true
@@ -119,10 +119,10 @@ paths:
             properties:
               sid:
                 type: string
-                description: The Session ID generated by the ``requestToken`` call.
+                description: The Session ID generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret passed to the ``requestToken`` call.
+                description: The client secret passed to the `requestToken` call.
               mxid:
                 type: string
                 description: The Matrix user ID to associate with the 3pids.
@@ -184,9 +184,9 @@ paths:
           description: |-
             The association was not published.
 
-            If the session has not been validated, then ``errcode`` will be
-            ``M_SESSION_NOT_VALIDATED``.  If the session has timed out, then
-            ``errcode`` will be ``M_SESSION_EXPIRED``.
+            If the session has not been validated, then `errcode` will be
+            `M_SESSION_NOT_VALIDATED`.  If the session has timed out, then
+            `errcode` will be `M_SESSION_EXPIRED`.
           examples:
             application/json: {
               "errcode": "M_SESSION_NOT_VALIDATED",
@@ -209,15 +209,15 @@ paths:
       description: |-
         Remove an association between a session and a Matrix user ID.
 
-        Future calls to ``/lookup`` for any of the session's 3pids will not
+        Future calls to `/lookup` for any of the session's 3pids will not
         return the removed association.
 
         The identity server should authenticate the request in one of two
         ways:
 
-        1. The request is signed by the homeserver which controls the ``user_id``.
-        2. The request includes the ``sid`` and ``client_secret`` parameters,
-           as per ``/3pid/bind``, which proves ownership of the 3PID.
+        1. The request is signed by the homeserver which controls the `user_id`.
+        2. The request includes the `sid` and `client_secret` parameters,
+           as per `/3pid/bind`, which proves ownership of the 3PID.
 
         If this endpoint returns a JSON Matrix error, that error should be passed
         through to the client requesting an unbind through a homeserver, if the
@@ -241,10 +241,10 @@ paths:
             properties:
               sid:
                 type: string
-                description: The Session ID generated by the ``requestToken`` call.
+                description: The Session ID generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret passed to the ``requestToken`` call.
+                description: The client secret passed to the `requestToken` call.
               mxid:
                 type: string
                 description: The Matrix user ID to remove from the 3pids.
@@ -253,7 +253,7 @@ paths:
                 title: 3PID
                 description: |-
                   The 3PID to remove. Must match the 3PID used to generate the session
-                  if using ``sid`` and ``client_secret`` to authenticate this request.
+                  if using `sid` and `client_secret` to authenticate this request.
                 properties:
                   medium:
                     type: string
diff --git a/data/api/identity/definitions/request_email_validation.yaml b/data/api/identity/definitions/request_email_validation.yaml
index 1a7502c7..c8a3af6a 100644
--- a/data/api/identity/definitions/request_email_validation.yaml
+++ b/data/api/identity/definitions/request_email_validation.yaml
@@ -23,7 +23,7 @@ properties:
     description: |
       A unique string generated by the client, and used to identify the
       validation attempt. It must be a string consisting of the characters
-      ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
+      `[0-9a-zA-Z.=_-]`. Its length must not exceed 255 characters and it
       must not be empty.
     example: "monkeys_are_GREAT"
   email:
@@ -33,9 +33,9 @@ properties:
   send_attempt:
     type: integer
     description: |-
-      The server will only send an email if the ``send_attempt``
+      The server will only send an email if the `send_attempt`
       is a number greater than the most recent one which it has seen,
-      scoped to that ``email`` + ``client_secret`` pair. This is to
+      scoped to that `email` + `client_secret` pair. This is to
       avoid repeatedly sending the same email in the case of request
       retries between the POSTing user and the identity server.
       The client should increment this value if they desire a new
diff --git a/data/api/identity/definitions/request_msisdn_validation.yaml b/data/api/identity/definitions/request_msisdn_validation.yaml
index 93cea2ed..2b1c8708 100644
--- a/data/api/identity/definitions/request_msisdn_validation.yaml
+++ b/data/api/identity/definitions/request_msisdn_validation.yaml
@@ -24,14 +24,14 @@ properties:
     description: |
       A unique string generated by the client, and used to identify the
       validation attempt. It must be a string consisting of the characters
-      ``[0-9a-zA-Z.=_-]``. Its length must not exceed 255 characters and it
+      `[0-9a-zA-Z.=_-]`. Its length must not exceed 255 characters and it
       must not be empty.
     example: "monkeys_are_GREAT"
   country:
     type: string
     description: |-
       The two-letter uppercase ISO-3166-1 alpha-2 country code that the
-      number in ``phone_number`` should be parsed as if it were dialled from.
+      number in `phone_number` should be parsed as if it were dialled from.
     example: "GB"
   phone_number:
     type: string
@@ -40,9 +40,9 @@ properties:
   send_attempt:
     type: integer
     description: |-
-      The server will only send an SMS if the ``send_attempt`` is a
+      The server will only send an SMS if the `send_attempt` is a
       number greater than the most recent one which it has seen,
-      scoped to that ``country`` + ``phone_number`` + ``client_secret``
+      scoped to that `country` + `phone_number` + `client_secret`
       triple. This is to avoid repeatedly sending the same SMS in
       the case of request retries between the POSTing user and the
       identity server. The client should increment this value if
diff --git a/data/api/identity/definitions/security.yaml b/data/api/identity/definitions/security.yaml
index ef49ff5c..64225ec4 100644
--- a/data/api/identity/definitions/security.yaml
+++ b/data/api/identity/definitions/security.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 accessToken:
   type: apiKey
-  description: The access_token returned by a call to ``/register``.
+  description: The access_token returned by a call to `/register`.
   name: access_token
   in: query
diff --git a/data/api/identity/definitions/sid.yaml b/data/api/identity/definitions/sid.yaml
index c1f1ae64..904f79e1 100644
--- a/data/api/identity/definitions/sid.yaml
+++ b/data/api/identity/definitions/sid.yaml
@@ -18,7 +18,7 @@ properties:
     description: |
       The session ID. Session IDs are opaque strings generated by the identity
       server. They must consist entirely of the characters
-      ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and they
+      `[0-9a-zA-Z.=_-]`. Their length must not exceed 255 characters and they
       must not be empty.
     example: "123abc"
 required: ['sid']
diff --git a/data/api/identity/email_associations.yaml b/data/api/identity/email_associations.yaml
index 69ec7c58..6aa7bf4a 100644
--- a/data/api/identity/email_associations.yaml
+++ b/data/api/identity/email_associations.yaml
@@ -37,13 +37,13 @@ paths:
 
         Note that homeservers offer APIs that proxy this API, adding
         additional behaviour on top, for example,
-        ``/register/email/requestToken`` is designed specifically for use when
+        `/register/email/requestToken` is designed specifically for use when
         registering an account and therefore will inform the user if the email
         address given is already registered on the server.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: emailRequestToken
       deprecated: true
@@ -61,8 +61,8 @@ paths:
           description: |
             An error ocurred.  Some possible errors are:
 
-            - ``M_INVALID_EMAIL``: The email address provided was invalid.
-            - ``M_EMAIL_SEND_ERROR``: The validation email could not be sent.
+            - `M_INVALID_EMAIL`: The email address provided was invalid.
+            - `M_EMAIL_SEND_ERROR`: The validation email could not be sent.
           examples:
             application/json: {
               "errcode": "M_INVALID_EMAIL",
@@ -77,10 +77,10 @@ paths:
         Validate ownership of an email address.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the email address is considered to
+        `requestToken` call, ownership of the email address is considered to
         have been validated. This does not publish any information publicly, or
         associate the email address with any Matrix user ID. Specifically,
-        calls to ``/lookup`` will not show a binding.
+        calls to `/lookup` will not show a binding.
 
         The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
@@ -90,7 +90,7 @@ paths:
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: emailSubmitTokenPost
       deprecated: true
@@ -107,13 +107,13 @@ paths:
             properties:
               sid:
                 type: string
-                description: The session ID, generated by the ``requestToken`` call.
+                description: The session ID, generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret that was supplied to the ``requestToken`` call.
+                description: The client secret that was supplied to the `requestToken` call.
               token:
                 type: string
-                description: The token generated by the ``requestToken`` call and emailed to the user.
+                description: The token generated by the `requestToken` call and emailed to the user.
             required: ["sid", "client_secret", "token"]
       responses:
         200:
@@ -136,10 +136,10 @@ paths:
         Validate ownership of an email address.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the email address is considered to
+        `requestToken` call, ownership of the email address is considered to
         have been validated. This does not publish any information publicly, or
         associate the email address with any Matrix user ID. Specifically,
-        calls to ``/lookup`` will not show a binding.
+        calls to `/lookup` will not show a binding.
 
         Note that, in contrast with the POST version, this endpoint will be
         used by end-users, and so the response should be human-readable.
@@ -150,28 +150,28 @@ paths:
           type: string
           name: sid
           required: true
-          description: The session ID, generated by the ``requestToken`` call.
+          description: The session ID, generated by the `requestToken` call.
           x-example: 1234
         - in: query
           type: string
           name: client_secret
           required: true
-          description: The client secret that was supplied to the ``requestToken`` call.
+          description: The client secret that was supplied to the `requestToken` call.
           x-example: monkeys_are_GREAT
         - in: query
           type: string
           name: token
           required: true
-          description: The token generated by the ``requestToken`` call and emailed to the user.
+          description: The token generated by the `requestToken` call and emailed to the user.
           x-example: atoken
       responses:
         200:
           description: Email address is validated.
         "3xx":
           description: |-
-            Email address is validated, and the ``next_link`` parameter was
-            provided to the ``requestToken`` call.  The user must be redirected
-            to the URL provided by the ``next_link`` parameter.
+            Email address is validated, and the `next_link` parameter was
+            provided to the `requestToken` call.  The user must be redirected
+            to the URL provided by the `next_link` parameter.
         "4xx":
           description:
             Validation failed.
diff --git a/data/api/identity/invitation_signing.yaml b/data/api/identity/invitation_signing.yaml
index e2ac28b0..fc9da1d2 100644
--- a/data/api/identity/invitation_signing.yaml
+++ b/data/api/identity/invitation_signing.yaml
@@ -30,8 +30,8 @@ paths:
       description: |-
         Sign invitation details.
 
-        The identity server will look up ``token`` which was stored in a call
-        to ``store-invite``, and fetch the sender of the invite.
+        The identity server will look up `token` which was stored in a call
+        to `store-invite`, and fetch the sender of the invite.
       operationId: blindlySignStuff
       deprecated: true
       parameters:
@@ -50,7 +50,7 @@ paths:
                 description: The Matrix user ID of the user accepting the invitation.
               token:
                 type: string
-                description: The token from the call to ``store-invite``.
+                description: The token from the call to `store-invite`.
               private_key:
                 type: string
                 description: The private key, encoded as `Unpadded base64`_.
diff --git a/data/api/identity/lookup.yaml b/data/api/identity/lookup.yaml
index 78fa3e3e..bdce7980 100644
--- a/data/api/identity/lookup.yaml
+++ b/data/api/identity/lookup.yaml
@@ -131,8 +131,8 @@ paths:
                     - type: string
                     - type: string
                 description: |-
-                  An array of arrays containing the `3PID Types`_ with the ``medium``
-                  in first position and the ``address`` in second position.
+                  An array of arrays containing the `3PID Types`_ with the `medium`
+                  in first position and the `address` in second position.
             required:
               - "threepids"
       responses:
@@ -164,8 +164,8 @@ paths:
                     - type: string
                     - type: string
                 description: |-
-                  An array of array containing the `3PID Types`_ with the ``medium``
-                  in first position, the ``address`` in second position and Matrix user
+                  An array of array containing the `3PID Types`_ with the `medium`
+                  in first position, the `address` in second position and Matrix user
                   ID in third position.
             required:
               - "threepids"
diff --git a/data/api/identity/phone_associations.yaml b/data/api/identity/phone_associations.yaml
index 65bbff0c..53d4132d 100644
--- a/data/api/identity/phone_associations.yaml
+++ b/data/api/identity/phone_associations.yaml
@@ -37,13 +37,13 @@ paths:
 
         Note that homeservers offer APIs that proxy this API, adding
         additional behaviour on top, for example,
-        ``/register/msisdn/requestToken`` is designed specifically for use when
+        `/register/msisdn/requestToken` is designed specifically for use when
         registering an account and therefore will inform the user if the phone
         number given is already registered on the server.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data. However, this usage is
+        `application/x-form-www-urlencoded` data. However, this usage is
         deprecated.
       operationId: msisdnRequestToken
       deprecated: true
@@ -61,9 +61,9 @@ paths:
           description: |
             An error ocurred. Some possible errors are:
 
-            - ``M_INVALID_ADDRESS``: The phone number provided was invalid.
-            - ``M_SEND_ERROR``: The validation SMS could not be sent.
-            - ``M_DESTINATION_REJECTED``: The identity server cannot deliver an
+            - `M_INVALID_ADDRESS`: The phone number provided was invalid.
+            - `M_SEND_ERROR`: The validation SMS could not be sent.
+            - `M_DESTINATION_REJECTED`: The identity server cannot deliver an
               SMS to the provided country or region.
           examples:
             application/json: {
@@ -79,10 +79,10 @@ paths:
         Validate ownership of a phone number.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the phone number is considered to
+        `requestToken` call, ownership of the phone number is considered to
         have been validated. This does not publish any information publicly, or
         associate the phone number address with any Matrix user
-        ID. Specifically, calls to ``/lookup`` will not show a binding.
+        ID. Specifically, calls to `/lookup` will not show a binding.
 
         The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
@@ -92,7 +92,7 @@ paths:
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data. However, this usage is
+        `application/x-form-www-urlencoded` data. However, this usage is
         deprecated.
       operationId: msisdnSubmitTokenPost
       deprecated: true
@@ -109,13 +109,13 @@ paths:
             properties:
               sid:
                 type: string
-                description: The session ID, generated by the ``requestToken`` call.
+                description: The session ID, generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret that was supplied to the ``requestToken`` call.
+                description: The client secret that was supplied to the `requestToken` call.
               token:
                 type: string
-                description: The token generated by the ``requestToken`` call and sent to the user.
+                description: The token generated by the `requestToken` call and sent to the user.
             required: ["sid", "client_secret", "token"]
       responses:
         200:
@@ -138,10 +138,10 @@ paths:
         Validate ownership of a phone number.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the phone number address is
+        `requestToken` call, ownership of the phone number address is
         considered to have been validated. This does not publish any
         information publicly, or associate the phone number with any Matrix
-        user ID. Specifically, calls to ``/lookup`` will not show a binding.
+        user ID. Specifically, calls to `/lookup` will not show a binding.
 
         Note that, in contrast with the POST version, this endpoint will be
         used by end-users, and so the response should be human-readable.
@@ -152,28 +152,28 @@ paths:
           type: string
           name: sid
           required: true
-          description: The session ID, generated by the ``requestToken`` call.
+          description: The session ID, generated by the `requestToken` call.
           x-example: 1234
         - in: query
           type: string
           name: client_secret
           required: true
-          description: The client secret that was supplied to the ``requestToken`` call.
+          description: The client secret that was supplied to the `requestToken` call.
           x-example: monkeys_are_GREAT
         - in: query
           type: string
           name: token
           required: true
-          description: The token generated by the ``requestToken`` call and sent to the user.
+          description: The token generated by the `requestToken` call and sent to the user.
           x-example: atoken
       responses:
         200:
           description: Phone number is validated.
         "3xx":
           description: |-
-            Phone number address is validated, and the ``next_link`` parameter
-            was provided to the ``requestToken`` call. The user must be
-            redirected to the URL provided by the ``next_link`` parameter.
+            Phone number address is validated, and the `next_link` parameter
+            was provided to the `requestToken` call. The user must be
+            redirected to the URL provided by the `next_link` parameter.
         "4xx":
           description:
             Validation failed.
diff --git a/data/api/identity/store_invite.yaml b/data/api/identity/store_invite.yaml
index 4a5d525d..20e40852 100644
--- a/data/api/identity/store_invite.yaml
+++ b/data/api/identity/store_invite.yaml
@@ -37,23 +37,23 @@ paths:
         The service will generate a random token and an ephemeral key used for
         accepting the invite.
 
-        The service also generates a ``display_name`` for the inviter, which is
-        a redacted version of ``address`` which does not leak the full contents
-        of the ``address``.
+        The service also generates a `display_name` for the inviter, which is
+        a redacted version of `address` which does not leak the full contents
+        of the `address`.
 
         The service records persistently all of the above information.
 
         It also generates an email containing all of this data, sent to the
-        ``address`` parameter, notifying them of the invitation.
+        `address` parameter, notifying them of the invitation.
 
         Also, the generated ephemeral public key will be listed as valid on
-        requests to ``/_matrix/identity/api/v1/pubkey/ephemeral/isvalid``.
+        requests to `/_matrix/identity/api/v1/pubkey/ephemeral/isvalid`.
 
-        Currently, invites may only be issued for 3pids of the ``email`` medium.
+        Currently, invites may only be issued for 3pids of the `email` medium.
 
         Optional fields in the request should be populated to the best of the
         server's ability. Identity servers may use these variables when notifying
-        the ``address`` of the pending invite for display purposes.
+        the `address` of the pending invite for display purposes.
       operationId: storeInvite
       deprecated: true
       parameters:
@@ -64,7 +64,7 @@ paths:
             properties:
               medium:
                 type: string
-                description: The literal string ``email``.
+                description: The literal string `email`.
                 example: "email"
               address:
                 type: string
@@ -82,26 +82,26 @@ paths:
                 type: string
                 description: |-
                   The Matrix room alias for the room to which the user is
-                  invited. This should be retrieved from the ``m.room.canonical_alias``
+                  invited. This should be retrieved from the `m.room.canonical_alias`
                   state event.
                 example: "#somewhere:exmaple.org"
               room_avatar_url:
                 type: string
                 description: |-
                   The Content URI for the room to which the user is invited. This should
-                  be retrieved from the ``m.room.avatar`` state event.
+                  be retrieved from the `m.room.avatar` state event.
                 example: "mxc://example.org/s0meM3dia"
               room_join_rules:
                 type: string
                 description: |-
-                  The ``join_rule`` for the room to which the user is invited. This should
-                  be retrieved from the ``m.room.join_rules`` state event.
+                  The `join_rule` for the room to which the user is invited. This should
+                  be retrieved from the `m.room.join_rules` state event.
                 example: "public"
               room_name:
                 type: string
                 description: |-
                   The name of the room to which the user is invited. This should be retrieved
-                  from the ``m.room.name`` state event.
+                  from the `m.room.name` state event.
                 example: "Bob's Emporium of Messages"
               sender_display_name:
                 type: string
@@ -122,7 +122,7 @@ paths:
                 type: string
                 description: |
                   The generated token. Must be a string consisting of the
-                  characters ``[0-9a-zA-Z.=_-]``. Its length must not exceed
+                  characters `[0-9a-zA-Z.=_-]`. Its length must not exceed
                   255 characters and it must not be empty.
               public_keys:
                 type: array
@@ -149,8 +149,8 @@ paths:
             An error has occured.
 
             If the 3pid is already bound to a Matrix user ID, the error code
-            will be ``M_THREEPID_IN_USE``.  If the medium is unsupported, the
-            error code will be ``M_UNRECOGNIZED``.
+            will be `M_THREEPID_IN_USE`.  If the medium is unsupported, the
+            error code will be `M_UNRECOGNIZED`.
           examples:
             application/json: {
               "errcode": "M_THREEPID_IN_USE",
diff --git a/data/api/identity/v2_associations.yaml b/data/api/identity/v2_associations.yaml
index b9039a18..e6d78d99 100644
--- a/data/api/identity/v2_associations.yaml
+++ b/data/api/identity/v2_associations.yaml
@@ -39,13 +39,13 @@ paths:
         - in: query
           type: string
           name: sid
-          description: The Session ID generated by the ``requestToken`` call.
+          description: The Session ID generated by the `requestToken` call.
           required: true
           x-example: 1234
         - in: query
           type: string
           name: client_secret
-          description: The client secret passed to the ``requestToken`` call.
+          description: The client secret passed to the `requestToken` call.
           required: true
           x-example: monkeys_are_GREAT
       responses:
@@ -76,9 +76,9 @@ paths:
           description: |-
             The session has not been validated.
 
-            If the session has not been validated, then ``errcode`` will be
-            ``M_SESSION_NOT_VALIDATED``.  If the session has timed out, then
-            ``errcode`` will be ``M_SESSION_EXPIRED``.
+            If the session has not been validated, then `errcode` will be
+            `M_SESSION_NOT_VALIDATED`.  If the session has timed out, then
+            `errcode` will be `M_SESSION_EXPIRED`.
           examples:
             application/json: {
               "errcode": "M_SESSION_NOT_VALIDATED",
@@ -98,7 +98,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -112,12 +112,12 @@ paths:
       description: |-
         Publish an association between a session and a Matrix user ID.
 
-        Future calls to ``/lookup`` for any of the session\'s 3pids will return
+        Future calls to `/lookup` for any of the session\'s 3pids will return
         this association.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: bindV2
       security:
@@ -135,10 +135,10 @@ paths:
             properties:
               sid:
                 type: string
-                description: The Session ID generated by the ``requestToken`` call.
+                description: The Session ID generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret passed to the ``requestToken`` call.
+                description: The client secret passed to the `requestToken` call.
               mxid:
                 type: string
                 description: The Matrix user ID to associate with the 3pids.
@@ -200,9 +200,9 @@ paths:
           description: |-
             The association was not published.
 
-            If the session has not been validated, then ``errcode`` will be
-            ``M_SESSION_NOT_VALIDATED``.  If the session has timed out, then
-            ``errcode`` will be ``M_SESSION_EXPIRED``.
+            If the session has not been validated, then `errcode` will be
+            `M_SESSION_NOT_VALIDATED`.  If the session has timed out, then
+            `errcode` will be `M_SESSION_EXPIRED`.
           examples:
             application/json: {
               "errcode": "M_SESSION_NOT_VALIDATED",
@@ -222,7 +222,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -236,15 +236,15 @@ paths:
       description: |-
         Remove an association between a session and a Matrix user ID.
 
-        Future calls to ``/lookup`` for any of the session's 3pids will not
+        Future calls to `/lookup` for any of the session's 3pids will not
         return the removed association.
 
         The identity server should authenticate the request in one of two
         ways:
 
-        1. The request is signed by the homeserver which controls the ``user_id``.
-        2. The request includes the ``sid`` and ``client_secret`` parameters,
-           as per ``/3pid/bind``, which proves ownership of the 3PID.
+        1. The request is signed by the homeserver which controls the `user_id`.
+        2. The request includes the `sid` and `client_secret` parameters,
+           as per `/3pid/bind`, which proves ownership of the 3PID.
 
         If this endpoint returns a JSON Matrix error, that error should be passed
         through to the client requesting an unbind through a homeserver, if the
@@ -269,10 +269,10 @@ paths:
             properties:
               sid:
                 type: string
-                description: The Session ID generated by the ``requestToken`` call.
+                description: The Session ID generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret passed to the ``requestToken`` call.
+                description: The client secret passed to the `requestToken` call.
               mxid:
                 type: string
                 description: The Matrix user ID to remove from the 3pids.
@@ -281,7 +281,7 @@ paths:
                 title: 3PID
                 description: |-
                   The 3PID to remove. Must match the 3PID used to generate the session
-                  if using ``sid`` and ``client_secret`` to authenticate this request.
+                  if using `sid` and `client_secret` to authenticate this request.
                 properties:
                   medium:
                     type: string
@@ -317,7 +317,7 @@ paths:
             the chosen authentication method (such as blocking homeservers from
             unbinding identifiers).
 
-            Another common error code is ``M_TERMS_NOT_SIGNED`` where the user
+            Another common error code is `M_TERMS_NOT_SIGNED` where the user
             needs to `agree to more terms`_ in order to continue.
           examples:
             application/json: {
diff --git a/data/api/identity/v2_auth.yaml b/data/api/identity/v2_auth.yaml
index a34f679c..f76550b1 100644
--- a/data/api/identity/v2_auth.yaml
+++ b/data/api/identity/v2_auth.yaml
@@ -32,7 +32,7 @@ paths:
       description: |-
         Exchanges an OpenID token from the homeserver for an access token to
         access the identity server. The request body is the same as the values
-        returned by ``/openid/request_token`` in the Client-Server API.
+        returned by `/openid/request_token` in the Client-Server API.
       operationId: registerAccount
       parameters:
         - in: body
@@ -83,7 +83,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -121,7 +121,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_email_associations.yaml b/data/api/identity/v2_email_associations.yaml
index 76c3747e..9865771b 100644
--- a/data/api/identity/v2_email_associations.yaml
+++ b/data/api/identity/v2_email_associations.yaml
@@ -40,13 +40,13 @@ paths:
 
         Note that homeservers offer APIs that proxy this API, adding
         additional behaviour on top, for example,
-        ``/register/email/requestToken`` is designed specifically for use when
+        `/register/email/requestToken` is designed specifically for use when
         registering an account and therefore will inform the user if the email
         address given is already registered on the server.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: emailRequestTokenV2
       security:
@@ -65,8 +65,8 @@ paths:
           description: |
             An error ocurred.  Some possible errors are:
 
-            - ``M_INVALID_EMAIL``: The email address provided was invalid.
-            - ``M_EMAIL_SEND_ERROR``: The validation email could not be sent.
+            - `M_INVALID_EMAIL`: The email address provided was invalid.
+            - `M_EMAIL_SEND_ERROR`: The validation email could not be sent.
           examples:
             application/json: {
               "errcode": "M_INVALID_EMAIL",
@@ -77,7 +77,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -92,10 +92,10 @@ paths:
         Validate ownership of an email address.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the email address is considered to
+        `requestToken` call, ownership of the email address is considered to
         have been validated. This does not publish any information publicly, or
         associate the email address with any Matrix user ID. Specifically,
-        calls to ``/lookup`` will not show a binding.
+        calls to `/lookup` will not show a binding.
 
         The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
@@ -105,7 +105,7 @@ paths:
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data.  However, this usage is
+        `application/x-form-www-urlencoded` data.  However, this usage is
         deprecated.
       operationId: emailSubmitTokenPostV2
       security:
@@ -123,13 +123,13 @@ paths:
             properties:
               sid:
                 type: string
-                description: The session ID, generated by the ``requestToken`` call.
+                description: The session ID, generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret that was supplied to the ``requestToken`` call.
+                description: The client secret that was supplied to the `requestToken` call.
               token:
                 type: string
-                description: The token generated by the ``requestToken`` call and emailed to the user.
+                description: The token generated by the `requestToken` call and emailed to the user.
             required: ["sid", "client_secret", "token"]
       responses:
         200:
@@ -149,7 +149,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -163,10 +163,10 @@ paths:
         Validate ownership of an email address.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the email address is considered to
+        `requestToken` call, ownership of the email address is considered to
         have been validated. This does not publish any information publicly, or
         associate the email address with any Matrix user ID. Specifically,
-        calls to ``/lookup`` will not show a binding.
+        calls to `/lookup` will not show a binding.
 
         Note that, in contrast with the POST version, this endpoint will be
         used by end-users, and so the response should be human-readable.
@@ -178,35 +178,35 @@ paths:
           type: string
           name: sid
           required: true
-          description: The session ID, generated by the ``requestToken`` call.
+          description: The session ID, generated by the `requestToken` call.
           x-example: 1234
         - in: query
           type: string
           name: client_secret
           required: true
-          description: The client secret that was supplied to the ``requestToken`` call.
+          description: The client secret that was supplied to the `requestToken` call.
           x-example: monkeys_are_GREAT
         - in: query
           type: string
           name: token
           required: true
-          description: The token generated by the ``requestToken`` call and emailed to the user.
+          description: The token generated by the `requestToken` call and emailed to the user.
           x-example: atoken
       responses:
         200:
           description: Email address is validated.
         "3xx":
           description: |-
-            Email address is validated, and the ``next_link`` parameter was
-            provided to the ``requestToken`` call.  The user must be redirected
-            to the URL provided by the ``next_link`` parameter.
+            Email address is validated, and the `next_link` parameter was
+            provided to the `requestToken` call.  The user must be redirected
+            to the URL provided by the `next_link` parameter.
         "4xx":
           description:
             Validation failed.
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_invitation_signing.yaml b/data/api/identity/v2_invitation_signing.yaml
index 0431233a..c8045779 100644
--- a/data/api/identity/v2_invitation_signing.yaml
+++ b/data/api/identity/v2_invitation_signing.yaml
@@ -33,8 +33,8 @@ paths:
       description: |-
         Sign invitation details.
 
-        The identity server will look up ``token`` which was stored in a call
-        to ``store-invite``, and fetch the sender of the invite.
+        The identity server will look up `token` which was stored in a call
+        to `store-invite`, and fetch the sender of the invite.
       operationId: blindlySignStuffV2
       security:
         - accessToken: []
@@ -54,7 +54,7 @@ paths:
                 description: The Matrix user ID of the user accepting the invitation.
               token:
                 type: string
-                description: The token from the call to ``store-invite``.
+                description: The token from the call to `store-invite`.
               private_key:
                 type: string
                 description: The private key, encoded as `Unpadded base64`_.
@@ -102,7 +102,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_lookup.yaml b/data/api/identity/v2_lookup.yaml
index 8acafd75..9e5b18ec 100644
--- a/data/api/identity/v2_lookup.yaml
+++ b/data/api/identity/v2_lookup.yaml
@@ -55,7 +55,7 @@ paths:
                 type: string
                 description: |-
                   The pepper the client MUST use in hashing identifiers, and MUST
-                  supply to the ``/lookup`` endpoint when performing lookups.
+                  supply to the `/lookup` endpoint when performing lookups.
 
                   Servers SHOULD rotate this string often.
               algorithms:
@@ -63,7 +63,7 @@ paths:
                 items:
                   type: string
                 description: |-
-                  The algorithms the server supports. Must contain at least ``sha256``.
+                  The algorithms the server supports. Must contain at least `sha256`.
             required: ['lookup_pepper', 'algorithms']
   "/lookup":
     post:
@@ -84,14 +84,14 @@ paths:
               algorithm:
                 type: string
                 description: |-
-                  The algorithm the client is using to encode the ``addresses``. This
-                  should be one of the available options from ``/hash_details``.
+                  The algorithm the client is using to encode the `addresses`. This
+                  should be one of the available options from `/hash_details`.
                 example: "sha256"
               pepper:
                 type: string
                 description: |-
-                  The pepper from ``/hash_details``. This is required even when the
-                  ``algorithm`` does not make use of it.
+                  The pepper from `/hash_details`. This is required even when the
+                  `algorithm` does not make use of it.
                 example: "matrixrocks"
               addresses:
                 type: array
@@ -99,7 +99,7 @@ paths:
                   type: string
                 description: |-
                   The addresses to look up. The format of the entries here depend on
-                  the ``algorithm`` used. Note that queries which have been incorrectly
+                  the `algorithm` used. Note that queries which have been incorrectly
                   hashed or formatted will lead to no matches.
                 example: [
                   "4kenr7N9drpCJ4AfalmlGQVsOn3o2RHjkADUpXJWZUc",
@@ -109,7 +109,7 @@ paths:
       responses:
         200:
           description:
-            The associations for any matched ``addresses``.
+            The associations for any matched `addresses`.
           examples:
             application/json: {
               "mappings": {
@@ -122,7 +122,7 @@ paths:
               mappings:
                 type: object
                 description: |-
-                  Any applicable mappings of ``addresses`` to Matrix User IDs. Addresses
+                  Any applicable mappings of `addresses` to Matrix User IDs. Addresses
                   which do not have associations will not be included, which can make
                   this property be an empty object.
                 title: AssociatedMappings
@@ -132,13 +132,13 @@ paths:
         400:
           description:
             The client's request was invalid in some way. One possible problem could
-            be the ``pepper`` being invalid after the server has rotated it - this is
-            presented with the ``M_INVALID_PEPPER`` error code. Clients SHOULD make
-            a call to ``/hash_details`` to get a new pepper in this scenario, being
+            be the `pepper` being invalid after the server has rotated it - this is
+            presented with the `M_INVALID_PEPPER` error code. Clients SHOULD make
+            a call to `/hash_details` to get a new pepper in this scenario, being
             careful to avoid retry loops.
 
-            ``M_INVALID_PARAM`` can also be returned to indicate the client supplied
-            an ``algorithm`` that is unknown to the server.
+            `M_INVALID_PARAM` can also be returned to indicate the client supplied
+            an `algorithm` that is unknown to the server.
           examples:
             application/json: {
               "errcode": "M_INVALID_PEPPER",
diff --git a/data/api/identity/v2_phone_associations.yaml b/data/api/identity/v2_phone_associations.yaml
index 6d4ad79b..7db891ba 100644
--- a/data/api/identity/v2_phone_associations.yaml
+++ b/data/api/identity/v2_phone_associations.yaml
@@ -40,13 +40,13 @@ paths:
 
         Note that homeservers offer APIs that proxy this API, adding
         additional behaviour on top, for example,
-        ``/register/msisdn/requestToken`` is designed specifically for use when
+        `/register/msisdn/requestToken` is designed specifically for use when
         registering an account and therefore will inform the user if the phone
         number given is already registered on the server.
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data. However, this usage is
+        `application/x-form-www-urlencoded` data. However, this usage is
         deprecated.
       operationId: msisdnRequestTokenV2
       security:
@@ -65,9 +65,9 @@ paths:
           description: |
             An error ocurred. Some possible errors are:
 
-            - ``M_INVALID_ADDRESS``: The phone number provided was invalid.
-            - ``M_SEND_ERROR``: The validation SMS could not be sent.
-            - ``M_DESTINATION_REJECTED``: The identity server cannot deliver an
+            - `M_INVALID_ADDRESS`: The phone number provided was invalid.
+            - `M_SEND_ERROR`: The validation SMS could not be sent.
+            - `M_DESTINATION_REJECTED`: The identity server cannot deliver an
               SMS to the provided country or region.
           examples:
             application/json: {
@@ -79,7 +79,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -94,10 +94,10 @@ paths:
         Validate ownership of a phone number.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the phone number is considered to
+        `requestToken` call, ownership of the phone number is considered to
         have been validated. This does not publish any information publicly, or
         associate the phone number address with any Matrix user
-        ID. Specifically, calls to ``/lookup`` will not show a binding.
+        ID. Specifically, calls to `/lookup` will not show a binding.
 
         The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
@@ -107,7 +107,7 @@ paths:
 
         Note: for backwards compatibility with previous drafts of this
         specification, the parameters may also be specified as
-        ``application/x-form-www-urlencoded`` data. However, this usage is
+        `application/x-form-www-urlencoded` data. However, this usage is
         deprecated.
       operationId: msisdnSubmitTokenPostV2
       security:
@@ -125,13 +125,13 @@ paths:
             properties:
               sid:
                 type: string
-                description: The session ID, generated by the ``requestToken`` call.
+                description: The session ID, generated by the `requestToken` call.
               client_secret:
                 type: string
-                description: The client secret that was supplied to the ``requestToken`` call.
+                description: The client secret that was supplied to the `requestToken` call.
               token:
                 type: string
-                description: The token generated by the ``requestToken`` call and sent to the user.
+                description: The token generated by the `requestToken` call and sent to the user.
             required: ["sid", "client_secret", "token"]
       responses:
         200:
@@ -151,7 +151,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -165,10 +165,10 @@ paths:
         Validate ownership of a phone number.
 
         If the three parameters are consistent with a set generated by a
-        ``requestToken`` call, ownership of the phone number address is
+        `requestToken` call, ownership of the phone number address is
         considered to have been validated. This does not publish any
         information publicly, or associate the phone number with any Matrix
-        user ID. Specifically, calls to ``/lookup`` will not show a binding.
+        user ID. Specifically, calls to `/lookup` will not show a binding.
 
         Note that, in contrast with the POST version, this endpoint will be
         used by end-users, and so the response should be human-readable.
@@ -180,35 +180,35 @@ paths:
           type: string
           name: sid
           required: true
-          description: The session ID, generated by the ``requestToken`` call.
+          description: The session ID, generated by the `requestToken` call.
           x-example: 1234
         - in: query
           type: string
           name: client_secret
           required: true
-          description: The client secret that was supplied to the ``requestToken`` call.
+          description: The client secret that was supplied to the `requestToken` call.
           x-example: monkeys_are_GREAT
         - in: query
           type: string
           name: token
           required: true
-          description: The token generated by the ``requestToken`` call and sent to the user.
+          description: The token generated by the `requestToken` call and sent to the user.
           x-example: atoken
       responses:
         200:
           description: Phone number is validated.
         "3xx":
           description: |-
-            Phone number address is validated, and the ``next_link`` parameter
-            was provided to the ``requestToken`` call. The user must be
-            redirected to the URL provided by the ``next_link`` parameter.
+            Phone number address is validated, and the `next_link` parameter
+            was provided to the `requestToken` call. The user must be
+            redirected to the URL provided by the `next_link` parameter.
         "4xx":
           description:
             Validation failed.
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_store_invite.yaml b/data/api/identity/v2_store_invite.yaml
index 9b7a653c..36079061 100644
--- a/data/api/identity/v2_store_invite.yaml
+++ b/data/api/identity/v2_store_invite.yaml
@@ -40,23 +40,23 @@ paths:
         The service will generate a random token and an ephemeral key used for
         accepting the invite.
 
-        The service also generates a ``display_name`` for the inviter, which is
-        a redacted version of ``address`` which does not leak the full contents
-        of the ``address``.
+        The service also generates a `display_name` for the inviter, which is
+        a redacted version of `address` which does not leak the full contents
+        of the `address`.
 
         The service records persistently all of the above information.
 
         It also generates an email containing all of this data, sent to the
-        ``address`` parameter, notifying them of the invitation.
+        `address` parameter, notifying them of the invitation.
 
         Also, the generated ephemeral public key will be listed as valid on
-        requests to ``/_matrix/identity/v2/pubkey/ephemeral/isvalid``.
+        requests to `/_matrix/identity/v2/pubkey/ephemeral/isvalid`.
 
-        Currently, invites may only be issued for 3pids of the ``email`` medium.
+        Currently, invites may only be issued for 3pids of the `email` medium.
 
         Optional fields in the request should be populated to the best of the
         server's ability. Identity servers may use these variables when notifying
-        the ``address`` of the pending invite for display purposes.
+        the `address` of the pending invite for display purposes.
       operationId: storeInviteV2
       security:
         - accessToken: []
@@ -68,7 +68,7 @@ paths:
             properties:
               medium:
                 type: string
-                description: The literal string ``email``.
+                description: The literal string `email`.
                 example: "email"
               address:
                 type: string
@@ -86,26 +86,26 @@ paths:
                 type: string
                 description: |-
                   The Matrix room alias for the room to which the user is
-                  invited. This should be retrieved from the ``m.room.canonical_alias``
+                  invited. This should be retrieved from the `m.room.canonical_alias`
                   state event.
                 example: "#somewhere:exmaple.org"
               room_avatar_url:
                 type: string
                 description: |-
                   The Content URI for the room to which the user is invited. This should
-                  be retrieved from the ``m.room.avatar`` state event.
+                  be retrieved from the `m.room.avatar` state event.
                 example: "mxc://example.org/s0meM3dia"
               room_join_rules:
                 type: string
                 description: |-
-                  The ``join_rule`` for the room to which the user is invited. This should
-                  be retrieved from the ``m.room.join_rules`` state event.
+                  The `join_rule` for the room to which the user is invited. This should
+                  be retrieved from the `m.room.join_rules` state event.
                 example: "public"
               room_name:
                 type: string
                 description: |-
                   The name of the room to which the user is invited. This should be retrieved
-                  from the ``m.room.name`` state event.
+                  from the `m.room.name` state event.
                 example: "Bob's Emporium of Messages"
               sender_display_name:
                 type: string
@@ -126,7 +126,7 @@ paths:
                 type: string
                 description: |
                   The generated token. Must be a string consisting of the
-                  characters ``[0-9a-zA-Z.=_-]``. Its length must not exceed
+                  characters `[0-9a-zA-Z.=_-]`. Its length must not exceed
                   255 characters and it must not be empty.
               public_keys:
                 type: array
@@ -153,8 +153,8 @@ paths:
             An error has occured.
 
             If the 3pid is already bound to a Matrix user ID, the error code
-            will be ``M_THREEPID_IN_USE``.  If the medium is unsupported, the
-            error code will be ``M_UNRECOGNIZED``.
+            will be `M_THREEPID_IN_USE`.  If the medium is unsupported, the
+            error code will be `M_UNRECOGNIZED`.
           examples:
             application/json: {
               "errcode": "M_THREEPID_IN_USE",
@@ -166,7 +166,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an ``M_TERMS_NOT_SIGNED`` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_terms.yaml b/data/api/identity/v2_terms.yaml
index 9b831fba..fcab28b7 100644
--- a/data/api/identity/v2_terms.yaml
+++ b/data/api/identity/v2_terms.yaml
@@ -106,7 +106,7 @@ paths:
                           all three criteria to avoid conflicts when the policy is updated
                           in the future: for example, if this was "https://example.org/terms.html"
                           then the server would be unable to update it because the client would
-                          have already added that URL to the ``m.accepted_terms`` collection.
+                          have already added that URL to the `m.accepted_terms` collection.
                     required: ['name', 'url']
             required: ['policies']
     post:
@@ -121,7 +121,7 @@ paths:
         to the user. Servers SHOULD consider acceptance of any one language's URL as
         acceptance for all other languages of that policy.
 
-        The server should avoid returning ``M_TERMS_NOT_SIGNED`` because the client
+        The server should avoid returning `M_TERMS_NOT_SIGNED` because the client
         may not be accepting all terms at once.
       operationId: agreeToTerms
       security:
diff --git a/data/api/push-gateway/push_notifier.yaml b/data/api/push-gateway/push_notifier.yaml
index 754c325a..2f03433b 100644
--- a/data/api/push-gateway/push_notifier.yaml
+++ b/data/api/push-gateway/push_notifier.yaml
@@ -39,7 +39,7 @@ paths:
 
         Notifications about a particular event will normally cause the user to be
         alerted in some way. It is therefore necessary to perform duplicate
-        suppression for such notifications using the ``event_id`` field to avoid
+        suppression for such notifications using the `event_id` field to avoid
         retries of this HTTP API causing duplicate alerts. The operation of
         updating counts of unread notifications should be idempotent and
         therefore do not require duplicate suppression.
@@ -111,7 +111,7 @@ paths:
                   type:
                     type: string
                     description: |-
-                      The type of the event as in the event's ``type`` field.
+                      The type of the event as in the event's `type` field.
                   sender:
                     type: string
                     description: |-
@@ -131,13 +131,13 @@ paths:
                     type: boolean
                     description: |-
                       This is true if the user receiving the notification is the
-                      subject of a member event (i.e. the ``state_key`` of the
+                      subject of a member event (i.e. the `state_key` of the
                       member event is equal to the user's Matrix ID).
                   prio:
                     type: string
                     enum: ["high", "low"]
                     description: |-
-                      The priority of the notification. If omitted, ``high`` is
+                      The priority of the notification. If omitted, `high` is
                       assumed. This may be used by push gateways to deliver less
                       time-sensitive notifications in a way that will preserve
                       battery power on mobile devices.
@@ -145,7 +145,7 @@ paths:
                     type: object
                     title: EventContent
                     description: |-
-                      The ``content`` field from the event, if present. The pusher
+                      The `content` field from the event, if present. The pusher
                       may omit this if the event had no content or for any other
                       reason.
                   counts:
@@ -178,10 +178,10 @@ paths:
                         app_id:
                           type: string
                           description: |-
-                            The ``app_id`` given when the pusher was created.
+                            The `app_id` given when the pusher was created.
                         pushkey:
                           type: string
-                          description: The ``pushkey`` given when the pusher was created.
+                          description: The `pushkey` given when the pusher was created.
                         pushkey_ts:
                           type: integer
                           description: |-
@@ -193,7 +193,7 @@ paths:
                           description: |-
                             A dictionary of additional pusher-specific data. For
                             'http' pushers, this is the data dictionary passed in at
-                            pusher creation minus the ``url`` key.
+                            pusher creation minus the `url` key.
                         tweaks:
                           type: object
                           title: Tweaks
diff --git a/data/api/server-server/backfill.yaml b/data/api/server-server/backfill.yaml
index 74067a80..2fd984e7 100644
--- a/data/api/server-server/backfill.yaml
+++ b/data/api/server-server/backfill.yaml
@@ -32,8 +32,8 @@ paths:
       summary: Retrieves the events which precede the given event
       description: |-
         Retrieves a sliding-window history of previous PDUs that occurred in the given room.
-        Starting from the PDU ID(s) given in the ``v`` argument, the PDUs given in ``v`` and
-        the PDUs that preceded them are retrieved, up to the total number given by the ``limit``.
+        Starting from the PDU ID(s) given in the `v` argument, the PDUs given in `v` and
+        the PDUs that preceded them are retrieved, up to the total number given by the `limit`.
       operationId: backfillRoom
       security:
         - signedRequest: []
@@ -65,12 +65,12 @@ paths:
             event(s), up to the given limit.
 
             **Note:**
-            Though the PDU definitions require that ``prev_events`` and ``auth_events`` be limited
+            Though the PDU definitions require that `prev_events` and `auth_events` be limited
             in number, the response of backfill MUST NOT be validated on these specific restrictions.
 
             Due to historical reasons, it is possible that events which were previously accepted
             would now be rejected by these limitations. The events should be rejected per usual by
-            the ``/send``, ``/get_missing_events``, and remaining endpoints.
+            the `/send`, `/get_missing_events`, and remaining endpoints.
           schema:
             $ref: "definitions/unlimited_pdu_transaction.yaml"
   "/get_missing_events/{roomId}":
@@ -78,8 +78,8 @@ paths:
       summary: Retrieves events that the sender is missing
       description: |-
         Retrieves previous events that the sender is missing. This is done by doing a breadth-first
-        walk of the ``prev_events`` for the ``latest_events``, ignoring any events in ``earliest_events``
-        and stopping at the ``limit``.
+        walk of the `prev_events` for the `latest_events`, ignoring any events in `earliest_events`
+        and stopping at the `limit`.
       operationId: getMissingPreviousEvents
       security:
         - signedRequest: []
@@ -107,7 +107,7 @@ paths:
                 type: array
                 description: |-
                   The latest event IDs that the sender already has. These are skipped when retrieving
-                  the previous events of ``latest_events``.
+                  the previous events of `latest_events`.
                 items:
                   type: string
                 example: ["$missing_event:example.org"]
@@ -121,8 +121,8 @@ paths:
       responses:
         200:
           description: |-
-            The previous events for ``latest_events``, excluding any ``earliest_events``, up to the
-            provided ``limit``.
+            The previous events for `latest_events`, excluding any `earliest_events`, up to the
+            provided `limit`.
           schema:
             type: object
             properties:
diff --git a/data/api/server-server/definitions/event-schemas/m.device_list_update.yaml b/data/api/server-server/definitions/event-schemas/m.device_list_update.yaml
index ba22aace..2a9d9b60 100644
--- a/data/api/server-server/definitions/event-schemas/m.device_list_update.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.device_list_update.yaml
@@ -32,7 +32,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.device_list_update']
-        description: The string ``m.device_list_update``.
+        description: The string `m.device_list_update`.
         example: "m.device_list_update"
       content:
         type: object
@@ -57,7 +57,7 @@ allOf:
             type: integer
             description: |-
               An ID sent by the server for this update, unique for a given
-              user_id.  Used to identify any gaps in the sequence of ``m.device_list_update``
+              user_id.  Used to identify any gaps in the sequence of `m.device_list_update`
               EDUs broadcast by a server.
             example: 6
           prev_id:
@@ -67,7 +67,7 @@ allOf:
               which have not been referred to already in an EDU's prev_id field.  If the
               receiving server does not recognise any of the prev_ids, it means an EDU
               has been lost and the server should query a snapshot of the device list
-              via ``/user/keys/query`` in order to correctly interpret future ``m.device_list_update``
+              via `/user/keys/query` in order to correctly interpret future `m.device_list_update`
               EDUs.  May be missing or empty for the first EDU in a sequence.
             items:
               type: integer
diff --git a/data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml b/data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml
index 9d5a7468..916922cf 100644
--- a/data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.direct_to_device.yaml
@@ -25,7 +25,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.direct_to_device']
-        description: The string ``m.direct_to_device``.
+        description: The string `m.direct_to_device`.
         example: "m.direct_to_device"
       content:
         type: object
@@ -50,7 +50,7 @@ allOf:
             description: |-
               The contents of the messages to be sent.  These are arranged in
               a map of user IDs to a map of device IDs to message bodies.
-              The device ID may also be ``*``, meaning all known devices for the user.
+              The device ID may also be `*`, meaning all known devices for the user.
             additionalProperties:
               type: object
               title: User Devices
diff --git a/data/api/server-server/definitions/event-schemas/m.presence.yaml b/data/api/server-server/definitions/event-schemas/m.presence.yaml
index 7f47add4..09d5d0d2 100644
--- a/data/api/server-server/definitions/event-schemas/m.presence.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.presence.yaml
@@ -23,7 +23,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.presence']
-        description: The string ``m.presence``
+        description: The string `m.presence`
         example: "m.presence"
       content:
         type: object
@@ -63,8 +63,8 @@ allOf:
                   type: boolean
                   description: |-
                     True if the user is likely to be interacting with their
-                    client. This may be indicated by the user having a 
-                    ``last_active_ago`` within the last few minutes. Defaults
+                    client. This may be indicated by the user having a
+                    `last_active_ago` within the last few minutes. Defaults
                     to false.
                   example: true
               required: ['user_id', 'presence', 'last_active_ago']
diff --git a/data/api/server-server/definitions/event-schemas/m.receipt.yaml b/data/api/server-server/definitions/event-schemas/m.receipt.yaml
index 70a02b49..335e7c27 100644
--- a/data/api/server-server/definitions/event-schemas/m.receipt.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.receipt.yaml
@@ -26,7 +26,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.receipt']
-        description: The string ``m.receipt``
+        description: The string `m.receipt`
         example: "m.receipt"
       content:
         type: object
diff --git a/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml b/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
index e372483a..c84cd6c3 100644
--- a/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.signing_key_update.yaml
@@ -24,7 +24,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.signing_key_update']
-        description: The string ``m.signing_update``.
+        description: The string `m.signing_update`.
         example: "m.signing_key_update"
       content:
         type: object
diff --git a/data/api/server-server/definitions/event-schemas/m.typing.yaml b/data/api/server-server/definitions/event-schemas/m.typing.yaml
index ccbecf53..7f23bae1 100644
--- a/data/api/server-server/definitions/event-schemas/m.typing.yaml
+++ b/data/api/server-server/definitions/event-schemas/m.typing.yaml
@@ -22,7 +22,7 @@ allOf:
       edu_type:
         type: enum
         enum: ['m.typing']
-        description: The string ``m.typing``
+        description: The string `m.typing`
         example: "m.typing"
       content:
         type: object
diff --git a/data/api/server-server/definitions/invite_event.yaml b/data/api/server-server/definitions/invite_event.yaml
index dd2efdd6..3b430d03 100644
--- a/data/api/server-server/definitions/invite_event.yaml
+++ b/data/api/server-server/definitions/invite_event.yaml
@@ -22,7 +22,7 @@ allOf:
       sender:
         type: string
         description: |-
-          The matrix ID of the user who sent the original ``m.room.third_party_invite``.
+          The matrix ID of the user who sent the original `m.room.third_party_invite`.
         example: "@someone:example.org"
       origin:
         type: string
@@ -35,7 +35,7 @@ allOf:
         example: 1234567890
       type:
         type: string
-        description: The value ``m.room.member``.
+        description: The value `m.room.member`.
         example: "m.room.member"
       state_key:
         type: string
@@ -46,12 +46,12 @@ allOf:
         title: Membership Event Content
         description: |-
           The content of the event, matching what is available in the
-          `Client-Server API`_. Must include a ``membership`` of ``invite``.
+          `Client-Server API`_. Must include a `membership` of `invite`.
         example: {"membership": "invite"}
         properties:
           membership:
             type: string
-            description: The value ``invite``.
+            description: The value `invite`.
             example: "invite"
         required: ['membership']
     required:
diff --git a/data/api/server-server/definitions/keys.yaml b/data/api/server-server/definitions/keys.yaml
index 306d4d00..bd0aa737 100644
--- a/data/api/server-server/definitions/keys.yaml
+++ b/data/api/server-server/definitions/keys.yaml
@@ -26,10 +26,10 @@ properties:
     description: |-
       Public keys of the homeserver for verifying digital signatures.
 
-      The object's key is the algorithm and version combined (``ed25519`` being the
-      algorithm and ``abc123`` being the version in the example below). Together,
+      The object's key is the algorithm and version combined (`ed25519` being the
+      algorithm and `abc123` being the version in the example below). Together,
       this forms the Key ID. The version must have characters matching the regular
-      expression ``[a-zA-Z0-9_]``.
+      expression `[a-zA-Z0-9_]`.
     additionalProperties:
       type: object
       title: Verify Key
@@ -49,10 +49,10 @@ properties:
     description: |-
       The public keys that the server used to use and when it stopped using them.
 
-      The object's key is the algorithm and version combined (``ed25519`` being the
-      algorithm and ``0ldK3y`` being the version in the example below). Together,
+      The object's key is the algorithm and version combined (`ed25519` being the
+      algorithm and `0ldK3y` being the version in the example below). Together,
       this forms the Key ID. The version must have characters matching the regular
-      expression ``[a-zA-Z0-9_]``.
+      expression `[a-zA-Z0-9_]`.
     additionalProperties:
       type: object
       title: Old Verify Key
@@ -76,7 +76,7 @@ properties:
   signatures:
     type: object
     description: |-
-      Digital signatures for this object signed using the ``verify_keys``.
+      Digital signatures for this object signed using the `verify_keys`.
 
       The signature is calculated using the process described at `Signing
       JSON`_.
diff --git a/data/api/server-server/definitions/security.yaml b/data/api/server-server/definitions/security.yaml
index 6c9cc808..4e0652e9 100644
--- a/data/api/server-server/definitions/security.yaml
+++ b/data/api/server-server/definitions/security.yaml
@@ -14,6 +14,6 @@
 signedRequest:
   type: apiKey
   description: |-
-    The ``Authorization`` header defined in the `Authentication`_ section.
+    The `Authorization` header defined in the `Authentication`_ section.
   name: Authorization
   in: header
diff --git a/data/api/server-server/definitions/transaction.yaml b/data/api/server-server/definitions/transaction.yaml
index 08f3738a..cf6aaf31 100644
--- a/data/api/server-server/definitions/transaction.yaml
+++ b/data/api/server-server/definitions/transaction.yaml
@@ -20,7 +20,7 @@ properties:
   origin:
     type: string
     description: |-
-      The ``server_name`` of the homeserver sending this transaction.
+      The `server_name` of the homeserver sending this transaction.
     example: "example.org"
   origin_server_ts:
     type: integer
diff --git a/data/api/server-server/definitions/unsigned_pdu_base.yaml b/data/api/server-server/definitions/unsigned_pdu_base.yaml
index c97e74de..dae148a1 100644
--- a/data/api/server-server/definitions/unsigned_pdu_base.yaml
+++ b/data/api/server-server/definitions/unsigned_pdu_base.yaml
@@ -27,7 +27,7 @@ properties:
     example: "@someone:matrix.org"
   origin:
     type: string
-    description: The ``server_name`` of the homeserver that created this event.
+    description: The `server_name` of the homeserver that created this event.
     example: "matrix.org"
   origin_server_ts:
     type: integer
@@ -42,7 +42,7 @@ properties:
     type: string
     description: |-
       If this key is present, the event is a state event, and it will replace previous events
-      with the same ``type`` and ``state_key`` in the room state.
+      with the same `type` and `state_key` in the room state.
     example: "my_key"
   content:
     type: object
@@ -77,7 +77,7 @@ properties:
   depth:
     type: integer
     description: |-
-      The maximum depth of the ``prev_events``, plus one. Must be less than the
+      The maximum depth of the `prev_events`, plus one. Must be less than the
       maximum value for an integer (2^63 - 1). If the room's depth is already at
       the limit, the depth must be set to the limit.
     example: 12
@@ -117,7 +117,7 @@ properties:
     type: object
     title: UnsignedData
     description: |-
-      Additional data added by the origin server but not covered by the ``signatures``. More
+      Additional data added by the origin server but not covered by the `signatures`. More
       keys than those defined here may be used.
     example: {"key": "value"}
     properties:
diff --git a/data/api/server-server/events.yaml b/data/api/server-server/events.yaml
index 1f8ee537..945af253 100644
--- a/data/api/server-server/events.yaml
+++ b/data/api/server-server/events.yaml
@@ -94,7 +94,7 @@ paths:
       summary: Get all the state event IDs of a given room
       description: |-
         Retrieves a snapshot of a room's state at a given event, in the form of
-        event IDs. This performs the same function as calling ``/state/{roomId}``,
+        event IDs. This performs the same function as calling `/state/{roomId}`,
         however this returns just the event IDs rather than the full events.
       operationId: getRoomStateIds
       security:
diff --git a/data/api/server-server/invites-v1.yaml b/data/api/server-server/invites-v1.yaml
index c054bdd5..f7bf30f8 100644
--- a/data/api/server-server/invites-v1.yaml
+++ b/data/api/server-server/invites-v1.yaml
@@ -36,8 +36,8 @@ paths:
         room by the inviting homeserver.
 
         Servers should prefer to use the v2 API for invites instead of the v1 API. Servers
-        which receive a v1 invite request must assume that the room version is either ``"1"``
-        or ``"2"``.
+        which receive a v1 invite request must assume that the room version is either `"1"`
+        or `"2"`.
 
         Note that events have a different format depending on the room version - check the
         `room version specification`_ for precise event formats. **The request and response
@@ -113,7 +113,7 @@ paths:
             maxItems: 2
             items:
               - type: integer
-                description: The value ``200``.
+                description: The value `200`.
                 example: 200
               - type: object
                 description: An object containing the signed invite event.
diff --git a/data/api/server-server/invites-v2.yaml b/data/api/server-server/invites-v2.yaml
index 58d32049..33140b28 100644
--- a/data/api/server-server/invites-v2.yaml
+++ b/data/api/server-server/invites-v2.yaml
@@ -164,7 +164,7 @@ paths:
         400:
           description: |-
             The request is invalid or the room the server is attempting
-            to join has a version that is not listed in the ``ver``
+            to join has a version that is not listed in the `ver`
             parameters.
 
             The error should be passed through to clients so that they
@@ -177,8 +177,8 @@ paths:
                   room_version:
                     type: string
                     description: |-
-                      The version of the room. Required if the ``errcode``
-                      is ``M_INCOMPATIBLE_ROOM_VERSION``.
+                      The version of the room. Required if the `errcode`
+                      is `M_INCOMPATIBLE_ROOM_VERSION`.
           examples:
             application/json: {
               "errcode": "M_INCOMPATIBLE_ROOM_VERSION",
diff --git a/data/api/server-server/joins-v1.yaml b/data/api/server-server/joins-v1.yaml
index e9654cd8..da9485bb 100644
--- a/data/api/server-server/joins-v1.yaml
+++ b/data/api/server-server/joins-v1.yaml
@@ -57,7 +57,7 @@ paths:
           name: ver
           description: |-
             The room versions the sending server has support for. Defaults
-            to ``[1]``.
+            to `[1]`.
           x-example: ["1", "2"]
       responses:
         200:
@@ -99,7 +99,7 @@ paths:
                     example: 1234567890
                   type:
                     type: string
-                    description: The value ``m.room.member``.
+                    description: The value `m.room.member`.
                     example: "m.room.member"
                   state_key:
                     type: string
@@ -113,7 +113,7 @@ paths:
                     properties:
                       membership:
                         type: string
-                        description: The value ``join``.
+                        description: The value `join`.
                         example: "join"
                     required: ['membership']
                 required:
@@ -141,7 +141,7 @@ paths:
         400:
           description: |-
             The request is invalid or the room the server is attempting
-            to join has a version that is not listed in the ``ver``
+            to join has a version that is not listed in the `ver`
             parameters.
 
             The error should be passed through to clients so that they
@@ -154,8 +154,8 @@ paths:
                   room_version:
                     type: string
                     description: |-
-                      The version of the room. Required if the ``errcode``
-                      is ``M_INCOMPATIBLE_ROOM_VERSION``.
+                      The version of the room. Required if the `errcode`
+                      is `M_INCOMPATIBLE_ROOM_VERSION`.
           examples:
             application/json: {
               "errcode": "M_INCOMPATIBLE_ROOM_VERSION",
@@ -177,7 +177,7 @@ paths:
       summary: Submit a signed join event to a resident server
       description: |-
         **Note:**
-        Servers should instead prefer to use the v2 ``/send_join`` endpoint.
+        Servers should instead prefer to use the v2 `/send_join` endpoint.
 
         Submits a signed join event to the resident server for it
         to accept it into the room's graph. Note that events have
@@ -224,7 +224,7 @@ paths:
                 example: 1234567890
               type:
                 type: string
-                description: The value ``m.room.member``.
+                description: The value `m.room.member`.
                 example: "m.room.member"
               state_key:
                 type: string
@@ -238,7 +238,7 @@ paths:
                 properties:
                   membership:
                     type: string
-                    description: The value ``join``.
+                    description: The value `join`.
                     example: "join"
                 required: ['membership']
             required:
@@ -269,7 +269,7 @@ paths:
             maxItems: 2
             items:
               - type: integer
-                description: The value ``200``.
+                description: The value `200`.
                 example: 200
               - $ref: "./definitions/send_join_response.yaml"
           examples:
diff --git a/data/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml
index 7f1d675e..94cdef19 100644
--- a/data/api/server-server/joins-v2.yaml
+++ b/data/api/server-server/joins-v2.yaml
@@ -87,7 +87,7 @@ paths:
                 example: 1234567890
               type:
                 type: string
-                description: The value ``m.room.member``.
+                description: The value `m.room.member`.
                 example: "m.room.member"
               state_key:
                 type: string
@@ -101,7 +101,7 @@ paths:
                 properties:
                   membership:
                     type: string
-                    description: The value ``join``.
+                    description: The value `join`.
                     example: "join"
                 required: ['membership']
             required:
diff --git a/data/api/server-server/keys_query.yaml b/data/api/server-server/keys_query.yaml
index 4989f7fa..cad6b882 100644
--- a/data/api/server-server/keys_query.yaml
+++ b/data/api/server-server/keys_query.yaml
@@ -93,11 +93,11 @@ paths:
               server_keys:
                 type: object
                 description: |-
-                  The query criteria. The outer ``string`` key on the object is the
-                  server name (eg: ``matrix.org``). The inner ``string`` key is the
+                  The query criteria. The outer `string` key on the object is the
+                  server name (eg: `matrix.org`). The inner `string` key is the
                   Key ID to query for the particular server. If no key IDs are given
                   to be queried, the notary server should query for all keys. If no
-                  servers are given, the notary server must return an empty ``server_keys``
+                  servers are given, the notary server must return an empty `server_keys`
                   array in the response.
 
                   The notary server may return multiple keys regardless of the Key IDs
diff --git a/data/api/server-server/leaving-v1.yaml b/data/api/server-server/leaving-v1.yaml
index ff12bbce..2579d68c 100644
--- a/data/api/server-server/leaving-v1.yaml
+++ b/data/api/server-server/leaving-v1.yaml
@@ -53,7 +53,7 @@ paths:
       responses:
         200:
           description: |-
-            A template to be used to call ``/send_leave``. Note that
+            A template to be used to call `/send_leave`. Note that
             events have a different format depending on the room version - check the
             `room version specification`_ for precise event formats. **The response body
             here describes the common event fields in more detail and may be missing other
@@ -90,7 +90,7 @@ paths:
                     example: 1234567890
                   type:
                     type: string
-                    description: The value ``m.room.member``.
+                    description: The value `m.room.member`.
                     example: "m.room.member"
                   state_key:
                     type: string
@@ -104,7 +104,7 @@ paths:
                     properties:
                       membership:
                         type: string
-                        description: The value ``leave``.
+                        description: The value `leave`.
                         example: "leave"
                     required: ['membership']
                 required:
@@ -144,7 +144,7 @@ paths:
       summary: Submit a signed leave event to a resident server
       description: |-
         **Note:**
-        Servers should instead prefer to use the v2 ``/send_leave`` endpoint.
+        Servers should instead prefer to use the v2 `/send_leave` endpoint.
 
         Submits a signed leave event to the resident server for it
         to accept it into the room's graph. Note that events have
@@ -191,7 +191,7 @@ paths:
                 example: 1234567890
               type:
                 type: string
-                description: The value ``m.room.member``.
+                description: The value `m.room.member`.
                 example: "m.room.member"
               state_key:
                 type: string
@@ -205,7 +205,7 @@ paths:
                 properties:
                   membership:
                     type: string
-                    description: The value ``leave``.
+                    description: The value `leave`.
                     example: "leave"
                 required: ['membership']
               depth:
@@ -242,7 +242,7 @@ paths:
             maxItems: 2
             items:
               - type: integer
-                description: The value ``200``.
+                description: The value `200`.
                 example: 200
               - type: object
                 title: Empty Object
diff --git a/data/api/server-server/leaving-v2.yaml b/data/api/server-server/leaving-v2.yaml
index 7069b6c0..bd1023fe 100644
--- a/data/api/server-server/leaving-v2.yaml
+++ b/data/api/server-server/leaving-v2.yaml
@@ -87,7 +87,7 @@ paths:
                 example: 1234567890
               type:
                 type: string
-                description: The value ``m.room.member``.
+                description: The value `m.room.member`.
                 example: "m.room.member"
               state_key:
                 type: string
@@ -101,7 +101,7 @@ paths:
                 properties:
                   membership:
                     type: string
-                    description: The value ``leave``.
+                    description: The value `leave`.
                     example: "leave"
                 required: ['membership']
               depth:
diff --git a/data/api/server-server/public_rooms.yaml b/data/api/server-server/public_rooms.yaml
index 5324eac3..3c8d7ea6 100644
--- a/data/api/server-server/public_rooms.yaml
+++ b/data/api/server-server/public_rooms.yaml
@@ -61,7 +61,7 @@ paths:
           type: string
           description: |-
             The specific third party network/protocol to request from the homeserver.
-            Can only be used if ``include_all_networks`` is false.
+            Can only be used if `include_all_networks` is false.
           x-example: "irc"
       responses:
         200:
@@ -77,7 +77,7 @@ paths:
         of joined members, with the largest rooms first.
 
         Note that this endpoint receives and returns the same format that is seen
-        in the Client-Server API's ``POST /publicRooms`` endpoint.
+        in the Client-Server API's `POST /publicRooms` endpoint.
       operationId: queryPublicRooms
       security:
         - signedRequest: []
@@ -122,7 +122,7 @@ paths:
                 type: string
                 description: |-
                   The specific third party network/protocol to request from the
-                  homeserver. Can only be used if ``include_all_networks`` is false.
+                  homeserver. Can only be used if `include_all_networks` is false.
                 example: "irc"
             example: {
               "limit": 10,
diff --git a/data/api/server-server/query.yaml b/data/api/server-server/query.yaml
index 29826b32..42b64ea8 100644
--- a/data/api/server-server/query.yaml
+++ b/data/api/server-server/query.yaml
@@ -137,13 +137,13 @@ paths:
       responses:
         200:
           description: |-
-            The profile for the user. If a ``field`` is specified in the request, only the
-            matching field should be included in the response. If no ``field`` was specified,
+            The profile for the user. If a `field` is specified in the request, only the
+            matching field should be included in the response. If no `field` was specified,
             the response should include the fields of the user's profile that can be made
             public, such as the display name and avatar.
 
             If the user does not have a particular field set on their profile, the server
-            should exclude it from the response body or give it the value ``null``.
+            should exclude it from the response body or give it the value `null`.
           schema:
             type: object
             properties:
diff --git a/data/api/server-server/third_party_invite.yaml b/data/api/server-server/third_party_invite.yaml
index fbd2a9d9..f9a2bf76 100644
--- a/data/api/server-server/third_party_invite.yaml
+++ b/data/api/server-server/third_party_invite.yaml
@@ -31,7 +31,7 @@ paths:
     put:
       summary: Request a server to auth a third party invite event
       description: |-
-        The receiving server will verify the partial ``m.room.member`` event
+        The receiving server will verify the partial `m.room.member` event
         given in the request body. If valid, the receiving server will issue
         an invite as per the `Inviting to a room`_ section before returning a
         response to this request.
@@ -48,14 +48,14 @@ paths:
         - in: body
           name: body
           type: object
-          description: A partial ``m.room.member`` event
+          description: A partial `m.room.member` event
           required: true
           schema:
             type: object
             properties:
               type:
                 type: string
-                description: The event type. Must be ``m.room.member``
+                description: The event type. Must be `m.room.member`
                 example: "m.room.member"
               room_id:
                 type: string
@@ -66,7 +66,7 @@ paths:
               sender:
                 type: string
                 description: |-
-                  The user ID of the user who sent the original ``m.room.third_party_invite``
+                  The user ID of the user who sent the original `m.room.third_party_invite`
                   event.
                 example: "@joe:matrix.org"
               state_key:
@@ -80,7 +80,7 @@ paths:
                 properties:
                   membership:
                     type: string
-                    description: The membership state. Must be ``invite``
+                    description: The membership state. Must be `invite`
                     example: invite
                   third_party_invite:
                     type: object
@@ -288,7 +288,7 @@ paths:
                           type: object
                           title: Identity Server Signature
                           description: |-
-                            The signature from the identity server. The ``string`` key
+                            The signature from the identity server. The `string` key
                             is the identity server's domain name, such as vector.im
                           additionalProperties:
                             type: object
diff --git a/data/api/server-server/transactions.yaml b/data/api/server-server/transactions.yaml
index a6348e13..8690c7aa 100644
--- a/data/api/server-server/transactions.yaml
+++ b/data/api/server-server/transactions.yaml
@@ -36,7 +36,7 @@ paths:
         transaction body will be processed.
 
         The sending server must wait and retry for a 200 OK response before sending a
-        transaction with a different ``txnId`` to the receiving server.
+        transaction with a different `txnId` to the receiving server.
 
         Note that events have a different format depending on the room version - check
         the `room version specification`_ for precise event formats.
diff --git a/data/api/server-server/user_devices.yaml b/data/api/server-server/user_devices.yaml
index 6bff54c0..0c2348da 100644
--- a/data/api/server-server/user_devices.yaml
+++ b/data/api/server-server/user_devices.yaml
@@ -58,8 +58,8 @@ paths:
                 type: integer
                 description: |-
                   A unique ID for a given user_id which describes the version of
-                  the returned device list.  This is matched with the ``stream_id``
-                  field in ``m.device_list_update`` EDUs in order to incrementally
+                  the returned device list.  This is matched with the `stream_id`
+                  field in `m.device_list_update` EDUs in order to incrementally
                   update the returned device_list.
                 example: 5
               devices:
diff --git a/data/api/server-server/user_keys.yaml b/data/api/server-server/user_keys.yaml
index c7cf6b76..bcda1737 100644
--- a/data/api/server-server/user_keys.yaml
+++ b/data/api/server-server/user_keys.yaml
@@ -72,7 +72,7 @@ paths:
                 type: object
                 description: |-
                   One-time keys for the queried devices. A map from user ID, to a
-                  map from devices to a map from ``<algorithm>:<key_id>`` to the key object.
+                  map from devices to a map from `<algorithm>:<key_id>` to the key object.
 
                   See the `Client-Server Key Algorithms`_ section for more information on
                   the Key Object format.
@@ -158,7 +158,7 @@ paths:
                   Information on the queried devices. A map from user ID, to a
                   map from device ID to device information.  For each device,
                   the information returned will be the same as uploaded via
-                  ``/keys/upload``, with the addition of an ``unsigned``
+                  `/keys/upload`, with the addition of an `unsigned`
                   property.
                 additionalProperties:
                   type: object
@@ -184,8 +184,8 @@ paths:
                   Information on the master cross-signing keys of the queried users.
                   A map from user ID, to master key information.  For each key, the
                   information returned will be the same as uploaded via
-                  ``/keys/device_signing/upload``, along with the signatures
-                  uploaded via ``/keys/signatures/upload`` that the user is
+                  `/keys/device_signing/upload`, along with the signatures
+                  uploaded via `/keys/signatures/upload` that the user is
                   allowed to see.
                 additionalProperties:
                   allOf:
@@ -205,7 +205,7 @@ paths:
                   Information on the self-signing keys of the queried users. A map
                   from user ID, to self-signing key information.  For each key, the
                   information returned will be the same as uploaded via
-                  ``/keys/device_signing/upload``.
+                  `/keys/device_signing/upload`.
                 additionalProperties:
                   allOf:
                     - $ref: ../client-server/definitions/cross_signing_key.yaml
diff --git a/data/api/server-server/wellknown.yaml b/data/api/server-server/wellknown.yaml
index bc390bd5..24d2ae42 100644
--- a/data/api/server-server/wellknown.yaml
+++ b/data/api/server-server/wellknown.yaml
@@ -33,8 +33,8 @@ paths:
       responses:
         200:
           description:
-            The delegated server information. The ``Content-Type`` for this response SHOULD
-            be ``application/json``, however servers parsing the response should assume that
+            The delegated server information. The `Content-Type` for this response SHOULD
+            be `application/json`, however servers parsing the response should assume that
             the body is JSON regardless of type. Failures parsing the JSON or invalid data
             provided in the resulting parsed JSON should not result in discovery failure -
             consult the server discovery process for information on how to continue.
diff --git a/data/event-schemas/moderation_policy_rule.yaml b/data/event-schemas/moderation_policy_rule.yaml
index 34ad4d9a..a57a1ffe 100644
--- a/data/event-schemas/moderation_policy_rule.yaml
+++ b/data/event-schemas/moderation_policy_rule.yaml
@@ -14,14 +14,14 @@
 properties:
   entity:
     description: |-
-      The entity affected by this rule. Glob characters ``*`` and ``?`` can be used
+      The entity affected by this rule. Glob characters `*` and `?` can be used
       to match zero or more and one or more characters respectively.
     type: string
   recommendation:
-    description: The suggested action to take. Currently only ``m.ban`` is specified.
+    description: The suggested action to take. Currently only `m.ban` is specified.
     type: string
   reason:
-    description: The human-readable description for the ``recommendation``.
+    description: The human-readable description for the `recommendation`.
     type: string
 type: object
 required:
diff --git a/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml b/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
index ff40efcb..0958fc8a 100644
--- a/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
+++ b/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
@@ -12,7 +12,7 @@ properties:
       differ from the intrinsic dimensions of the image file.
     type: integer
   mimetype:
-    description: The mimetype of the image, e.g. ``image/jpeg``.
+    description: The mimetype of the image, e.g. `image/jpeg`.
     type: string
   size:
     description: Size of the image in bytes.
@@ -31,6 +31,6 @@ properties:
   thumbnail_info:
     allOf:
       - $ref: thumbnail_info.yaml
-    description: Metadata about the image referred to in ``thumbnail_url``.
+    description: Metadata about the image referred to in `thumbnail_url`.
 title: ImageInfo
 type: object
diff --git a/data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml b/data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
index 82ffaf5e..79f7c253 100644
--- a/data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
+++ b/data/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
@@ -12,7 +12,7 @@ properties:
       differ from the intrinsic dimensions of the image file.
     type: integer
   mimetype:
-    description: The mimetype of the image, e.g. ``image/jpeg``.
+    description: The mimetype of the image, e.g. `image/jpeg`.
     type: string
   size:
     description: Size of the image in bytes.
diff --git a/data/event-schemas/schema/core-event-schema/room_event.yaml b/data/event-schemas/schema/core-event-schema/room_event.yaml
index 6a74acdc..7eaae223 100644
--- a/data/event-schemas/schema/core-event-schema/room_event.yaml
+++ b/data/event-schemas/schema/core-event-schema/room_event.yaml
@@ -5,7 +5,7 @@ properties:
   room_id:
     description: |-
       The ID of the room associated with this event. Will not be present on events
-      that arrive through ``/sync``, despite being required everywhere else.
+      that arrive through `/sync`, despite being required everywhere else.
     type: string
 required:
 - room_id
diff --git a/data/event-schemas/schema/core-event-schema/sync_state_event.yaml b/data/event-schemas/schema/core-event-schema/sync_state_event.yaml
index dc48f941..e7a061f5 100644
--- a/data/event-schemas/schema/core-event-schema/sync_state_event.yaml
+++ b/data/event-schemas/schema/core-event-schema/sync_state_event.yaml
@@ -20,7 +20,7 @@ description: In addition to the Room Event fields, State Events have the followi
   additional fields.
 properties:
   prev_content:
-    description: Optional. The previous ``content`` for this event. If there is no
+    description: Optional. The previous `content` for this event. If there is no
       previous content, this key will be missing.
     title: EventContent
     type: object
@@ -29,7 +29,7 @@ properties:
       of room state. This value is often a zero-length string. The presence of this
       key makes this event a State Event.
 
-      State keys starting with an ``@`` are reserved for referencing user IDs, such
+      State keys starting with an `@` are reserved for referencing user IDs, such
       as room members. With the exception of a few events, state events set with a
       given user's ID as the state key MUST only be set by that user.
     type: string
diff --git a/data/event-schemas/schema/core-event-schema/unsigned_prop.yaml b/data/event-schemas/schema/core-event-schema/unsigned_prop.yaml
index 36c37230..aace29ff 100644
--- a/data/event-schemas/schema/core-event-schema/unsigned_prop.yaml
+++ b/data/event-schemas/schema/core-event-schema/unsigned_prop.yaml
@@ -29,6 +29,6 @@ properties:
   transaction_id:
     description: |
       The client-supplied transaction ID, for example, provided via
-      ``PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}``,
+      `PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}`,
       if the client being given the event is the same one which sent it.
     type: string
diff --git a/data/event-schemas/schema/m.call.hangup.yaml b/data/event-schemas/schema/m.call.hangup.yaml
index c0478f5a..116d5af7 100644
--- a/data/event-schemas/schema/m.call.hangup.yaml
+++ b/data/event-schemas/schema/m.call.hangup.yaml
@@ -18,7 +18,7 @@
                 },
                 "reason": {
                     "type": "string",
-                    "description": "Optional error reason for the hangup. This should not be provided when the user naturally ends or rejects the call. When there was an error in the call negotiation, this should be ``ice_failed`` for when ICE negotiation fails or ``invite_timeout`` for when the other party did not answer in time.",
+                    "description": "Optional error reason for the hangup. This should not be provided when the user naturally ends or rejects the call. When there was an error in the call negotiation, this should be `ice_failed` for when ICE negotiation fails or `invite_timeout` for when the other party did not answer in time.",
                     "enum": [
                         "ice_failed",
                         "invite_timeout"
diff --git a/data/event-schemas/schema/m.direct.yaml b/data/event-schemas/schema/m.direct.yaml
index 8cbbf38f..f00b83bc 100644
--- a/data/event-schemas/schema/m.direct.yaml
+++ b/data/event-schemas/schema/m.direct.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 description: |-
   A map of which rooms are considered 'direct' rooms for specific users
-  is kept in  ``account_data`` in an event of type ``m.direct``. The
+  is kept in  `account_data` in an event of type `m.direct`. The
   content of this event is an object where the keys are the user IDs
   and values are lists of room ID strings of the 'direct' rooms for
   that user ID.
diff --git a/data/event-schemas/schema/m.dummy.yaml b/data/event-schemas/schema/m.dummy.yaml
index 8e4b6f94..6677cacf 100644
--- a/data/event-schemas/schema/m.dummy.yaml
+++ b/data/event-schemas/schema/m.dummy.yaml
@@ -4,13 +4,13 @@ allOf:
 
 description: |-
   This event type is used to indicate new Olm sessions for end-to-end encryption.
-  Typically it is encrypted as an ``m.room.encrypted`` event, then sent as a `to-device`_
+  Typically it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_
   event.
 
   The event does not have any content associated with it. The sending client is expected
   to send a key share request shortly after this message, causing the receiving client to
-  process this ``m.dummy`` event as the most recent event and using the keyshare request
-  to set up the session. The keyshare request and ``m.dummy`` combination should result
+  process this `m.dummy` event as the most recent event and using the keyshare request
+  to set up the session. The keyshare request and `m.dummy` combination should result
   in the original sending client receiving keys over the newly established session.
 properties:
   content:
diff --git a/data/event-schemas/schema/m.forwarded_room_key.yaml b/data/event-schemas/schema/m.forwarded_room_key.yaml
index 7350a25b..a7b45b69 100644
--- a/data/event-schemas/schema/m.forwarded_room_key.yaml
+++ b/data/event-schemas/schema/m.forwarded_room_key.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to forward keys for end-to-end encryption. Typically
-  it is encrypted as an ``m.room.encrypted`` event, then sent as a `to-device`_
+  it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_
   event.
 properties:
   content:
@@ -49,8 +49,8 @@ properties:
           Indicates that the key cannot be used to decrypt all the messages
           from the session because a portion of the session was withheld as
           described in `Reporting that decryption keys are withheld`_. This
-          object must include the ``code`` and ``reason`` properties from the
-          ``m.room_key.withheld`` message that was received by the sender of
+          object must include the `code` and `reason` properties from the
+          `m.room_key.withheld` message that was received by the sender of
           this message.
     required:
       - algorithm
diff --git a/data/event-schemas/schema/m.identity_server.yaml b/data/event-schemas/schema/m.identity_server.yaml
index 75d2409f..acd0eb92 100644
--- a/data/event-schemas/schema/m.identity_server.yaml
+++ b/data/event-schemas/schema/m.identity_server.yaml
@@ -11,10 +11,10 @@ properties:
       base_url:
         type: string
         description: |-
-          The URL of the identity server the user prefers to use, or ``null``
+          The URL of the identity server the user prefers to use, or `null`
           if the user does not want to use an identity server. This value is
-          similar in structure to the ``base_url`` for identity servers in the
-          ``.well-known/matrix/client`` schema.
+          similar in structure to the `base_url` for identity servers in the
+          `.well-known/matrix/client` schema.
   type:
     enum:
       - m.identity_server
diff --git a/data/event-schemas/schema/m.ignored_user_list.yaml b/data/event-schemas/schema/m.ignored_user_list.yaml
index 7f7a6604..0f0b2f85 100644
--- a/data/event-schemas/schema/m.ignored_user_list.yaml
+++ b/data/event-schemas/schema/m.ignored_user_list.yaml
@@ -2,8 +2,8 @@
 allOf:
   - $ref: core-event-schema/event.yaml
 description: |-
-  A map of users which are considered ignored is kept in ``account_data``
-  in an event type of ``m.ignored_user_list``.
+  A map of users which are considered ignored is kept in `account_data`
+  in an event type of `m.ignored_user_list`.
 properties:
   content:
     type: object
diff --git a/data/event-schemas/schema/m.key.verification.accept.yaml b/data/event-schemas/schema/m.key.verification.accept.yaml
index 3f579cc4..d3cdbc67 100644
--- a/data/event-schemas/schema/m.key.verification.accept.yaml
+++ b/data/event-schemas/schema/m.key.verification.accept.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Accepts a previously sent ``m.key.verification.start`` message. Typically sent as a
+  Accepts a previously sent `m.key.verification.start` message. Typically sent as a
   `to-device`_ event.
 properties:
   content:
@@ -12,27 +12,27 @@ properties:
         type: string
         description: |-
           An opaque identifier for the verification process. Must be the same as
-          the one used for the ``m.key.verification.start`` message.
+          the one used for the `m.key.verification.start` message.
       key_agreement_protocol:
         type: string
         description: |-
           The key agreement protocol the device is choosing to use, out of the
-          options in the ``m.key.verification.start`` message.
+          options in the `m.key.verification.start` message.
       hash:
         type: string
         description: |-
           The hash method the device is choosing to use, out of the options in
-          the ``m.key.verification.start`` message.
+          the `m.key.verification.start` message.
       message_authentication_code:
         type: string
         description: |-
           The message authentication code the device is choosing to use, out of
-          the options in the ``m.key.verification.start`` message.
+          the options in the `m.key.verification.start` message.
       short_authentication_string:
         type: array
         description: |-
           The SAS methods both devices involved in the verification process
-          understand. Must be a subset of the options in the ``m.key.verification.start``
+          understand. Must be a subset of the options in the `m.key.verification.start`
           message.
         items:
           type: string
@@ -42,7 +42,7 @@ properties:
         description: |-
           The hash (encoded as unpadded base64) of the concatenation of the device's
           ephemeral public key (encoded as unpadded base64) and the canonical JSON
-          representation of the ``m.key.verification.start`` message.
+          representation of the `m.key.verification.start` message.
     required:
       - transaction_id
       - method
diff --git a/data/event-schemas/schema/m.key.verification.cancel.yaml b/data/event-schemas/schema/m.key.verification.cancel.yaml
index 36ffc9ea..7f11b877 100644
--- a/data/event-schemas/schema/m.key.verification.cancel.yaml
+++ b/data/event-schemas/schema/m.key.verification.cancel.yaml
@@ -14,8 +14,8 @@ properties:
       reason:
         type: string
         description: |-
-          A human readable description of the ``code``. The client should only rely on this
-          string if it does not understand the ``code``.
+          A human readable description of the `code`. The client should only rely on this
+          string if it does not understand the `code`.
       code:
         type: string
         # Note: this is not an enum because we go into detail about the different
@@ -27,34 +27,34 @@ properties:
           codes should use the Java package naming convention if not in the following
           list:
 
-          ``m.user``: The user cancelled the verification.
+          `m.user`: The user cancelled the verification.
 
-          ``m.timeout``: The verification process timed out. Verification processes
+          `m.timeout`: The verification process timed out. Verification processes
           can define their own timeout parameters.
 
-          ``m.unknown_transaction``: The device does not know about the given transaction
+          `m.unknown_transaction`: The device does not know about the given transaction
           ID.
 
-          ``m.unknown_method``: The device does not know how to handle the requested
-          method. This should be sent for ``m.key.verification.start`` messages and
+          `m.unknown_method`: The device does not know how to handle the requested
+          method. This should be sent for `m.key.verification.start` messages and
           messages defined by individual verification processes.
 
-          ``m.unexpected_message``: The device received an unexpected message. Typically
+          `m.unexpected_message`: The device received an unexpected message. Typically
           raised when one of the parties is handling the verification out of order.
 
-          ``m.key_mismatch``: The key was not verified.
+          `m.key_mismatch`: The key was not verified.
 
-          ``m.user_mismatch``: The expected user did not match the user verified.
+          `m.user_mismatch`: The expected user did not match the user verified.
 
-          ``m.invalid_message``: The message received was invalid.
+          `m.invalid_message`: The message received was invalid.
 
-          ``m.accepted``: A ``m.key.verification.request`` was accepted by a different
+          `m.accepted`: A `m.key.verification.request` was accepted by a different
             device. The device receiving this error can ignore the verification request.
 
           Clients should be careful to avoid error loops. For example, if a device sends
-          an incorrect message and the client returns ``m.invalid_message`` to which it
-          gets an unexpected response with ``m.unexpected_message``, the client should not
-          respond again with ``m.unexpected_message`` to avoid the other device potentially
+          an incorrect message and the client returns `m.invalid_message` to which it
+          gets an unexpected response with `m.unexpected_message`, the client should not
+          respond again with `m.unexpected_message` to avoid the other device potentially
           sending another error response.
 
           .. The above blank line is important for RST.
diff --git a/data/event-schemas/schema/m.key.verification.key.yaml b/data/event-schemas/schema/m.key.verification.key.yaml
index 6dc4954b..b8c14797 100644
--- a/data/event-schemas/schema/m.key.verification.key.yaml
+++ b/data/event-schemas/schema/m.key.verification.key.yaml
@@ -12,7 +12,7 @@ properties:
         type: string
         description: |-
           An opaque identifier for the verification process. Must be the same as
-          the one used for the ``m.key.verification.start`` message.
+          the one used for the `m.key.verification.start` message.
       key:
         type: string
         description: |-
diff --git a/data/event-schemas/schema/m.key.verification.mac.yaml b/data/event-schemas/schema/m.key.verification.mac.yaml
index 769ebe15..fb06cfc2 100644
--- a/data/event-schemas/schema/m.key.verification.mac.yaml
+++ b/data/event-schemas/schema/m.key.verification.mac.yaml
@@ -12,7 +12,7 @@ properties:
         type: string
         description: |-
           An opaque identifier for the verification process. Must be the same as
-          the one used for the ``m.key.verification.start`` message.
+          the one used for the `m.key.verification.start` message.
       mac:
         type: object
         description: |-
@@ -24,7 +24,7 @@ properties:
       keys:
         type: string
         description: |-
-          The MAC of the comma-separated, sorted, list of key IDs given in the ``mac``
+          The MAC of the comma-separated, sorted, list of key IDs given in the `mac`
           property, encoded as unpadded base64.
     required:
       - transaction_id
diff --git a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
index f4deb3c8..621c9382 100644
--- a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
+++ b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Begins a SAS key verification process using the ``m.sas.v1`` method. Typically sent as a `to-device`_ event.
+  Begins a SAS key verification process using the `m.sas.v1` method. Typically sent as a `to-device`_ event.
 properties:
   content:
     properties:
@@ -16,7 +16,7 @@ properties:
         description: |-
           An opaque identifier for the verification process. Must be unique
           with respect to the devices involved. Must be the same as the
-          ``transaction_id`` given in the ``m.key.verification.request``
+          `transaction_id` given in the `m.key.verification.request`
           if this process is originating from a request.
       method:
         type: string
@@ -27,29 +27,29 @@ properties:
         type: array
         description: |-
           The key agreement protocols the sending device understands. Should
-          include at least ``curve25519-hkdf-sha256``.
+          include at least `curve25519-hkdf-sha256`.
         items:
           type: string
       hashes:
         type: array
         description: |-
           The hash methods the sending device understands. Must include at least
-          ``sha256``.
+          `sha256`.
         items:
           type: string
       message_authentication_codes:
         type: array
         description: |-
           The message authentication codes that the sending device understands.
-          Must include at least ``hkdf-hmac-sha256``.
+          Must include at least `hkdf-hmac-sha256`.
         items:
           type: string
       short_authentication_string:
         type: array
         description: |-
           The SAS methods the sending device (and the sending device's user)
-          understands. Must include at least ``decimal``. Optionally can include
-          ``emoji``.
+          understands. Must include at least `decimal`. Optionally can include
+          `emoji`.
         items:
           type: string
           enum: ["decimal", "emoji"]
diff --git a/data/event-schemas/schema/m.key.verification.start.yaml b/data/event-schemas/schema/m.key.verification.start.yaml
index faa7a96a..17341a3d 100644
--- a/data/event-schemas/schema/m.key.verification.start.yaml
+++ b/data/event-schemas/schema/m.key.verification.start.yaml
@@ -3,9 +3,9 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Begins a key verification process. Typically sent as a `to-device`_ event. The ``method``
+  Begins a key verification process. Typically sent as a `to-device`_ event. The `method`
   field determines the type of verification. The fields in the event will differ depending
-  on the ``method``. This definition includes fields that are in common among all variants.
+  on the `method`. This definition includes fields that are in common among all variants.
 properties:
   content:
     properties:
@@ -18,7 +18,7 @@ properties:
         description: |-
           An opaque identifier for the verification process. Must be unique
           with respect to the devices involved. Must be the same as the
-          ``transaction_id`` given in the ``m.key.verification.request``
+          `transaction_id` given in the `m.key.verification.request`
           if this process is originating from a request.
       method:
         type: string
@@ -28,8 +28,8 @@ properties:
         type: string
         description: |-
           Optional method to use to verify the other user's key with. Applicable
-          when the ``method`` chosen only verifies one user's key. This field will
-          never be present if the ``method`` verifies keys both ways.
+          when the `method` chosen only verifies one user's key. This field will
+          never be present if the `method` verifies keys both ways.
     required:
       - from_device
       - transaction_id
diff --git a/data/event-schemas/schema/m.receipt.yaml b/data/event-schemas/schema/m.receipt.yaml
index 8594dd7c..4b04e6d6 100644
--- a/data/event-schemas/schema/m.receipt.yaml
+++ b/data/event-schemas/schema/m.receipt.yaml
@@ -18,7 +18,7 @@
                         "m.read": {
                             "type": "object",
                             "title": "Users",
-                            "description": "A collection of users who have sent ``m.read`` receipts for this event.",
+                            "description": "A collection of users who have sent `m.read` receipts for this event.",
                             "patternProperties": {
                                 "^@": {
                                     "type": "object",
diff --git a/data/event-schemas/schema/m.room.avatar.yaml b/data/event-schemas/schema/m.room.avatar.yaml
index a0ecb21c..7d4b90b1 100644
--- a/data/event-schemas/schema/m.room.avatar.yaml
+++ b/data/event-schemas/schema/m.room.avatar.yaml
@@ -8,7 +8,7 @@ properties:
       info:
         allOf:
           - $ref: core-event-schema/msgtype_infos/image_info.yaml
-        description: Metadata about the image referred to in ``url``.
+        description: Metadata about the image referred to in `url`.
       url:
         description: The URL to the image.
         type: string
diff --git a/data/event-schemas/schema/m.room.canonical_alias.yaml b/data/event-schemas/schema/m.room.canonical_alias.yaml
index f227871a..7547bd3a 100644
--- a/data/event-schemas/schema/m.room.canonical_alias.yaml
+++ b/data/event-schemas/schema/m.room.canonical_alias.yaml
@@ -17,7 +17,7 @@ properties:
       alt_aliases:
         description: |
           Alternative aliases the room advertises. This list can have aliases
-          despite the ``alias`` field being null, empty, or otherwise not present.
+          despite the `alias` field being null, empty, or otherwise not present.
         type: array
         items:
           type: string
diff --git a/data/event-schemas/schema/m.room.create.yaml b/data/event-schemas/schema/m.room.create.yaml
index a6fe331e..80ff046e 100644
--- a/data/event-schemas/schema/m.room.create.yaml
+++ b/data/event-schemas/schema/m.room.create.yaml
@@ -6,13 +6,13 @@ properties:
   content:
     properties:
       creator:
-        description: The ``user_id`` of the room creator. This is set by the homeserver.
+        description: The `user_id` of the room creator. This is set by the homeserver.
         type: string
       m.federate:
-        description: Whether users on other servers can join this room. Defaults to ``true`` if key does not exist.
+        description: Whether users on other servers can join this room. Defaults to `true` if key does not exist.
         type: boolean
       room_version:
-        description: The version of the room. Defaults to ``"1"`` if the key does not exist.
+        description: The version of the room. Defaults to `"1"` if the key does not exist.
         type: string
       predecessor:
         description: A reference to the room this room replaces, if the previous room was upgraded.
diff --git a/data/event-schemas/schema/m.room.encryption.yaml b/data/event-schemas/schema/m.room.encryption.yaml
index d7c4d429..9f443b5e 100644
--- a/data/event-schemas/schema/m.room.encryption.yaml
+++ b/data/event-schemas/schema/m.room.encryption.yaml
@@ -15,12 +15,12 @@ properties:
       rotation_period_ms:
         type: integer
         description: |-
-          How long the session should be used before changing it. ``604800000``
+          How long the session should be used before changing it. `604800000`
           (a week) is the recommended default.
       rotation_period_msgs:
         type: integer
         description: |-
-          How many messages should be sent before changing the session. ``100`` is the
+          How many messages should be sent before changing the session. `100` is the
           recommended default.
     required:
       - algorithm
diff --git a/data/event-schemas/schema/m.room.join_rules.yaml b/data/event-schemas/schema/m.room.join_rules.yaml
index b8e8501c..faa0f249 100644
--- a/data/event-schemas/schema/m.room.join_rules.yaml
+++ b/data/event-schemas/schema/m.room.join_rules.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/state_event.yaml
-description: 'A room may be ``public`` meaning anyone can join the room without any prior action. Alternatively, it can be ``invite`` meaning that a user who wishes to join the room must first receive an invite to the room from someone already inside of the room. Currently, ``knock`` and ``private`` are reserved keywords which are not implemented.'
+description: 'A room may be `public` meaning anyone can join the room without any prior action. Alternatively, it can be `invite` meaning that a user who wishes to join the room must first receive an invite to the room from someone already inside of the room. Currently, `knock` and `private` are reserved keywords which are not implemented.'
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room.member.yaml b/data/event-schemas/schema/m.room.member.yaml
index 172cdd30..3afc6bb9 100644
--- a/data/event-schemas/schema/m.room.member.yaml
+++ b/data/event-schemas/schema/m.room.member.yaml
@@ -2,34 +2,34 @@
 allOf:
   - $ref: core-event-schema/state_event.yaml
 description: |-
-  Adjusts the membership state for a user in a room. It is preferable to use the membership APIs (``/rooms/<room id>/invite`` etc) when performing membership actions rather than adjusting the state directly as there are a restricted set of valid transformations. For example, user A cannot force user B to join a room, and trying to force this state change directly will fail.
+  Adjusts the membership state for a user in a room. It is preferable to use the membership APIs (`/rooms/<room id>/invite` etc) when performing membership actions rather than adjusting the state directly as there are a restricted set of valid transformations. For example, user A cannot force user B to join a room, and trying to force this state change directly will fail.
 
   The following membership states are specified:
 
-  - ``invite`` - The user has been invited to join a room, but has not yet joined it. They may not participate in the room until they join.
+  - `invite` - The user has been invited to join a room, but has not yet joined it. They may not participate in the room until they join.
 
-  - ``join`` - The user has joined the room (possibly after accepting an invite), and may participate in it.
+  - `join` - The user has joined the room (possibly after accepting an invite), and may participate in it.
 
-  - ``leave`` - The user was once joined to the room, but has since left (possibly by choice, or possibly by being kicked).
+  - `leave` - The user was once joined to the room, but has since left (possibly by choice, or possibly by being kicked).
 
-  - ``ban`` - The user has been banned from the room, and is no longer allowed to join it until they are un-banned from the room (by having their membership state set to a value other than ``ban``).
+  - `ban` - The user has been banned from the room, and is no longer allowed to join it until they are un-banned from the room (by having their membership state set to a value other than `ban`).
 
-  - ``knock`` - This is a reserved word, which currently has no meaning.
+  - `knock` - This is a reserved word, which currently has no meaning.
 
-  The ``third_party_invite`` property will be set if this invite is an ``invite`` event and is the successor of an ``m.room.third_party_invite`` event, and absent otherwise.
+  The `third_party_invite` property will be set if this invite is an `invite` event and is the successor of an `m.room.third_party_invite` event, and absent otherwise.
 
-  This event may also include an ``invite_room_state`` key inside the event's ``unsigned`` data.
-  If present, this contains an array of ``StrippedState`` Events. These events provide information
+  This event may also include an `invite_room_state` key inside the event's `unsigned` data.
+  If present, this contains an array of `StrippedState` Events. These events provide information
   on a subset of state events such as the room name.
 
-  The user for which a membership applies is represented by the ``state_key``. Under some conditions,
-  the ``sender`` and ``state_key`` may not match - this may be interpreted as the ``sender`` affecting
-  the membership state of the ``state_key`` user.
+  The user for which a membership applies is represented by the `state_key`. Under some conditions,
+  the `sender` and `state_key` may not match - this may be interpreted as the `sender` affecting
+  the membership state of the `state_key` user.
 
-  The ``membership`` for a given user can change over time. The table below represents the various changes
+  The `membership` for a given user can change over time. The table below represents the various changes
   over time and how clients and servers must interpret those changes. Previous membership can be retrieved
-  from the ``prev_content`` object on an event. If not present, the user's previous membership must be assumed
-  as ``leave``.
+  from the `prev_content` object on an event. If not present, the user's previous membership must be assumed
+  as `leave`.
 
   .. TODO: Improve how this table is written? We use a csv-table to get around vertical header restrictions.
 
@@ -37,12 +37,12 @@ description: |-
     :header-rows: 1
     :stub-columns: 1
 
-    "","to ``invite``","to ``join``","to ``leave``","to ``ban``","to ``knock``"
-    "from ``invite``","No change.","User joined the room.","If the ``state_key`` is the same as the ``sender``, the user rejected the invite. Otherwise, the ``state_key`` user had their invite revoked.","User was banned.","Not implemented."
-    "from ``join``","Must never happen.","``displayname`` or ``avatar_url`` changed.","If the ``state_key`` is the same as the ``sender``, the user left. Otherwise, the ``state_key`` user was kicked.","User was kicked and banned.","Not implemented."
-    "from ``leave``","New invitation sent.","User joined.","No change.","User was banned.","Not implemented."
-    "from ``ban``","Must never happen.","Must never happen.","User was unbanned.","No change.","Not implemented."
-    "from ``knock``","Not implemented.","Not implemented.","Not implemented.","Not implemented.","Not implemented."
+    "","to `invite`","to `join`","to `leave`","to `ban`","to `knock`"
+    "from `invite`","No change.","User joined the room.","If the `state_key` is the same as the `sender`, the user rejected the invite. Otherwise, the `state_key` user had their invite revoked.","User was banned.","Not implemented."
+    "from `join`","Must never happen.","`displayname` or `avatar_url` changed.","If the `state_key` is the same as the `sender`, the user left. Otherwise, the `state_key` user was kicked.","User was kicked and banned.","Not implemented."
+    "from `leave`","New invitation sent.","User joined.","No change.","User was banned.","Not implemented."
+    "from `ban`","Must never happen.","Must never happen.","User was unbanned.","No change.","Not implemented."
+    "from `knock`","Not implemented.","Not implemented.","Not implemented.","Not implemented.","Not implemented."
 
 properties:
   content:
@@ -115,8 +115,8 @@ properties:
     type: object
   state_key:
     description: |-
-      The ``user_id`` this membership event relates to. In all cases except for when ``membership`` is
-      ``join``, the user ID sending the event does not need to match the user ID in the ``state_key``,
+      The `user_id` this membership event relates to. In all cases except for when `membership` is
+      `join`, the user ID sending the event does not need to match the user ID in the `state_key`,
       unlike other events. Regular authorisation rules still apply.
     type: string
   type:
@@ -129,7 +129,7 @@ properties:
       - type: object
         properties:
           invite_room_state:
-            description: 'A subset of the state of the room at the time of the invite, if ``membership`` is ``invite``. Note that this state is informational, and SHOULD NOT be trusted; once the client has joined the room, it SHOULD fetch the live state from the server and discard the invite_room_state. Also, clients must not rely on any particular state being present here; they SHOULD behave properly (with possibly a degraded but not a broken experience) in the absence of any particular events here. If they are set on the room, at least the state for ``m.room.avatar``, ``m.room.canonical_alias``, ``m.room.join_rules``, and ``m.room.name`` SHOULD be included.'
+            description: 'A subset of the state of the room at the time of the invite, if `membership` is `invite`. Note that this state is informational, and SHOULD NOT be trusted; once the client has joined the room, it SHOULD fetch the live state from the server and discard the invite_room_state. Also, clients must not rely on any particular state being present here; they SHOULD behave properly (with possibly a degraded but not a broken experience) in the absence of any particular events here. If they are set on the room, at least the state for `m.room.avatar`, `m.room.canonical_alias`, `m.room.join_rules`, and `m.room.name` SHOULD be included.'
             items:
               $ref: "stripped_state.yaml"
             type: array
diff --git a/data/event-schemas/schema/m.room.message$m.audio.yaml b/data/event-schemas/schema/m.room.message$m.audio.yaml
index fb049fc9..ce59820c 100644
--- a/data/event-schemas/schema/m.room.message$m.audio.yaml
+++ b/data/event-schemas/schema/m.room.message$m.audio.yaml
@@ -9,13 +9,13 @@ properties:
         description: "A description of the audio e.g. 'Bee Gees - Stayin' Alive', or some kind of content description for accessibility e.g. 'audio attachment'."
         type: string
       info:
-        description: Metadata for the audio clip referred to in ``url``.
+        description: Metadata for the audio clip referred to in `url`.
         properties:
           duration:
             description: The duration of the audio in milliseconds.
             type: integer
           mimetype:
-            description: The mimetype of the audio e.g. ``audio/aac``.
+            description: The mimetype of the audio e.g. `audio/aac`.
             type: string
           size:
             description: The size of the audio clip in bytes.
diff --git a/data/event-schemas/schema/m.room.message$m.emote.yaml b/data/event-schemas/schema/m.room.message$m.emote.yaml
index f67a184b..43e2639d 100644
--- a/data/event-schemas/schema/m.room.message$m.emote.yaml
+++ b/data/event-schemas/schema/m.room.message$m.emote.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: "This message is similar to ``m.text`` except that the sender is 'performing' the action contained in the ``body`` key, similar to ``/me`` in IRC. This message should be prefixed by the name of the sender. This message could also be represented in a different colour to distinguish it from regular ``m.text`` messages."
+description: "This message is similar to `m.text` except that the sender is 'performing' the action contained in the `body` key, similar to `/me` in IRC. This message should be prefixed by the name of the sender. This message could also be represented in a different colour to distinguish it from regular `m.text` messages."
 properties:
   content:
     properties:
@@ -14,12 +14,12 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the ``formatted_body``. Currently only
-          ``org.matrix.custom.html`` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-
-          The formatted version of the ``body``. This is required if ``format``
+          The formatted version of the `body`. This is required if `format`
           is specified.
         type: string
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.file.yaml b/data/event-schemas/schema/m.room.message$m.file.yaml
index 54a999ec..a3466f78 100644
--- a/data/event-schemas/schema/m.room.message$m.file.yaml
+++ b/data/event-schemas/schema/m.room.message$m.file.yaml
@@ -12,10 +12,10 @@ properties:
         description: The original filename of the uploaded file.
         type: string
       info:
-        description: Information about the file referred to in ``url``.
+        description: Information about the file referred to in `url`.
         properties:
           mimetype:
-            description: The mimetype of the file e.g. ``application/msword``.
+            description: The mimetype of the file e.g. `application/msword`.
             type: string
           size:
             description: The size of the file in bytes.
@@ -34,7 +34,7 @@ properties:
           thumbnail_info:
             allOf:
               - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
-            description: Metadata about the image referred to in ``thumbnail_url``.
+            description: Metadata about the image referred to in `thumbnail_url`.
         title: FileInfo
         type: object
       msgtype:
diff --git a/data/event-schemas/schema/m.room.message$m.image.yaml b/data/event-schemas/schema/m.room.message$m.image.yaml
index 8944ce96..98d201f4 100644
--- a/data/event-schemas/schema/m.room.message$m.image.yaml
+++ b/data/event-schemas/schema/m.room.message$m.image.yaml
@@ -11,7 +11,7 @@ properties:
       info:
         allOf:
           - $ref: core-event-schema/msgtype_infos/image_info.yaml
-        description: Metadata about the image referred to in ``url``.
+        description: Metadata about the image referred to in `url`.
       msgtype:
         enum:
           - m.image
diff --git a/data/event-schemas/schema/m.room.message$m.location.yaml b/data/event-schemas/schema/m.room.message$m.location.yaml
index ffc4edce..cc52bb97 100644
--- a/data/event-schemas/schema/m.room.message$m.location.yaml
+++ b/data/event-schemas/schema/m.room.message$m.location.yaml
@@ -32,7 +32,7 @@ properties:
           thumbnail_info:
             allOf:
               - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
-            description:  Metadata about the image referred to in ``thumbnail_url``.
+            description:  Metadata about the image referred to in `thumbnail_url`.
         title: LocationInfo
     required:
       - msgtype
diff --git a/data/event-schemas/schema/m.room.message$m.notice.yaml b/data/event-schemas/schema/m.room.message$m.notice.yaml
index 19c4f985..7b735d60 100644
--- a/data/event-schemas/schema/m.room.message$m.notice.yaml
+++ b/data/event-schemas/schema/m.room.message$m.notice.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: 'The ``m.notice`` type is primarily intended for responses from automated clients. An ``m.notice`` message must be treated the same way as a regular ``m.text`` message with two exceptions. Firstly, clients should present ``m.notice`` messages to users in a distinct manner, and secondly, ``m.notice`` messages must never be automatically responded to. This helps to prevent infinite-loop situations where two automated clients continuously exchange messages.'
+description: 'The `m.notice` type is primarily intended for responses from automated clients. An `m.notice` message must be treated the same way as a regular `m.text` message with two exceptions. Firstly, clients should present `m.notice` messages to users in a distinct manner, and secondly, `m.notice` messages must never be automatically responded to. This helps to prevent infinite-loop situations where two automated clients continuously exchange messages.'
 properties:
   content:
     properties:
@@ -14,12 +14,12 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the ``formatted_body``. Currently only
-          ``org.matrix.custom.html`` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-
-          The formatted version of the ``body``. This is required if ``format``
+          The formatted version of the `body`. This is required if `format`
           is specified.
         type: string
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.server_notice.yaml b/data/event-schemas/schema/m.room.message$m.server_notice.yaml
index f1848821..ca7144b0 100644
--- a/data/event-schemas/schema/m.room.message$m.server_notice.yaml
+++ b/data/event-schemas/schema/m.room.message$m.server_notice.yaml
@@ -19,12 +19,12 @@ properties:
       admin_contact:
         description: |-
           A URI giving a contact method for the server administrator. Required if the
-          notice type is ``m.server_notice.usage_limit_reached``.
+          notice type is `m.server_notice.usage_limit_reached`.
         type: string
       limit_type:
         description: |-
           The kind of usage limit the server has exceeded. Required if the notice type is
-          ``m.server_notice.usage_limit_reached``.
+          `m.server_notice.usage_limit_reached`.
         type: string
     required:
       - msgtype
diff --git a/data/event-schemas/schema/m.room.message$m.text.yaml b/data/event-schemas/schema/m.room.message$m.text.yaml
index b481bcea..4cba2bd6 100644
--- a/data/event-schemas/schema/m.room.message$m.text.yaml
+++ b/data/event-schemas/schema/m.room.message$m.text.yaml
@@ -14,12 +14,12 @@ properties:
         type: string
       format:
         description: |-
-          The format used in the ``formatted_body``. Currently only
-          ``org.matrix.custom.html`` is supported.
+          The format used in the `formatted_body`. Currently only
+          `org.matrix.custom.html` is supported.
         type: string
       formatted_body:
         description: |-
-          The formatted version of the ``body``. This is required if ``format``
+          The formatted version of the `body`. This is required if `format`
           is specified.
         type: string
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.video.yaml b/data/event-schemas/schema/m.room.message$m.video.yaml
index 1a3c3e40..9bf3e09c 100644
--- a/data/event-schemas/schema/m.room.message$m.video.yaml
+++ b/data/event-schemas/schema/m.room.message$m.video.yaml
@@ -9,7 +9,7 @@ properties:
         description: "A description of the video e.g. 'Gangnam style', or some kind of content description for accessibility e.g. 'video attachment'."
         type: string
       info:
-        description: Metadata about the video clip referred to in ``url``.
+        description: Metadata about the video clip referred to in `url`.
         properties:
           duration:
             description: The duration of the video in milliseconds.
@@ -21,7 +21,7 @@ properties:
             description: The width of the video in pixels.
             type: integer
           mimetype:
-            description: The mimetype of the video e.g. ``video/mp4``.
+            description: The mimetype of the video e.g. `video/mp4`.
             type: string
           size:
             description: The size of the video in bytes.
@@ -40,7 +40,7 @@ properties:
           thumbnail_info:
             allOf:
               - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
-            description: Metadata about the image referred to in ``thumbnail_url``.
+            description: Metadata about the image referred to in `thumbnail_url`.
         title: VideoInfo
         type: object
       msgtype:
diff --git a/data/event-schemas/schema/m.room.message.feedback.yaml b/data/event-schemas/schema/m.room.message.feedback.yaml
index fa3390fa..dc8f4b58 100644
--- a/data/event-schemas/schema/m.room.message.feedback.yaml
+++ b/data/event-schemas/schema/m.room.message.feedback.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: '**NB: Usage of this event is discouraged in favour of the** `receipts module`_. **Most clients will not recognise this event.** Feedback events are events sent to acknowledge a message in some way. There are two supported acknowledgements: ``delivered`` (sent when the event has been received) and ``read`` (sent when the event has been observed by the end-user). The ``target_event_id`` should reference the ``m.room.message`` event being acknowledged.'
+description: '**NB: Usage of this event is discouraged in favour of the** `receipts module`_. **Most clients will not recognise this event.** Feedback events are events sent to acknowledge a message in some way. There are two supported acknowledgements: `delivered` (sent when the event has been received) and `read` (sent when the event has been observed by the end-user). The `target_event_id` should reference the `m.room.message` event being acknowledged.'
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room.message.yaml b/data/event-schemas/schema/m.room.message.yaml
index 45025c99..546b5e19 100644
--- a/data/event-schemas/schema/m.room.message.yaml
+++ b/data/event-schemas/schema/m.room.message.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: 'This event is used when sending messages in a room. Messages are not limited to be text. The ``msgtype`` key outlines the type of message, e.g. text, audio, image, video, etc. The ``body`` key is text and MUST be used with every kind of ``msgtype`` as a fallback mechanism for when a client cannot render a message. This allows clients to display *something* even if it is just plain text.'
+description: 'This event is used when sending messages in a room. Messages are not limited to be text. The `msgtype` key outlines the type of message, e.g. text, audio, image, video, etc. The `body` key is text and MUST be used with every kind of `msgtype` as a fallback mechanism for when a client cannot render a message. This allows clients to display *something* even if it is just plain text.'
 properties:
   content:
     properties:
@@ -9,7 +9,7 @@ properties:
         description: The textual representation of this message.
         type: string
       msgtype:
-        description: 'The type of message, e.g. ``m.image``, ``m.text``'
+        description: 'The type of message, e.g. `m.image`, `m.text`'
         type: string
     required:
       - msgtype
diff --git a/data/event-schemas/schema/m.room.name.yaml b/data/event-schemas/schema/m.room.name.yaml
index 3e3d15ac..bbc5fc9a 100644
--- a/data/event-schemas/schema/m.room.name.yaml
+++ b/data/event-schemas/schema/m.room.name.yaml
@@ -7,12 +7,12 @@ description: |-
     is a human-friendly string designed to be displayed to the end-user. The
     room name is not unique, as multiple rooms can have the same room name set.
 
-    A room with an ``m.room.name`` event with an absent, null, or empty
-    ``name`` field should be treated the same as a room with no ``m.room.name``
+    A room with an `m.room.name` event with an absent, null, or empty
+    `name` field should be treated the same as a room with no `m.room.name`
     event.
 
     An event of this type is automatically created when creating a room using
-    ``/createRoom`` with the ``name`` key.
+    `/createRoom` with the `name` key.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room.power_levels.yaml b/data/event-schemas/schema/m.room.power_levels.yaml
index 6e026d6c..39c1988c 100644
--- a/data/event-schemas/schema/m.room.power_levels.yaml
+++ b/data/event-schemas/schema/m.room.power_levels.yaml
@@ -5,42 +5,42 @@ description: |-
   This event specifies the minimum level a user must have in order to perform a
   certain action. It also specifies the levels of each user in the room.
 
-  If a ``user_id`` is in the ``users`` list, then that ``user_id`` has the
+  If a `user_id` is in the `users` list, then that `user_id` has the
   associated power level. Otherwise they have the default level
-  ``users_default``. If ``users_default`` is not supplied, it is assumed to be
-  0. If the room contains no ``m.room.power_levels`` event, the room's creator has
+  `users_default`. If `users_default` is not supplied, it is assumed to be
+  0. If the room contains no `m.room.power_levels` event, the room's creator has
   a power level of 100, and all other users have a power level of 0.
 
-  The level required to send a certain event is governed by ``events``,
-  ``state_default`` and ``events_default``. If an event type is specified in
-  ``events``, then the user must have at least the level specified in order to
+  The level required to send a certain event is governed by `events`,
+  `state_default` and `events_default`. If an event type is specified in
+  `events`, then the user must have at least the level specified in order to
   send that event. If the event type is not supplied, it defaults to
-  ``events_default`` for Message Events and ``state_default`` for State
+  `events_default` for Message Events and `state_default` for State
   Events.
 
-  If there is no ``state_default`` in the ``m.room.power_levels`` event, the
-  ``state_default`` is 50. If there is no ``events_default`` in the
-  ``m.room.power_levels`` event, the ``events_default`` is 0. If the room
-  contains no ``m.room.power_levels`` event, *both* the ``state_default`` and
-  ``events_default`` are 0.
+  If there is no `state_default` in the `m.room.power_levels` event, the
+  `state_default` is 50. If there is no `events_default` in the
+  `m.room.power_levels` event, the `events_default` is 0. If the room
+  contains no `m.room.power_levels` event, *both* the `state_default` and
+  `events_default` are 0.
 
   The power level required to invite a user to the room, kick a user from the
   room, ban a user from the room, or redact an event sent by another user, is
-  defined by ``invite``, ``kick``, ``ban``, and ``redact``, respectively. Each
+  defined by `invite`, `kick`, `ban`, and `redact`, respectively. Each
   of these levels defaults to 50 if they are not specified in the
-  ``m.room.power_levels`` event, or if the room contains no ``m.room.power_levels``
+  `m.room.power_levels` event, or if the room contains no `m.room.power_levels`
   event.
 
   **Note:**
 
-  As noted above, in the absence of an ``m.room.power_levels`` event, the
-  ``state_default`` is 0, and all users are considered to have power level 0.
+  As noted above, in the absence of an `m.room.power_levels` event, the
+  `state_default` is 0, and all users are considered to have power level 0.
   That means that **any** member of the room can send an
-  ``m.room.power_levels`` event, changing the permissions in the room.
+  `m.room.power_levels` event, changing the permissions in the room.
 
   Server implementations should therefore ensure that each room has an
-  ``m.room.power_levels`` event as soon as it is created. See also the
-  documentation of the ``/createRoom`` API.
+  `m.room.power_levels` event as soon as it is created. See also the
+  documentation of the `/createRoom` API.
 
 properties:
   content:
@@ -57,7 +57,7 @@ properties:
       events_default:
         description: |-
             The default level required to send message events. Can be
-            overridden by the ``events`` key.  Defaults to 0 if unspecified.
+            overridden by the `events` key.  Defaults to 0 if unspecified.
         type: integer
       invite:
         description: The level required to invite a user. Defaults to 50 if unspecified.
@@ -71,30 +71,30 @@ properties:
       state_default:
         description: |-
             The default level required to send state events. Can be overridden
-            by the ``events`` key. Defaults to 50 if unspecified.
+            by the `events` key. Defaults to 50 if unspecified.
         type: integer
       users:
         additionalProperties:
           type: integer
-        description: The power levels for specific users. This is a mapping from ``user_id`` to power level for that user.
+        description: The power levels for specific users. This is a mapping from `user_id` to power level for that user.
         title: User power levels
         type: object
       users_default:
         description: |-
             The default power level for every user in the room, unless their
-            ``user_id`` is mentioned in the ``users`` key. Defaults to 0 if
+            `user_id` is mentioned in the `users` key. Defaults to 0 if
             unspecified.
         type: integer
       notifications:
         properties:
           room:
             type: integer
-            description: The level required to trigger an ``@room`` notification. Defaults to 50 if unspecified.
+            description: The level required to trigger an `@room` notification. Defaults to 50 if unspecified.
         additionalProperties:
           type: integer
         description: |-
             The power level requirements for specific notification types.
-            This is a mapping from ``key`` to power level for that notifications key.
+            This is a mapping from `key` to power level for that notifications key.
         title: Notifications
         type: object
     type: object
diff --git a/data/event-schemas/schema/m.room.redaction.yaml b/data/event-schemas/schema/m.room.redaction.yaml
index b66c540c..143e7eff 100644
--- a/data/event-schemas/schema/m.room.redaction.yaml
+++ b/data/event-schemas/schema/m.room.redaction.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: 'This event is created by the server to describe which event has been redacted, by whom, and optionally why. The event that has been redacted is specified in the ``redacts`` event level key. Redacting an event means that all keys not required by the protocol are stripped off, allowing messages to be hidden or allowing admins to remove offensive or illegal content.'
+description: 'This event is created by the server to describe which event has been redacted, by whom, and optionally why. The event that has been redacted is specified in the `redacts` event level key. Redacting an event means that all keys not required by the protocol are stripped off, allowing messages to be hidden or allowing admins to remove offensive or illegal content.'
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room.server_acl.yaml b/data/event-schemas/schema/m.room.server_acl.yaml
index 60424cc6..3a7128f0 100644
--- a/data/event-schemas/schema/m.room.server_acl.yaml
+++ b/data/event-schemas/schema/m.room.server_acl.yaml
@@ -7,19 +7,19 @@ description: |-
   server ACL. Servers that do not uphold the ACLs MUST be added to the denied hosts
   list in order for the ACLs to remain effective.
 
-  The ``allow`` and ``deny`` lists are lists of globs supporting ``?`` and ``*``
+  The `allow` and `deny` lists are lists of globs supporting `?` and `*`
   as wildcards. When comparing against the server ACLs, the suspect server's port
-  number must not be considered. Therefore ``evil.com``, ``evil.com:8448``, and
-  ``evil.com:1234`` would all match rules that apply to ``evil.com``, for example.
+  number must not be considered. Therefore `evil.com`, `evil.com:8448`, and
+  `evil.com:1234` would all match rules that apply to `evil.com`, for example.
 
   The ACLs are applied to servers when they make requests, and are applied in
   the following order:
 
-  1. If there is no ``m.room.server_acl`` event in the room state, allow.
-  #. If the server name is an IP address (v4 or v6) literal, and ``allow_ip_literals``
-     is present and ``false``, deny.
-  #. If the server name matches an entry in the ``deny`` list, deny.
-  #. If the server name matches an entry in the ``allow`` list, allow.
+  1. If there is no `m.room.server_acl` event in the room state, allow.
+  #. If the server name is an IP address (v4 or v6) literal, and `allow_ip_literals`
+     is present and `false`, deny.
+  #. If the server name matches an entry in the `deny` list, deny.
+  #. If the server name matches an entry in the `allow` list, allow.
   #. Otherwise, deny.
 
   **Note:**
@@ -28,17 +28,17 @@ description: |-
   allowed to connect and interact with a given room.
 
   **Warning:**
-  Failing to provide an ``allow`` rule of some kind will prevent **all**
+  Failing to provide an `allow` rule of some kind will prevent **all**
   servers from participating in the room, including the sender. This renders
-  the room unusable. A common allow rule is ``[ "*" ]`` which would still
-  permit the use of the ``deny`` list without losing the room.
+  the room unusable. A common allow rule is `[ "*" ]` which would still
+  permit the use of the `deny` list without losing the room.
 
   **Warning:**
   All compliant servers must implement server ACLs.  However, legacy or noncompliant
   servers exist which do not uphold ACLs, and these MUST be manually appended to
   the denied hosts list when setting an ACL to prevent them from leaking events from
   banned servers into a room. Currently, the only way to determine noncompliant hosts is
-  to check the ``prev_events`` of leaked events, therefore detecting servers which
+  to check the `prev_events` of leaked events, therefore detecting servers which
   are not upholding the ACLs. Server versions can also be used to try to detect hosts that
   will not uphold the ACLs, although this is not comprehensive. Server ACLs were added
   in Synapse v0.32.0, although other server implementations and versions exist in the world.
@@ -54,15 +54,15 @@ properties:
           True to allow server names that are IP address literals. False to
           deny. Defaults to true if missing or otherwise not a boolean.
 
-          This is strongly recommended to be set to ``false`` as servers running
+          This is strongly recommended to be set to `false` as servers running
           with IP literal names are strongly discouraged in order to require
           legitimate homeservers to be backed by a valid registered domain name.
       allow:
         type: array
         description: |-
           The server names to allow in the room, excluding any port information.
-          Wildcards may be used to cover a wider range of hosts, where ``*``
-          matches zero or more characters and ``?`` matches exactly one character.
+          Wildcards may be used to cover a wider range of hosts, where `*`
+          matches zero or more characters and `?` matches exactly one character.
 
           **This defaults to an empty list when not provided, effectively disallowing
           every server.**
@@ -72,8 +72,8 @@ properties:
         type: array
         description: |-
           The server names to disallow in the room, excluding any port information.
-          Wildcards may be used to cover a wider range of hosts, where ``*``
-          matches zero or more characters and ``?`` matches exactly one character.
+          Wildcards may be used to cover a wider range of hosts, where `*`
+          matches zero or more characters and `?` matches exactly one character.
 
           This defaults to an empty list when not provided.
         items:
diff --git a/data/event-schemas/schema/m.room.third_party_invite.yaml b/data/event-schemas/schema/m.room.third_party_invite.yaml
index 794bd232..f4188192 100644
--- a/data/event-schemas/schema/m.room.third_party_invite.yaml
+++ b/data/event-schemas/schema/m.room.third_party_invite.yaml
@@ -2,7 +2,7 @@
 $schema: http://json-schema.org/draft-04/schema#
 allOf:
   - $ref: core-event-schema/state_event.yaml
-description: "Acts as an ``m.room.member`` invite event, where there isn't a target user_id to invite. This event contains a token and a public key whose private key must be used to sign the token. Any user who can present that signature may use this invitation to join the target room."
+description: "Acts as an `m.room.member` invite event, where there isn't a target user_id to invite. This event contains a token and a public key whose private key must be used to sign the token. Any user who can present that signature may use this invitation to join the target room."
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room.topic.yaml b/data/event-schemas/schema/m.room.topic.yaml
index ad2a3ba2..78a3d878 100644
--- a/data/event-schemas/schema/m.room.topic.yaml
+++ b/data/event-schemas/schema/m.room.topic.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/state_event.yaml
-description: 'A topic is a short message detailing what is currently being discussed in the room.  It can also be used as a way to display extra information about the room, which may not be suitable for the room name. The room topic can also be set when creating a room using ``/createRoom`` with the ``topic`` key.'
+description: 'A topic is a short message detailing what is currently being discussed in the room.  It can also be used as a way to display extra information about the room, which may not be suitable for the room name. The room topic can also be set when creating a room using `/createRoom` with the `topic` key.'
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room_key.withheld.yaml b/data/event-schemas/schema/m.room_key.withheld.yaml
index a2cddbfa..797b51f9 100644
--- a/data/event-schemas/schema/m.room_key.withheld.yaml
+++ b/data/event-schemas/schema/m.room_key.withheld.yaml
@@ -6,31 +6,31 @@ description: |-
   This event type is used to indicate that the sender is not sharing room keys
   with the recipient. It is sent as a to-device event.
 
-  Possible values for ``code`` include:
+  Possible values for `code` include:
 
-  * ``m.blacklisted``: the user/device was blacklisted.
-  * ``m.unverified``: the user/device was not verified, and the sender is only
+  * `m.blacklisted`: the user/device was blacklisted.
+  * `m.unverified`: the user/device was not verified, and the sender is only
     sharing keys with verified users/devices.
-  * ``m.unauthorised``: the user/device is not allowed to have the key. For
+  * `m.unauthorised`: the user/device is not allowed to have the key. For
     example, this could be sent in response to a key request if the user/device
     was not in the room when the original message was sent.
-  * ``m.unavailable``: sent in reply to a key request if the device that the
+  * `m.unavailable`: sent in reply to a key request if the device that the
     key is requested from does not have the requested key.
-  * ``m.no_olm``: an olm session could not be established.
+  * `m.no_olm`: an olm session could not be established.
 
   In most cases, this event refers to a specific room key. The one exception to
   this is when the sender is unable to establish an olm session with the
   recipient. When this happens, multiple sessions will be affected.  In order
   to avoid filling the recipient\'s device mailbox, the sender should only send
-  one ``m.room_key.withheld`` message with no ``room_id`` nor ``session_id``
+  one `m.room_key.withheld` message with no `room_id` nor `session_id`
   set.  If the sender retries and fails to create an olm session again in the
-  future, it should not send another ``m.room_key.withheld`` message with a
-  ``code`` of ``m.no_olm``, unless another olm session was previously
+  future, it should not send another `m.room_key.withheld` message with a
+  `code` of `m.no_olm`, unless another olm session was previously
   established successfully.  In response to receiving an
-  ``m.room_key.withheld`` message with a ``code`` of ``m.no_olm``, the
-  recipient may start an olm session with the sender and send an ``m.dummy``
+  `m.room_key.withheld` message with a `code` of `m.no_olm`, the
+  recipient may start an olm session with the sender and send an `m.dummy`
   message to notify the sender of the new olm session.  The recipient may
-  assume that this ``m.room_key.withheld`` message applies to all encrypted
+  assume that this `m.room_key.withheld` message applies to all encrypted
   room messages sent before it receives the message.
 properties:
   content:
@@ -43,12 +43,12 @@ properties:
       room_id:
         type: string
         description: |-
-          Required if ``code`` is not ``m.no_olm``.  The room for the key that
+          Required if `code` is not `m.no_olm`.  The room for the key that
           this event is about.
       session_id:
         type: string
         description: |-
-          Required of ``code`` is not ``m.no_olm``.  The session ID of the key
+          Required of `code` is not `m.no_olm`.  The session ID of the key
           that this event is aboutis for.
       sender_key:
         type: string
@@ -73,7 +73,7 @@ properties:
         description: |-
           A human-readable reason for why the key was not sent. The receiving
           client should only use this string if it does not understand the
-          ``code``.
+          `code`.
     required:
       - algorithm
       - sender_key
diff --git a/data/event-schemas/schema/m.room_key.yaml b/data/event-schemas/schema/m.room_key.yaml
index ef8c51c0..8f140aab 100644
--- a/data/event-schemas/schema/m.room_key.yaml
+++ b/data/event-schemas/schema/m.room_key.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to exchange keys for end-to-end encryption. Typically
-  it is encrypted as an ``m.room.encrypted`` event, then sent as a `to-device`_ event.
+  it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_ event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room_key_request.yaml b/data/event-schemas/schema/m.room_key_request.yaml
index c08ac0e3..a456b8fe 100644
--- a/data/event-schemas/schema/m.room_key_request.yaml
+++ b/data/event-schemas/schema/m.room_key_request.yaml
@@ -10,8 +10,8 @@ properties:
     properties:
       body:
         description: |-
-          Information about the requested key. Required when ``action`` is
-          ``request``.
+          Information about the requested key. Required when `action` is
+          `request`.
         properties:
           algorithm:
             type: string
diff --git a/data/event-schemas/schema/m.sticker.yaml b/data/event-schemas/schema/m.sticker.yaml
index 1dd1173c..5856cca6 100644
--- a/data/event-schemas/schema/m.sticker.yaml
+++ b/data/event-schemas/schema/m.sticker.yaml
@@ -15,11 +15,11 @@ properties:
         allOf:
           - $ref: core-event-schema/msgtype_infos/image_info.yaml
         description: |-
-          Metadata about the image referred to in ``url`` including a thumbnail
+          Metadata about the image referred to in `url` including a thumbnail
           representation.
       url:
         description: |-
-          The URL to the sticker image. This must be a valid ``mxc://`` URI.
+          The URL to the sticker image. This must be a valid `mxc://` URI.
         type: string
     required:
       - body
diff --git a/data/event-schemas/schema/m.tag.yaml b/data/event-schemas/schema/m.tag.yaml
index 8da093bd..afa22420 100644
--- a/data/event-schemas/schema/m.tag.yaml
+++ b/data/event-schemas/schema/m.tag.yaml
@@ -24,7 +24,7 @@
                 "type": "number",
                 "format": "float",
                 "description":
-                  "A number in a range ``[0,1]`` describing a relative position of the room under the given tag."
+                  "A number in a range `[0,1]` describing a relative position of the room under the given tag."
               }
             }
           }
diff --git a/data/event-schemas/schema/stripped_state.yaml b/data/event-schemas/schema/stripped_state.yaml
index ec591bf1..92306dc9 100644
--- a/data/event-schemas/schema/stripped_state.yaml
+++ b/data/event-schemas/schema/stripped_state.yaml
@@ -21,21 +21,21 @@
 title: StrippedState
 type: object
 description: |-
-  A stripped down state event, with only the ``type``, ``state_key``,
-  ``sender``, and ``content`` keys.
+  A stripped down state event, with only the `type`, `state_key`,
+  `sender`, and `content` keys.
 properties:
   content:
-    description: The ``content`` for the event.
+    description: The `content` for the event.
     title: EventContent
     type: object
   state_key:
-    description: The ``state_key`` for the event.
+    description: The `state_key` for the event.
     type: string
   type:
-    description: The ``type`` for the event.
+    description: The `type` for the event.
     type: string
   sender:
-    description: The ``sender`` for the event.
+    description: The `sender` for the event.
     type: string
 required:
   - type

From 873e8b30eb8fe647b9b6a6d67593c1be5cc75d6c Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Thu, 28 Jan 2021 16:00:39 -0800
Subject: [PATCH 07/19] Fix links in data

---
 .../client-server/administrative_contact.yaml |  8 +++--
 data/api/client-server/banning.yaml           |  2 +-
 data/api/client-server/content-repo.yaml      | 10 +++----
 data/api/client-server/create_room.yaml       |  7 +++--
 data/api/client-server/cross_signing.yaml     |  2 +-
 .../definitions/cross_signing_key.yaml        |  4 +--
 .../definitions/device_keys.yaml              |  3 +-
 .../definitions/key_backup_data.yaml          |  2 +-
 .../definitions/push_condition.yaml           |  2 +-
 .../definitions/room_event_filter.yaml        |  4 +--
 .../definitions/user_identifier.yaml          |  2 +-
 data/api/client-server/device_management.yaml |  4 +--
 data/api/client-server/event_context.yaml     |  4 +--
 data/api/client-server/inviting.yaml          |  5 +---
 data/api/client-server/joining.yaml           |  6 ++--
 data/api/client-server/key_backup.yaml        | 25 ++++++++--------
 data/api/client-server/keys.yaml              |  4 +--
 data/api/client-server/kicking.yaml           |  2 +-
 data/api/client-server/login.yaml             |  9 +++---
 data/api/client-server/logout.yaml            |  6 ++--
 .../api/client-server/message_pagination.yaml |  2 +-
 data/api/client-server/notifications.yaml     |  2 +-
 data/api/client-server/old_sync.yaml          | 17 ++++++-----
 data/api/client-server/openid.yaml            |  3 +-
 data/api/client-server/pusher.yaml            |  4 +--
 data/api/client-server/registration.yaml      | 29 +++++++------------
 data/api/client-server/room_initial_sync.yaml |  4 +--
 data/api/client-server/room_send.yaml         |  2 +-
 data/api/client-server/room_state.yaml        |  5 +---
 data/api/client-server/rooms.yaml             |  3 --
 data/api/client-server/search.yaml            |  6 +---
 data/api/client-server/sync.yaml              | 12 ++++----
 .../client-server/third_party_membership.yaml |  5 +---
 data/api/identity/associations.yaml           |  2 +-
 data/api/identity/invitation_signing.yaml     |  2 +-
 data/api/identity/lookup.yaml                 | 10 +++----
 data/api/identity/v2_associations.yaml        |  8 ++---
 data/api/identity/v2_auth.yaml                |  4 +--
 data/api/identity/v2_email_associations.yaml  |  6 ++--
 data/api/identity/v2_invitation_signing.yaml  |  4 +--
 data/api/identity/v2_phone_associations.yaml  |  6 ++--
 data/api/identity/v2_store_invite.yaml        |  2 +-
 data/api/server-server/backfill.yaml          |  2 +-
 .../definitions/invite_event.yaml             |  4 +--
 data/api/server-server/definitions/keys.yaml  |  9 +++---
 data/api/server-server/definitions/pdu.yaml   |  4 +--
 .../api/server-server/definitions/pdu_v3.yaml |  4 +--
 .../server-server/definitions/security.yaml   |  2 +-
 .../definitions/send_join_response.yaml       | 12 ++++----
 .../definitions/single_pdu_transaction.yaml   |  6 ++--
 .../definitions/transaction.yaml              |  6 ++--
 .../unlimited_pdu_transaction.yaml            |  6 ++--
 data/api/server-server/event_auth.yaml        |  6 ++--
 data/api/server-server/events.yaml            | 12 ++++----
 data/api/server-server/invites-v1.yaml        |  4 +--
 data/api/server-server/invites-v2.yaml        |  4 +--
 data/api/server-server/joins-v1.yaml          |  8 ++---
 data/api/server-server/joins-v2.yaml          |  2 +-
 data/api/server-server/leaving-v1.yaml        |  6 ++--
 data/api/server-server/leaving-v2.yaml        |  2 +-
 .../api/server-server/third_party_invite.yaml |  4 +--
 data/api/server-server/transactions.yaml      |  2 +-
 data/api/server-server/user_keys.yaml         |  5 ++--
 data/api/server-server/wellknown.yaml         |  2 +-
 .../msgtype_infos/image_info.yaml             |  5 ++--
 data/event-schemas/schema/m.dummy.yaml        |  2 +-
 .../schema/m.forwarded_room_key.yaml          |  4 +--
 .../schema/m.key.verification.accept.yaml     |  2 +-
 .../schema/m.key.verification.cancel.yaml     |  2 +-
 .../schema/m.key.verification.key.yaml        |  2 +-
 .../schema/m.key.verification.mac.yaml        |  2 +-
 .../schema/m.key.verification.request.yaml    |  2 +-
 .../m.key.verification.start$m.sas.v1.yaml    |  2 +-
 .../schema/m.key.verification.start.yaml      |  2 +-
 .../schema/m.room.encrypted.yaml              |  6 ++--
 data/event-schemas/schema/m.room.member.yaml  |  2 +-
 .../schema/m.room.message$m.audio.yaml        |  5 ++--
 .../schema/m.room.message$m.file.yaml         |  8 +++--
 .../schema/m.room.message$m.image.yaml        |  5 ++--
 .../schema/m.room.message$m.location.yaml     |  3 +-
 .../schema/m.room.message$m.video.yaml        | 10 ++++---
 .../schema/m.room.message.feedback.yaml       |  2 +-
 data/event-schemas/schema/m.room_key.yaml     |  2 +-
 .../schema/m.room_key_request.yaml            |  2 +-
 84 files changed, 211 insertions(+), 220 deletions(-)

diff --git a/data/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml
index 8a709f54..cea8538e 100644
--- a/data/api/client-server/administrative_contact.yaml
+++ b/data/api/client-server/administrative_contact.yaml
@@ -183,7 +183,7 @@ paths:
     post:
       summary: Adds contact information to the user's account.
       description: |-
-        This API endpoint uses the `User-Interactive Authentication API`_.
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api).
 
         Adds contact information to the user's account. Homeservers should use 3PIDs added
         through this endpoint for password resets instead of relying on the identity server.
@@ -424,7 +424,8 @@ paths:
         already associated with an account on this homeserver. This API should
         be used to request validation tokens when adding an email address to an
         account. This API's parameters and response are identical to that of
-        the |/register/email/requestToken|_ endpoint. The homeserver should validate
+        the [`/register/email/requestToken`](/client-server-api/#post_matrixclientr0registeremailrequesttoken)
+        endpoint. The homeserver should validate
         the email itself, either by sending a validation email itself or by using
         a service it has control over.
       operationId: requestTokenTo3PIDEmail
@@ -474,7 +475,8 @@ paths:
         already associated with an account on this homeserver. This API should
         be used to request validation tokens when adding a phone number to an
         account. This API's parameters and response are identical to that of
-        the |/register/msisdn/requestToken|_ endpoint. The homeserver should validate
+        the [`/register/msisdn/requestToken`](/client-server-api/#post_matrixclientr0registermsisdnrequesttoken)
+        endpoint. The homeserver should validate
         the phone number itself, either by sending a validation message itself or by using
         a service it has control over.
       operationId: requestTokenTo3PIDMSISDN
diff --git a/data/api/client-server/banning.yaml b/data/api/client-server/banning.yaml
index 8b3cb80d..5c6e7ee3 100644
--- a/data/api/client-server/banning.yaml
+++ b/data/api/client-server/banning.yaml
@@ -62,7 +62,7 @@ paths:
               reason:
                 type: string
                 description: The reason the user has been banned. This will be supplied as the
-                  `reason` on the target's updated `m.room.member`_ event.
+                  `reason` on the target's updated [`m.room.member`](/client-server-api/#mroommember) event.
             required: ["user_id"]
       responses:
         200:
diff --git a/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml
index 220115b0..c36fa837 100644
--- a/data/api/client-server/content-repo.yaml
+++ b/data/api/client-server/content-repo.yaml
@@ -59,14 +59,14 @@ paths:
             format: byte
       responses:
         200:
-          description: The `MXC URI`_ for the uploaded content.
+          description: The [MXC URI](/client-server-api/#matrix-content-mxc-uris) for the uploaded content.
           schema:
             type: object
             required: ["content_uri"]
             properties:
               content_uri:
                 type: string
-                description: "The `MXC URI`_ to the uploaded content."
+                description: "The [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the uploaded content."
           examples:
             application/json: {
               "content_uri": "mxc://example.com/AQwafuaFswefuhsfAFAgsw"
@@ -238,7 +238,7 @@ paths:
       summary: Download a thumbnail of content from the content repository
       description: |-
         Download a thumbnail of content from the content repository.
-        See the `thumbnailing <#thumbnails>`_ section for more information.
+        See the [Thumbnails](/client-server-api/#thumbnails) section for more information.
       operationId: getContentThumbnail
       produces: ["image/jpeg", "image/png"]
       parameters:
@@ -278,7 +278,7 @@ paths:
           name: method
           x-example: "scale"
           description: |-
-            The desired resizing method. See the `thumbnailing <#thumbnails>`_
+            The desired resizing method. See the [Thumbnails](/client-server-api/#thumbnails)
             section for more information.
         - in: query
           type: boolean
@@ -390,7 +390,7 @@ paths:
               "og:image":
                 type: string
                 description: |-
-                  An `MXC URI`_ to the image. Omitted if there is no image.
+                  An [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the image. Omitted if there is no image.
           examples:
             application/json: {
                 "og:title": "Matrix Blog Post",
diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml
index 0330d955..8fd8cbc8 100644
--- a/data/api/client-server/create_room.yaml
+++ b/data/api/client-server/create_room.yaml
@@ -173,7 +173,7 @@ paths:
                 type: object
                 description: |-
                   Extra keys, such as `m.federate`, to be added to the content
-                  of the `m.room.create`_ event. The server will clobber the following
+                  of the [`m.room.create`](client-server-api/#mroomcreate) event. The server will clobber the following
                   keys: `creator`, `room_version`. Future versions of the specification
                   may allow the server to clobber other keys.
               initial_state:
@@ -216,13 +216,14 @@ paths:
                 description: |-
                   This flag makes the server set the `is_direct` flag on the
                   `m.room.member` events sent to the users in `invite` and
-                  `invite_3pid`. See `Direct Messaging`_ for more information.
+                  `invite_3pid`. See [Direct Messaging](/client-server-api/#direct-messaging) for more information.
               power_level_content_override:
                 title: Power Level Event Content
                 type: object
                 description: |-
                   The power level content to override in the default power level
-                  event. This object is applied on top of the generated `m.room.power_levels`_
+                  event. This object is applied on top of the generated
+                  [`m.room.power_levels`](client-server-api/#mroompower_levels)
                   event content prior to it being sent to the room. Defaults to
                   overriding nothing.
       responses:
diff --git a/data/api/client-server/cross_signing.yaml b/data/api/client-server/cross_signing.yaml
index 981262c6..a0516ef2 100644
--- a/data/api/client-server/cross_signing.yaml
+++ b/data/api/client-server/cross_signing.yaml
@@ -33,7 +33,7 @@ paths:
       description: |-
         Publishes cross-signing keys for the user.
 
-        This API endpoint uses the `User-Interactive Authentication API`_.
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api).
       operationId: uploadCrossSigningKeys
       security:
         - accessToken: []
diff --git a/data/api/client-server/definitions/cross_signing_key.yaml b/data/api/client-server/definitions/cross_signing_key.yaml
index d445d93d..cebc5ecd 100644
--- a/data/api/client-server/definitions/cross_signing_key.yaml
+++ b/data/api/client-server/definitions/cross_signing_key.yaml
@@ -41,8 +41,8 @@ properties:
     type: object
     title: Signatures
     description: |-
-      Signatures of the key, calculated using the process described at `Signing
-      JSON`_. Optional for the master key. Other keys must be signed by the
+      Signatures of the key, calculated using the process described at [Signing JSON](/appendices/#signing-json).
+      Optional for the master key. Other keys must be signed by the
       user\'s master key.
     example: {
         "@alice:example.com": {
diff --git a/data/api/client-server/definitions/device_keys.yaml b/data/api/client-server/definitions/device_keys.yaml
index f24dedd7..ab033941 100644
--- a/data/api/client-server/definitions/device_keys.yaml
+++ b/data/api/client-server/definitions/device_keys.yaml
@@ -52,8 +52,7 @@ properties:
        Signatures for the device key object. A map from user ID, to a map from
        `<algorithm>:<device_id>` to the signature.
 
-       The signature is calculated using the process described at `Signing
-       JSON`_.
+       The signature is calculated using the process described at [Signing JSON](/appendices/#signing-json).
     additionalProperties:
       type: object
       additionalProperties:
diff --git a/data/api/client-server/definitions/key_backup_data.yaml b/data/api/client-server/definitions/key_backup_data.yaml
index 6a3b4042..c6e6b29e 100644
--- a/data/api/client-server/definitions/key_backup_data.yaml
+++ b/data/api/client-server/definitions/key_backup_data.yaml
@@ -35,7 +35,7 @@ properties:
   session_data:
     description: |-
       Algorithm-dependent data.  See the documentation for the backup
-      algorithms in `Server-side key backups`_ for more information on the
+      algorithms in [Server-side key backups](/client-server-api/#server-side-key-backups) for more information on the
       expected format of the data.
     type: object
     example: {
diff --git a/data/api/client-server/definitions/push_condition.yaml b/data/api/client-server/definitions/push_condition.yaml
index a97786ff..64d975ff 100644
--- a/data/api/client-server/definitions/push_condition.yaml
+++ b/data/api/client-server/definitions/push_condition.yaml
@@ -18,7 +18,7 @@ properties:
   kind:
     type: string
     description: |-
-      The kind of condition to apply. See `conditions <#conditions>`_ for
+      The kind of condition to apply. See [conditions](/client-server-api/#conditions) for
       more information on the allowed kinds and how they work.
   key:
     type: string
diff --git a/data/api/client-server/definitions/room_event_filter.yaml b/data/api/client-server/definitions/room_event_filter.yaml
index 2c4fddc6..8d96a165 100644
--- a/data/api/client-server/definitions/room_event_filter.yaml
+++ b/data/api/client-server/definitions/room_event_filter.yaml
@@ -20,7 +20,7 @@ allOf:
       type: boolean
       description: |-
         If `true`, enables lazy-loading of membership events. See
-        `Lazy-loading room members <#lazy-loading-room-members>`_
+        [Lazy-loading room members](/client-server-api/#lazy-loading-room-members)
         for more information. Defaults to `false`.
     include_redundant_members:
       type: boolean
@@ -28,7 +28,7 @@ allOf:
         If `true`, sends all membership events for all events, even if they have already
         been sent to the client. Does not
         apply unless `lazy_load_members` is `true`. See
-        `Lazy-loading room members <#lazy-loading-room-members>`_
+        [Lazy-loading room members](/client-server-api/#lazy-loading-room-members)
         for more information. Defaults to `false`.
     not_rooms:
       description: A list of room IDs to exclude. If this list is absent then no rooms
diff --git a/data/api/client-server/definitions/user_identifier.yaml b/data/api/client-server/definitions/user_identifier.yaml
index ce65053d..7e6eca9c 100644
--- a/data/api/client-server/definitions/user_identifier.yaml
+++ b/data/api/client-server/definitions/user_identifier.yaml
@@ -18,7 +18,7 @@ type: object
 properties:
   type:
     type: string
-    description: The type of identification.  See `Identifier types`_ for supported values and additional property descriptions.
+    description: The type of identification.  See [Identifier types](/client-server-api/#identifier-types) for supported values and additional property descriptions.
 required:
   - type
 additionalProperties: true
diff --git a/data/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml
index c42ebbd7..aeb1346a 100644
--- a/data/api/client-server/device_management.yaml
+++ b/data/api/client-server/device_management.yaml
@@ -137,7 +137,7 @@ paths:
     delete:
       summary: Delete a device
       description: |-
-        This API endpoint uses the `User-Interactive Authentication API`_.
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api).
 
         Deletes the given device, and invalidates any access token associated with it.
       operationId: deleteDevice
@@ -183,7 +183,7 @@ paths:
     post:
       summary: Bulk deletion of devices
       description: |-
-        This API endpoint uses the `User-Interactive Authentication API`_.
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api).
 
         Deletes the given devices, and invalidates any access token associated with them.
       operationId: deleteDevices
diff --git a/data/api/client-server/event_context.yaml b/data/api/client-server/event_context.yaml
index 872356e4..03e38fe1 100644
--- a/data/api/client-server/event_context.yaml
+++ b/data/api/client-server/event_context.yaml
@@ -36,7 +36,7 @@ paths:
         surrounding an event.
 
         *Note*: This endpoint supports lazy-loading of room member events. See
-        `Lazy-loading room members <#lazy-loading-room-members>`_ for more information.
+        [Lazy-loading room members](/client-server-api/#lazy-loading-room-members) for more information.
       operationId: getEventContext
       security:
         - accessToken: []
@@ -69,7 +69,7 @@ paths:
             be applied before or/and after the `limit` parameter - whichever the
             homeserver prefers.
 
-            See `Filtering <#filtering>`_ for more information.
+            See [Filtering](/client-server-api/#filtering) for more information.
           x-example: "66696p746572"
       responses:
         200:
diff --git a/data/api/client-server/inviting.yaml b/data/api/client-server/inviting.yaml
index 5df5b4de..b099b3ef 100644
--- a/data/api/client-server/inviting.yaml
+++ b/data/api/client-server/inviting.yaml
@@ -33,12 +33,10 @@ paths:
     post:
       summary: Invite a user to participate in a particular room.
       description: |-
-        .. _invite-by-user-id-endpoint:
-
         *Note that there are two forms of this API, which are documented separately.
         This version of the API requires that the inviter knows the Matrix
         identifier of the invitee. The other is documented in the*
-        `third party invites section`_.
+        [third party invites section](/client-server-api/#post_matrixclientr0roomsroomidinvite-1).
 
         This API invites a user to participate in a particular room.
         They do not start participating in the room until they actually join the
@@ -50,7 +48,6 @@ paths:
         If the user was invited to the room, the homeserver will append a
         `m.room.member` event to the room.
 
-        .. _third party invites section: `invite-by-third-party-id-endpoint`_
       operationId: inviteUser
       security:
         - accessToken: []
diff --git a/data/api/client-server/joining.yaml b/data/api/client-server/joining.yaml
index 0f18a571..e56d6ada 100644
--- a/data/api/client-server/joining.yaml
+++ b/data/api/client-server/joining.yaml
@@ -40,7 +40,8 @@ paths:
         events associated with the room until the user leaves the room.
 
         After a user has joined a room, the room will appear as an entry in the
-        response of the |/initialSync|_ and |/sync|_ APIs.
+        response of the [`/initialSync`](/client-server-api/#get_matrixclientr0initialsync)
+        and [`/sync`](/client-server-api/#get_matrixclientr0sync) APIs.
       operationId: joinRoomById
       security:
         - accessToken: []
@@ -116,7 +117,8 @@ paths:
         events associated with the room until the user leaves the room.
 
         After a user has joined a room, the room will appear as an entry in the
-        response of the |/initialSync|_ and |/sync|_ APIs.
+        response of the [`/initialSync`](/client-server-api/#get_matrixclientr0initialsync)
+        and [`/sync`](/client-server-api/#get_matrixclientr0sync) APIs.
       operationId: joinRoom
       security:
         - accessToken: []
diff --git a/data/api/client-server/key_backup.yaml b/data/api/client-server/key_backup.yaml
index ba3ec85f..7c42f6b5 100644
--- a/data/api/client-server/key_backup.yaml
+++ b/data/api/client-server/key_backup.yaml
@@ -51,7 +51,7 @@ paths:
               auth_data:
                 description: |-
                   Algorithm-dependent data. See the documentation for the backup
-                  algorithms in `Server-side key backups`_ for more information on the
+                  algorithms in [Server-side key backups](/client-server-api/#server-side-key-backups) for more information on the
                   expected format of the data.
                 type: object
                 example: {
@@ -106,7 +106,7 @@ paths:
               auth_data:
                 description: |-
                   Algorithm-dependent data. See the documentation for the backup
-                  algorithms in `Server-side key backups`_ for more information on the
+                  algorithms in [Server-side key backups](/client-server-api/#server-side-key-backups) for more information on the
                   expected format of the data.
                 type: object
                 example: {
@@ -169,8 +169,9 @@ paths:
           name: version
           description: |-
             The backup version to get, as returned in the `version` parameter
-            of the response in `POST /_matrix/client/r0/room_keys/version`_ or
-            this endpoint.
+            of the response in
+            [`POST /_matrix/client/r0/room_keys/version`](/client-server/#post_matrixclientr0room_keysversion)
+            or this endpoint.
           required: true
           x-example: "1"
       responses:
@@ -188,7 +189,7 @@ paths:
               auth_data:
                 description: |-
                   Algorithm-dependent data. See the documentation for the backup
-                  algorithms in `Server-side key backups`_ for more information on the
+                  algorithms in [Server-side key backups](/client-server-api/#server-side-key-backups) for more information on the
                   expected format of the data.
                 type: object
                 example: {
@@ -250,9 +251,9 @@ paths:
           name: version
           description: |-
             The backup version to update, as returned in the `version`
-            parameter in the response of `POST
-            /_matrix/client/r0/room_keys/version`_ or `GET
-            /_matrix/client/r0/room_keys/version/{version}`_.
+            parameter in the response of
+            [`POST /_matrix/client/r0/room_keys/version`](/client-server-api/#post_matrixclientr0room_keysversion)
+            or [`GET /_matrix/client/r0/room_keys/version/{version}`](/client-server-api/#get_matrixclientr0room_keysversionversion).
           required: true
           x-example: "1"
         - in: body
@@ -272,7 +273,7 @@ paths:
               auth_data:
                 description: |-
                   Algorithm-dependent data. See the documentation for the backup
-                  algorithms in `Server-side key backups`_ for more information on the
+                  algorithms in [Server-side key backups](/client-server-api/#server-side-key-backups) for more information on the
                   expected format of the data.
                 type: object
                 example: {
@@ -339,9 +340,9 @@ paths:
           name: version
           description: |-
             The backup version to delete, as returned in the `version`
-            parameter in the response of `POST
-            /_matrix/client/r0/room_keys/version`_ or `GET
-            /_matrix/client/r0/room_keys/version/{version}`_.
+            parameter in the response of
+            [`POST /_matrix/client/r0/room_keys/version`](/client-server-api/#post_matrixclientr0room_keysversion)
+            or [`GET /_matrix/client/r0/room_keys/version/{version}`](/client-server-api/#get_matrixclientr0room_keysversionversion).
           required: true
           x-example: "1"
       responses:
diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
index b3a8b219..1ad5123d 100644
--- a/data/api/client-server/keys.yaml
+++ b/data/api/client-server/keys.yaml
@@ -58,7 +58,7 @@ paths:
                   One-time public keys for "pre-key" messages.  The names of
                   the properties should be in the format
                   `<algorithm>:<key_id>`. The format of the key is determined
-                  by the `key algorithm <#key-algorithms>`_.
+                  by the [key algorithm](/client-server-api/#key-algorithms).
 
                   May be absent if no new one-time keys are required.
                 additionalProperties:
@@ -374,7 +374,7 @@ paths:
                   One-time keys for the queried devices. A map from user ID, to a
                   map from devices to a map from `<algorithm>:<key_id>` to the key object.
 
-                  See the `key algorithms <#key-algorithms>`_ section for information
+                  See the [key algorithms](/client-server-api/#key-algorithms) section for information
                   on the Key Object format.
                 additionalProperties:
                   type: object
diff --git a/data/api/client-server/kicking.yaml b/data/api/client-server/kicking.yaml
index 728406fe..bf6738e1 100644
--- a/data/api/client-server/kicking.yaml
+++ b/data/api/client-server/kicking.yaml
@@ -65,7 +65,7 @@ paths:
                 type: string
                 description: |-
                   The reason the user has been kicked. This will be supplied as the
-                  `reason` on the target's updated `m.room.member`_ event.
+                  `reason` on the target's updated [`m.room.member`](/client-server-api/#mroommember) event.
             required: ["user_id"]
       responses:
         200:
diff --git a/data/api/client-server/login.yaml b/data/api/client-server/login.yaml
index b68094c6..14aa3aaf 100644
--- a/data/api/client-server/login.yaml
+++ b/data/api/client-server/login.yaml
@@ -77,7 +77,7 @@ paths:
         The returned access token must be associated with the `device_id`
         supplied by the client or generated by the server. The server may
         invalidate any access token previously associated with that device. See
-        `Relationship between access tokens and devices`_.
+        [Relationship between access tokens and devices](/client-server-api/#relationship-between-access-tokens-and-devices).
       operationId: login
       parameters:
         - in: body
@@ -118,14 +118,15 @@ paths:
               token:
                 type: string
                 description: |-
-                  Required when `type` is `m.login.token`. Part of `Token-based`_ login.
+                  Required when `type` is `m.login.token`. Part of Token-based login.
               device_id:
                 type: string
                 description: |-
                   ID of the client device. If this does not correspond to a
                   known client device, a new device will be created. The given
-                  device ID must not be the same as a `cross-signing key ID
-                  <#cross-signing>`_. The server will auto-generate a device_id
+                  device ID must not be the same as a
+                  [cross-signing](/client-server-api/#cross-signing) key ID.
+                  The server will auto-generate a device_id
                   if this is not specified.
               initial_device_display_name:
                 type: string
diff --git a/data/api/client-server/logout.yaml b/data/api/client-server/logout.yaml
index 747a57b9..7be4f51c 100644
--- a/data/api/client-server/logout.yaml
+++ b/data/api/client-server/logout.yaml
@@ -33,7 +33,7 @@ paths:
       description: |-
         Invalidates an existing access token, so that it can no longer be used for
         authorization. The device associated with the access token is also deleted.
-        `Device keys <#device-keys>`_ for the device are deleted alongside the device.
+        [Device keys](/client-server-api/#device-keys) for the device are deleted alongside the device.
       operationId: logout
       security:
         - accessToken: []
@@ -51,10 +51,10 @@ paths:
       description: |-
         Invalidates all access tokens for a user, so that they can no longer be used for
         authorization. This includes the access token that made this request. All devices
-        for the user are also deleted. `Device keys <#device-keys>`_ for the device are
+        for the user are also deleted. [Device keys](/client-server-api/#device-keys) for the device are
         deleted alongside the device.
 
-        This endpoint does not use the `User-Interactive Authentication API`_ because
+        This endpoint does not use the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api) because
         User-Interactive Authentication is designed to protect against attacks where the
         someone gets hold of a single access token then takes over the account. This
         endpoint invalidates all access tokens for the user, including the token used in
diff --git a/data/api/client-server/message_pagination.yaml b/data/api/client-server/message_pagination.yaml
index 5e5a99c2..5b86ce90 100644
--- a/data/api/client-server/message_pagination.yaml
+++ b/data/api/client-server/message_pagination.yaml
@@ -35,7 +35,7 @@ paths:
         pagination query parameters to paginate history in the room.
 
         *Note*: This endpoint supports lazy-loading of room member events. See
-        `Lazy-loading room members <#lazy-loading-room-members>`_ for more information.
+        [Lazy-loading room members](/client-server-api/#lazy-loading-room-members) for more information.
       operationId: getRoomEvents
       security:
         - accessToken: []
diff --git a/data/api/client-server/notifications.yaml b/data/api/client-server/notifications.yaml
index 86f17a13..7d017403 100644
--- a/data/api/client-server/notifications.yaml
+++ b/data/api/client-server/notifications.yaml
@@ -101,7 +101,7 @@ paths:
                       type: array
                       description: |-
                         The action(s) to perform when the conditions for this rule are met.
-                        See `Push Rules: API`_.
+                        See [Push Rules: API](/client-server-api/#push-rules-api).
                       items:
                         type:
                         - object
diff --git a/data/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml
index 6c65c1b0..522f0b1a 100644
--- a/data/api/client-server/old_sync.yaml
+++ b/data/api/client-server/old_sync.yaml
@@ -35,9 +35,9 @@ paths:
         block until an event is received, or until the `timeout` is reached.
 
         This endpoint was deprecated in r0 of this specification. Clients
-        should instead call the |/sync|_ API with a `since` parameter. See
-        the `migration guide
-        <https://matrix.org/docs/guides/client-server-migrating-from-v1.html#deprecated-endpoints>`_.
+        should instead call the [`/sync`](/client-server-api/#get_matrixclientr0sync)
+        API with a `since` parameter. See
+        the [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints).
       operationId: getEvents
       security:
         - accessToken: []
@@ -101,9 +101,9 @@ paths:
         number of messages per room to return.
 
         This endpoint was deprecated in r0 of this specification. Clients
-        should instead call the |/sync|_ API with no `since` parameter. See
-        the `migration guide
-        <https://matrix.org/docs/guides/client-server-migrating-from-v1.html#deprecated-endpoints>`_.
+        should instead call the [`/sync`](/client-server-api/#get_matrixclientr0sync)
+        API with no `since` parameter. See
+        the [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints).
       operationId: initialSync
       security:
         - accessToken: []
@@ -310,8 +310,9 @@ paths:
         retrieve this event e.g. by being a member in the room for this event.
 
         This endpoint was deprecated in r0 of this specification. Clients
-        should instead call the |/rooms/{roomId}/event/{eventId}|_ API
-        or the |/rooms/{roomId}/context/{eventId}|_ API.
+        should instead call the
+        [/rooms/{roomId}/event/{eventId}](/client-server-api/#get_matrixclientr0roomsroomideventeventid) API
+        or the [/rooms/{roomId}/context/{eventId](/client-server-api/#get_matrixclientr0roomsroomidcontexteventid) API.
       operationId: getOneEvent
       security:
         - accessToken: []
diff --git a/data/api/client-server/openid.yaml b/data/api/client-server/openid.yaml
index ec6f8818..ef76e3d0 100644
--- a/data/api/client-server/openid.yaml
+++ b/data/api/client-server/openid.yaml
@@ -62,7 +62,8 @@ paths:
         200:
           description: |-
             OpenID token information. This response is nearly compatible with the
-            response documented in the `OpenID Connect 1.0 Specification <http://openid.net/specs/openid-connect-core-1_0.html#TokenResponse>`_
+            response documented in the
+            [OpenID Connect 1.0 Specification](http://openid.net/specs/openid-connect-core-1_0.html#TokenResponse)
             with the only difference being the lack of an `id_token`. Instead,
             the Matrix homeserver's name is provided.
           examples:
diff --git a/data/api/client-server/pusher.yaml b/data/api/client-server/pusher.yaml
index e274c3b3..69882066 100644
--- a/data/api/client-server/pusher.yaml
+++ b/data/api/client-server/pusher.yaml
@@ -135,7 +135,7 @@ paths:
     post:
       summary: Modify a pusher for this user on the homeserver.
       description: |-
-        This endpoint allows the creation, modification and deletion of `pushers`_
+        This endpoint allows the creation, modification and deletion of [pushers](/client-server-api/#push-notifications)
         for this user ID. The behaviour of this endpoint varies depending on the
         values in the JSON body.
       operationId: postPusher
@@ -231,7 +231,7 @@ paths:
                       The format to send notifications in to Push Gateways if the
                       `kind` is `http`. The details about what fields the
                       homeserver should send to the push gateway are defined in the
-                      `Push Gateway Specification`_. Currently the only format
+                      [Push Gateway Specification](/push-gateway-api/). Currently the only format
                       available is 'event_id_only'.
               append:
                 type: boolean
diff --git a/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml
index 26203320..925ad00b 100644
--- a/data/api/client-server/registration.yaml
+++ b/data/api/client-server/registration.yaml
@@ -29,7 +29,7 @@ paths:
     post:
       summary: Register for an account on this homeserver.
       description: |-
-        This API endpoint uses the `User-Interactive Authentication API`_, except in
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api), except in
         the cases where a guest account is being registered.
 
         Register for an account on this homeserver.
@@ -59,7 +59,7 @@ paths:
         The returned access token must be associated with the `device_id`
         supplied by the client or generated by the server. The server may
         invalidate any access token previously associated with that device. See
-        `Relationship between access tokens and devices`_.
+        [Relationship between access tokens and devices](/client-server-api/#relationship-between-access-tokens-and-devices).
 
         When registering a guest account, all parameters in the request body
         with the exception of `initial_device_display_name` MUST BE ignored
@@ -67,7 +67,7 @@ paths:
         regardless of input.
 
         Any user ID returned by this API must conform to the grammar given in the
-        `Matrix specification <../appendices.html#user-identifiers>`_.
+        [Matrix specification](/appendices/#user-identifiers).
       operationId: register
       parameters:
         - in: query
@@ -145,7 +145,7 @@ paths:
                   The fully-qualified Matrix user ID (MXID) that has been registered.
 
                   Any user ID returned by this API must conform to the grammar given in the
-                  `Matrix specification <../appendices.html#user-identifiers>`_.
+                  [Matrix specification](/appendices/#user-identifiers).
               access_token:
                 type: string
                 description: |-
@@ -321,7 +321,7 @@ paths:
       description: |-
         Changes the password for an account on this homeserver.
 
-        This API endpoint uses the `User-Interactive Authentication API`_ to
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api) to
         ensure the user changing the password is actually the owner of the
         account.
 
@@ -352,7 +352,7 @@ paths:
                   Whether the user's other access tokens, and their associated devices, should be
                   revoked if the request succeeds. Defaults to true.
 
-                  When `false`, the server can still take advantage of `the soft logout method <#soft-logout>`_
+                  When `false`, the server can still take advantage of the [soft logout method](/client-server-api/#soft-logout)
                   for the user's remaining devices.
                 example: true
               auth:
@@ -389,7 +389,8 @@ paths:
         `/account/password` endpoint.
 
         This API's parameters and response are identical to that of the
-        |/register/email/requestToken|_ endpoint, except that
+        [`/register/email/requestToken`](/client-server-api/#post_matrixclientr0registeremailrequesttoken)
+        endpoint, except that
         `M_THREEPID_NOT_FOUND` may be returned if no account matching the
         given email address could be found. The server may instead send an
         email to the given address prompting the user to create an account.
@@ -397,11 +398,6 @@ paths:
 
         The homeserver should validate the email itself, either by sending a
         validation email itself or by using a service it has control over.
-
-
-        .. |/register/email/requestToken| replace:: `/register/email/requestToken`
-
-        .. _/register/email/requestToken: #post-matrix-client-%CLIENT_MAJOR_VERSION%-register-email-requesttoken
       operationId: requestTokenToResetPasswordEmail
       parameters:
         - in: body
@@ -448,7 +444,8 @@ paths:
         `/account/password` endpoint.
 
         This API's parameters and response are identical to that of the
-        |/register/msisdn/requestToken|_ endpoint, except that
+        [`/register/msisdn/requestToken`](/client-server-api/#post_matrixclientr0registermsisdnrequesttoken)
+        endpoint, except that
         `M_THREEPID_NOT_FOUND` may be returned if no account matching the
         given phone number could be found. The server may instead send the SMS
         to the given phone number prompting the user to create an account.
@@ -456,10 +453,6 @@ paths:
 
         The homeserver should validate the phone number itself, either by sending a
         validation message itself or by using a service it has control over.
-
-        .. |/register/msisdn/requestToken| replace:: `/register/msisdn/requestToken`
-
-        .. _/register/msisdn/requestToken: #post-matrix-client-%CLIENT_MAJOR_VERSION%-register-email-requesttoken
       operationId: requestTokenToResetPasswordMSISDN
       parameters:
         - in: body
@@ -503,7 +496,7 @@ paths:
         Deactivate the user's account, removing all ability for the user to
         login again.
 
-        This API endpoint uses the `User-Interactive Authentication API`_.
+        This API endpoint uses the [User-Interactive Authentication API](/client-server-api/#user-interactive-authentication-api).
 
         An access token should be submitted to this endpoint if the client has
         an active session.
diff --git a/data/api/client-server/room_initial_sync.yaml b/data/api/client-server/room_initial_sync.yaml
index 48f3176c..bab0e3d9 100644
--- a/data/api/client-server/room_initial_sync.yaml
+++ b/data/api/client-server/room_initial_sync.yaml
@@ -22,8 +22,8 @@ paths:
 
         This endpoint was deprecated in r0 of this specification. There is no
         direct replacement; the relevant information is returned by the
-        |/sync|_ API. See the `migration guide
-        <https://matrix.org/docs/guides/client-server-migrating-from-v1.html#deprecated-endpoints>`_.
+        [`/sync`](/client-server-api/#get_matrixclientr0sync) API. See the
+        [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints).
       operationId: roomInitialSync
       security:
         - accessToken: []
diff --git a/data/api/client-server/room_send.yaml b/data/api/client-server/room_send.yaml
index fc8f3339..c22fcfe4 100644
--- a/data/api/client-server/room_send.yaml
+++ b/data/api/client-server/room_send.yaml
@@ -37,7 +37,7 @@ paths:
 
         The body of the request should be the content object of the event; the
         fields in this object will vary depending on the type of event. See
-        `Room Events`_ for the m. event specification.
+        [Room Events](/client-server-api/#room-events) for the m. event specification.
       operationId: sendMessage
       security:
         - accessToken: []
diff --git a/data/api/client-server/room_state.yaml b/data/api/client-server/room_state.yaml
index 2b6fffd4..381c5c57 100644
--- a/data/api/client-server/room_state.yaml
+++ b/data/api/client-server/room_state.yaml
@@ -31,9 +31,6 @@ paths:
     put:
       summary: Send a state event to the given room.
       description: |
-        .. For backwards compatibility with older links...
-        .. _`put-matrix-client-%CLIENT_MAJOR_VERSION%-rooms-roomid-state-eventtype`:
-
         State events can be sent using this endpoint.  These events will be
         overwritten if `<room id>`, `<event type>` and `<state key>` all
         match.
@@ -44,7 +41,7 @@ paths:
 
         The body of the request should be the content object of the event; the
         fields in this object will vary depending on the type of event. See
-        `Room Events`_ for the `m.` event specification.
+        [Room Events](/client-server-api/#room-events) for the `m.` event specification.
 
         If the event type being sent is `m.room.canonical_alias` servers
         SHOULD ensure that any new aliases being listed in the event are valid
diff --git a/data/api/client-server/rooms.yaml b/data/api/client-server/rooms.yaml
index 3d4aed93..0dd60d8e 100644
--- a/data/api/client-server/rooms.yaml
+++ b/data/api/client-server/rooms.yaml
@@ -75,9 +75,6 @@ paths:
     get:
       summary: Get the state identified by the type and key.
       description: |-
-        .. For backwards compatibility with older links...
-        .. _`get-matrix-client-%CLIENT_MAJOR_VERSION%-rooms-roomid-state-eventtype`:
-
         Looks up the contents of a state event in a room. If the user is
         joined to the room then the state is taken from the current
         state of the room. If the user has left the room then the state is
diff --git a/data/api/client-server/search.yaml b/data/api/client-server/search.yaml
index 33d946b0..1dc9804e 100644
--- a/data/api/client-server/search.yaml
+++ b/data/api/client-server/search.yaml
@@ -90,12 +90,8 @@ paths:
                       filter:
                         type: object
                         title: Filter
-                        # Within the C-S spec document, `filter`_ is picked up
-                        # as a link to the filtering section. In OpenAPI 3.0,
-                        # we could use the link feature, but we're still on 2.0
-                        # for now :/
                         description: |-
-                          This takes a `filter`_.
+                          This takes a [filter](/client-server-api/#filtering).
                         allOf:
                           - $ref: "definitions/room_event_filter.yaml"
                       order_by:
diff --git a/data/api/client-server/sync.yaml b/data/api/client-server/sync.yaml
index 3a965b56..a7090d6b 100644
--- a/data/api/client-server/sync.yaml
+++ b/data/api/client-server/sync.yaml
@@ -35,7 +35,7 @@ paths:
         of the state on the server, and then continue to call this API to get
         incremental deltas to the state, and to receive new messages.
 
-        *Note*: This endpoint supports lazy-loading. See `Filtering <#filtering>`_
+        *Note*: This endpoint supports lazy-loading. See [Filtering](/client-server-api/#filtering)
         for more information. Lazy-loading members is only supported on a `StateFilter`
         for this endpoint. When lazy-loading is enabled, servers MUST include the
         syncing user's own membership event when they join a room, or when the
@@ -67,7 +67,7 @@ paths:
             clients that reuse the same filter multiple times, for example in
             long poll requests.
 
-            See `Filtering <#filtering>`_ for more information.
+            See [Filtering](/client-server-api/#filtering) for more information.
           x-example: "66696p746572"
         - in: query
           name: since
@@ -236,7 +236,7 @@ paths:
                           type: object
                           description: |-
                             Counts of unread notifications for this room. See the
-                            `Receiving notifications section <#receiving-notifications>`_
+                            [Receiving notifications](/client-server-api/#receiving-notifications) section
                             for more information on how these are calculated.
                           properties:
                             highlight_count:
@@ -333,13 +333,13 @@ paths:
                 type: object
                 description: |-
                   Information on the send-to-device messages for the client
-                  device, as defined in |send_to_device_sync|_.
+                  device, as defined in [Send-to-Device messaging](/client-server-api/#extensions-to-sync).
               device_lists:
                 title: DeviceLists
                 type: object
                 description: |-
                   Information on end-to-end device updates, as specified in
-                  |device_lists_sync|_.
+                  [End-to-end encryption](/client-server-api/#extensions-to-sync-1).
               device_one_time_keys_count:
                 title: One-time keys count
                 type: object
@@ -347,7 +347,7 @@ paths:
                   type: integer
                 description: |-
                   Information on end-to-end encryption keys, as specified
-                  in |device_lists_sync|_.
+                  in [End-to-end encryption](/client-server-api/#extensions-to-sync-1).
             required:
               - next_batch
           examples:
diff --git a/data/api/client-server/third_party_membership.yaml b/data/api/client-server/third_party_membership.yaml
index d56fd99c..c48b4697 100644
--- a/data/api/client-server/third_party_membership.yaml
+++ b/data/api/client-server/third_party_membership.yaml
@@ -31,14 +31,12 @@ paths:
     post:
       summary: Invite a user to participate in a particular room.
       description: |-
-        .. _invite-by-third-party-id-endpoint:
-
         *Note that there are two forms of this API, which are documented separately.
         This version of the API does not require that the inviter know the Matrix
         identifier of the invitee, and instead relies on third party identifiers.
         The homeserver uses an identity server to perform the mapping from
         third party identifier to a Matrix identifier. The other is documented in the*
-        `joining rooms section`_.
+        [joining rooms section](/client-server-api/#post_matrixclientr0roomsroomidinvite).
 
         This API invites a user to participate in a particular room.
         They do not start participating in the room until they actually join the
@@ -74,7 +72,6 @@ paths:
         If a token is requested from the identity server, the homeserver will
         append a `m.room.third_party_invite` event to the room.
 
-        .. _joining rooms section: `invite-by-user-id-endpoint`_
       operationId: inviteBy3PID
       security:
         - accessToken: []
diff --git a/data/api/identity/associations.yaml b/data/api/identity/associations.yaml
index 084ccded..f2d09af1 100644
--- a/data/api/identity/associations.yaml
+++ b/data/api/identity/associations.yaml
@@ -258,7 +258,7 @@ paths:
                   medium:
                     type: string
                     description: |-
-                      A medium from the `3PID Types`_ Appendix, matching the medium
+                      A medium from the [3PID Types](/appendices/#3pid-types) Appendix, matching the medium
                       of the identifier to unbind.
                   address:
                     type: string
diff --git a/data/api/identity/invitation_signing.yaml b/data/api/identity/invitation_signing.yaml
index fc9da1d2..a3d215f2 100644
--- a/data/api/identity/invitation_signing.yaml
+++ b/data/api/identity/invitation_signing.yaml
@@ -53,7 +53,7 @@ paths:
                 description: The token from the call to `store-invite`.
               private_key:
                 type: string
-                description: The private key, encoded as `Unpadded base64`_.
+                description: The private key, encoded as [Unpadded base64](/appendices/#unpadded-base64).
             required: ["mxid", "token", "private_key"]
       responses:
         200:
diff --git a/data/api/identity/lookup.yaml b/data/api/identity/lookup.yaml
index bdce7980..6163807e 100644
--- a/data/api/identity/lookup.yaml
+++ b/data/api/identity/lookup.yaml
@@ -38,13 +38,13 @@ paths:
           type: string
           name: medium
           required: true
-          description: The medium type of the 3pid. See the `3PID Types`_ Appendix.
+          description: The medium type of the 3pid. See the [3PID Types](/appendices/#3pid-types) Appendix.
           x-example: "email"
         - in: query
           type: string
           name: address
           required: true
-          description: The address of the 3pid being looked up. See the `3PID Types`_ Appendix.
+          description: The address of the 3pid being looked up. See the [3PID Types](/appendices/#3pid-types) Appendix.
           x-example: "louise@bobs.burgers"
       responses:
         200:
@@ -72,7 +72,7 @@ paths:
                 description: The 3pid address of the user being looked up, matching the address requested.
               medium:
                 type: string
-                description: A medium from the `3PID Types`_ Appendix, matching the medium requested.
+                description: A medium from the [3PID Types](/appendices/#3pid-types) Appendix, matching the medium requested.
               mxid:
                 type: string
                 description: The Matrix user ID associated with the 3pid.
@@ -131,7 +131,7 @@ paths:
                     - type: string
                     - type: string
                 description: |-
-                  An array of arrays containing the `3PID Types`_ with the `medium`
+                  An array of arrays containing the [3PID Types](/appendices/#3pid-types) with the `medium`
                   in first position and the `address` in second position.
             required:
               - "threepids"
@@ -164,7 +164,7 @@ paths:
                     - type: string
                     - type: string
                 description: |-
-                  An array of array containing the `3PID Types`_ with the `medium`
+                  An array of array containing the [3PID Types](/appendices/#3pid-types) with the `medium`
                   in first position, the `address` in second position and Matrix user
                   ID in third position.
             required:
diff --git a/data/api/identity/v2_associations.yaml b/data/api/identity/v2_associations.yaml
index e6d78d99..e08ac1da 100644
--- a/data/api/identity/v2_associations.yaml
+++ b/data/api/identity/v2_associations.yaml
@@ -98,7 +98,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -222,7 +222,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -286,7 +286,7 @@ paths:
                   medium:
                     type: string
                     description: |-
-                      A medium from the `3PID Types`_ Appendix, matching the medium
+                      A medium from the [3PID Types](/appendices/#3pid-types) Appendix, matching the medium
                       of the identifier to unbind.
                   address:
                     type: string
@@ -318,7 +318,7 @@ paths:
             unbinding identifiers).
 
             Another common error code is `M_TERMS_NOT_SIGNED` where the user
-            needs to `agree to more terms`_ in order to continue.
+            needs to [agree to more terms](/identity-service-api/#terms-of-service) in order to continue.
           examples:
             application/json: {
               "errcode": "M_FORBIDDEN",
diff --git a/data/api/identity/v2_auth.yaml b/data/api/identity/v2_auth.yaml
index f76550b1..b5d1a41c 100644
--- a/data/api/identity/v2_auth.yaml
+++ b/data/api/identity/v2_auth.yaml
@@ -83,7 +83,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -121,7 +121,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_email_associations.yaml b/data/api/identity/v2_email_associations.yaml
index 9865771b..08e8c9fa 100644
--- a/data/api/identity/v2_email_associations.yaml
+++ b/data/api/identity/v2_email_associations.yaml
@@ -77,7 +77,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -149,7 +149,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -206,7 +206,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_invitation_signing.yaml b/data/api/identity/v2_invitation_signing.yaml
index c8045779..d81b973d 100644
--- a/data/api/identity/v2_invitation_signing.yaml
+++ b/data/api/identity/v2_invitation_signing.yaml
@@ -57,7 +57,7 @@ paths:
                 description: The token from the call to `store-invite`.
               private_key:
                 type: string
-                description: The private key, encoded as `Unpadded base64`_.
+                description: The private key, encoded as [Unpadded base64](/appendices/#unpadded-base64).
             required: ["mxid", "token", "private_key"]
       responses:
         200:
@@ -102,7 +102,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_phone_associations.yaml b/data/api/identity/v2_phone_associations.yaml
index 7db891ba..72680064 100644
--- a/data/api/identity/v2_phone_associations.yaml
+++ b/data/api/identity/v2_phone_associations.yaml
@@ -79,7 +79,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -151,7 +151,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
@@ -208,7 +208,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/identity/v2_store_invite.yaml b/data/api/identity/v2_store_invite.yaml
index 36079061..c3fbc7ca 100644
--- a/data/api/identity/v2_store_invite.yaml
+++ b/data/api/identity/v2_store_invite.yaml
@@ -166,7 +166,7 @@ paths:
         403:
           description: |
             The user must do something in order to use this endpoint. One example
-            is an `M_TERMS_NOT_SIGNED` error where the user must `agree to more terms`_.
+            is an `M_TERMS_NOT_SIGNED` error where the user must [agree to more terms](/identity-service-api/#terms-of-service).
           examples:
             application/json: {
               "errcode": "M_TERMS_NOT_SIGNED",
diff --git a/data/api/server-server/backfill.yaml b/data/api/server-server/backfill.yaml
index 2fd984e7..42a0e3bd 100644
--- a/data/api/server-server/backfill.yaml
+++ b/data/api/server-server/backfill.yaml
@@ -130,7 +130,7 @@ paths:
                 type: array
                 description: |-
                   The missing events. The event format varies depending on the room version - check
-                  the `room version specification`_ for precise event formats.
+                  the [room version specification](/#room-versions) for precise event formats.
                 items:
                   type: object
                   title: PDU
diff --git a/data/api/server-server/definitions/invite_event.yaml b/data/api/server-server/definitions/invite_event.yaml
index 3b430d03..416eb709 100644
--- a/data/api/server-server/definitions/invite_event.yaml
+++ b/data/api/server-server/definitions/invite_event.yaml
@@ -15,7 +15,7 @@ type: object
 title: InviteEvent
 description: |-
   An invite event. Note that events have a different format depending on the
-  room version - check the `room version specification`_ for precise event formats.
+  room version - check the [room version specification](/#room-versions) for precise event formats.
 allOf:
   - type: object
     properties:
@@ -46,7 +46,7 @@ allOf:
         title: Membership Event Content
         description: |-
           The content of the event, matching what is available in the
-          `Client-Server API`_. Must include a `membership` of `invite`.
+          [Client-Server API](/client-server-api/). Must include a `membership` of `invite`.
         example: {"membership": "invite"}
         properties:
           membership:
diff --git a/data/api/server-server/definitions/keys.yaml b/data/api/server-server/definitions/keys.yaml
index bd0aa737..3676ae52 100644
--- a/data/api/server-server/definitions/keys.yaml
+++ b/data/api/server-server/definitions/keys.yaml
@@ -41,7 +41,7 @@ properties:
       properties:
         key:
           type: string
-          description: The `Unpadded Base64`_ encoded key.
+          description: The [Unpadded base64](/appendices/#unpadded-base64) encoded key.
           example: "VGhpcyBzaG91bGQgYmUgYSByZWFsIGVkMjU1MTkgcGF5bG9hZA"
       required: ["key"]
   old_verify_keys:
@@ -70,7 +70,7 @@ properties:
           example: 1532645052628
         key:
           type: string
-          description: The `Unpadded Base64`_ encoded key.
+          description: The [Unpadded base64](/appendices/#unpadded-base64) encoded key.
           example: "VGhpcyBzaG91bGQgYmUgeW91ciBvbGQga2V5J3MgZWQyNTUxOSBwYXlsb2FkLg"
       required: ["expired_ts", "key"]
   signatures:
@@ -78,8 +78,7 @@ properties:
     description: |-
       Digital signatures for this object signed using the `verify_keys`.
 
-      The signature is calculated using the process described at `Signing
-      JSON`_.
+      The signature is calculated using the process described at [Signing JSON](/appendices/#signing-json).
     title: Signatures
     additionalProperties:
       type: object
@@ -91,7 +90,7 @@ properties:
     description: |-
       POSIX timestamp when the list of valid keys should be refreshed. This field MUST
       be ignored in room versions 1, 2, 3, and 4. Keys used beyond this timestamp MUST
-      be considered invalid, depending on the `room version specification`_.
+      be considered invalid, depending on the [room version specification](/#room-versions).
 
       Servers MUST use the lesser of this field and 7 days into the future when
       determining if a key is valid. This is to avoid a situation where an attacker
diff --git a/data/api/server-server/definitions/pdu.yaml b/data/api/server-server/definitions/pdu.yaml
index 87064c22..d87db1a3 100644
--- a/data/api/server-server/definitions/pdu.yaml
+++ b/data/api/server-server/definitions/pdu.yaml
@@ -24,7 +24,7 @@ allOf:
         type: object
         title: Event Hash
         description: |-
-          Content hashes of the PDU, following the algorithm specified in `Signing Events`_.
+          Content hashes of the PDU, following the algorithm specified in [Signing Events](/server-server-api/#signing-events).
         example: {
           "sha256": "ThisHashCoversAllFieldsInCaseThisIsRedacted"
         }
@@ -37,7 +37,7 @@ allOf:
       signatures:
         type: object
         description: |-
-          Signatures for the PDU, following the algorithm specified in `Signing Events`_.
+          Signatures for the PDU, following the algorithm specified in [Signing Events](/server-server-api/#signing-events).
         example: {
           "example.com": {
             "ed25519:key_version:": "86BytesOfSignatureOfTheRedactedEvent"
diff --git a/data/api/server-server/definitions/pdu_v3.yaml b/data/api/server-server/definitions/pdu_v3.yaml
index 3e69d941..32d05b36 100644
--- a/data/api/server-server/definitions/pdu_v3.yaml
+++ b/data/api/server-server/definitions/pdu_v3.yaml
@@ -52,7 +52,7 @@ allOf:
         type: object
         title: Event Hash
         description: |-
-          Content hashes of the PDU, following the algorithm specified in `Signing Events`_.
+          Content hashes of the PDU, following the algorithm specified in [Signing Events](/server-server-api/#signing-events).
         example: {
           "sha256": "ThisHashCoversAllFieldsInCaseThisIsRedacted"
         }
@@ -65,7 +65,7 @@ allOf:
       signatures:
         type: object
         description: |-
-          Signatures for the PDU, following the algorithm specified in `Signing Events`_.
+          Signatures for the PDU, following the algorithm specified in [Signing Events](/server-server-api/#signing-events).
         example: {
           "example.com": {
             "ed25519:key_version:": "86BytesOfSignatureOfTheRedactedEvent"
diff --git a/data/api/server-server/definitions/security.yaml b/data/api/server-server/definitions/security.yaml
index 4e0652e9..822b3fdf 100644
--- a/data/api/server-server/definitions/security.yaml
+++ b/data/api/server-server/definitions/security.yaml
@@ -14,6 +14,6 @@
 signedRequest:
   type: apiKey
   description: |-
-    The `Authorization` header defined in the `Authentication`_ section.
+    The `Authorization` header defined in the [Authentication](/server-server-api/#authentication) section.
   name: Authorization
   in: header
diff --git a/data/api/server-server/definitions/send_join_response.yaml b/data/api/server-server/definitions/send_join_response.yaml
index 2837556b..0aad1758 100644
--- a/data/api/server-server/definitions/send_join_response.yaml
+++ b/data/api/server-server/definitions/send_join_response.yaml
@@ -25,13 +25,13 @@ properties:
       The auth chain for the entire current room state prior to the join event.
 
       Note that events have a different format depending on the room version - check the
-      `room version specification`_ for precise event formats.
+      [room version specification](/#room-versions) for precise event formats.
     items:
       type: object
       title: PDU
       description: |-
-        The `PDUs <#pdus>`_ that make up the auth chain. The event format varies depending
-        on the room version - check the `room version specification`_ for precise event formats.
+        The [PDUs](/server-server-api/#pdus) that make up the auth chain. The event format varies depending
+        on the room version - check the [room version specification](/#room-versions) for precise event formats.
       schema:
         type: object
         properties: []
@@ -42,14 +42,14 @@ properties:
     description: |-
       The resolved current room state prior to the join event.
 
-      The event format varies depending on the room version - check the `room version specification`_
+      The event format varies depending on the room version - check the [room version specification](/#room-versions)
       for precise event formats.
     items:
       type: object
       title: PDU
       description: |-
-        The `PDUs <#pdus>`_ for the fully resolved state of the room. The event format varies depending
-        on the room version - check the `room version specification`_ for precise event formats.
+        The [PDUs](/server-server-api/#pdus) for the fully resolved state of the room. The event format varies depending
+        on the room version - check the [room version specification](/#room-versions) for precise event formats.
       schema:
         type: object
         properties: []
diff --git a/data/api/server-server/definitions/single_pdu_transaction.yaml b/data/api/server-server/definitions/single_pdu_transaction.yaml
index ff682a44..3c406e8f 100644
--- a/data/api/server-server/definitions/single_pdu_transaction.yaml
+++ b/data/api/server-server/definitions/single_pdu_transaction.yaml
@@ -19,13 +19,13 @@ properties:
     type: array
     description: |-
       A single PDU. Note that events have a different format depending on the room
-      version - check the `room version specification`_ for precise event formats.
+      version - check the [room version specification](/#room-versions) for precise event formats.
     items:
       type: object
       title: PDU
       description: |-
-        The `PDUs <#pdus>`_ contained in the transaction. The event format varies depending
-        on the room version - check the `room version specification`_ for precise event formats.
+        The [PDUs](/server-server-api/#pdus) contained in the transaction. The event format varies depending
+        on the room version - check the [room version specification](/#room-versions) for precise event formats.
       properties: []
       example:
         $ref: "../examples/minimal_pdu.json"
diff --git a/data/api/server-server/definitions/transaction.yaml b/data/api/server-server/definitions/transaction.yaml
index cf6aaf31..4d9f3ae4 100644
--- a/data/api/server-server/definitions/transaction.yaml
+++ b/data/api/server-server/definitions/transaction.yaml
@@ -34,13 +34,13 @@ properties:
     description: |-
       List of persistent updates to rooms. Must not include more than 50 PDUs. Note that
       events have a different format depending on the room version - check the
-      `room version specification`_ for precise event formats.
+      [room version specification](/#room-versions) for precise event formats.
     items:
       type: object
       title: PDU
       description: |-
-        The `PDUs <#pdus>`_ contained in the transaction. The event format varies depending
-        on the room version - check the `room version specification`_ for precise event formats.
+        The [PDUs](/server-server-api/#pdus) contained in the transaction. The event format varies depending
+        on the room version - check the [room version specification](/#room-versions) for precise event formats.
       properties: []
       example:
         $ref: "../examples/minimal_pdu.json"
diff --git a/data/api/server-server/definitions/unlimited_pdu_transaction.yaml b/data/api/server-server/definitions/unlimited_pdu_transaction.yaml
index 0fc31ee4..bfa29609 100644
--- a/data/api/server-server/definitions/unlimited_pdu_transaction.yaml
+++ b/data/api/server-server/definitions/unlimited_pdu_transaction.yaml
@@ -19,14 +19,14 @@ properties:
     type: array
     description: |-
       List of persistent updates to rooms. Note that events have a different format
-      depending on the room version - check the `room version specification`_ for
+      depending on the room version - check the [room version specification](/#room-versions) for
       precise event formats.
     items:
       type: object
       title: PDU
       description: |-
-        The `PDUs <#pdus>`_ contained in the transaction. The event format varies depending
-        on the room version - check the `room version specification`_ for precise event formats.
+        The [PDUs](/server-server-api/#pdus) contained in the transaction. The event format varies depending
+        on the room version - check the [room version specification](/#room-versions) for precise event formats.
       properties: []
       example:
         $ref: "../examples/minimal_pdu.json"
diff --git a/data/api/server-server/event_auth.yaml b/data/api/server-server/event_auth.yaml
index 8f545e1d..0d9fdec1 100644
--- a/data/api/server-server/event_auth.yaml
+++ b/data/api/server-server/event_auth.yaml
@@ -60,13 +60,13 @@ paths:
                   The full set of authorization events that make up the state of
                   the room, and their authorization events, recursively. Note that
                   events have a different format depending on the room version -
-                  check the `room version specification`_ for precise event formats.
+                  check the [room version specification](/#room-versions) for precise event formats.
                 items:
                   type: object
                   title: PDU
                   description: |-
-                    The `PDUs <#pdus>`_ contained in the auth chain. The event format
-                    varies depending on the room version - check the `room version specification`_
+                    The [PDUs](/server-server-api/#pdus) contained in the auth chain. The event format
+                    varies depending on the room version - check the [room version specification](/#room-versions)
                     for precise event formats.
                   properties: []
                   example:
diff --git a/data/api/server-server/events.yaml b/data/api/server-server/events.yaml
index 945af253..51405d1c 100644
--- a/data/api/server-server/events.yaml
+++ b/data/api/server-server/events.yaml
@@ -61,13 +61,13 @@ paths:
                   The full set of authorization events that make up the state
                   of the room, and their authorization events, recursively. Note that
                   events have a different format depending on the room version -
-                  check the `room version specification`_ for precise event formats.
+                  check the [room version specification](/#room-versions) for precise event formats.
                 items:
                   type: object
                   title: PDU
                   description: |-
-                    The `PDUs <#pdus>`_ contained in the auth chain. The event format
-                    varies depending on the room version - check the `room version specification`_
+                    The [PDUs](/server-server-api/#pdus) contained in the auth chain. The event format
+                    varies depending on the room version - check the [room version specification](/#room-versions)
                     for precise event formats.
                   properties: []
                   example:
@@ -77,13 +77,13 @@ paths:
                 description: |-
                   The fully resolved state of the room at the given event. Note that
                   events have a different format depending on the room version -
-                  check the `room version specification`_ for precise event formats.
+                  check the [room version specification](/#room-versions) for precise event formats.
                 items:
                   type: object
                   title: PDU
                   description: |-
-                    The `PDUs <#pdus>`_ for the fully resolved state of the room. The event format
-                    varies depending on the room version - check the `room version specification`_
+                    The [PDUs](/server-server-api/#pdus) for the fully resolved state of the room. The event format
+                    varies depending on the room version - check the [room version specification](/#room-versions)
                     for precise event formats.
                   properties: []
                   example:
diff --git a/data/api/server-server/invites-v1.yaml b/data/api/server-server/invites-v1.yaml
index f7bf30f8..4925221f 100644
--- a/data/api/server-server/invites-v1.yaml
+++ b/data/api/server-server/invites-v1.yaml
@@ -40,7 +40,7 @@ paths:
         or `"2"`.
 
         Note that events have a different format depending on the room version - check the
-        `room version specification`_ for precise event formats. **The request and response
+        [room version specification](/#room-versions) for precise event formats. **The request and response
         bodies here describe the common event fields in more detail and may be missing other
         required fields for a PDU.**
       operationId: sendInviteV1
@@ -106,7 +106,7 @@ paths:
           description: |-
             The event with the invited server's signature added. All other fields of the events
             should remain untouched. Note that events have a different format depending on the
-            room version - check the `room version specification`_ for precise event formats.
+            room version - check the [room version specification](/#room-versions) for precise event formats.
           schema:
             type: array
             minItems: 2
diff --git a/data/api/server-server/invites-v2.yaml b/data/api/server-server/invites-v2.yaml
index 33140b28..039a9e65 100644
--- a/data/api/server-server/invites-v2.yaml
+++ b/data/api/server-server/invites-v2.yaml
@@ -44,7 +44,7 @@ paths:
         API as the server may be older, if the room version is "1" or "2".
 
         Note that events have a different format depending on the room version - check the
-        `room version specification`_ for precise event formats. **The request and response
+        [room version specification](/#room-versions) for precise event formats. **The request and response
         bodies here describe the common event fields in more detail and may be missing other
         required fields for a PDU.**
       operationId: sendInviteV2
@@ -111,7 +111,7 @@ paths:
           description: |-
             The event with the invited server's signature added. All other fields of the events
             should remain untouched. Note that events have a different format depending on the
-            room version - check the `room version specification`_ for precise event formats.
+            room version - check the [room version specification](/#room-versions) for precise event formats.
           schema:
             type: object
             description: An object containing the signed invite event.
diff --git a/data/api/server-server/joins-v1.yaml b/data/api/server-server/joins-v1.yaml
index da9485bb..696ca533 100644
--- a/data/api/server-server/joins-v1.yaml
+++ b/data/api/server-server/joins-v1.yaml
@@ -62,9 +62,9 @@ paths:
       responses:
         200:
           description: |-
-            A template to be used for the rest of the `Joining Rooms`_ handshake. Note that
+            A template to be used for the rest of the [Joining Rooms](/server-server-api/#joining-rooms) handshake. Note that
             events have a different format depending on the room version - check the
-            `room version specification`_ for precise event formats. **The response body
+            [room version specification](/#room-versions) for precise event formats. **The response body
             here describes the common event fields in more detail and may be missing other
             required fields for a PDU.**
           schema:
@@ -79,7 +79,7 @@ paths:
               event:
                 description: |-
                   An unsigned template event. Note that events have a different format
-                  depending on the room version - check the `room version specification`_
+                  depending on the room version - check the [room version specification](/#room-versions)
                   for precise event formats.
                 type: object
                 title: Event Template
@@ -182,7 +182,7 @@ paths:
         Submits a signed join event to the resident server for it
         to accept it into the room's graph. Note that events have
         a different format depending on the room version - check
-        the `room version specification`_ for precise event formats.
+        the [room version specification](/#room-versions) for precise event formats.
         **The request and response body here describe the common
         event fields in more detail and may be missing other required
         fields for a PDU.**
diff --git a/data/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml
index 94cdef19..de5c5711 100644
--- a/data/api/server-server/joins-v2.yaml
+++ b/data/api/server-server/joins-v2.yaml
@@ -45,7 +45,7 @@ paths:
         Submits a signed join event to the resident server for it
         to accept it into the room's graph. Note that events have
         a different format depending on the room version - check
-        the `room version specification`_ for precise event formats.
+        the [room version specification](/#room-versions) for precise event formats.
         **The request and response body here describe the common
         event fields in more detail and may be missing other required
         fields for a PDU.**
diff --git a/data/api/server-server/leaving-v1.yaml b/data/api/server-server/leaving-v1.yaml
index 2579d68c..ce96ab4a 100644
--- a/data/api/server-server/leaving-v1.yaml
+++ b/data/api/server-server/leaving-v1.yaml
@@ -55,7 +55,7 @@ paths:
           description: |-
             A template to be used to call `/send_leave`. Note that
             events have a different format depending on the room version - check the
-            `room version specification`_ for precise event formats. **The response body
+            [room version specification](/#room-versions) for precise event formats. **The response body
             here describes the common event fields in more detail and may be missing other
             required fields for a PDU.**
           schema:
@@ -70,7 +70,7 @@ paths:
               event:
                 description: |-
                   An unsigned template event. Note that events have a different format
-                  depending on the room version - check the `room version specification`_
+                  depending on the room version - check the [room version specification](/#room-versions)
                   for precise event formats.
                 type: object
                 title: Event Template
@@ -149,7 +149,7 @@ paths:
         Submits a signed leave event to the resident server for it
         to accept it into the room's graph. Note that events have
         a different format depending on the room version - check
-        the `room version specification`_ for precise event formats.
+        the [room version specification](/#room-versions) for precise event formats.
         **The request and response body here describe the common
         event fields in more detail and may be missing other required
         fields for a PDU.**
diff --git a/data/api/server-server/leaving-v2.yaml b/data/api/server-server/leaving-v2.yaml
index bd1023fe..28a41759 100644
--- a/data/api/server-server/leaving-v2.yaml
+++ b/data/api/server-server/leaving-v2.yaml
@@ -45,7 +45,7 @@ paths:
         Submits a signed leave event to the resident server for it
         to accept it into the room's graph. Note that events have
         a different format depending on the room version - check
-        the `room version specification`_ for precise event formats.
+        the [room version specification](/#room-versions) for precise event formats.
         **The request and response body here describe the common
         event fields in more detail and may be missing other required
         fields for a PDU.**
diff --git a/data/api/server-server/third_party_invite.yaml b/data/api/server-server/third_party_invite.yaml
index f9a2bf76..9a636aa9 100644
--- a/data/api/server-server/third_party_invite.yaml
+++ b/data/api/server-server/third_party_invite.yaml
@@ -33,7 +33,7 @@ paths:
       description: |-
         The receiving server will verify the partial `m.room.member` event
         given in the request body. If valid, the receiving server will issue
-        an invite as per the `Inviting to a room`_ section before returning a
+        an invite as per the [Inviting to a room](/server-server-api/#inviting-to-a-room) section before returning a
         response to this request.
       operationId: exchangeThirdPartyInvite
       security:
@@ -111,7 +111,7 @@ paths:
                               The server signatures for this event.
 
                               The signature is calculated using the process
-                              described at `Signing JSON`_.
+                              described at [Signing JSON](/appendices/#signing-json).
                             example: {
                               "magic.forest": {
                                 "ed25519:3": "fQpGIW1Snz+pwLZu6sTy2aHy/DYWWTspTJRPyNp0PKkymfIsNffysMl6ObMMFdIJhk6g6pwlIqZ54rxo8SLmAg"
diff --git a/data/api/server-server/transactions.yaml b/data/api/server-server/transactions.yaml
index 8690c7aa..15b3ee36 100644
--- a/data/api/server-server/transactions.yaml
+++ b/data/api/server-server/transactions.yaml
@@ -39,7 +39,7 @@ paths:
         transaction with a different `txnId` to the receiving server.
 
         Note that events have a different format depending on the room version - check
-        the `room version specification`_ for precise event formats.
+        the [room version specification](/#room-versions) for precise event formats.
       operationId: sendTransaction
       security:
         - signedRequest: []
diff --git a/data/api/server-server/user_keys.yaml b/data/api/server-server/user_keys.yaml
index bcda1737..e1601e33 100644
--- a/data/api/server-server/user_keys.yaml
+++ b/data/api/server-server/user_keys.yaml
@@ -74,7 +74,7 @@ paths:
                   One-time keys for the queried devices. A map from user ID, to a
                   map from devices to a map from `<algorithm>:<key_id>` to the key object.
 
-                  See the `Client-Server Key Algorithms`_ section for more information on
+                  See the [Client-Server Key Algorithms](/client-server-api/#key-algorithms) section for more information on
                   the Key Object format.
                 additionalProperties:
                   type: object
@@ -97,8 +97,7 @@ paths:
                             description: |-
                               Signature of the key object.
 
-                              The signature is calculated using the process described at `Signing
-                              JSON`_.
+                              The signature is calculated using the process described at [Signing JSON](/appendices/#signing-json).
                         required: ['key', 'signatures']
                 example: {
                   "@alice:example.com": {
diff --git a/data/api/server-server/wellknown.yaml b/data/api/server-server/wellknown.yaml
index 24d2ae42..54da2c75 100644
--- a/data/api/server-server/wellknown.yaml
+++ b/data/api/server-server/wellknown.yaml
@@ -50,4 +50,4 @@ paths:
                 description: |-
                   The server name to delegate server-server communciations to, with optional
                   port. The delegated server name uses the same grammar as
-                  `server names in the appendices <../appendices.html#server-name>`_.
+                  [server names in the appendices](/appendices/#server-name).
diff --git a/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml b/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
index 0958fc8a..b83bf6c1 100644
--- a/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
+++ b/data/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
@@ -19,13 +19,14 @@ properties:
     type: integer
   thumbnail_url:
     description: |-
-      The URL (typically `MXC URI`_) to a thumbnail of the image.
+      The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris)) to a thumbnail of the image.
       Only present if the thumbnail is unencrypted.
     type: string
   thumbnail_file:
     description: |-
       Information on the encrypted thumbnail file, as specified in
-      |encrypted_files|_. Only present if the thumbnail is encrypted.
+      [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
+      Only present if the thumbnail is encrypted.
     title: EncryptedFile
     type: object
   thumbnail_info:
diff --git a/data/event-schemas/schema/m.dummy.yaml b/data/event-schemas/schema/m.dummy.yaml
index 6677cacf..4699dd86 100644
--- a/data/event-schemas/schema/m.dummy.yaml
+++ b/data/event-schemas/schema/m.dummy.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to indicate new Olm sessions for end-to-end encryption.
-  Typically it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_
+  Typically it is encrypted as an `m.room.encrypted` event, then sent as a [to-device](/client-server-api/#send-to-device-messaging)
   event.
 
   The event does not have any content associated with it. The sending client is expected
diff --git a/data/event-schemas/schema/m.forwarded_room_key.yaml b/data/event-schemas/schema/m.forwarded_room_key.yaml
index a7b45b69..71ea6690 100644
--- a/data/event-schemas/schema/m.forwarded_room_key.yaml
+++ b/data/event-schemas/schema/m.forwarded_room_key.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to forward keys for end-to-end encryption. Typically
-  it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_
+  it is encrypted as an `m.room.encrypted` event, then sent as a [to-device](/client-server-api/#send-to-device-messaging)
   event.
 properties:
   content:
@@ -48,7 +48,7 @@ properties:
         description: |-
           Indicates that the key cannot be used to decrypt all the messages
           from the session because a portion of the session was withheld as
-          described in `Reporting that decryption keys are withheld`_. This
+          described in [Reporting that decryption keys are withheld](/client-server-api/#reporting-that-decryption-keys-are-withheld). This
           object must include the `code` and `reason` properties from the
           `m.room_key.withheld` message that was received by the sender of
           this message.
diff --git a/data/event-schemas/schema/m.key.verification.accept.yaml b/data/event-schemas/schema/m.key.verification.accept.yaml
index d3cdbc67..92ff6dfc 100644
--- a/data/event-schemas/schema/m.key.verification.accept.yaml
+++ b/data/event-schemas/schema/m.key.verification.accept.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   Accepts a previously sent `m.key.verification.start` message. Typically sent as a
-  `to-device`_ event.
+  [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.cancel.yaml b/data/event-schemas/schema/m.key.verification.cancel.yaml
index 7f11b877..f51670d9 100644
--- a/data/event-schemas/schema/m.key.verification.cancel.yaml
+++ b/data/event-schemas/schema/m.key.verification.cancel.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Cancels a key verification process/request. Typically sent as a `to-device`_ event.
+  Cancels a key verification process/request. Typically sent as a [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.key.yaml b/data/event-schemas/schema/m.key.verification.key.yaml
index b8c14797..34993bd4 100644
--- a/data/event-schemas/schema/m.key.verification.key.yaml
+++ b/data/event-schemas/schema/m.key.verification.key.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   Sends the ephemeral public key for a device to the partner device. Typically sent as a
-  `to-device`_ event.
+  [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.mac.yaml b/data/event-schemas/schema/m.key.verification.mac.yaml
index fb06cfc2..eec5d65b 100644
--- a/data/event-schemas/schema/m.key.verification.mac.yaml
+++ b/data/event-schemas/schema/m.key.verification.mac.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   Sends the MAC of a device's key to the partner device. Typically sent as a
-  `to-device`_ event.
+  [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.request.yaml b/data/event-schemas/schema/m.key.verification.request.yaml
index c9efa14e..05e88b0f 100644
--- a/data/event-schemas/schema/m.key.verification.request.yaml
+++ b/data/event-schemas/schema/m.key.verification.request.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   Requests a key verification with another user's devices. Typically sent as a
-  `to-device`_ event.
+  [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
index 621c9382..aa833549 100644
--- a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
+++ b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Begins a SAS key verification process using the `m.sas.v1` method. Typically sent as a `to-device`_ event.
+  Begins a SAS key verification process using the `m.sas.v1` method. Typically sent as a [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.key.verification.start.yaml b/data/event-schemas/schema/m.key.verification.start.yaml
index 17341a3d..0cc60cb2 100644
--- a/data/event-schemas/schema/m.key.verification.start.yaml
+++ b/data/event-schemas/schema/m.key.verification.start.yaml
@@ -3,7 +3,7 @@ allOf:
   - $ref: core-event-schema/event.yaml
 
 description: |-
-  Begins a key verification process. Typically sent as a `to-device`_ event. The `method`
+  Begins a key verification process. Typically sent as a [to-device](/client-server-api/#send-to-device-messaging) event. The `method`
   field determines the type of verification. The fields in the event will differ depending
   on the `method`. This definition includes fields that are in common among all variants.
 properties:
diff --git a/data/event-schemas/schema/m.room.encrypted.yaml b/data/event-schemas/schema/m.room.encrypted.yaml
index 44b09c3f..32e86902 100644
--- a/data/event-schemas/schema/m.room.encrypted.yaml
+++ b/data/event-schemas/schema/m.room.encrypted.yaml
@@ -4,8 +4,8 @@ allOf:
 
 description: |-
   This event type is used when sending encrypted events. It can be used either
-  within a room (in which case it will have all of the `Room Event fields`_), or
-  as a `to-device`_ event.
+  within a room (in which case it will have all of the [Room Event fields](/client-server-api/#room-event-fields)), or
+  as a [to-device](/client-server-api/#send-to-device-messaging) event.
 
 properties:
   content:
@@ -37,7 +37,7 @@ properties:
           The encrypted content of the event. Either the encrypted payload
           itself, in the case of a Megolm event, or a map from the recipient
           Curve25519 identity key to ciphertext information, in the case of an
-          Olm event. For more details, see `Messaging Algorithms`_.
+          Olm event. For more details, see [Messaging Algorithms](/client-server-api/#messaging-algorithms).
       sender_key:
         type: string
         description: The Curve25519 key of the sender.
diff --git a/data/event-schemas/schema/m.room.member.yaml b/data/event-schemas/schema/m.room.member.yaml
index 3afc6bb9..e3abdb0c 100644
--- a/data/event-schemas/schema/m.room.member.yaml
+++ b/data/event-schemas/schema/m.room.member.yaml
@@ -65,7 +65,7 @@ properties:
           - ban
         type: string
       is_direct:
-        description: Flag indicating if the room containing this event was created with the intention of being a direct chat. See `Direct Messaging`_.
+        description: Flag indicating if the room containing this event was created with the intention of being a direct chat. See [Direct Messaging](/client-server-api/#direct-messaging).
         type: boolean
       reason:
         type: string
diff --git a/data/event-schemas/schema/m.room.message$m.audio.yaml b/data/event-schemas/schema/m.room.message$m.audio.yaml
index ce59820c..3faf0c31 100644
--- a/data/event-schemas/schema/m.room.message$m.audio.yaml
+++ b/data/event-schemas/schema/m.room.message$m.audio.yaml
@@ -28,13 +28,14 @@ properties:
         type: string
       url:
         description: |-
-          Required if the file is unencrypted. The URL (typically `MXC URI`_)
+          Required if the file is unencrypted. The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris))
           to the audio clip.
         type: string
       file:
         description: |-
           Required if the file is encrypted. Information on the encrypted
-          file, as specified in |encrypted_files|_.
+          file, as specified in
+          [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
         title: EncryptedFile
         type: object
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.file.yaml b/data/event-schemas/schema/m.room.message$m.file.yaml
index a3466f78..5958e117 100644
--- a/data/event-schemas/schema/m.room.message$m.file.yaml
+++ b/data/event-schemas/schema/m.room.message$m.file.yaml
@@ -28,7 +28,8 @@ properties:
           thumbnail_file:
             description: |-
               Information on the encrypted thumbnail file, as specified in
-              |encrypted_files|_. Only present if the thumbnail is encrypted.
+              [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
+              Only present if the thumbnail is encrypted.
             title: EncryptedFile
             type: object
           thumbnail_info:
@@ -43,13 +44,14 @@ properties:
         type: string
       url:
         description: |-
-          Required if the file is unencrypted. The URL (typically `MXC URI`_)
+          Required if the file is unencrypted. The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris))
           to the file.
         type: string
       file:
         description: |-
           Required if the file is encrypted. Information on the encrypted
-          file, as specified in |encrypted_files|_.
+          file, as specified in
+          [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
         title: EncryptedFile
         type: object
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.image.yaml b/data/event-schemas/schema/m.room.message$m.image.yaml
index 98d201f4..5eaa89d4 100644
--- a/data/event-schemas/schema/m.room.message$m.image.yaml
+++ b/data/event-schemas/schema/m.room.message$m.image.yaml
@@ -18,13 +18,14 @@ properties:
         type: string
       url:
         description: |-
-          Required if the file is unencrypted. The URL (typically `MXC URI`_)
+          Required if the file is unencrypted. The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris))
           to the image.
         type: string
       file:
         description: |-
           Required if the file is encrypted. Information on the encrypted
-          file, as specified in |encrypted_files|_.
+          file, as specified in
+          [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
         title: EncryptedFile
         type: object
     required:
diff --git a/data/event-schemas/schema/m.room.message$m.location.yaml b/data/event-schemas/schema/m.room.message$m.location.yaml
index cc52bb97..5ddf68b7 100644
--- a/data/event-schemas/schema/m.room.message$m.location.yaml
+++ b/data/event-schemas/schema/m.room.message$m.location.yaml
@@ -26,7 +26,8 @@ properties:
           thumbnail_file:
             description: |-
               Information on the encrypted thumbnail file, as specified in
-              |encrypted_files|_. Only present if the thumbnail is encrypted.
+              [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
+              Only present if the thumbnail is encrypted.
             title: EncryptedFile
             type: object
           thumbnail_info:
diff --git a/data/event-schemas/schema/m.room.message$m.video.yaml b/data/event-schemas/schema/m.room.message$m.video.yaml
index 9bf3e09c..1879df65 100644
--- a/data/event-schemas/schema/m.room.message$m.video.yaml
+++ b/data/event-schemas/schema/m.room.message$m.video.yaml
@@ -28,13 +28,14 @@ properties:
             type: integer
           thumbnail_url:
             description: |-
-              The URL (typically `MXC URI`_) to an image thumbnail of
+              The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris)) to an image thumbnail of
               the video clip. Only present if the thumbnail is unencrypted.
             type: string
           thumbnail_file:
             description: |-
               Information on the encrypted thumbnail file, as specified in
-              |encrypted_files|_. Only present if the thumbnail is encrypted.
+              [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
+              Only present if the thumbnail is encrypted.
             title: EncryptedFile
             type: object
           thumbnail_info:
@@ -49,13 +50,14 @@ properties:
         type: string
       url:
         description: |-
-          Required if the file is unencrypted. The URL (typically `MXC URI`_)
+          Required if the file is unencrypted. The URL (typically [MXC URI](/client-server-api/#matrix-content-mxc-uris))
           to the video clip.
         type: string
       file:
         description: |-
           Required if the file is encrypted. Information on the encrypted
-          file, as specified in |encrypted_files|_.
+          file, as specified in
+          [End-to-end encryption](/client-server-api/#sending-encrypted-attachments).
         title: EncryptedFile
         type: object
     required:
diff --git a/data/event-schemas/schema/m.room.message.feedback.yaml b/data/event-schemas/schema/m.room.message.feedback.yaml
index dc8f4b58..fbb39c0a 100644
--- a/data/event-schemas/schema/m.room.message.feedback.yaml
+++ b/data/event-schemas/schema/m.room.message.feedback.yaml
@@ -1,7 +1,7 @@
 ---
 allOf:
   - $ref: core-event-schema/room_event.yaml
-description: '**NB: Usage of this event is discouraged in favour of the** `receipts module`_. **Most clients will not recognise this event.** Feedback events are events sent to acknowledge a message in some way. There are two supported acknowledgements: `delivered` (sent when the event has been received) and `read` (sent when the event has been observed by the end-user). The `target_event_id` should reference the `m.room.message` event being acknowledged.'
+description: '**NB: Usage of this event is discouraged in favour of the** [receipts module](/client-server-api/#receipts). **Most clients will not recognise this event.** Feedback events are events sent to acknowledge a message in some way. There are two supported acknowledgements: `delivered` (sent when the event has been received) and `read` (sent when the event has been observed by the end-user). The `target_event_id` should reference the `m.room.message` event being acknowledged.'
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room_key.yaml b/data/event-schemas/schema/m.room_key.yaml
index 8f140aab..6eebbec5 100644
--- a/data/event-schemas/schema/m.room_key.yaml
+++ b/data/event-schemas/schema/m.room_key.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to exchange keys for end-to-end encryption. Typically
-  it is encrypted as an `m.room.encrypted` event, then sent as a `to-device`_ event.
+  it is encrypted as an `m.room.encrypted` event, then sent as a [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:
diff --git a/data/event-schemas/schema/m.room_key_request.yaml b/data/event-schemas/schema/m.room_key_request.yaml
index a456b8fe..99afdb19 100644
--- a/data/event-schemas/schema/m.room_key_request.yaml
+++ b/data/event-schemas/schema/m.room_key_request.yaml
@@ -4,7 +4,7 @@ allOf:
 
 description: |-
   This event type is used to request keys for end-to-end encryption. It is sent as an
-  unencrypted `to-device`_ event.
+  unencrypted [to-device](/client-server-api/#send-to-device-messaging) event.
 properties:
   content:
     properties:

From 215b625d813672c8f9e9cac49e87217c9cdeddd2 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 10:27:55 -0800
Subject: [PATCH 08/19] Replace csv table with GFM table

---
 data/event-schemas/schema/m.room.member.yaml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/data/event-schemas/schema/m.room.member.yaml b/data/event-schemas/schema/m.room.member.yaml
index e3abdb0c..181c5737 100644
--- a/data/event-schemas/schema/m.room.member.yaml
+++ b/data/event-schemas/schema/m.room.member.yaml
@@ -31,18 +31,13 @@ description: |-
   from the `prev_content` object on an event. If not present, the user's previous membership must be assumed
   as `leave`.
 
-  .. TODO: Improve how this table is written? We use a csv-table to get around vertical header restrictions.
-
-  .. csv-table::
-    :header-rows: 1
-    :stub-columns: 1
-
-    "","to `invite`","to `join`","to `leave`","to `ban`","to `knock`"
-    "from `invite`","No change.","User joined the room.","If the `state_key` is the same as the `sender`, the user rejected the invite. Otherwise, the `state_key` user had their invite revoked.","User was banned.","Not implemented."
-    "from `join`","Must never happen.","`displayname` or `avatar_url` changed.","If the `state_key` is the same as the `sender`, the user left. Otherwise, the `state_key` user was kicked.","User was kicked and banned.","Not implemented."
-    "from `leave`","New invitation sent.","User joined.","No change.","User was banned.","Not implemented."
-    "from `ban`","Must never happen.","Must never happen.","User was unbanned.","No change.","Not implemented."
-    "from `knock`","Not implemented.","Not implemented.","Not implemented.","Not implemented.","Not implemented."
+  |                   | to `invite`         | to `join`                              | to `leave`                                                                                                                              | to `ban`                    | to `knock`       |
+  |-------------------|---------------------|----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|-----------------------------|------------------|
+  | **from `invite`** | No change.          | User joined the room.                  | If the `state_key` is the same as the `sender`, the user rejected the invite. Otherwise, the `state_key` user had their invite revoked. | User was banned.            | Not implemented. |
+  | **from `join`**   |Must never happen.   | `displayname` or `avatar_url` changed. | If the `state_key` is the same as the `sender`, the user left. Otherwise, the `state_key` user was kicked.                              | User was kicked and banned. | Not implemented. |
+  | **from `leave`**  |New invitation sent. | User joined.                           | No change.                                                                                                                              | User was banned.            | Not implemented. |
+  | **from `ban`**    |Must never happen.   | Must never happen.                     | User was unbanned.                                                                                                                      | No change.                  | Not implemented. |
+  | **from `knock`**  |Not implemented.     | Not implemented.                       | Not implemented.                                                                                                                        | Not implemented.            | Not implemented. |
 
 properties:
   content:

From 06983e1eb177b90c1370ee19b46a0cd6597a55f5 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 10:28:38 -0800
Subject: [PATCH 09/19] Remove RST comment, add bullets into list

---
 .../schema/m.key.verification.cancel.yaml     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/data/event-schemas/schema/m.key.verification.cancel.yaml b/data/event-schemas/schema/m.key.verification.cancel.yaml
index f51670d9..1c6cd841 100644
--- a/data/event-schemas/schema/m.key.verification.cancel.yaml
+++ b/data/event-schemas/schema/m.key.verification.cancel.yaml
@@ -27,28 +27,28 @@ properties:
           codes should use the Java package naming convention if not in the following
           list:
 
-          `m.user`: The user cancelled the verification.
+          * `m.user`: The user cancelled the verification.
 
-          `m.timeout`: The verification process timed out. Verification processes
+          * `m.timeout`: The verification process timed out. Verification processes
           can define their own timeout parameters.
 
-          `m.unknown_transaction`: The device does not know about the given transaction
+          * `m.unknown_transaction`: The device does not know about the given transaction
           ID.
 
-          `m.unknown_method`: The device does not know how to handle the requested
+          * `m.unknown_method`: The device does not know how to handle the requested
           method. This should be sent for `m.key.verification.start` messages and
           messages defined by individual verification processes.
 
-          `m.unexpected_message`: The device received an unexpected message. Typically
+          * `m.unexpected_message`: The device received an unexpected message. Typically
           raised when one of the parties is handling the verification out of order.
 
-          `m.key_mismatch`: The key was not verified.
+          * `m.key_mismatch`: The key was not verified.
 
-          `m.user_mismatch`: The expected user did not match the user verified.
+          * `m.user_mismatch`: The expected user did not match the user verified.
 
-          `m.invalid_message`: The message received was invalid.
+          * `m.invalid_message`: The message received was invalid.
 
-          `m.accepted`: A `m.key.verification.request` was accepted by a different
+          * `m.accepted`: A `m.key.verification.request` was accepted by a different
             device. The device receiving this error can ignore the verification request.
 
           Clients should be careful to avoid error loops. For example, if a device sends
@@ -56,8 +56,6 @@ properties:
           gets an unexpected response with `m.unexpected_message`, the client should not
           respond again with `m.unexpected_message` to avoid the other device potentially
           sending another error response.
-
-          .. The above blank line is important for RST.
     required:
       - transaction_id
       - code

From 5f45a897ef713d752030bd3741660749b1f58aaf Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 15:30:39 -0800
Subject: [PATCH 10/19] Add templates used to render data

---
 layouts/partials/events/render-event.html     | 93 ++++++++++++++++++
 .../json-schema/resolve-additional-types.html | 92 ++++++++++++++++++
 .../partials/json-schema/resolve-allof.html   | 76 +++++++++++++++
 .../partials/json-schema/resolve-example.html | 29 ++++++
 .../partials/json-schema/resolve-refs.html    | 65 +++++++++++++
 layouts/partials/openapi/render-api.html      | 54 +++++++++++
 .../partials/openapi/render-object-table.html | 92 ++++++++++++++++++
 .../partials/openapi/render-operation.html    | 65 +++++++++++++
 .../partials/openapi/render-parameters.html   | 30 ++++++
 layouts/partials/openapi/render-request.html  | 67 +++++++++++++
 .../partials/openapi/render-responses.html    | 97 +++++++++++++++++++
 layouts/shortcodes/definition.html            | 59 +++++++++++
 layouts/shortcodes/event-fields.html          | 45 +++++++++
 layouts/shortcodes/event-group.html           | 32 ++++++
 layouts/shortcodes/event.html                 | 20 ++++
 layouts/shortcodes/http-api.html              | 26 +++++
 layouts/shortcodes/msgtypes.html              | 48 +++++++++
 17 files changed, 990 insertions(+)
 create mode 100644 layouts/partials/events/render-event.html
 create mode 100644 layouts/partials/json-schema/resolve-additional-types.html
 create mode 100644 layouts/partials/json-schema/resolve-allof.html
 create mode 100644 layouts/partials/json-schema/resolve-example.html
 create mode 100644 layouts/partials/json-schema/resolve-refs.html
 create mode 100644 layouts/partials/openapi/render-api.html
 create mode 100644 layouts/partials/openapi/render-object-table.html
 create mode 100644 layouts/partials/openapi/render-operation.html
 create mode 100644 layouts/partials/openapi/render-parameters.html
 create mode 100644 layouts/partials/openapi/render-request.html
 create mode 100644 layouts/partials/openapi/render-responses.html
 create mode 100644 layouts/shortcodes/definition.html
 create mode 100644 layouts/shortcodes/event-fields.html
 create mode 100644 layouts/shortcodes/event-group.html
 create mode 100644 layouts/shortcodes/event.html
 create mode 100644 layouts/shortcodes/http-api.html
 create mode 100644 layouts/shortcodes/msgtypes.html

diff --git a/layouts/partials/events/render-event.html b/layouts/partials/events/render-event.html
new file mode 100644
index 00000000..b4bb75b4
--- /dev/null
+++ b/layouts/partials/events/render-event.html
@@ -0,0 +1,93 @@
+{{/*
+
+  Renders a single event, given:
+
+    * `event_name`: the name we want to display for the event
+    * `event_data`: the event specification
+    * `desired_example_name` (optional): the exact name of the examples to render.
+    If `desired_example_name` is omitted we render all examples
+    whose names start with the `event_name`.
+
+*/}}
+
+{{ $event_name := .event_name }}
+{{ $desired_example_name := .desired_example_name }}
+{{ $event_data := .event_data }}
+
+<section class="rendered-data event">
+
+<details {{ if not .Site.Params.ui.rendered_data_collapsed }}open{{ end }}>
+<summary>
+
+  <h1 id="{{ anchorize $event_name }}">
+   <code>{{ $event_name }}</code>
+  </h1>
+
+  <hr/>
+
+{{ $event_data.description | markdownify }}
+
+</summary>
+
+{{ $state_key := index $event_data.properties "state_key" }}
+
+<table class="basic-info">
+  <tr>
+   <th>Event type:</th>
+   <td>{{ if $state_key }}State event{{ else }}Message event{{ end }}</td>
+  </tr>
+{{ if $state_key }}
+  <tr>
+   <th>State key</th>
+   <td>{{ $state_key.description | markdownify }}</td>
+ </tr>
+{{ end }}
+</table>
+
+<h2>Content</h2>
+
+{{ $additional_types := partial "json-schema/resolve-additional-types" $event_data.properties.content }}
+
+{{ range $additional_types }}
+    {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
+{{end}}
+
+<h2>Examples</h2>
+
+{{ $all_examples := index site.Data "event-schemas" "examples" }}
+
+{{ range $example_name, $example := $all_examples }}
+
+    {{/*
+      This is to allow the msgtype template to work.
+      It lets callers specify exactly the name of the example they want
+    */}}
+    {{ if $desired_example_name }}
+        {{ if eq $example_name $desired_example_name }}
+            {{ $example_content := partial "json-schema/resolve-refs" (dict "schema" $example "path" "event-schemas/examples") }}
+```json
+{{ jsonify (dict "indent" "  ") $example_content }}
+```
+        {{ end }}
+    {{/*
+      If `$desired_example_name` is not given, we will include any
+      examples whose first part (before "$") matches the event name
+    */}}
+    {{ else }}
+
+        {{ $pieces := split $example_name "$" }}
+        {{ $example_base_name := index $pieces 0 }}
+        {{ if eq $event_name $example_base_name }}
+            {{ $example_content := partial "json-schema/resolve-refs" (dict "schema" $example "path" "event-schemas/examples") }}
+            {{ $example_json := jsonify (dict "indent" "  ") $example_content }}
+            {{ $example_json = replace $example_json "\\u003c" "<" }}
+            {{ $example_json = replace $example_json "\\u003e" ">" | safeHTML }}
+
+```json
+{{ $example_json }}
+```
+        {{ end }}
+    {{ end }}
+{{ end }}
+
+</section>
diff --git a/layouts/partials/json-schema/resolve-additional-types.html b/layouts/partials/json-schema/resolve-additional-types.html
new file mode 100644
index 00000000..a4f95445
--- /dev/null
+++ b/layouts/partials/json-schema/resolve-additional-types.html
@@ -0,0 +1,92 @@
+{{/*
+
+  Finds and returns all nested objects, given:
+
+  * `this_object`: a JSON schema object
+
+  Given a schema object, this template finds all nested objects under that
+  schema.
+
+  It "cleans" each object by copying only the parts of the objects that
+  the renderer needs, and adds the result to an array, `additional_objects`.
+
+  Finally it returns the array of all the objects it found.
+
+  Note that the returned array may contain duplicate objects.
+
+*/}}
+
+{{ $this_object := partial "json-schema/resolve-allof" . }}
+{{ $additional_objects := slice }}
+
+{{ if eq $this_object.type "object" }}
+
+    {{/*
+      Add the object we were passed into the $additional_objects array
+    */}}
+    {{ $additional_objects = $additional_objects | append (partial "clean-object" $this_object) }}
+
+    {{/*
+      Add any nested objects referenced in this object's `additionalProperties`
+    */}}
+    {{ if $this_object.additionalProperties }}
+        {{ if reflect.IsMap $this_object.additionalProperties }}
+            {{ $additional_objects = $additional_objects | append (partial "clean-object" $this_object.additionalProperties) }}
+
+            {{ range $key, $property := $this_object.additionalProperties.properties }}
+                {{ $additional_objects = partial "get-additional-objects" (dict "this_object" $property "additional_objects" $additional_objects) }}
+            {{ end }}
+
+        {{ end }}
+    {{ end }}
+
+    {{/*
+      Add any nested objects referenced in this object's `properties`
+    */}}
+    {{ range $key, $property := $this_object.properties}}
+        {{ $additional_objects = partial "get-additional-objects" (dict "this_object" $property "additional_objects" $additional_objects) }}
+    {{ end }}
+
+{{ end }}
+
+{{ if eq $this_object.type "array" }}
+    {{/*
+      Add any nested objects referenced in this object's `items`
+    */}}
+    {{ if reflect.IsSlice $this_object.items}}
+        {{ range $this_object.items }}
+            {{ $additional_objects = partial "get-additional-objects" (dict "this_object" . "additional_objects" $additional_objects) }}
+        {{ end }}
+    {{ else }}
+        {{ $additional_objects = partial "get-additional-objects" (dict "this_object" $this_object.items "additional_objects" $additional_objects) }}
+    {{ end }}
+{{ end }}
+
+{{ return $additional_objects }}
+
+
+{{/*
+  This actually makes the recursive call and adds the returned objects to the array
+*/}}
+{{ define "partials/get-additional-objects" }}
+    {{ $additional_objects := .additional_objects }}
+
+    {{ $this_object := partial "json-schema/resolve-allof" .this_object }}
+    {{ $more_objects := partial "json-schema/resolve-additional-types" $this_object }}
+    {{/*
+      As far as I know we don't have something like Array.concat(), so add them one at a time
+    */}}
+    {{ range $more_objects}}
+        {{ $additional_objects = $additional_objects | append (partial "clean-object" .) }}
+    {{ end }}
+    {{ return $additional_objects }}
+{{ end }}
+
+{{/*
+  Only copy the bits of the object that we actually care about.
+  This is needed for uniqify to work - otherwise objects that are the same
+  but with (for example) different examples will be considered differen.
+*/}}
+{{ define "partials/clean-object" }}
+    {{ return (dict "title" .title "properties" .properties "required" .required "enum" .enum) }}
+{{ end }}
diff --git a/layouts/partials/json-schema/resolve-allof.html b/layouts/partials/json-schema/resolve-allof.html
new file mode 100644
index 00000000..0150cfde
--- /dev/null
+++ b/layouts/partials/json-schema/resolve-allof.html
@@ -0,0 +1,76 @@
+{{/*
+
+  Resolves the `allOf` keyword (https://swagger.io/specification/v2/#composition-and-inheritance-polymorphism),
+  given a JSON schema object.
+
+  `allOf` is used to support a kind of inheritance for JSON schema objects.
+
+  An object can reference a "parent" object using `allOf`, and it then inherits
+  its parent's properties. If the same property is present in the child, then
+  we use the child's version (the child overrides the parent).
+
+  Of course the parent can itself inherit from *its* parent, so we recurse to
+  handle that.
+
+*/}}
+
+{{ $ret := . }}
+{{ $original := . }}
+
+{{ $required := .required }}
+{{ if not $required }}
+    {{ $required := slice }}
+{{ end }}
+
+{{ with $ret.allOf }}
+
+    {{ $all_of_values := dict }}
+
+    {{/*
+      allOf is always an array
+    */}}
+    {{ range . }}
+
+        {{ with .required }}
+            {{ $required = union $required . }}
+        {{ end }}
+
+        {{/*
+          With merge, values from the second argument override those from the first argument.
+          So this order will accumulate values from allOf items, allowing later ones to override earlier
+        */}}
+        {{ $all_of_values = merge $all_of_values . }}
+
+    {{ end }}
+
+    {{/*
+      Then apply allOf values to the original, but allow the original to override allOf.
+    */}}
+    {{ $ret = merge $all_of_values $ret }}
+
+    {{/*
+      Except that if allOf *itself* contains allOf, we do want to override the original for that field only.
+    */}}
+    {{ with $all_of_values.allOf }}
+        {{ $ret = merge $ret (dict "allOf" . ) }}
+    {{ end }}
+
+    {{ with $ret.required }}
+        {{ $required = union $required $ret.required }}
+    {{ end }}
+
+    {{ $ret = merge $ret (dict "required" $required) }}
+
+{{ end }}
+
+{{/*
+  Recurse while we are finding new allOf entries to resolve
+*/}}
+{{ if ne $ret.allOf $original.allOf }}
+
+    {{ $resolved := partial "json-schema/resolve-allof" $ret }}
+    {{ $ret = merge $ret $resolved }}
+
+{{ end }}
+
+{{ return $ret }}
diff --git a/layouts/partials/json-schema/resolve-example.html b/layouts/partials/json-schema/resolve-example.html
new file mode 100644
index 00000000..51ce6d53
--- /dev/null
+++ b/layouts/partials/json-schema/resolve-example.html
@@ -0,0 +1,29 @@
+{{/*
+
+  For complex objects, example content is sometimes attached to the
+  object's individual properties (and subproperties...), so to get
+  a complete example for the whole object we need to iterate through
+  its properties (and subproperties...) and assemble them.
+
+  That's what this template does.
+
+*/}}
+
+{{ $this_object := partial "json-schema/resolve-allof" . }}
+
+{{ if eq $this_object.type "object" }}
+
+    {{ if not $this_object.example }}
+        {{ $this_object := merge (dict "example" dict ) $this_object }}
+    {{ end }}
+
+    {{ range $key, $property := $this_object.properties}}
+        {{ $this_property_example := partial "json-schema/resolve-example" $property }}
+        {{ if $this_property_example }}
+            {{ $this_object = merge (dict "example" (dict $key $this_property_example)) $this_object }}
+        {{ end }}
+    {{ end }}
+
+{{ end }}
+
+{{ return $this_object.example }}
diff --git a/layouts/partials/json-schema/resolve-refs.html b/layouts/partials/json-schema/resolve-refs.html
new file mode 100644
index 00000000..1d99201d
--- /dev/null
+++ b/layouts/partials/json-schema/resolve-refs.html
@@ -0,0 +1,65 @@
+{{/*
+
+  Resolves the `$ref` JSON schema keyword, by recursively replacing
+  it with the object it points to.
+
+  This template uses [`Scratch`](https://gohugo.io/functions/scratch/)
+  rather than a normal `dict` because with `dict` you can't replace key values:
+  https://discourse.gohugo.io/t/how-can-i-add-set-and-delete-keys-in-a-dictionary/29661
+
+*/}}
+
+{{ $schema := .schema }}
+{{ $path := .path}}
+
+{{ $ret := $schema }}
+
+{{ if reflect.IsMap $schema }}
+
+    {{ $scratch := newScratch }}
+    {{ $scratch.Set "result_map" dict }}
+
+    {{ $ref_value := index $schema "$ref"}}
+    {{ if $ref_value}}
+        {{ $full_path := path.Join $path $ref_value }}
+        {{/*
+          Apparently Hugo doesn't give us a nice way to split the extension off a filename.
+        */}}
+        {{ $without_ext := replaceRE "\\.[^\\.]*$" "" $full_path }}
+        {{ $pieces := split $without_ext "/" }}
+
+        {{ $ref := index site.Data $pieces }}
+
+        {{ $new_path := (path.Split $full_path).Dir}}
+        {{ $result_map := partial "json-schema/resolve-refs" (dict "schema" $ref "path" $new_path)}}
+        {{ if $result_map}}
+            {{ $scratch.Set "result_map" $result_map }}
+        {{end }}
+    {{ end }}
+
+
+    {{ range $key, $value := $schema }}
+        {{ if ne $key "$ref" }}
+            {{ $resolved := partial "json-schema/resolve-refs" (dict "schema" $value "path" $path) }}
+            {{ $scratch.SetInMap "result_map" $key $resolved }}
+        {{ end }}
+    {{ end }}
+
+    {{ $ret = $scratch.Get "result_map" }}
+
+{{ end }}
+
+{{ if reflect.IsSlice $schema }}
+
+    {{ $result_slice := slice }}
+
+    {{ range $schema }}
+        {{ $resolved := partial "json-schema/resolve-refs" (dict "schema" . "path" $path) }}
+        {{ $result_slice = $result_slice | append $resolved }}
+    {{ end }}
+
+    {{ $ret = $result_slice }}
+
+{{ end }}
+
+{{ return $ret }}
diff --git a/layouts/partials/openapi/render-api.html b/layouts/partials/openapi/render-api.html
new file mode 100644
index 00000000..db10b98c
--- /dev/null
+++ b/layouts/partials/openapi/render-api.html
@@ -0,0 +1,54 @@
+{{/*
+
+  Render an HTTP API, given:
+
+  * `api_data`: the OpenAPI/Swagger data
+  * `base_url`: the base URL: that is, the part we glue onto the front
+  of each value in `paths` to get a complete URL.
+  * `path`: the directory under /data where we found this API definition.
+  We use this to resolve "$ref" values, since they are relative to the schema's
+  location.
+
+*/}}
+
+{{ $api_data := index .api_data }}
+{{ $base_url := .base_url }}
+{{ $path := .path }}
+
+{{ range $path_name, $path_data := $api_data.paths }}
+
+    {{ $endpoint := delimit (slice $base_url $path_name ) "" }}
+
+    {{/* note that a `paths` entry can be a $ref */}}
+
+    {{ $params := dict "endpoint" $endpoint "path" $path }}
+
+    {{ with $path_data.get }}
+
+        {{ $operation_params := merge $params (dict "method" "GET" "operation_data" . ) }}
+        {{ partial "openapi/render-operation" $operation_params }}
+
+    {{ end }}
+
+    {{ with $path_data.post }}
+
+        {{ $operation_params := merge $params (dict "method" "POST" "operation_data" . ) }}
+        {{ partial "openapi/render-operation" $operation_params }}
+
+    {{ end }}
+
+    {{ with $path_data.put }}
+
+        {{ $operation_params := merge $params (dict "method" "PUT" "operation_data" . ) }}
+        {{ partial "openapi/render-operation" $operation_params }}
+
+    {{ end }}
+
+    {{ with $path_data.delete }}
+
+        {{ $operation_params := merge $params (dict "method" "DELETE" "operation_data" . ) }}
+        {{ partial "openapi/render-operation" $operation_params }}
+
+    {{ end }}
+
+{{ end }}
diff --git a/layouts/partials/openapi/render-object-table.html b/layouts/partials/openapi/render-object-table.html
new file mode 100644
index 00000000..0f4b3a77
--- /dev/null
+++ b/layouts/partials/openapi/render-object-table.html
@@ -0,0 +1,92 @@
+{{/*
+
+  Render a table listing the properties of an object, given:
+
+  * `caption`: optional caption for the table
+  * `properties`: dictionary of the properties to list, each given as:
+  `property_name` : `property_data`
+  * `required`: array containing the names of required properties.
+  In some cases (such as response body specifications) this isn't used, and
+  instead properties have a `required` boolean attribute. We support this too.
+
+*/}}
+
+{{ $caption := .caption }}
+{{ $properties := .properties}}
+{{ $required := .required}}
+
+{{ if $properties }}
+
+<table class>
+ {{ with $caption }}
+ <caption>{{ . }}</caption>
+ {{ end }}
+ <thead>
+  <th class="col-name">Name</th>
+  <th class="col-type">Type</th>
+  <th class="col-description">Description</th>
+ </thead>
+
+    {{ range $property_name, $property := $properties }}
+
+        {{ $property := partial "json-schema/resolve-allof" $property }}
+
+        {{/*
+            If the property has a `title`, use that rather than `type`.
+            This means we can write things like `EventFilter` rather than `object`.
+        */}}
+        {{ $type := $property.type}}
+        {{ if $property.title }}
+            {{ $type = $property.title }}
+        {{ end }}
+
+        {{/*
+            If the property is an array, indicate this with square brackets,
+            like`[type]`.
+        */}}
+        {{ if eq $type "array"}}
+            {{ $items := $property.items }}
+            {{ if $property.items }}
+                {{ $items = partial "json-schema/resolve-allof" $property.items }}
+            {{ end }}
+            {{ $inner_type := $items.type }}
+            {{ if $items.title }}
+                {{ $inner_type = $items.title }}
+            {{ end }}
+            {{ $type = delimit (slice "[" $inner_type "]") "" }}
+        {{ end }}
+
+        {{/*
+            If the property is an enum, indicate this.
+        */}}
+        {{ if (and (eq $type "string") ($property.enum)) }}
+            {{ $type = "enum" }}
+        {{ end }}
+
+        {{/*
+            If the property uses `additionalProperties` to describe its
+            internal structure, handle this.
+        */}}
+        {{ if reflect.IsMap $property.additionalProperties }}
+            {{ if $property.additionalProperties.title }}
+                {{ $type = delimit (slice "{ string: " $property.additionalProperties.title "}" ) "" }}
+            {{ end }}
+        {{ end }}
+
+        {{/*
+          Handle two ways of indicating "required", one for simple parameters,
+          the other for request and response body objects.
+        */}}
+        {{ $required := cond (or (in $required $property_name) ( eq $property.required true )) true false }}
+
+ <tr>
+  <td><code>{{ $property_name }}</code></td>
+  <td><code>{{ $type }}</code></td>
+  <td>{{ if $required }}<strong>Required: </strong>{{end}}{{ $property.description | markdownify }}{{ if eq $type "enum"}}<p>One of: <code>{{ $property.enum }}</code>.</p>{{ end }}</td>
+ </tr>
+
+    {{ end }}
+
+</table>
+
+{{ end }}
diff --git a/layouts/partials/openapi/render-operation.html b/layouts/partials/openapi/render-operation.html
new file mode 100644
index 00000000..430c571a
--- /dev/null
+++ b/layouts/partials/openapi/render-operation.html
@@ -0,0 +1,65 @@
+{{/*
+
+  Render a single HTTP API operation: that is, a method+endpoint combination, given:
+
+  * `method`: the method, e.g. GET, PUT
+  * `endpoint`: the endpoint
+  * `operation_data`: the OpenAPI/Swagger data for the operation
+  * `path`: the path where this definition was found, to enable us to resolve "$ref"
+
+  This template renders the operation as a `<section>` containing:
+
+    * an `<h1>` heading containing the method and endpoint
+    * a `<details>` element containing the details, including:
+      * operation description
+      * basic info about the operation
+      * request details
+      * response details
+
+*/}}
+
+{{ $method := .method }}
+{{ $endpoint := .endpoint }}
+{{ $operation_data := .operation_data }}
+{{ $path := .path }}
+
+<section class="rendered-data http-api {{ $method }}">
+
+<details {{ if not site.Params.ui.rendered_data_collapsed }}open{{ end }}>
+<summary>
+
+  <h1 id="{{ lower $method }}{{ anchorize $endpoint }}">
+   <span class="http-api-method {{ $method }}">{{ $method }}</span>
+   <span class="endpoint{{ if $operation_data.deprecated }} deprecated-inline{{ end }}">{{ $endpoint }}</span>
+  </h1>
+
+  <hr/>
+
+{{ if $operation_data.deprecated }}
+    {{ partial "alert" (dict "type" "warning" "omit_title" "true" "content" "This API is deprecated and will be removed from a future release.") }}
+{{ end }}
+
+<p>{{ $operation_data.description | markdownify }}</p>
+
+</summary>
+
+<table class="basic-info">
+  <tr>
+   <th>Rate-limited:</th>
+   {{ $rate_limited := index $operation_data.responses "429" }}
+   <td>{{ if $rate_limited }}Yes{{ else }}No{{ end }}</td>
+  </tr>
+ <tr>
+  <th>Requires authentication:</th>
+  <td>{{ if $operation_data.security }}Yes{{ else }}No{{ end }}</td>
+ </tr>
+</table>
+
+<hr/>
+{{ partial "openapi/render-request"   (dict "parameters" $operation_data.parameters "path" $path) }}
+<hr/>
+{{ partial "openapi/render-responses" (dict "responses"  $operation_data.responses  "path" $path) }}
+
+</details>
+
+</section>
diff --git a/layouts/partials/openapi/render-parameters.html b/layouts/partials/openapi/render-parameters.html
new file mode 100644
index 00000000..2b4fb09d
--- /dev/null
+++ b/layouts/partials/openapi/render-parameters.html
@@ -0,0 +1,30 @@
+{{/*
+
+  Render the parameters of a given type, given:
+
+  * `parameters`: OpenAPI/Swagger data specifying the parameters
+  * `type`: the type of parameters to render: "header, ""path", "query"
+  * `caption`: caption to use for the table
+
+  This template renders a single table containing parameters of the given type.
+
+*/}}
+
+{{ $parameters := .parameters }}
+{{ $type := .type }}
+{{ $caption := .caption }}
+
+{{ $parameters_of_type := where $parameters "in" $type }}
+
+{{ with $parameters_of_type }}
+
+    {{/* convert parameters into the format that render-object-table expects to see */}}
+    {{ $param_dict := dict }}
+    {{ range $parameter := . }}
+        {{ $param_dict = merge $param_dict (dict $parameter.name (dict "type" $parameter.type "description" $parameter.description "required" $parameter.required "enum" $parameter.enum)  )}}
+    {{ end }}
+
+    {{/* and render the parameters */}}
+    {{ partial "openapi/render-object-table" (dict "caption" $caption "properties" $param_dict) }}
+
+{{ end }}
diff --git a/layouts/partials/openapi/render-request.html b/layouts/partials/openapi/render-request.html
new file mode 100644
index 00000000..1695c2f8
--- /dev/null
+++ b/layouts/partials/openapi/render-request.html
@@ -0,0 +1,67 @@
+{{/*
+
+  Render the request part of a single HTTP API operation, given:
+
+  * `parameters`: OpenAPI/Swagger data specifying the parameters
+  * `path`: the path where this definition was found, to enable us to resolve "$ref"
+
+  This template renders:
+  * the "simple parameters" (header, path, query parameters)
+  * body parameters, which may be more complex, containing nested objects
+  * response body examples
+
+*/}}
+
+{{ $parameters := .parameters }}
+{{ $path := .path }}
+
+<h2>Request</h2>
+
+{{ if $parameters }}
+
+    {{ $simple_parameters := where $parameters "in" "!=" "body"}}
+    {{ if $simple_parameters }}
+<h3>Request parameters</h3>
+
+        {{ partial "openapi/render-parameters" (dict "parameters" $simple_parameters "type" "header" "caption" "header parameters") }}
+        {{ partial "openapi/render-parameters" (dict "parameters" $simple_parameters "type" "path" "caption" "path parameters") }}
+        {{ partial "openapi/render-parameters" (dict "parameters" $simple_parameters "type" "query" "caption" "query parameters") }}
+
+    {{ end }}
+
+    {{ $body_parameters := where $parameters "in" "body"}}
+    {{ if $body_parameters }}
+<h3>Request body</h3>
+
+        {{/* at most one body param is allowed by the spec */}}
+        {{ $body_parameter := index $body_parameters 0 }}
+        {{ $schema := partial "json-schema/resolve-refs" (dict "schema" $body_parameter.schema "path" $path) }}
+        {{ $schema := partial "json-schema/resolve-allof" $schema }}
+
+        {{ $additional_types := partial "json-schema/resolve-additional-types" $schema }}
+        {{ $additional_types = uniq $additional_types }}
+        {{ range $additional_types }}
+            {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
+        {{ end }}
+
+<h3>Request body example</h3>
+
+        {{ $example := partial "json-schema/resolve-example" $schema }}
+        {{ if $example }}
+            {{ $example_json := jsonify (dict "indent" "  ") $example }}
+            {{ $example_json = replace $example_json "\\u003c" "<" }}
+            {{ $example_json = replace $example_json "\\u003e" ">" | safeHTML }}
+
+```json
+{{ $example_json }}
+```
+
+        {{ else }}
+            {{ partial "alert" (dict "type" "warning" "omit_title" "true" "color" "warning" "content" "Specification error: Example invalid or not present") }}
+        {{ end }}
+
+    {{ end }}
+
+{{ else }}
+<p>No request parameters or request body.</p>
+{{ end }}
diff --git a/layouts/partials/openapi/render-responses.html b/layouts/partials/openapi/render-responses.html
new file mode 100644
index 00000000..c92aba8e
--- /dev/null
+++ b/layouts/partials/openapi/render-responses.html
@@ -0,0 +1,97 @@
+{{/*
+
+  Render the response part of a single HTTP API operation, given:
+
+  * `responses`: OpenAPI/Swagger data specifying the responses
+  * `path`: the path where this definition was found, to enable us to resolve "$ref"
+
+  This template renders:
+  * a summary of all the different responses
+  * details of the body for each response code
+  * body parameters, which may be more complex, containing nested objects
+  * response body examples
+
+*/}}
+
+{{ $responses := .responses }}
+{{ $path := .path }}
+
+<h2>Responses</h2>
+
+<table class>
+ <thead>
+  <th class="col-status">Status</th>
+  <th class="col-status-description">Description</th>
+ </thead>
+
+{{ range $code, $response := $responses }}
+
+ <tr>
+  <td><code>{{ $code }}</code></td>
+  <td>{{ $response.description | markdownify }}</td>
+ </tr>
+
+{{ end }}
+
+</table>
+
+{{ range  $code, $response := $responses }}
+
+    {{ if $response.schema }}
+
+        {{ $schema := partial "json-schema/resolve-refs" (dict "schema" $response.schema "path" $path) }}
+        {{ $schema := partial "json-schema/resolve-allof" $schema }}
+
+        {{ if or $schema.properties (eq $schema.type "array") }}
+<h3>{{ $code}} response</h3>
+
+            {{/*
+              All this is to work out how to express the content of the response
+              in the case where it is an array.
+            */}}
+            {{ if eq $schema.type "array" }}
+                {{ $type_of := "" }}
+                {{ if reflect.IsSlice $schema.items }}
+                    {{ $types := slice }}
+                    {{ range $schema.items }}
+                        {{ if .title }}
+                            {{ $types = $types | append .title}}
+                        {{ else }}
+                            {{ $types = $types | append .type }}
+                        {{ end }}
+                    {{ end }}
+                    {{ $type_of = delimit $types ", "}}
+                {{ else }}
+                    {{ $type_of = $schema.items.title }}
+                {{ end }}
+<p>Array of <code>{{ $type_of }}</code>.</p>
+            {{ end }}
+
+            {{ $additional_types := partial "json-schema/resolve-additional-types" $schema }}
+            {{ $additional_types = uniq $additional_types }}
+            {{ range $additional_types }}
+                {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
+            {{ end }}
+
+            {{ $example := partial "json-schema/resolve-example" $schema }}
+            {{ if $response.examples }}
+                {{ $example = partial "json-schema/resolve-refs" (dict "schema" $response.examples "path" $path) }}
+                {{ $example = index $example "application/json" }}
+            {{ end }}
+
+            {{ if $example }}
+                {{ $example_json := jsonify (dict "indent" "  ") $example }}
+                {{ $example_json = replace $example_json "\\u003c" "<" }}
+                {{ $example_json = replace $example_json "\\u003e" ">" | safeHTML }}
+
+```json
+{{ $example_json }}
+```
+
+            {{ else }}
+                {{ partial "alert" (dict "type" "warning" "omit_title" "true" "color" "warning" "content" "Specification error: Example invalid or not present") }}
+            {{ end }}
+
+        {{ end }}
+    {{ end }}
+{{ end }}
diff --git a/layouts/shortcodes/definition.html b/layouts/shortcodes/definition.html
new file mode 100644
index 00000000..151e0606
--- /dev/null
+++ b/layouts/shortcodes/definition.html
@@ -0,0 +1,59 @@
+{{/*
+
+  This template is used to render EDUs and PDUs in the server-server and room versions specs.
+
+  It expects to be passed a `path` parameter, which is a path, relative to /data,
+  pointing to a schema file. The file extension is omitted. For example:
+
+      {{% definition path="api/server-server/definitions/edu" %}}
+
+  This template replaces the old {{definition_*}} template.
+
+*/}}
+
+{{ $path := .Params.path }}
+{{ $compact := .Params.compact }}
+{{ $pieces := split $path "/" }}
+
+{{/* The definition is referenced by the .path parameter */}}
+{{ $definition := index .Site.Data $pieces }}
+
+{{/* The base path, which we use to resolve $ref, omits the last component */}}
+{{ $pieces = first (sub (len $pieces) 1) $pieces}}
+{{ $path = delimit $pieces "/" }}
+
+{{/* Resolve $ref and allOf */}}
+{{ $definition = partial "json-schema/resolve-refs" (dict "schema" $definition "path" $path) }}
+{{ $definition = partial "json-schema/resolve-allof" $definition }}
+
+<section class="rendered-data definition">
+
+<details {{ if not $compact }}open{{ end }}>
+<summary>
+
+<h1>
+ <code>{{ $definition.title }}</code>
+</h1>
+
+<hr/>
+
+{{ $definition.description | markdownify }}
+
+</summary>
+
+{{ $additional_types := partial "json-schema/resolve-additional-types" $definition }}
+{{ $additional_types = uniq $additional_types }}
+
+{{ range $additional_types }}
+    {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
+{{end}}
+
+<h2>Examples</h2>
+
+{{ $example := partial "json-schema/resolve-example" $definition }}
+
+```json
+{{ jsonify (dict "indent" "  ") $example }}
+```
+
+</section>
diff --git a/layouts/shortcodes/event-fields.html b/layouts/shortcodes/event-fields.html
new file mode 100644
index 00000000..83651c21
--- /dev/null
+++ b/layouts/shortcodes/event-fields.html
@@ -0,0 +1,45 @@
+{{/*
+
+  This template is used to render the fields that all basic events and room events
+  must or may contain.
+
+  It expects to be passed an `event_type` parameter, is the name of a file under
+  /data/event-schemas/core-event-schema. The file extension is omitted. For example:
+
+      {{% event-fields event_type="room_event" %}}
+
+  This template replaces the old {{common_event_fields}} and {{common_room_event_fields}} templates.
+
+*/}}
+
+{{ $event := index .Site.Data "event-schemas" "schema" "core-event-schema" .Params.event_type }}
+{{ $path := "event-schemas/schema/core-event-schema" }}
+
+{{ $event = partial "json-schema/resolve-refs" (dict "schema" $event "path" $path) }}
+{{ $event := partial "json-schema/resolve-allof" $event }}
+
+<section class="rendered-data event">
+
+<details {{ if not .Site.Params.ui.rendered_data_collapsed }}open{{ end }}>
+<summary>
+
+<h1>
+ <code>{{ humanize $event.title }}</code>
+</h1>
+
+<hr/>
+
+{{ $event.description | markdownify }}
+
+</summary>
+
+{{ $event = merge $event (dict "title" "") }}
+
+{{ $additional_types := partial "json-schema/resolve-additional-types" $event }}
+{{ range $additional_types }}
+    {{ partial "openapi/render-object-table" (dict "caption" .title "properties" .properties "required" .required) }}
+{{end}}
+
+</details>
+
+</section>
diff --git a/layouts/shortcodes/event-group.html b/layouts/shortcodes/event-group.html
new file mode 100644
index 00000000..5e2900f0
--- /dev/null
+++ b/layouts/shortcodes/event-group.html
@@ -0,0 +1,32 @@
+{{/*
+
+  This template is used to render a group of events starting with a given prefix.
+
+  It expects to be passed a `group_name` parameter. For example:
+
+      {{% event-group group_name="m.call" %}}
+
+  The template will then render all events whose schema starts with the given name.
+
+  This template replaces the old {{*_events}} template.
+
+*/}}
+
+{{ $path := "event-schemas/schema" }}
+
+{{ $events := index .Site.Data "event-schemas" "schema" }}
+{{ $group_name := .Params.group_name }}
+
+{{ range $event_name, $event_data := $events }}
+
+    {{ $prefix := substr $event_name 0 (len $group_name) }}
+    {{ if eq $prefix $group_name }}
+
+        {{ $event_data = partial "json-schema/resolve-refs" (dict "schema" $event_data "path" $path) }}
+        {{ $event_data := partial "json-schema/resolve-allof" $event_data }}
+
+        {{ partial "events/render-event" (dict "event_name" $event_name "event_data" $event_data)}}
+
+    {{ end }}
+
+{{ end }}
diff --git a/layouts/shortcodes/event.html b/layouts/shortcodes/event.html
new file mode 100644
index 00000000..71c9c534
--- /dev/null
+++ b/layouts/shortcodes/event.html
@@ -0,0 +1,20 @@
+{{/*
+
+  This template is used to render an event.
+
+  It expects to be passed an `event` parameter, which is the name of a schema file under
+  "data/event-schemas/schema". The file extension is omitted. For example:
+
+      {{% event event="m.accepted_terms" %}}
+
+  This template replaces the old {{*_event}} template.
+
+*/}}
+
+{{ $event_data := index .Site.Data "event-schemas" "schema" .Params.event }}
+{{ $path := "event-schemas/schema" }}
+
+{{ $event_data = partial "json-schema/resolve-refs" (dict "schema" $event_data "path" $path) }}
+{{ $event_data := partial "json-schema/resolve-allof" $event_data }}
+
+{{ partial "events/render-event" (dict "event_name" .Params.event "event_data" $event_data)}}
diff --git a/layouts/shortcodes/http-api.html b/layouts/shortcodes/http-api.html
new file mode 100644
index 00000000..b4bc6d0d
--- /dev/null
+++ b/layouts/shortcodes/http-api.html
@@ -0,0 +1,26 @@
+{{/*
+
+  This template is used to render an HTTP API, given an OpenAPI/Swagger definition.
+
+  It expects to be passed two parameters:
+
+  * a `spec` parameter identifying the spec, which must be the name of
+  a directory under /data/api
+  * an `api` parameter, identifying an OpenAPI/Swagger definition,
+  which is the name of a schema file under "data/api/$spec".
+  The file extension is omitted. For example:
+
+      {{% http-api spec="server-server" api="public_rooms" %}}
+
+  This template replaces the old {{*_http_api}} template.
+
+*/}}
+
+{{ $spec := .Params.spec}}
+{{ $api := .Params.api}}
+
+{{ $api_data := index .Site.Data.api .Params.spec .Params.api }}
+{{ $base_url := replace $api_data.basePath "%CLIENT_MAJOR_VERSION%"  "r0" }}
+{{ $path := delimit (slice "api" $spec) "/" }}
+
+{{ partial "openapi/render-api" (dict "api_data" $api_data "base_url" $base_url "path" $path) }}
diff --git a/layouts/shortcodes/msgtypes.html b/layouts/shortcodes/msgtypes.html
new file mode 100644
index 00000000..695e9bb7
--- /dev/null
+++ b/layouts/shortcodes/msgtypes.html
@@ -0,0 +1,48 @@
+{{/*
+
+  This template is used to render the `m.room.message` events.
+
+  It replaces the old {{msgtype_events}} template.
+
+*/}}
+
+{{ $path := "event-schemas/schema" }}
+{{ $compact := false }}
+
+{{/*
+  The old template starts with an explicit list of events, presumably
+  to define the order in which they are rendered.
+*/}}
+{{ $msgtypes := (slice "m.room.message$m.text" "m.room.message$m.emote" "m.room.message$m.notice" "m.room.message$m.image" "m.room.message$m.file") }}
+
+{{/*
+  It excludes `m.room.message$m.server_notice`
+*/}}
+{{ $excluded := slice "m.room.message$m.server_notice" }}
+
+{{/*
+  It then adds any other events that start `m.room.message`.
+*/}}
+{{ $events := index .Site.Data "event-schemas" "schema" }}
+{{ $expected_prefix := "m.room.message$"}}
+{{ range $object_name, $event_data := $events }}
+
+    {{ $prefix := substr $object_name 0 (len $expected_prefix) }}
+    {{ if and (eq $prefix $expected_prefix) (not (in $excluded $object_name)) (not (in $msgtypes $object_name))  }}
+        {{ $msgtypes = $msgtypes | append $object_name }}
+    {{ end }}
+
+{{ end }}
+
+{{ $site_data := .Site.Data }}
+
+{{ range $msgtypes }}
+
+    {{ $event_data := index $site_data "event-schemas" "schema" . }}
+    {{ $event_data = partial "json-schema/resolve-refs" (dict "schema" $event_data "path" $path) }}
+    {{ $event_data := partial "json-schema/resolve-allof" $event_data }}
+
+    {{ $event_name := index (split . "$") 1 }}
+    {{ partial "events/render-event" (dict "event_name" $event_name "desired_example_name" . "event_data" $event_data)}}
+
+{{ end }}

From 1d629bae40188892d93d0d4e51a434f1c35d2c50 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 15:31:35 -0800
Subject: [PATCH 11/19] Add styles for rendered data

---
 assets-hugo/scss/custom.scss | 124 +++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/assets-hugo/scss/custom.scss b/assets-hugo/scss/custom.scss
index 7b80d434..73d14048 100644
--- a/assets-hugo/scss/custom.scss
+++ b/assets-hugo/scss/custom.scss
@@ -242,6 +242,130 @@ footer {
   }
 }
 
+/* Styles for sections that are rendered from data, such as HTTP APIs and event schemas */
+.rendered-data {
+  margin: 1rem 0 3rem 0;
+  padding: 1rem;
+
+  details {
+
+    summary {
+      padding: .5rem 0;
+      list-style-position: outside;
+    }
+  }
+
+  .deprecated-inline {
+
+    &:after {
+      content: " — DEPRECATED";
+      color: $warning;
+      font-weight: $font-weight-bold;
+    }
+  }
+
+  h1 {
+    display: inline-block;
+    font-size: 1.3rem;
+
+    .endpoint {
+      color: $secondary;
+    }
+  }
+
+  h2 {
+    font-weight: $font-weight-bold;
+    font-size: 1.3rem;
+    margin: 3rem 0 .5rem 0;
+  }
+
+  h3 {
+    font-weight: $font-weight-bold;
+    font-size: 1.1rem;
+    margin: 1.5rem 0 .75rem 0;
+  }
+
+  h2 + table, h3 + table, h3 + div.highlight {
+    margin-top: 0;
+  }
+
+  hr {
+    border-bottom: 2px solid $dark;
+    margin-bottom: 1.5rem;
+  }
+
+  p {
+    margin: .5rem;
+    max-width: 80%;
+  }
+
+  p code, table code {
+    background-color: $white;
+  }
+
+  table {
+    table-layout: fixed;
+    width: 100%;
+    margin: 4rem 0;
+
+    caption {
+      caption-side: top;
+      color: $dark;
+      font-size: 1rem;
+      font-weight: $font-weight-bold;
+    }
+
+    th, td, caption {
+      padding: 1rem;
+    }
+
+    th {
+      background-color: $white;
+    }
+
+    caption, tr {
+      background-color: $table-row-default;
+    }
+
+    tr:nth-child(even) {
+      background-color: $table-row-alternate;
+    }
+
+    &.basic-info, &.basic-info th, &.basic-info td {
+      table-layout: fixed;
+      margin: 1rem 0 .5rem 0;
+      background-color: $white;
+    }
+
+    &.basic-info th {
+      width: 15rem;
+    }
+
+    .col-name, .col-type, .col-status {
+      width: 25%;
+    }
+
+    .col-description {
+      width: 50%;
+    }
+
+    .col-status-description {
+      width: 75%;
+    }
+
+  }
+
+  pre {
+    border: 0;
+    border-left: solid 5px $secondary;
+  }
+
+  .http-api-method {
+    font-weight: $font-weight-bold;
+  }
+
+}
+
 /* Miscellaneous custom bits */
 
 /* Update link colours for MAtrix style */

From 52f5e73a3941a74850921243d7283ab5d60436c8 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 15:32:31 -0800
Subject: [PATCH 12/19] Update content to call the new template for HTTP APIs

---
 content/application-service-api.md            | 10 ++--
 content/client-server-api/_index.md           | 56 +++++++++----------
 .../client-server-api/modules/account_data.md |  2 +-
 content/client-server-api/modules/admin.md    |  2 +-
 .../client-server-api/modules/content_repo.md |  2 +-
 .../modules/device_management.md              |  2 +-
 .../modules/end_to_end_encryption.md          |  6 +-
 .../modules/event_context.md                  |  2 +-
 content/client-server-api/modules/openid.md   |  2 +-
 content/client-server-api/modules/presence.md |  2 +-
 content/client-server-api/modules/push.md     |  6 +-
 .../client-server-api/modules/read_markers.md |  2 +-
 content/client-server-api/modules/receipts.md |  2 +-
 .../modules/report_content.md                 |  2 +-
 .../modules/room_previews.md                  |  2 +-
 .../modules/room_upgrades.md                  |  2 +-
 content/client-server-api/modules/search.md   |  2 +-
 .../modules/send_to_device.md                 |  2 +-
 .../client-server-api/modules/sso_login.md    |  2 +-
 content/client-server-api/modules/tags.md     |  2 +-
 .../modules/third_party_invites.md            |  2 +-
 .../modules/third_party_networks.md           |  2 +-
 .../modules/typing_notifications.md           |  2 +-
 .../client-server-api/modules/voip_events.md  |  2 +-
 content/identity-service-api.md               | 36 ++++++------
 content/push-gateway-api.md                   |  2 +-
 content/server-server-api.md                  | 40 ++++++-------
 27 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/content/application-service-api.md b/content/application-service-api.md
index 13d43883..e324bba0 100644
--- a/content/application-service-api.md
+++ b/content/application-service-api.md
@@ -204,7 +204,7 @@ NOT alter (e.g. add more) events they were going to send within that
 transaction ID on retries, as the application service may have already
 processed the events.
 
-{{transactions\_as\_http\_api}}
+{{% http-api spec="application-service" api="transactions" %}}
 
 #### Querying
 
@@ -227,9 +227,9 @@ about information about the entity such as room ID to room alias
 mappings.
 {{% /boxes/rationale %}}
 
-{{query\_user\_as\_http\_api}}
+{{% http-api spec="application-service" api="query_user" %}}
 
-{{query\_room\_as\_http\_api}}
+{{% http-api spec="application-service" api="query_room" %}}
 
 #### Third party networks
 
@@ -251,7 +251,7 @@ request the homeserver to search in a particular "network" (protocol),
 the search fields will be passed along to the application service for
 filtering.
 
-{{protocols\_as\_http\_api}}
+{{% http-api spec="application-service" api="protocols" %}}
 
 ### Client-Server API Extensions
 
@@ -356,7 +356,7 @@ defined third party protocols. These room directories may be accessed by
 clients through additional parameters on the `/publicRooms`
 client-server endpoint.
 
-{{appservice\_room\_directory\_cs\_http\_api}}
+{{% http-api spec="client-server" api="appservice_room_directory" %}}
 
 ### Referencing messages from a third party network
 
diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md
index b6a0b075..2a4ba3b9 100644
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@@ -205,7 +205,7 @@ Some API endpoints may allow or require the use of `POST` requests
 without a transaction ID. Where this is optional, the use of a `PUT`
 request is strongly recommended.
 
-{{versions\_cs\_http\_api}}
+{{% http-api spec="client-server" api="versions" %}}
 
 ## Web Browser Clients
 
@@ -301,7 +301,7 @@ specify parameter values. The flow for this method is as follows:
         `m.identity_server` property is present, but does not have a
         `base_url` value, then `FAIL_ERROR`.
 
-{{wellknown\_cs\_http\_api}}
+{{% http-api spec="client-server" api="wellknown" %}}
 
 ## Client Authentication
 
@@ -1021,9 +1021,9 @@ client supports it, the client should redirect the user to the
 is complete, the client will need to submit a `/login` request matching
 `m.login.token`.
 
-{{login\_cs\_http\_api}}
+{{% http-api spec="client-server" api="login" %}}
 
-{{logout\_cs\_http\_api}}
+{{% http-api spec="client-server" api="logout" %}}
 
 #### Login Fallback
 
@@ -1044,7 +1044,7 @@ the login endpoint during the login process. For example:
 
 ### Account registration and management
 
-{{registration\_cs\_http\_api}}
+{{% http-api spec="client-server" api="registration" %}}
 
 #### Notes on password management
 
@@ -1069,11 +1069,11 @@ identifier that is found in an identity server. Note that an identifier
 can be added and bound at the same time, depending on context.
 {{% /boxes/note %}}
 
-{{administrative\_contact\_cs\_http\_api}}
+{{% http-api spec="client-server" api="administrative_contact" %}}
 
 ### Current account information
 
-{{whoami\_cs\_http\_api}}
+{{% http-api spec="client-server" api="whoami" %}}
 
 #### Notes on identity servers
 
@@ -1148,7 +1148,7 @@ Matrix specification while other values may be used by servers using the
 Java package naming convention. The capabilities supported by the Matrix
 specification are defined later in this section.
 
-{{capabilities\_cs\_http\_api}}
+{{% http-api spec="client-server" api="capabilities" %}}
 
 ### `m.change_password` capability
 
@@ -1356,7 +1356,7 @@ The current endpoints which support lazy-loading room members are:
 
 ### API endpoints
 
-{{filter\_cs\_http\_api}}
+{{% http-api spec="client-server" api="filter" %}}
 
 ## Events
 
@@ -1582,23 +1582,23 @@ take a copy of the state dictionary, and *rewind* S1, in order to
 correctly calculate the display name for M0.
 {{% /boxes/rationale %}}
 
-{{sync\_cs\_http\_api}}
+{{% http-api spec="client-server" api="sync" %}}
 
-{{old\_sync\_cs\_http\_api}}
+{{% http-api spec="client-server" api="old_sync" %}}
 
 ### Getting events for a room
 
 There are several APIs provided to `GET` events for a room:
 
-{{rooms\_cs\_http\_api}}
+{{% http-api spec="client-server" api="rooms" %}}
 
-{{message\_pagination\_cs\_http\_api}}
+{{% http-api spec="client-server" api="message_pagination" %}}
 
-{{room\_initial\_sync\_cs\_http\_api}}
+{{% http-api spec="client-server" api="room_initial_sync" %}}
 
 ### Sending events to a room
 
-{{room\_state\_cs\_http\_api}}
+{{% http-api spec="client-server" api="room_state" %}}
 
 **Examples**
 
@@ -1647,7 +1647,7 @@ PUT /rooms/!roomid:domain/state/m.room.bgd.color
 { "color": "red", "hex": "#ff0000" }
 ```
 
-{{room\_send\_cs\_http\_api}}
+{{% http-api spec="client-server" api="room_send" %}}
 
 ### Redactions
 
@@ -1686,7 +1686,7 @@ the topic to be removed from the room.
 
 #### Client behaviour
 
-{{redaction\_cs\_http\_api}}
+{{% http-api spec="client-server" api="redaction" %}}
 
 ## Rooms
 
@@ -1706,7 +1706,7 @@ permissions in this room. This includes:
 See [Room Events](#room-events) for more information on these events. To
 create a room, a client has to use the following API.
 
-{{create\_room\_cs\_http\_api}}
+{{% http-api spec="client-server" api="create_room" %}}
 
 ### Room aliases
 
@@ -1731,7 +1731,7 @@ have a room alias of `#alias:example.com`, this SHOULD be checked to
 make sure that the room's ID matches the `room_id` returned from the
 request.
 
-{{directory\_cs\_http\_api}}
+{{% http-api spec="client-server" api="directory" %}}
 
 ### Permissions
 
@@ -1816,13 +1816,13 @@ The allowable state transitions of membership are:
                   /ban
 ```
 
-{{list\_joined\_rooms\_cs\_http\_api}}
+{{% http-api spec="client-server" api="list_joined_rooms" %}}
 
 #### Joining rooms
 
-{{inviting\_cs\_http\_api}}
+{{% http-api spec="client-server" api="inviting" %}}
 
-{{joining\_cs\_http\_api}}
+{{% http-api spec="client-server" api="joining" %}}
 
 #### Leaving rooms
 
@@ -1848,9 +1848,9 @@ behaviour is the same as if they had left of their own accord. In
 particular, the user is free to re-join if the room is not
 "invite-only".
 
-{{leaving\_cs\_http\_api}}
+{{% http-api spec="client-server" api="leaving" %}}
 
-{{kicking\_cs\_http\_api}}
+{{% http-api spec="client-server" api="kicking" %}}
 
 ##### Banning users in a room
 
@@ -1884,21 +1884,21 @@ A user must be explicitly unbanned with a request to
 `/rooms/<room_id>/unban`\_ before they can re-join the room or be
 re-invited.
 
-{{banning\_cs\_http\_api}}
+{{% http-api spec="client-server" api="banning" %}}
 
 ### Listing rooms
 
-{{list\_public\_rooms\_cs\_http\_api}}
+{{% http-api spec="client-server" api="list_public_rooms" %}}
 
 ## User Data
 
 ### User Directory
 
-{{users\_cs\_http\_api}}
+{{% http-api spec="client-server" api="users" %}}
 
 ### Profiles
 
-{{profile\_cs\_http\_api}}
+{{% http-api spec="client-server" api="profile" %}}
 
 #### Events on Change of Profile Information
 
diff --git a/content/client-server-api/modules/account_data.md b/content/client-server-api/modules/account_data.md
index ea78dc82..2ae34686 100644
--- a/content/client-server-api/modules/account_data.md
+++ b/content/client-server-api/modules/account_data.md
@@ -23,7 +23,7 @@ These events can also be received in a `/events` response or in the
 
 #### Client Behaviour
 
-{{account\_data\_cs\_http\_api}}
+{{% http-api spec="client-server" api="account-data" %}}
 
 #### Server Behaviour
 
diff --git a/content/client-server-api/modules/admin.md b/content/client-server-api/modules/admin.md
index 28176bd9..1f0cbe22 100644
--- a/content/client-server-api/modules/admin.md
+++ b/content/client-server-api/modules/admin.md
@@ -10,4 +10,4 @@ server state and data.
 
 #### Client Behaviour
 
-{{admin\_cs\_http\_api}}
+{{% http-api spec="client-server" api="admin" %}}
diff --git a/content/client-server-api/modules/content_repo.md b/content/client-server-api/modules/content_repo.md
index f615e7f7..fba296a0 100644
--- a/content/client-server-api/modules/content_repo.md
+++ b/content/client-server-api/modules/content_repo.md
@@ -34,7 +34,7 @@ look like:
 
 Clients can upload and download content using the following HTTP APIs.
 
-{{content\_repo\_cs\_http\_api}}
+{{% http-api spec="client-server" api="content-repo" %}}
 
 ##### Thumbnails
 
diff --git a/content/client-server-api/modules/device_management.md b/content/client-server-api/modules/device_management.md
index c6fa6c45..2cf93f45 100644
--- a/content/client-server-api/modules/device_management.md
+++ b/content/client-server-api/modules/device_management.md
@@ -13,7 +13,7 @@ Clients that implement this module should offer the user a list of
 registered devices, as well as the means to update their display names.
 Clients should also allow users to delete disused devices.
 
-{{device\_management\_cs\_http\_api}}
+{{% http-api spec="client-server" api="device_management" %}}
 
 #### Security considerations
 
diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md
index d8d1051c..b3efaeb2 100644
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@@ -905,7 +905,7 @@ To avoid leaking of social graphs, servers will only allow users to see:
 Users will not be able to see signatures made by other users'
 user-signing keys.
 
-{{cross\_signing\_cs\_http\_api}}
+{{% http-api spec="client-server" api="cross_signing" %}}
 
 #### Sharing keys between devices
 
@@ -1050,7 +1050,7 @@ The `session_data` field in the backups is constructed as follows:
     the resulting MAC are base64-encoded, and become the `mac` property
     of the `session_data`.
 
-{{key\_backup\_cs\_http\_api}}
+{{% http-api spec="client-server" api="key_backup" %}}
 
 ##### Key exports
 
@@ -1369,7 +1369,7 @@ messages.
 
 ##### Key management API
 
-{{keys\_cs\_http\_api}}
+{{% http-api spec="client-server" api="keys" %}}
 
 ##### Extensions to /sync
 
diff --git a/content/client-server-api/modules/event_context.md b/content/client-server-api/modules/event_context.md
index 32d7b9e8..65b1a7a4 100644
--- a/content/client-server-api/modules/event_context.md
+++ b/content/client-server-api/modules/event_context.md
@@ -14,7 +14,7 @@ an event.
 There is a single HTTP API for retrieving event context, documented
 below.
 
-{{event\_context\_cs\_http\_api}}
+{{% http-api spec="client-server" api="event_context" %}}
 
 #### Security considerations
 
diff --git a/content/client-server-api/modules/openid.md b/content/client-server-api/modules/openid.md
index af8b31c9..c51591fe 100644
--- a/content/client-server-api/modules/openid.md
+++ b/content/client-server-api/modules/openid.md
@@ -10,4 +10,4 @@ service. The third party service does need to be matrix-aware in that it
 will need to know to resolve matrix homeservers to exchange the user's
 token for identity information.
 
-{{openid\_cs\_http\_api}}
+{{% http-api spec="client-server" api="openid" %}}
diff --git a/content/client-server-api/modules/presence.md b/content/client-server-api/modules/presence.md
index 83f9c560..683d4839 100644
--- a/content/client-server-api/modules/presence.md
+++ b/content/client-server-api/modules/presence.md
@@ -37,7 +37,7 @@ enum of one of the following:
 Clients can manually set/get their presence using the HTTP APIs listed
 below.
 
-{{presence\_cs\_http\_api}}
+{{% http-api spec="client-server" api="presence" %}}
 
 ##### Last active ago
 
diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index 00b24cb4..16e9ad71 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -90,7 +90,7 @@ Clients MUST configure a Pusher before they will receive push
 notifications. There is a single API endpoint for this, as described
 below.
 
-{{pusher\_cs\_http\_api}}
+{{% http-api spec="client-server" api="pusher" %}}
 
 ##### Listing Notifications
 
@@ -98,7 +98,7 @@ A client can retrieve a list of events that it has been notified about.
 This may be useful so that users can see a summary of what important
 messages they have received.
 
-{{notifications\_cs\_http\_api}}
+{{% http-api spec="client-server" api="notifications" %}}
 
 ##### Receiving notifications
 
@@ -658,7 +658,7 @@ Definition:
 Clients can retrieve, add, modify and remove push rules globally or
 per-device using the APIs below.
 
-{{pushrules\_cs\_http\_api}}
+{{% http-api spec="client-server" api="pushrules" %}}
 
 ##### Push Rules: Events
 
diff --git a/content/client-server-api/modules/read_markers.md b/content/client-server-api/modules/read_markers.md
index ccbafd26..d2738821 100644
--- a/content/client-server-api/modules/read_markers.md
+++ b/content/client-server-api/modules/read_markers.md
@@ -39,7 +39,7 @@ commonly updated at the same time, and therefore the client might wish
 to save an extra HTTP call. Providing an `m.read` location performs the
 same task as a request to `/receipt/m.read/$event:example.org`.
 
-{{read\_markers\_cs\_http\_api}}
+{{% http-api spec="client-server" api="read_markers" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/receipts.md b/content/client-server-api/modules/receipts.md
index 423decea..05ea5ca1 100644
--- a/content/client-server-api/modules/receipts.md
+++ b/content/client-server-api/modules/receipts.md
@@ -58,7 +58,7 @@ for events sent by their own user.
 A client can update the markers for its user by interacting with the
 following HTTP APIs.
 
-{{receipts\_cs\_http\_api}}
+{{% http-api spec="client-server" api="receipts" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/report_content.md b/content/client-server-api/modules/report_content.md
index ff90207d..c6157f3c 100644
--- a/content/client-server-api/modules/report_content.md
+++ b/content/client-server-api/modules/report_content.md
@@ -14,7 +14,7 @@ offensive" and 0 is "inoffensive".
 
 #### Client behaviour
 
-{{report\_content\_cs\_http\_api}}
+{{% http-api spec="client-server" api="report_content" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/room_previews.md b/content/client-server-api/modules/room_previews.md
index f3368067..ecaedcbd 100644
--- a/content/client-server-api/modules/room_previews.md
+++ b/content/client-server-api/modules/room_previews.md
@@ -25,7 +25,7 @@ Clients can of course also call other endpoints such as [GET
 and [GET /search](#post_matrixclientr0search) to
 access events outside the `/events` stream.
 
-{{peeking\_events\_cs\_http\_api}}
+{{% http-api spec="client-server" api="peeking_events" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/room_upgrades.md b/content/client-server-api/modules/room_upgrades.md
index 1e5437f3..08738d0a 100644
--- a/content/client-server-api/modules/room_upgrades.md
+++ b/content/client-server-api/modules/room_upgrades.md
@@ -24,7 +24,7 @@ old room. Another approach may be to virtually merge the rooms such that
 the old room's timeline seamlessly continues into the new timeline
 without the user having to jump between the rooms.
 
-{{room\_upgrades\_cs\_http\_api}}
+{{% http-api spec="client-server" api="room_upgrades" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/search.md b/content/client-server-api/modules/search.md
index 3dfe6463..2fa5bc44 100644
--- a/content/client-server-api/modules/search.md
+++ b/content/client-server-api/modules/search.md
@@ -15,7 +15,7 @@ it won't include events in rooms that happened after you left.
 There is a single HTTP API for performing server-side search, documented
 below.
 
-{{search\_cs\_http\_api}}
+{{% http-api spec="client-server" api="search" %}}
 
 #### Search Categories
 
diff --git a/content/client-server-api/modules/send_to_device.md b/content/client-server-api/modules/send_to_device.md
index 5a879637..c1778863 100644
--- a/content/client-server-api/modules/send_to_device.md
+++ b/content/client-server-api/modules/send_to_device.md
@@ -52,7 +52,7 @@ should be sent on to the remote servers via
 
 #### Protocol definitions
 
-{{to\_device\_cs\_http\_api}}
+{{% http-api spec="client-server" api="to_device" %}}
 
 ##### Extensions to /sync
 
diff --git a/content/client-server-api/modules/sso_login.md b/content/client-server-api/modules/sso_login.md
index 36615375..18654b49 100644
--- a/content/client-server-api/modules/sso_login.md
+++ b/content/client-server-api/modules/sso_login.md
@@ -104,7 +104,7 @@ The client starts the process by instructing the browser to navigate to
 authentication is successful, the browser will be redirected to that
 `redirectUrl`.
 
-{{sso\_login\_redirect\_cs\_http\_api}}
+{{% http-api spec="client-server" api="sso_login_redirect" %}}
 
 ###### Security considerations
 
diff --git a/content/client-server-api/modules/tags.md b/content/client-server-api/modules/tags.md
index 94d455d2..28a74c9b 100644
--- a/content/client-server-api/modules/tags.md
+++ b/content/client-server-api/modules/tags.md
@@ -63,4 +63,4 @@ tags are defined in the `m.*` namespace:
 
 #### Client Behaviour
 
-{{tags\_cs\_http\_api}}
+{{% http-api spec="client-server" api="tags" %}}
diff --git a/content/client-server-api/modules/third_party_invites.md b/content/client-server-api/modules/third_party_invites.md
index 3b37dd97..45c94a93 100644
--- a/content/client-server-api/modules/third_party_invites.md
+++ b/content/client-server-api/modules/third_party_invites.md
@@ -37,7 +37,7 @@ invitee does indeed own that third party identifier. See the
 
 A client asks a server to invite a user by their third party identifier.
 
-{{third\_party\_membership\_cs\_http\_api}}
+{{% http-api spec="client-server" api="third_party_membership" %}}
 
 #### Server behaviour
 
diff --git a/content/client-server-api/modules/third_party_networks.md b/content/client-server-api/modules/third_party_networks.md
index 13142470..40ca1883 100644
--- a/content/client-server-api/modules/third_party_networks.md
+++ b/content/client-server-api/modules/third_party_networks.md
@@ -19,4 +19,4 @@ A client may wish to provide a rich interface for joining third party
 locations and connecting with third party users. Information necessary
 for such an interface is provided by third party lookups.
 
-{{third\_party\_lookup\_cs\_http\_api}}
+{{% http-api spec="client-server" api="third_party_lookup" %}}
diff --git a/content/client-server-api/modules/typing_notifications.md b/content/client-server-api/modules/typing_notifications.md
index d899b4e1..12417a64 100644
--- a/content/client-server-api/modules/typing_notifications.md
+++ b/content/client-server-api/modules/typing_notifications.md
@@ -33,7 +33,7 @@ recommended. When the user stops typing, the state change of the
 `boolean` to `false` should trigger another HTTP request to inform the
 server that the user has stopped typing.
 
-{{typing\_cs\_http\_api}}
+{{% http-api spec="client-server" api="typing" %}}
 
 #### Security considerations
 
diff --git a/content/client-server-api/modules/voip_events.md b/content/client-server-api/modules/voip_events.md
index 31cd3fec..b8b94df2 100644
--- a/content/client-server-api/modules/voip_events.md
+++ b/content/client-server-api/modules/voip_events.md
@@ -82,7 +82,7 @@ The homeserver MAY provide a TURN server which clients can use to
 contact the remote party. The following HTTP API endpoints will be used
 by clients in order to get information about the TURN server.
 
-{{voip\_cs\_http\_api}}
+{{% http-api spec="client-server" api="voip" %}}
 
 #### Security considerations
 
diff --git a/content/identity-service-api.md b/content/identity-service-api.md
index ef9d1bf0..3ce8b6fe 100644
--- a/content/identity-service-api.md
+++ b/content/identity-service-api.md
@@ -172,7 +172,7 @@ header is inaccessible for the client.
 When credentials are required but missing or invalid, the HTTP call will
 return with a status of 401 and the error code `M_UNAUTHORIZED`.
 
-{{v2\_auth\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_auth" %}}
 
 ## Terms of service
 
@@ -198,13 +198,13 @@ has just accepted are appended to `m.accepted_terms`.
 
 {{m\_accepted\_terms\_event}}
 
-{{v2\_terms\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_terms" %}}
 
 ## Status check
 
-{{ping\_is\_http\_api}}
+{{% http-api spec="identity" api="ping" %}}
 
-{{v2\_ping\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_ping" %}}
 
 ## Key management
 
@@ -217,15 +217,15 @@ The identity server may also keep track of some short-term
 public-private keypairs, which may have different usage and lifetime
 characteristics than the service's long-term keys.
 
-{{pubkey\_is\_http\_api}}
+{{% http-api spec="identity" api="pubkey" %}}
 
-{{v2\_pubkey\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_pubkey" %}}
 
 ## Association lookup
 
-{{lookup\_is\_http\_api}}
+{{% http-api spec="identity" api="lookup" %}}
 
-{{v2\_lookup\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_lookup" %}}
 
 ### Client behaviour
 
@@ -398,21 +398,21 @@ through without modification.
 
 ### Email associations
 
-{{email\_associations\_is\_http\_api}}
+{{% http-api spec="identity" api="email_associations" %}}
 
-{{v2\_email\_associations\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_email_associations" %}}
 
 ### Phone number associations
 
-{{phone\_associations\_is\_http\_api}}
+{{% http-api spec="identity" api="phone_associations" %}}
 
-{{v2\_phone\_associations\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_phone_associations" %}}
 
 ### General
 
-{{associations\_is\_http\_api}}
+{{% http-api spec="identity" api="associations" %}}
 
-{{v2\_associations\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_associations" %}}
 
 ## Invitation storage
 
@@ -427,9 +427,9 @@ the Matrix user's homeserver via the
 endpoint. The request MUST be signed with a long-term private key for
 the identity server.
 
-{{store\_invite\_is\_http\_api}}
+{{% http-api spec="identity" api="store_invite" %}}
 
-{{v2\_store\_invite\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_store_invite" %}}
 
 ## Ephemeral invitation signing
 
@@ -438,6 +438,6 @@ identity server offers some crypto functionality to help in accepting
 invitations. This is less secure than the client doing it itself, but
 may be useful where this isn't possible.
 
-{{invitation\_signing\_is\_http\_api}}
+{{% http-api spec="identity" api="invitation_signing" %}}
 
-{{v2\_invitation\_signing\_is\_http\_api}}
+{{% http-api spec="identity" api="v2_invitation_signing" %}}
diff --git a/content/push-gateway-api.md b/content/push-gateway-api.md
index a6a3d1a3..541db129 100644
--- a/content/push-gateway-api.md
+++ b/content/push-gateway-api.md
@@ -54,4 +54,4 @@ Note that most of the values and behaviour of this endpoint is described
 by the Client-Server API's [Push
 Module](/client-server-api#push-notifications).
 
-{{push\_notifier\_push\_http\_api}}
+{{% http-api spec="push-gateway" api="push_notifier" %}}
diff --git a/content/server-server-api.md b/content/server-server-api.md
index 21d6b495..beb175dd 100644
--- a/content/server-server-api.md
+++ b/content/server-server-api.md
@@ -150,11 +150,11 @@ SNI is not supported and should not be sent.
 Servers are encouraged to make use of the [Certificate
 Transparency](https://www.certificate-transparency.org/) project.
 
-{{wellknown\_ss\_http\_api}}
+{{% http-api spec="server-server" api="wellknown" %}}
 
 ### Server implementation
 
-{{version\_ss\_http\_api}}
+{{% http-api spec="server-server" api="version" %}}
 
 ### Retrieving server keys
 
@@ -190,7 +190,7 @@ Homeservers publish their signing keys in a JSON object at
 homeserver and for signing events. It contains a list of
 `old_verify_keys` which are only valid for signing events.
 
-{{keys\_server\_ss\_http\_api}}
+{{% http-api spec="server-server" api="keys_server" %}}
 
 #### Querying Keys Through Another Server
 
@@ -205,7 +205,7 @@ Notary servers can return keys for servers that are offline or having
 issues serving their own keys by using cached responses. Keys can be
 queried from multiple servers to mitigate against DNS spoofing.
 
-{{keys\_query\_ss\_http\_api}}
+{{% http-api spec="server-server" api="keys_query" %}}
 
 ## Authentication
 
@@ -308,7 +308,7 @@ pair of homeservers that exchanged it; they are not globally-meaningful.
 Transactions are limited in size; they can have at most 50 PDUs and 100
 EDUs.
 
-{{transactions\_ss\_http\_api}}
+{{% http-api spec="server-server" api="transactions" %}}
 
 ## PDUs
 
@@ -559,7 +559,7 @@ to check with other servers to ensure it is receiving the correct auth
 chain. These APIs give the homeserver an avenue for getting the
 information it needs.
 
-{{event\_auth\_ss\_http\_api}}
+{{% http-api spec="server-server" api="event_auth" %}}
 
 ## EDUs
 
@@ -623,7 +623,7 @@ Similar to backfilling a room's history, a server may not have all the
 events in the graph. That server may use the `/get_missing_events` API
 to acquire the events it is missing.
 
-{{backfill\_ss\_http\_api}}
+{{% http-api spec="server-server" api="backfill" %}}
 
 ## Retrieving events
 
@@ -632,7 +632,7 @@ information about the room which cannot be easily determined from
 backfilling. These APIs provide homeservers with the option of getting
 events and the state of the room at a given point in the timeline.
 
-{{events\_ss\_http\_api}}
+{{% http-api spec="server-server" api="events" %}}
 
 ## Joining Rooms
 
@@ -716,9 +716,9 @@ graph, and responds to the joining server with the full set of state for
 the newly-joined room. The resident server must also send the event to
 other servers participating in the room.
 
-{{joins\_v1\_ss\_http\_api}}
+{{% http-api spec="server-server" api="joins-v1" %}}
 
-{{joins\_v2\_ss\_http\_api}}
+{{% http-api spec="server-server" api="joins-v2" %}}
 
 ## Inviting to a room
 
@@ -728,9 +728,9 @@ the process defined here. However, when a user invites another user on a
 different homeserver, a request to that homeserver to have the event
 signed and verified must be made.
 
-{{invites\_v1\_ss\_http\_api}}
+{{% http-api spec="server-server" api="invites-v1" %}}
 
-{{invites\_v2\_ss\_http\_api}}
+{{% http-api spec="server-server" api="invites-v2" %}}
 
 ## Leaving Rooms (Rejecting Invites)
 
@@ -751,9 +751,9 @@ and replaces the `event_id` with its own. This is then sent to the
 resident server via `/send_leave`. The resident server will then send
 the event to other servers in the room.
 
-{{leaving\_v1\_ss\_http\_api}}
+{{% http-api spec="server-server" api="leaving-v1" %}}
 
-{{leaving\_v2\_ss\_http\_api}}
+{{% http-api spec="server-server" api="leaving-v2" %}}
 
 ## Third-party invites
 
@@ -806,7 +806,7 @@ auth the event and send it.
 However, if the invited homeserver isn't in the room the invite came
 from, it will need to request the room's homeserver to auth the event.
 
-{{third\_party\_invite\_ss\_http\_api}}
+{{% http-api spec="server-server" api="third_party_invite" %}}
 
 #### Verifying the invite
 
@@ -841,7 +841,7 @@ homeservers need a way to query the public rooms for another server.
 This can be done by making a request to the `/publicRooms` endpoint for
 the server the room directory should be retrieved for.
 
-{{public\_rooms\_ss\_http\_api}}
+{{% http-api spec="server-server" api="public_rooms" %}}
 
 ## Typing Notifications
 
@@ -885,7 +885,7 @@ There are several types of queries that can be made. The generic
 endpoint to represent all queries is described first, followed by the
 more specific queries that can be made.
 
-{{query\_ss\_http\_api}}
+{{% http-api spec="server-server" api="query" %}}
 
 ## OpenID
 
@@ -897,7 +897,7 @@ without granting full access to the user's account.
 Access tokens generated by the OpenID API are only good for the OpenID
 API and nothing else.
 
-{{openid\_ss\_http\_api}}
+{{% http-api spec="server-server" api="openid" %}}
 
 ## Device Management
 
@@ -943,7 +943,7 @@ recognise, it must resynchronise its list by calling the
 `stream_id` which should be used to correlate with subsequent
 `m.device_list_update` EDUs.
 
-{{user\_devices\_ss\_http\_api}}
+{{% http-api spec="server-server" api="user_devices" %}}
 
 {{definition\_ss\_event\_schemas\_m\_device\_list\_update}}
 
@@ -958,7 +958,7 @@ The APIs defined here are designed to be able to proxy much of the
 client's request through to federation, and have the response also be
 proxied through to the client.
 
-{{user\_keys\_ss\_http\_api}}
+{{% http-api spec="server-server" api="user_keys" %}}
 
 {{definition\_ss\_event\_schemas\_m\_signing\_key\_update}}
 

From 72ff5b92cbef143f976291789294ff98bc142711 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Fri, 29 Jan 2021 20:46:25 -0800
Subject: [PATCH 13/19] Update content to call the new template for event
 definitions

---
 content/client-server-api/_index.md           | 30 ++++++++++---------
 content/client-server-api/modules/dm.md       |  2 +-
 .../modules/end_to_end_encryption.md          | 28 ++++++++---------
 .../client-server-api/modules/guest_access.md |  2 +-
 .../modules/history_visibility.md             |  2 +-
 .../client-server-api/modules/ignore_users.md |  2 +-
 .../modules/instant_messaging.md              | 14 ++++-----
 .../modules/moderation_policies.md            |  6 ++--
 content/client-server-api/modules/presence.md |  2 +-
 content/client-server-api/modules/push.md     |  2 +-
 .../client-server-api/modules/read_markers.md |  2 +-
 content/client-server-api/modules/receipts.md |  2 +-
 .../modules/room_upgrades.md                  |  2 +-
 .../client-server-api/modules/server_acls.md  |  2 +-
 .../modules/server_notices.md                 |  2 +-
 content/client-server-api/modules/stickers.md |  2 +-
 content/client-server-api/modules/tags.md     |  2 +-
 .../modules/third_party_invites.md            |  2 +-
 .../modules/typing_notifications.md           |  2 +-
 .../client-server-api/modules/voip_events.md  |  2 +-
 content/identity-service-api.md               |  2 +-
 content/rooms/v1.md                           |  2 +-
 content/rooms/v3.md                           |  2 +-
 content/rooms/v4.md                           |  2 +-
 content/server-server-api.md                  | 14 ++++-----
 25 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md
index 2a4ba3b9..27cbc389 100644
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@@ -1111,7 +1111,7 @@ which has no `m.identity_server` account data event should not end up
 with the client's default identity server in their account data, unless
 the user first visits their account settings to set the identity server.
 
-{{m\_identity\_server\_event}}
+{{% event event="m.identity_server" %}}
 
 ## Capabilities negotiation
 
@@ -1385,14 +1385,12 @@ available room versions.
 
 Room events are split into two categories:
 
-State Events  
-These are events which update the metadata state of the room (e.g. room
+* **State events**: These are events which update the metadata state of the room (e.g. room
 topic, room membership etc). State is keyed by a tuple of event `type`
 and a `state_key`. State in the room with the same key-tuple will be
 overwritten.
 
-Message events  
-These are events which describe transient "once-off" activity in a room:
+* **Message events**: These are events which describe transient "once-off" activity in a room:
 typically communication such as sending an instant message or setting up
 a VoIP call.
 
@@ -1416,11 +1414,15 @@ assuming the client has access to the `com.example` namespace.
 Note that the structure of these events may be different than those in
 the server-server API.
 
-{{common\_event\_fields}}
+#### Event fields
 
-{{common\_room\_event\_fields}}
+{{% event-fields event_type="event" %}}
 
-#### State Event Fields
+#### Room event fields
+
+{{% event-fields event_type="room_event" %}}
+
+#### State event fields
 
 In addition to the fields of a Room Event, State Events have the
 following fields.
@@ -1460,15 +1462,15 @@ This section is a work in progress.
 This specification outlines several standard event types, all of which
 are prefixed with `m.`
 
-{{m\_room\_canonical\_alias\_event}}
+{{% event event="m.room.canonical_alias" %}}
 
-{{m\_room\_create\_event}}
+{{% event event="m.room.create" %}}
 
-{{m\_room\_join\_rules\_event}}
+{{% event event="m.room.join_rules" %}}
 
-{{m\_room\_member\_event}}
+{{% event event="m.room.member" %}}
 
-{{m\_room\_power\_levels\_event}}
+{{% event event="m.room.power_levels" %}}
 
 #### Historical events
 
@@ -1682,7 +1684,7 @@ the topic to be removed from the room.
 
 #### Events
 
-{{m\_room\_redaction\_event}}
+{{% event event="m.room.redaction" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/dm.md b/content/client-server-api/modules/dm.md
index c9f4511a..c4f06bf3 100644
--- a/content/client-server-api/modules/dm.md
+++ b/content/client-server-api/modules/dm.md
@@ -19,7 +19,7 @@ whether a chat is 'direct' to an invitee.
 
 #### Events
 
-{{m\_direct\_event}}
+{{% event event="m.direct" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md
index b3efaeb2..aea43eaa 100644
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@@ -466,11 +466,11 @@ process.
 
 After the handshake, the verification process begins.
 
-{{m\_key\_verification\_request\_event}}
+{{% event event="m.key.verification.request" %}}
 
-{{m\_key\_verification\_start\_event}}
+{{% event event="m.key.verification.start" %}}
 
-{{m\_key\_verification\_cancel\_event}}
+{{% event event="m.key.verification.cancel" %}}
 
 ##### Short Authentication String (SAS) verification
 
@@ -634,13 +634,13 @@ following error codes are used in addition to those already specified:
 -   `m.mismatched_commitment`: The hash commitment did not match.
 -   `m.mismatched_sas`: The SAS did not match.
 
-{{m\_key\_verification\_start\_m\_sas\_v1\_event}}
+{{% event event="m.key.verification.start$m.sas.v1" %}}
 
-{{m\_key\_verification\_accept\_event}}
+{{% event event="m.key.verification.accept" %}}
 
-{{m\_key\_verification\_key\_event}}
+{{% event event="m.key.verification.key" %}}
 
-{{m\_key\_verification\_mac\_event}}
+{{% event event="m.key.verification.mac" %}}
 
 ###### HKDF calculation
 
@@ -1355,17 +1355,17 @@ messages.
 
 ##### Events
 
-{{m\_room\_encryption\_event}}
+{{% event event="m.room.encryption" %}}
 
-{{m\_room\_encrypted\_event}}
+{{% event event="m.room.encrypted" %}}
 
-{{m\_room\_key\_event}}
+{{% event event="m.room_key" %}}
 
-{{m\_room\_key\_request\_event}}
+{{% event event="m.room_key_request" %}}
 
-{{m\_forwarded\_room\_key\_event}}
+{{% event event="m.room_key" %}}
 
-{{m\_dummy\_event}}
+{{% event event="m.dummy" %}}
 
 ##### Key management API
 
@@ -1451,4 +1451,4 @@ by including a `withheld` property in the `m.forwarded_room_key` message
 that is an object with the `code` and `reason` properties from the
 `m.room_key.withheld` message.
 
-{{m\_room\_key\_withheld\_event}}
+{{% event event="m.room_key.withheld" %}}
diff --git a/content/client-server-api/modules/guest_access.md b/content/client-server-api/modules/guest_access.md
index b68a8e01..7d04035e 100644
--- a/content/client-server-api/modules/guest_access.md
+++ b/content/client-server-api/modules/guest_access.md
@@ -32,7 +32,7 @@ rather than allowing all homeservers to enforce the rules on each other.
 
 #### Events
 
-{{m\_room\_guest\_access\_event}}
+{{% event event="m.room.guest_access" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/history_visibility.md b/content/client-server-api/modules/history_visibility.md
index 8eba3643..0a00f01e 100644
--- a/content/client-server-api/modules/history_visibility.md
+++ b/content/client-server-api/modules/history_visibility.md
@@ -43,7 +43,7 @@ setting at that time was more restrictive.
 
 #### Events
 
-{{m\_room\_history\_visibility\_event}}
+{{% event event="m.room.history_visibility" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/ignore_users.md b/content/client-server-api/modules/ignore_users.md
index 18fadb67..51bb480d 100644
--- a/content/client-server-api/modules/ignore_users.md
+++ b/content/client-server-api/modules/ignore_users.md
@@ -11,7 +11,7 @@ and servers can implement the ignoring of users.
 
 #### Events
 
-{{m\_ignored\_user\_list\_event}}
+{{% event event="m.ignored_user_list" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/instant_messaging.md b/content/client-server-api/modules/instant_messaging.md
index 8550a7ae..6f60d5a0 100644
--- a/content/client-server-api/modules/instant_messaging.md
+++ b/content/client-server-api/modules/instant_messaging.md
@@ -11,9 +11,9 @@ room itself such as a room name and topic.
 
 #### Events
 
-{{m\_room\_message\_event}}
+{{% event event="m.room.message" %}}
 
-{{m\_room\_message\_feedback\_event}}
+{{% event event="m.room.message.feedback" %}}
 
 Usage of this event is discouraged for several reasons:  
 -   The number of feedback events will grow very quickly with the number
@@ -24,13 +24,13 @@ Usage of this event is discouraged for several reasons:
 -   There are no guarantees that the client has seen the event ID being
     acknowledged.
 
-{{m\_room\_name\_event}}
+{{% event event="m.room.name" %}}
 
-{{m\_room\_topic\_event}}
+{{% event event="m.room.topic" %}}
 
-{{m\_room\_avatar\_event}}
+{{% event event="m.room.avatar" %}}
 
-{{m\_room\_pinned\_events\_event}}
+{{% event event="m.room.pinned_events" %}}
 
 ##### m.room.message msgtypes
 
@@ -116,7 +116,7 @@ extensible message formatting options, such as the proposal
 [MSC1767](https://github.com/matrix-org/matrix-doc/pull/1767).
 {{% /boxes/note %}}
 
-{{msgtype\_events}}
+{{% msgtypes %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/moderation_policies.md b/content/client-server-api/modules/moderation_policies.md
index 923df71e..c164b1b1 100644
--- a/content/client-server-api/modules/moderation_policies.md
+++ b/content/client-server-api/modules/moderation_policies.md
@@ -97,11 +97,11 @@ rules against rooms can describe a room ID or room alias - the
 subscriber is responsible for resolving the alias to a room ID if
 desired.
 
-{{m\_policy\_rule\_user\_event}}
+{{% event event="m.policy.rule.user" %}}
 
-{{m\_policy\_rule\_room\_event}}
+{{% event event="m.policy.rule.room" %}}
 
-{{m\_policy\_rule\_server\_event}}
+{{% event event="m.policy.rule.server" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/presence.md b/content/client-server-api/modules/presence.md
index 683d4839..9944f086 100644
--- a/content/client-server-api/modules/presence.md
+++ b/content/client-server-api/modules/presence.md
@@ -30,7 +30,7 @@ enum of one of the following:
 
 #### Events
 
-{{presence\_events}}
+{{% event-group group_name="m.presence" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/push.md b/content/client-server-api/modules/push.md
index 16e9ad71..90546050 100644
--- a/content/client-server-api/modules/push.md
+++ b/content/client-server-api/modules/push.md
@@ -666,7 +666,7 @@ When a user changes their push rules a `m.push_rules` event is sent to
 all clients in the `account_data` section of their next `/sync` request.
 The content of the event is the current push rules for the user.
 
-{{m\_push\_rules\_event}}
+{{% event event="m.push_rules" %}}
 
 ###### Examples
 
diff --git a/content/client-server-api/modules/read_markers.md b/content/client-server-api/modules/read_markers.md
index d2738821..a2c0150b 100644
--- a/content/client-server-api/modules/read_markers.md
+++ b/content/client-server-api/modules/read_markers.md
@@ -24,7 +24,7 @@ The fully read marker is kept under an `m.fully_read` event. If the
 event does not exist on the user's account data, the fully read marker
 should be considered to be the user's read receipt location.
 
-{{m\_fully\_read\_event}}
+{{% event event="m.fully_read" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/receipts.md b/content/client-server-api/modules/receipts.md
index 05ea5ca1..fb28aacd 100644
--- a/content/client-server-api/modules/receipts.md
+++ b/content/client-server-api/modules/receipts.md
@@ -24,7 +24,7 @@ information on how read receipts affect notification counts.
 Each `user_id`, `receipt_type` pair must be associated with only a
 single `event_id`.
 
-{{m\_receipt\_event}}
+{{% event event="m.receipt" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/room_upgrades.md b/content/client-server-api/modules/room_upgrades.md
index 08738d0a..dbcb8233 100644
--- a/content/client-server-api/modules/room_upgrades.md
+++ b/content/client-server-api/modules/room_upgrades.md
@@ -11,7 +11,7 @@ to upgrade to a different room version when needed.
 
 #### Events
 
-{{m\_room\_tombstone\_event}}
+{{% event event="m.room.tombstone" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/server_acls.md b/content/client-server-api/modules/server_acls.md
index 5ee09501..fc308915 100644
--- a/content/client-server-api/modules/server_acls.md
+++ b/content/client-server-api/modules/server_acls.md
@@ -16,7 +16,7 @@ set of servers, or retroactively make the room no longer federate with
 any other server, similar to setting the `m.federate` value on the
 [m.room.create](#mroomcreate) event.
 
-{{m\_room\_server\_acl\_event}}
+{{% event event="m.room.server_acl" %}}
 
 {{% boxes/note %}}
 Port numbers are not supported because it is unclear to parsers whether
diff --git a/content/client-server-api/modules/server_notices.md b/content/client-server-api/modules/server_notices.md
index 13bafc46..199acd85 100644
--- a/content/client-server-api/modules/server_notices.md
+++ b/content/client-server-api/modules/server_notices.md
@@ -36,7 +36,7 @@ maximum. New connections are being refused by the server. What defines
 "active" is left as an implementation detail, however servers are
 encouraged to treat syncing users as "active".
 
-{{m\_room\_message\_m\_server\_notice\_event}}
+{{% event event="m.room.message$m.server_notice" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/stickers.md b/content/client-server-api/modules/stickers.md
index b705d9ac..234ebba2 100644
--- a/content/client-server-api/modules/stickers.md
+++ b/content/client-server-api/modules/stickers.md
@@ -22,7 +22,7 @@ when the sticker image is clicked.
 Sticker events are received as a single `m.sticker` event in the
 `timeline` section of a room, in a `/sync`.
 
-{{m\_sticker\_event}}
+{{% event event="m.sticker" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/tags.md b/content/client-server-api/modules/tags.md
index 28a74c9b..c47be0c1 100644
--- a/content/client-server-api/modules/tags.md
+++ b/content/client-server-api/modules/tags.md
@@ -59,7 +59,7 @@ tags are defined in the `m.*` namespace:
 -   `m.server_notice`: Used to identify [Server Notice
     Rooms](#server-notices).
 
-{{m\_tag\_event}}
+{{% event event="m.tag" %}}
 
 #### Client Behaviour
 
diff --git a/content/client-server-api/modules/third_party_invites.md b/content/client-server-api/modules/third_party_invites.md
index 45c94a93..4a5c63e5 100644
--- a/content/client-server-api/modules/third_party_invites.md
+++ b/content/client-server-api/modules/third_party_invites.md
@@ -31,7 +31,7 @@ invitee does indeed own that third party identifier. See the
 
 #### Events
 
-{{m\_room\_third\_party\_invite\_event}}
+{{% event event="m.room.third_party_invite" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/typing_notifications.md b/content/client-server-api/modules/typing_notifications.md
index 12417a64..b9254cdb 100644
--- a/content/client-server-api/modules/typing_notifications.md
+++ b/content/client-server-api/modules/typing_notifications.md
@@ -12,7 +12,7 @@ events scoped to a `room_id`. This means they do not form part of the
 
 #### Events
 
-{{m\_typing\_event}}
+{{% event event="m.typing" %}}
 
 #### Client behaviour
 
diff --git a/content/client-server-api/modules/voip_events.md b/content/client-server-api/modules/voip_events.md
index b8b94df2..db33eb4c 100644
--- a/content/client-server-api/modules/voip_events.md
+++ b/content/client-server-api/modules/voip_events.md
@@ -15,7 +15,7 @@ send call events to rooms with exactly two participants.
 
 #### Events
 
-{{voip\_events}}
+{{% event-group group_name="m.call" %}}
 
 #### Client behaviour
 
diff --git a/content/identity-service-api.md b/content/identity-service-api.md
index 3ce8b6fe..60115306 100644
--- a/content/identity-service-api.md
+++ b/content/identity-service-api.md
@@ -196,7 +196,7 @@ the client should not expect that the server will not respond with
 another `M_TERMS_NOT_SIGNED` on their next request. The terms the user
 has just accepted are appended to `m.accepted_terms`.
 
-{{m\_accepted\_terms\_event}}
+{{% event event="m.accepted_terms" %}}
 
 {{% http-api spec="identity" api="v2_terms" %}}
 
diff --git a/content/rooms/v1.md b/content/rooms/v1.md
index 450eea6d..b76147df 100644
--- a/content/rooms/v1.md
+++ b/content/rooms/v1.md
@@ -276,7 +276,7 @@ Some consequences of these rules:
 
 Events in version 1 rooms have the following structure:
 
-{{definition\_ss\_pdu}}
+{{% definition path="api/server-server/definitions/pdu" %}}
 
 ### Canonical JSON
 
diff --git a/content/rooms/v3.md b/content/rooms/v3.md
index 71d64c1a..e1966b6e 100644
--- a/content/rooms/v3.md
+++ b/content/rooms/v3.md
@@ -60,7 +60,7 @@ Additionally, the `auth_events` and `prev_events` have had a format
 change compared to other room versions to make it easier to handle.
 Instead of a tuple of values, they are now plain lists of events.
 
-{{definition\_ss\_pdu\_v3}}
+{{% definition path="api/server-server/definitions/pdu_v3" %}}
 
 ### Changes to APIs
 
diff --git a/content/rooms/v4.md b/content/rooms/v4.md
index d2aa8a23..c2853a2c 100644
--- a/content/rooms/v4.md
+++ b/content/rooms/v4.md
@@ -58,4 +58,4 @@ receiving end of an event, the server should compute the relevant event
 ID for itself. Room version 3 also changes the format of `auth_events`
 and `prev_events` in a PDU.
 
-{{definition\_ss\_pdu\_v4}}
+{{% definition path="api/server-server/definitions/pdu_v4" %}}
diff --git a/content/server-server-api.md b/content/server-server-api.md
index beb175dd..7e38e4b1 100644
--- a/content/server-server-api.md
+++ b/content/server-server-api.md
@@ -567,7 +567,7 @@ EDUs, by comparison to PDUs, do not have an ID, a room ID, or a list of
 "previous" IDs. They are intended to be non-persistent data such as user
 presence, typing notifications, etc.
 
-{{definition\_ss\_edu}}
+{{% definition path="api/server-server/definitions/edu" %}}
 
 ## Room State Resolution
 
@@ -850,7 +850,7 @@ need to be sent to other servers in the room so their users are aware of
 the same state. Receiving servers should verify that the user is in the
 room, and is a user belonging to the sending server.
 
-{{definition\_ss\_event\_schemas\_m\_typing}}
+{{% definition path="api/server-server/definitions/event-schemas/m.typing" %}}
 
 ## Presence
 
@@ -861,7 +861,7 @@ Servers should only send presence updates for users that the receiving
 server would be interested in. Such as the receiving server sharing a
 room with a given user.
 
-{{definition\_ss\_event\_schemas\_m\_presence}}
+{{% definition path="api/server-server/definitions/event-schemas/m.presence" %}}
 
 ## Receipts
 
@@ -872,7 +872,7 @@ where in the event graph the user has read up to.
 Read receipts for events that a user sent do not need to be sent. It is
 implied that by sending the event the user has read up to the event.
 
-{{definition\_ss\_event\_schemas\_m\_receipt}}
+{{% definition path="api/server-server/definitions/event-schemas/m.receipt" %}}
 
 ## Querying for information
 
@@ -945,7 +945,7 @@ recognise, it must resynchronise its list by calling the
 
 {{% http-api spec="server-server" api="user_devices" %}}
 
-{{definition\_ss\_event\_schemas\_m\_device\_list\_update}}
+{{% definition path="api/server-server/definitions/event-schemas/m.device_list_update" %}}
 
 ## End-to-End Encryption
 
@@ -960,7 +960,7 @@ proxied through to the client.
 
 {{% http-api spec="server-server" api="user_keys" %}}
 
-{{definition\_ss\_event\_schemas\_m\_signing\_key\_update}}
+{{% definition path="api/server-server/definitions/event-schemas/m.signing_key_update" %}}
 
 ## Send-to-device messaging
 
@@ -971,7 +971,7 @@ involved.
 Each send-to-device message should be sent to the destination server
 using the following EDU:
 
-{{definition\_ss\_event\_schemas\_m\_direct\_to\_device}}
+{{% definition path="api/server-server/definitions/event-schemas/m.direct_to_device" %}}
 
 ## Content Repository
 

From 9a179038cc75ebf13b90d7a077cca1374f1f1eff Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Sat, 30 Jan 2021 13:25:57 -0800
Subject: [PATCH 14/19] Fix links to rendered APIs

---
 content/client-server-api/_index.md           | 22 +++++-----
 content/client-server-api/modules/dm.md       |  8 ++--
 .../modules/end_to_end_encryption.md          | 42 +++++++++----------
 .../client-server-api/modules/ignore_users.md |  2 +-
 .../modules/send_to_device.md                 | 11 ++---
 .../client-server-api/modules/sso_login.md    | 10 ++---
 content/server-server-api.md                  |  2 +-
 7 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md
index 27cbc389..06d161be 100644
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@@ -287,7 +287,7 @@ specify parameter values. The flow for this method is as follows:
         1.  Parse it as a URL. If it is not a URL, then `FAIL_ERROR`.
         2.  Clients SHOULD validate that the URL points to a valid
             homeserver before accepting it by connecting to the
-            `/_matrix/client/versions`\_ endpoint, ensuring that it does
+            [`/_matrix/client/versions`](/client-server-api/#get_matrixclientversions) endpoint, ensuring that it does
             not return an error, and parsing and validating that the
             data conforms with the expected response format. If any step
             in the validation fails, then `FAIL_ERROR`. Validation is
@@ -1350,9 +1350,9 @@ The expected pattern for using lazy-loading is currently:
 
 The current endpoints which support lazy-loading room members are:
 
--   `/sync`\_
--   `/rooms/<room_id>/messages`\_
--   `/rooms/{roomId}/context/{eventId}`\_
+-   [`/sync`](/client-server-api/#get_matrixclientr0sync)
+-   [`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientr0roomsroomidmessages)
+-   [`/rooms/{roomId}/context/{eventId}`](/client-server-api/#get_matrixclientr0roomsroomidcontexteventid)
 
 ### API endpoints
 
@@ -1486,13 +1486,13 @@ events.
 ### Syncing
 
 To read events, the intended flow of operation is for clients to first
-call the `/sync`\_ API without a `since` parameter. This returns the
+call the [`/sync`](/client-server-api/#get_matrixclientr0sync) API without a `since` parameter. This returns the
 most recent message events for each room, as well as the state of the
 room at the start of the returned timeline. The response also includes a
 `next_batch` field, which should be used as the value of the `since`
 parameter in the next call to `/sync`. Finally, the response includes,
 for each room, a `prev_batch` field, which can be passed as a `start`
-parameter to the `/rooms/<room_id>/messages`\_ API to retrieve earlier
+parameter to the [`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientr0roomsroomidmessages) API to retrieve earlier
 messages.
 
 You can visualise the range of events being returned as:
@@ -1529,7 +1529,7 @@ containing only the most recent message events. A state "delta" is also
 returned, summarising any state changes in the omitted part of the
 timeline. The client may therefore end up with "gaps" in its knowledge
 of the message timeline. The client can fill these gaps using the
-`/rooms/<room_id>/messages`\_ API. This situation looks like this:
+[`/rooms/<room_id>/messages`](/client-server-api/#get_matrixclientr0roomsroomidmessages) API. This situation looks like this:
 
 ```
     | gap |
@@ -1832,7 +1832,7 @@ A user can leave a room to stop receiving events for that room. A user
 must have been invited to or have joined the room before they are
 eligible to leave the room. Leaving a room to which the user has been
 invited rejects the invite. Once a user leaves a room, it will no longer
-appear in the response to the `/sync`\_ API unless it is explicitly
+appear in the response to the [`/sync`](/client-server-api/#get_matrixclientr0sync) API unless it is explicitly
 requested via a filter with the `include_leave` field set to `true`.
 
 Whether or not they actually joined the room, if the room is an
@@ -1840,7 +1840,7 @@ Whether or not they actually joined the room, if the room is an
 re-join the room.
 
 A user can also forget a room which they have left. Rooms which have
-been forgotten will never appear the response to the `/sync`\_ API,
+been forgotten will never appear the response to the [`/sync`](/client-server-api/#get_matrixclientr0sync) API,
 until the user re-joins or is re-invited.
 
 A user may wish to force another user to leave a room. This can be done
@@ -1861,7 +1861,7 @@ target user to leave the room and prevents them from re-joining the
 room. A banned user will not be treated as a joined user, and so will
 not be able to send or receive events in the room. In order to ban
 someone, the user performing the ban MUST have the required power level.
-To ban a user, a request should be made to `/rooms/<room_id>/ban`\_
+To ban a user, a request should be made to [`/rooms/<room_id>/ban`](/client-server-api/#post_matrixclientr0roomsroomidban)
 with:
 
 ```json
@@ -1883,7 +1883,7 @@ target member's state, by making a request to
 ```
 
 A user must be explicitly unbanned with a request to
-`/rooms/<room_id>/unban`\_ before they can re-join the room or be
+[`/rooms/<room_id>/unban`](/client-server-api/#post_matrixclientr0roomsroomidunban) before they can re-join the room or be
 re-invited.
 
 {{% http-api spec="client-server" api="banning" %}}
diff --git a/content/client-server-api/modules/dm.md b/content/client-server-api/modules/dm.md
index c4f06bf3..59d09e3e 100644
--- a/content/client-server-api/modules/dm.md
+++ b/content/client-server-api/modules/dm.md
@@ -24,7 +24,7 @@ whether a chat is 'direct' to an invitee.
 #### Client behaviour
 
 To start a direct chat with another user, the inviting user's client
-should set the `is_direct` flag to \_. The client should do this
+should set the `is_direct` flag to [`/createRoom`](/client-server-api/#post_matrixclientr0createroom). The client should do this
 whenever the flow the user has followed is one where their intention is
 to speak directly with another person, as opposed to bringing that
 person in to a shared room. For example, clicking on 'Start Chat' beside
@@ -38,10 +38,10 @@ the flag altogether.
 
 Both the inviting client and the invitee's client should record the fact
 that the room is a direct chat by storing an `m.direct` event in the
-account data using \_.
+account data using [`/user/<user_id>/account_data/<type>`](/client-server-api/#put_matrixclientr0useruseridaccount_datatype).
 
 #### Server behaviour
 
-When the `is_direct` flag is given to \_, the home server must set the
+When the `is_direct` flag is given to [`/createRoom`](/client-server-api/#post_matrixclientr0createroom), the home server must set the
 `is_direct` flag in the invite member event for any users invited in the
-\_ call.
+[`/createRoom`](/client-server-api/#post_matrixclientr0createroom) call.
diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md
index aea43eaa..13ecbdcc 100644
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@@ -113,13 +113,13 @@ key, and a number of signed Curve25519 one-time keys.
 ##### Uploading keys
 
 A device uploads the public parts of identity keys to their homeserver
-as a signed JSON object, using the `/keys/upload`\_ API. The JSON object
+as a signed JSON object, using the [`/keys/upload`](/client-server-api/#post_matrixclientr0keysupload) API. The JSON object
 must include the public part of the device's Ed25519 key, and must be
 signed by that key, as described in [Signing
 JSON](/appendices/#signing-json).
 
 One-time keys are also uploaded to the homeserver using the
-`/keys/upload`\_ API.
+[`/keys/upload`](/client-server-api/#post_matrixclientr0keysupload) API.
 
 Devices must store the private part of each key they upload. They can
 discard the private part of a one-time key when they receive a message
@@ -134,12 +134,12 @@ too many private keys may discard keys starting with the oldest.
 Before Alice can send an encrypted message to Bob, she needs a list of
 each of his devices and the associated identity keys, so that she can
 establish an encryption session with each device. This list can be
-obtained by calling `/keys/query`\_, passing Bob's user ID in the
+obtained by calling [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery), passing Bob's user ID in the
 `device_keys` parameter.
 
 From time to time, Bob may add new devices, and Alice will need to know
 this so that she can include his new devices for later encrypted
-messages. A naive solution to this would be to call `/keys/query`\_
+messages. A naive solution to this would be to call [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery)
 before sending each message -however, the number of users and devices
 may be large and this would be inefficient.
 
@@ -157,23 +157,23 @@ process:
     list, and a separate flag to indicate that its list of Bob's devices
     is outdated. Both flags should be in storage which persists over
     client restarts.
-2.  It then makes a request to `/keys/query`\_, passing Bob's user ID in
+2.  It then makes a request to [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery), passing Bob's user ID in
     the `device_keys` parameter. When the request completes, it stores
     the resulting list of devices in persistent storage, and clears the
     'outdated' flag.
-3.  During its normal processing of responses to \_, Alice's client
-    inspects the `changed` property of the `device_lists`\_ field. If it
+3.  During its normal processing of responses to [`/sync`](/client-server-api/#get_matrixclientr0sync), Alice's client
+    inspects the `changed` property of the [`device_lists`](/client-server-api/#extensions-to-sync-1) field. If it
     is tracking the device lists of any of the listed users, then it
     marks the device lists for those users outdated, and initiates
-    another request to `/keys/query`\_ for them.
+    another request to [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery) for them.
 4.  Periodically, Alice's client stores the `next_batch` field of the
-    result from \_ in persistent storage. If Alice later restarts her
+    result from [`/sync`](/client-server-api/#get_matrixclientr0sync) in persistent storage. If Alice later restarts her
     client, it can obtain a list of the users who have updated their
-    device list while it was offline by calling `/keys/changes`\_,
+    device list while it was offline by calling [`/keys/changes`](/client-server-api/#get_matrixclientr0keyschanges),
     passing the recorded `next_batch` field as the `from` parameter. If
     the client is tracking the device list of any of the users listed in
     the response, it marks them as outdated. It combines this list with
-    those already flagged as outdated, and initiates a `/keys/query`\_
+    those already flagged as outdated, and initiates a [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery)
     request for all of them.
 
 {{% boxes/warning %}}
@@ -342,7 +342,7 @@ Example:
 
 A client wanting to set up a session with another device can claim a
 one-time key for that device. This is done by making a request to the
-`/keys/claim`\_ API.
+[`/keys/claim`](/client-server-api/#post_matrixclientr0keysclaim) API.
 
 A homeserver should rate-limit the number of one-time keys that a given
 user or remote server can claim. A homeserver should discard the public
@@ -784,11 +784,11 @@ key, then Alice's device can trust Bob's master key, and she can sign it
 with her user-signing key.
 
 Users upload their cross-signing keys to the server using [POST
-/\_matrix/client/r0/keys/device\_signing/upload](). When Alice uploads
+/\_matrix/client/r0/keys/device\_signing/upload](/client-server-api/#post_matrixclientr0keysdevice_signingupload). When Alice uploads
 new cross-signing keys, her user ID will appear in the `changed`
 property of the `device_lists` field of the `/sync` of response of all
 users who share an encrypted room with her. When Bob sees Alice's user
-ID in his `/sync`, he will call [POST /\_matrix/client/r0/keys/query]()
+ID in his `/sync`, he will call [POST /\_matrix/client/r0/keys/query](/client-server-api/#post_matrixclientr0keysquery)
 to retrieve Alice's device and cross-signing keys.
 
 If Alice has a device and wishes to send an encrypted message to Bob,
@@ -959,8 +959,8 @@ be encrypted through the backup's `auth_data`; other clients can
 discover the backup by calling [GET
 /\_matrix/client/r0/room\_keys/version](#get_matrixclientr0room_keysversion). Keys are encrypted according
 to the backup's `auth_data` and added to the backup by calling [PUT
-/\_matrix/client/r0/room\_keys/keys]() or one of its variants, and can
-be retrieved by calling [GET /\_matrix/client/r0/room\_keys/keys](#put_matrixclientr0room_keyskeys) or
+/\_matrix/client/r0/room\_keys/keys](#put_matrixclientr0room_keyskeys) or one of its variants, and can
+be retrieved by calling [GET /\_matrix/client/r0/room\_keys/keys](#get_matrixclientr0room_keyskeys) or
 one of its variants. Keys can only be written to the most recently
 created version of the backup. Backups can also be deleted using [DELETE
 /\_matrix/client/r0/room\_keys/version/{version}](#delete_matrixclientr0room_keysversionversion), or individual keys
@@ -1241,7 +1241,7 @@ correspond to the user who sent the event, `recipient` to the local
 user, and `recipient_keys` to the local ed25519 key.
 
 Clients must confirm that the `sender_key` and the `ed25519` field value
-under the `keys` property match the keys returned by `/keys/query`\_ for
+under the `keys` property match the keys returned by [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery) for
 the given user, and must also verify the signature of the payload.
 Without this check, a client cannot be sure that the sender device owns
 the private part of the ed25519 key it claims to have in the Olm
@@ -1373,17 +1373,17 @@ messages.
 
 ##### Extensions to /sync
 
-This module adds an optional `device_lists` property to the \_ response,
+This module adds an optional `device_lists` property to the [`/sync`](/client-server-api/#get_matrixclientr0sync)  response,
 as specified below. The server need only populate this property for an
 incremental `/sync` (i.e., one where the `since` parameter was
-specified). The client is expected to use `/keys/query`\_ or
-`/keys/changes`\_ for the equivalent functionality after an initial
+specified). The client is expected to use [`/keys/query`](/client-server-api/#post_matrixclientr0keysquery) or
+[`/keys/changes`](/client-server-api/#get_matrixclientr0keyschanges) for the equivalent functionality after an initial
 sync, as documented in [Tracking the device list for a
 user](#tracking-the-device-list-for-a-user).
 
 It also adds a `one_time_keys_count` property. Note the spelling
 difference with the `one_time_key_counts` property in the
-`/keys/upload`\_ response.
+[`/keys/upload`](/client-server-api/#post_matrixclientr0keysupload) response.
 
 | Parameter                  | Type               | Description                                                                                                            |
 |----------------------------|--------------------|------------------------------------------------------------------------------------------------------------------------|
diff --git a/content/client-server-api/modules/ignore_users.md b/content/client-server-api/modules/ignore_users.md
index 51bb480d..b67f5976 100644
--- a/content/client-server-api/modules/ignore_users.md
+++ b/content/client-server-api/modules/ignore_users.md
@@ -17,7 +17,7 @@ and servers can implement the ignoring of users.
 
 To ignore a user, effectively blocking them, the client should add the
 target user to the `m.ignored_user_list` event in their account data
-using \_. Once ignored, the client will no longer receive events sent by
+using [`/user/<user_id>/account_data/<type>`](/client-server-api/#put_matrixclientr0useruseridaccount_datatype). Once ignored, the client will no longer receive events sent by
 that user, with the exception of state events. The client should either
 hide previous content sent by the newly ignored user or perform a new
 `/sync` with no previous token.
diff --git a/content/client-server-api/modules/send_to_device.md b/content/client-server-api/modules/send_to_device.md
index c1778863..16ce3e46 100644
--- a/content/client-server-api/modules/send_to_device.md
+++ b/content/client-server-api/modules/send_to_device.md
@@ -13,26 +13,27 @@ client device.
 The primary motivation for this API is exchanging data that is
 meaningless or undesirable to persist in the room DAG - for example,
 one-time authentication tokens or key data. It is not intended for
-conversational data, which should be sent using the normal \_ API for
+conversational data, which should be sent using the normal [`/rooms/<room_id>/send`](/client-server-api/#put_matrixclientr0roomsroomidsendeventtypetxnid) API for
 consistency throughout Matrix.
 
 #### Client behaviour
 
 To send a message to other devices, a client should call
-`/sendToDevice`\_. Only one message can be sent to each device per
+[`/sendToDevice`](/client-server-api/#put_matrixclientr0sendtodeviceeventtypetxnid). Only one message can be sent to each device per
 transaction, and they must all have the same event type. The device ID
 in the request body can be set to `*` to request that the message be
 sent to all known devices.
 
 If there are send-to-device messages waiting for a client, they will be
-returned by \_, as detailed in Extensions to /sync\_. Clients should
+returned by [`/sync`](/client-server-api/#get_matrixclientr0sync), as detailed in [Extensions to /sync](/client-server-api/#extensions-to-sync). Clients should
 inspect the `type` of each returned event, and ignore any they do not
 understand.
 
 #### Server behaviour
 
 Servers should store pending messages for local users until they are
-successfully delivered to the destination device. When a client calls \_
+successfully delivered to the destination device. When a client calls
+[`/sync`](/client-server-api/#get_matrixclientr0sync)
 with an access token which corresponds to a device with pending
 messages, the server should list the pending messages, in order of
 arrival, in the response body.
@@ -56,7 +57,7 @@ should be sent on to the remote servers via
 
 ##### Extensions to /sync
 
-This module adds the following properties to the \_ response:
+This module adds the following properties to the [`/sync`](/client-server-api/#get_matrixclientr0sync) response:
 
 | Parameter | Type      | Description                                                                 |
 |-----------|-----------|-----------------------------------------------------------------------------|
diff --git a/content/client-server-api/modules/sso_login.md b/content/client-server-api/modules/sso_login.md
index 18654b49..eb6a0bb9 100644
--- a/content/client-server-api/modules/sso_login.md
+++ b/content/client-server-api/modules/sso_login.md
@@ -43,12 +43,12 @@ endpoints which consume the ticket.
 
 An overview of the process is as follows:
 
-1.  The Matrix client calls `GET /login`\_ to find the supported login
+1.  The Matrix client calls [`GET /login`](/client-server-api/#get_matrixclientr0login) to find the supported login
     types, and the homeserver includes a flow with
     `"type": "m.login.sso"` in the response.
 2.  To initiate the `m.login.sso` login type, the Matrix client
     instructs the user's browser to navigate to the
-    `/login/sso/redirect`\_ endpoint on the user's homeserver.
+    [`/login/sso/redirect`](/client-server-api/#get_matrixclientr0loginssoredirect) endpoint on the user's homeserver.
 3.  The homeserver responds with an HTTP redirect to the SSO user
     interface, which the browser follows.
 4.  The authentication server and the homeserver interact to verify the
@@ -57,7 +57,7 @@ An overview of the process is as follows:
 5.  The browser is directed to the `redirectUrl` provided by the client
     with a `loginToken` query parameter for the client to log in with.
 6.  The client exchanges the login token for an access token by calling
-    the `/login`\_ endpoint with a `type` of `m.login.token`.
+    the [`/login`](/client-server-api/#post_matrixclientr0login) endpoint with a `type` of `m.login.token`.
 
 For native applications, typically steps 1 to 4 are carried out by
 opening an embedded web view.
@@ -100,7 +100,7 @@ otherwise the same.
 ##### Client behaviour
 
 The client starts the process by instructing the browser to navigate to
-`/login/sso/redirect`\_ with an appropriate `redirectUrl`. Once
+[`/login/sso/redirect`](/client-server-api/#get_matrixclientr0loginssoredirect) with an appropriate `redirectUrl`. Once
 authentication is successful, the browser will be redirected to that
 `redirectUrl`.
 
@@ -178,7 +178,7 @@ The homeserver then proceeds as follows:
     registered as a new user.
 3.  The homeserver should generate a short-term login token. This is an
     opaque token, suitable for use with the `m.login.token` type of the
-    `/login`\_ API. The lifetime of this token SHOULD be limited to
+    [`/login`](/client-server-api/#post_matrixclientr0login) API. The lifetime of this token SHOULD be limited to
     around five seconds.
 4.  The homeserver adds a query parameter of `loginToken`, with the
     value of the generated login token, to the `redirectUrl` given in
diff --git a/content/server-server-api.md b/content/server-server-api.md
index 7e38e4b1..32db92d7 100644
--- a/content/server-server-api.md
+++ b/content/server-server-api.md
@@ -688,7 +688,7 @@ in practice will use just two.
 
 The first part of the handshake usually involves using the directory
 server to request the room ID and join candidates through the
-`/query/directory`\_ API endpoint. In the case of a new user joining a
+[`/query/directory`](/server-server-api/#get_matrixfederationv1querydirectory) API endpoint. In the case of a new user joining a
 room as a result of a received invite, the joining user's homeserver
 could optimise this step away by picking the origin server of that
 invite message as the join candidate. However, the joining server should

From 3e03e7b17a29e7482dd9b4f54280a71880e611c4 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Sat, 30 Jan 2021 21:12:53 -0800
Subject: [PATCH 15/19] A few small fixes in /data and /content

---
 .../modules/end_to_end_encryption.md                 |  2 +-
 data/api/client-server/create_room.yaml              | 12 +++++-------
 data/api/client-server/keys.yaml                     |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/content/client-server-api/modules/end_to_end_encryption.md b/content/client-server-api/modules/end_to_end_encryption.md
index 13ecbdcc..b5a444a4 100644
--- a/content/client-server-api/modules/end_to_end_encryption.md
+++ b/content/client-server-api/modules/end_to_end_encryption.md
@@ -1363,7 +1363,7 @@ messages.
 
 {{% event event="m.room_key_request" %}}
 
-{{% event event="m.room_key" %}}
+{{% event event="m.forwarded_room_key" %}}
 
 {{% event event="m.dummy" %}}
 
diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml
index 8fd8cbc8..fc558c03 100644
--- a/data/api/client-server/create_room.yaml
+++ b/data/api/client-server/create_room.yaml
@@ -62,13 +62,11 @@ paths:
 
         The available presets do the following with respect to room state:
 
-        ========================  ==============  ======================  ================  =========
-                 Preset           `join_rules`  `history_visibility`  `guest_access`  Other
-        ========================  ==============  ======================  ================  =========
-        `private_chat`          `invite`      `shared`              `can_join`
-        `trusted_private_chat`  `invite`      `shared`              `can_join`      All invitees are given the same power level as the room creator.
-        `public_chat`           `public`      `shared`              `forbidden`
-        ========================  ==============  ======================  ================  =========
+        | Preset                 | `join_rules` | `history_visibility` | `guest_access` | Other |
+        |------------------------|--------------|----------------------|----------------|-------|
+        | `private_chat`         | `invite`     | `shared`             | `can_join`     |       |
+        | `trusted_private_chat` | `invite`     | `shared`             | `can_join`     | All invitees are given the same power level as the room creator. |
+        | `public_chat`          | `public`     | `shared`             | `forbidden`    |       |
 
         The server will create a `m.room.create` event in the room with the
         requesting user as the creator, alongside other keys provided in the
diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
index 1ad5123d..e0788b6b 100644
--- a/data/api/client-server/keys.yaml
+++ b/data/api/client-server/keys.yaml
@@ -437,7 +437,7 @@ paths:
           type: string
           description: |-
              The desired start point of the list. Should be the `next_batch` field
-             from a response to an earlier call to |/sync|. Users who have not
+             from a response to an earlier call to [`/sync`](/client-server-api/#get_matrixclientr0sync). Users who have not
              uploaded new device identity keys since this point, nor deleted
              existing devices with identity keys since then, will be excluded
              from the results.
@@ -448,7 +448,7 @@ paths:
           type: string
           description: |-
              The desired end point of the list. Should be the `next_batch`
-             field from a recent call to |/sync| - typically the most recent
+             field from a recent call to [`/sync`](/client-server-api/#get_matrixclientr0sync) - typically the most recent
              such call. This may be used by the server as a hint to check its
              caches are up to date.
           required: true

From a0316f67941d845252cf9c748356be0b445cd589 Mon Sep 17 00:00:00 2001
From: Will <will@bootbonnet.ca>
Date: Tue, 2 Feb 2021 11:07:31 -0800
Subject: [PATCH 16/19] Update path to Swagger files

---
 scripts/dump-swagger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dump-swagger.py b/scripts/dump-swagger.py
index 232ca8ad..4b4922ff 100755
--- a/scripts/dump-swagger.py
+++ b/scripts/dump-swagger.py
@@ -31,7 +31,7 @@ import yaml
 
 scripts_dir = os.path.dirname(os.path.abspath(__file__))
 templating_dir = os.path.join(scripts_dir, "templating")
-api_dir = os.path.join(os.path.dirname(scripts_dir), "api")
+api_dir = os.path.join(os.path.dirname(scripts_dir), "data", "api")
 
 sys.path.insert(0, templating_dir)
 

From 942f865f64ba8353add123b3e80bf80ff6d83add Mon Sep 17 00:00:00 2001
From: wbamberg <will@bootbonnet.ca>
Date: Fri, 5 Feb 2021 09:11:43 -0800
Subject: [PATCH 17/19] Fix typo in comment

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
 layouts/partials/json-schema/resolve-additional-types.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/json-schema/resolve-additional-types.html b/layouts/partials/json-schema/resolve-additional-types.html
index a4f95445..26df52e5 100644
--- a/layouts/partials/json-schema/resolve-additional-types.html
+++ b/layouts/partials/json-schema/resolve-additional-types.html
@@ -85,7 +85,7 @@
 {{/*
   Only copy the bits of the object that we actually care about.
   This is needed for uniqify to work - otherwise objects that are the same
-  but with (for example) different examples will be considered differen.
+  but with (for example) different examples will be considered different.
 */}}
 {{ define "partials/clean-object" }}
     {{ return (dict "title" .title "properties" .properties "required" .required "enum" .enum) }}

From 6fc1f52f2fa29f36dacf25b899ca0c0b068a16ef Mon Sep 17 00:00:00 2001
From: wbamberg <will@bootbonnet.ca>
Date: Fri, 5 Feb 2021 09:11:57 -0800
Subject: [PATCH 18/19] Fix typo in comment

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
 layouts/partials/openapi/render-object-table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/partials/openapi/render-object-table.html b/layouts/partials/openapi/render-object-table.html
index 0f4b3a77..bf275ed6 100644
--- a/layouts/partials/openapi/render-object-table.html
+++ b/layouts/partials/openapi/render-object-table.html
@@ -42,7 +42,7 @@
 
         {{/*
             If the property is an array, indicate this with square brackets,
-            like`[type]`.
+            like `[type]`.
         */}}
         {{ if eq $type "array"}}
             {{ $items := $property.items }}

From 07c66616ac7a05d66551a8119986f157789e31f0 Mon Sep 17 00:00:00 2001
From: wbamberg <will@bootbonnet.ca>
Date: Fri, 5 Feb 2021 09:12:07 -0800
Subject: [PATCH 19/19] Fix typo in comment

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
 layouts/shortcodes/msgtypes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/shortcodes/msgtypes.html b/layouts/shortcodes/msgtypes.html
index 695e9bb7..ccdfda5f 100644
--- a/layouts/shortcodes/msgtypes.html
+++ b/layouts/shortcodes/msgtypes.html
@@ -21,7 +21,7 @@
 {{ $excluded := slice "m.room.message$m.server_notice" }}
 
 {{/*
-  It then adds any other events that start `m.room.message`.
+  It then adds any other events that start with `m.room.message`.
 */}}
 {{ $events := index .Site.Data "event-schemas" "schema" }}
 {{ $expected_prefix := "m.room.message$"}}