Re-generate API files

76 files changed, 1119 insertions, 607 deletions

diff --git a/lib/application-service/definitions/protocol.h b/lib/application-service/definitions/protocol.h
index 6aee9c57..213dbf19 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/lib/application-service/definitions/protocol.h
@@ -40,7 +40,7 @@ struct ProtocolInstance {
     /// provided at the higher level Protocol object.
     QString icon;
 
-    /// Preset values for ``fields`` the client may use to search by.
+    /// Preset values for `fields` the client may use to search by.
     QJsonObject fields;
 
     /// A unique identifier across all instances.
@@ -81,10 +81,9 @@ struct ThirdPartyProtocol {
     /// A content URI representing an icon for the third party protocol.
     QString icon;
 
-    /// 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.
     QHash<QString, FieldType> fieldTypes;
diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h
index 9a31596f..0c760e80 100644
--- a/lib/csapi/account-data.h
+++ b/lib/csapi/account-data.h
@@ -12,7 +12,7 @@ namespace Quotient {
  *
  * 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`.
  */
 class SetAccountDataJob : public BaseJob {
 public:
@@ -65,7 +65,7 @@ public:
  *
  * 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`.
  */
 class SetAccountDataPerRoomJob : public BaseJob {
 public:
diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
index 570bf24a..d4fe639b 100644
--- a/lib/csapi/admin.h
+++ b/lib/csapi/admin.h
@@ -74,7 +74,10 @@ public:
     // Result properties
 
     /// The Matrix user ID of the user.
-    QString userId() const { return loadFromJson<QString>("user_id"_ls); }
+    QString userId() const
+    {
+        return loadFromJson<QString>("user_id"_ls);
+    }
 
     /// Each key is an identifier for one of the user's devices.
     QHash<QString, DeviceInfo> devices() const
diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
index 1966d533..e436971d 100644
--- a/lib/csapi/administrative_contact.h
+++ b/lib/csapi/administrative_contact.h
@@ -93,14 +93,14 @@ struct JsonObjectConverter<GetAccount3PIDsJob::ThirdPartyIdentifier> {
  *
  * 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
- *    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.
  */
 class Post3PIDsJob : public BaseJob {
 public:
@@ -144,7 +144,8 @@ struct JsonObjectConverter<Post3PIDsJob::ThreePidCredentials> {
 
 /*! \brief Adds contact information to the user's account.
  *
- * 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
@@ -206,7 +207,7 @@ public:
  * 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.
  */
@@ -222,9 +223,9 @@ public:
      *
      * \param idServer
      *   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`.
      */
     explicit Delete3pidFromAccountJob(const QString& medium,
                                       const QString& address,
@@ -233,8 +234,8 @@ public:
     // Result properties
 
     /// 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.
@@ -249,7 +250,7 @@ public:
  * 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.
  */
@@ -265,9 +266,9 @@ public:
      *
      * \param idServer
      *   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`.
      */
     explicit Unbind3pidFromAccountJob(const QString& medium,
                                       const QString& address,
@@ -276,8 +277,8 @@ public:
     // Result properties
 
     /// 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.
     QString idServerUnbindResult() const
@@ -293,7 +294,9 @@ public:
  * 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.
  */
@@ -307,9 +310,11 @@ public:
      *   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 email itself, either by sending a validation email itself or
-     * by using a service it has control over.
+     *   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.
      */
     explicit RequestTokenTo3PIDEmailJob(const EmailValidationData& body);
 
@@ -331,7 +336,9 @@ public:
  * 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.
  */
@@ -345,9 +352,11 @@ public:
      *   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 phone number itself, either by sending a validation message
-     * itself or by using a service it has control over.
+     *   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.
      */
     explicit RequestTokenTo3PIDMSISDNJob(const MsisdnValidationData& body);
 
diff --git a/lib/csapi/appservice_room_directory.cpp b/lib/csapi/appservice_room_directory.cpp
index e8ec55bf..4d87e4af 100644
--- a/lib/csapi/appservice_room_directory.cpp
+++ b/lib/csapi/appservice_room_directory.cpp
@@ -8,10 +8,10 @@
 
 using namespace Quotient;
 
-UpdateAppserviceRoomDirectoryVsibilityJob::UpdateAppserviceRoomDirectoryVsibilityJob(
+UpdateAppserviceRoomDirectoryVisibilityJob::UpdateAppserviceRoomDirectoryVisibilityJob(
     const QString& networkId, const QString& roomId, const QString& visibility)
     : BaseJob(HttpVerb::Put,
-              QStringLiteral("UpdateAppserviceRoomDirectoryVsibilityJob"),
+              QStringLiteral("UpdateAppserviceRoomDirectoryVisibilityJob"),
               QStringLiteral("/_matrix/client/r0")
                   % "/directory/list/appservice/" % networkId % "/" % roomId)
 {
diff --git a/lib/csapi/appservice_room_directory.h b/lib/csapi/appservice_room_directory.h
index 3fa02a07..56a69592 100644
--- a/lib/csapi/appservice_room_directory.h
+++ b/lib/csapi/appservice_room_directory.h
@@ -17,11 +17,11 @@ namespace Quotient {
  * 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``) instead of a typical client's access_token. This API cannot be
- * invoked by users who are not identified as application services.
+ * 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.
  */
-class UpdateAppserviceRoomDirectoryVsibilityJob : public BaseJob {
+class UpdateAppserviceRoomDirectoryVisibilityJob : public BaseJob {
 public:
     /*! \brief Updates a room's visibility in the application service's room
      * directory.
@@ -38,9 +38,9 @@ public:
      *   Whether the room should be visible (public) in the directory
      *   or not (private).
      */
-    explicit UpdateAppserviceRoomDirectoryVsibilityJob(const QString& networkId,
-                                                       const QString& roomId,
-                                                       const QString& visibility);
+    explicit UpdateAppserviceRoomDirectoryVisibilityJob(
+        const QString& networkId, const QString& roomId,
+        const QString& visibility);
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index 8a8ec664..8e0add1a 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -19,12 +19,14 @@ BanJob::BanJob(const QString& roomId, const QString& userId,
     setRequestData(std::move(_data));
 }
 
-UnbanJob::UnbanJob(const QString& roomId, const QString& userId)
+UnbanJob::UnbanJob(const QString& roomId, const QString& userId,
+                   const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("UnbanJob"),
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/unban")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(std::move(_data));
 }
diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h
index 37ae91ee..7a9697d3 100644
--- a/lib/csapi/banning.h
+++ b/lib/csapi/banning.h
@@ -30,7 +30,8 @@ public:
      *
      * \param reason
      *   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.
      */
     explicit BanJob(const QString& roomId, const QString& userId,
                     const QString& reason = {});
@@ -54,8 +55,13 @@ public:
      *
      * \param userId
      *   The fully qualified user ID of the user being unbanned.
+     *
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
      */
-    explicit UnbanJob(const QString& roomId, const QString& userId);
+    explicit UnbanJob(const QString& roomId, const QString& userId,
+                      const QString& reason = {});
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index ed67485c..a41453b2 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -32,7 +32,8 @@ public:
 
     // Result properties
 
-    /// The `MXC URI`_ to the uploaded content.
+    /// The [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the
+    /// uploaded content.
     QString contentUri() const
     {
         return loadFromJson<QString>("content_uri"_ls);
@@ -47,10 +48,10 @@ public:
     /*! \brief Download content from the content repository.
      *
      * \param serverName
-     *   The server name from the ``mxc://`` URI (the authoritory component)
+     *   The server name from the `mxc://` URI (the authoritory component)
      *
      * \param mediaId
-     *   The media ID from the ``mxc://`` URI (the path component)
+     *   The media ID from the `mxc://` URI (the path component)
      *
      * \param allowRemote
      *   Indicates to the server that it should not attempt to fetch the media
@@ -71,7 +72,10 @@ public:
     // Result properties
 
     /// The content type of the file that was previously uploaded.
-    QString contentType() const { return reply()->rawHeader("Content-Type"); }
+    QString contentType() const
+    {
+        return reply()->rawHeader("Content-Type");
+    }
 
     /// The name of the file that was previously uploaded, if set.
     QString contentDisposition() const
@@ -80,7 +84,10 @@ public:
     }
 
     /// The content that was previously uploaded.
-    QIODevice* data() { return reply(); }
+    QIODevice* data()
+    {
+        return reply();
+    }
 };
 
 /*! \brief Download content from the content repository overriding the file name
@@ -95,13 +102,13 @@ public:
      * name
      *
      * \param serverName
-     *   The server name from the ``mxc://`` URI (the authoritory component)
+     *   The server name from the `mxc://` URI (the authoritory component)
      *
      * \param mediaId
-     *   The media ID from the ``mxc://`` URI (the path component)
+     *   The media ID from the `mxc://` URI (the path component)
      *
      * \param fileName
-     *   A filename to give in the ``Content-Disposition`` header.
+     *   A filename to give in the `Content-Disposition` header.
      *
      * \param allowRemote
      *   Indicates to the server that it should not attempt to fetch the media
@@ -125,9 +132,12 @@ public:
     // Result properties
 
     /// The content type of the file that was previously uploaded.
-    QString contentType() const { return reply()->rawHeader("Content-Type"); }
+    QString contentType() const
+    {
+        return reply()->rawHeader("Content-Type");
+    }
 
-    /// 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.
     QString contentDisposition() const
     {
@@ -135,23 +145,27 @@ public:
     }
 
     /// The content that was previously uploaded.
-    QIODevice* data() { return reply(); }
+    QIODevice* data()
+    {
+        return reply();
+    }
 };
 
 /*! \brief Download a thumbnail of content from the content repository
  *
  * 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.
  */
 class GetContentThumbnailJob : public BaseJob {
 public:
     /*! \brief Download a thumbnail of content from the content repository
      *
      * \param serverName
-     *   The server name from the ``mxc://`` URI (the authoritory component)
+     *   The server name from the `mxc://` URI (the authoritory component)
      *
      * \param mediaId
-     *   The media ID from the ``mxc://`` URI (the path component)
+     *   The media ID from the `mxc://` URI (the path component)
      *
      * \param width
      *   The *desired* width of the thumbnail. The actual thumbnail may be
@@ -162,8 +176,8 @@ public:
      *   larger than the size specified.
      *
      * \param method
-     *   The desired resizing method. See the `thumbnailing <#thumbnails>`_
-     *   section for more information.
+     *   The desired resizing method. See the
+     * [Thumbnails](/client-server-api/#thumbnails) section for more information.
      *
      * \param allowRemote
      *   Indicates to the server that it should not attempt to fetch
@@ -188,10 +202,16 @@ public:
     // Result properties
 
     /// The content type of the thumbnail.
-    QString contentType() const { return reply()->rawHeader("Content-Type"); }
+    QString contentType() const
+    {
+        return reply()->rawHeader("Content-Type");
+    }
 
     /// A thumbnail of the requested content.
-    QIODevice* data() { return reply(); }
+    QIODevice* data()
+    {
+        return reply();
+    }
 };
 
 /*! \brief Get information about a URL for a client
@@ -199,11 +219,11 @@ public:
  * 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.
  */
 class GetUrlPreviewJob : public BaseJob {
 public:
@@ -235,8 +255,12 @@ public:
         return loadFromJson<Omittable<qint64>>("matrix:image:size"_ls);
     }
 
-    /// An `MXC URI`_ to the image. Omitted if there is no image.
-    QString ogImage() const { return loadFromJson<QString>("og:image"_ls); }
+    /// An [MXC URI](/client-server-api/#matrix-content-mxc-uris) to the image.
+    /// Omitted if there is no image.
+    QString ogImage() const
+    {
+        return loadFromJson<QString>("og:image"_ls);
+    }
 };
 
 /*! \brief Get the configuration for the content repository.
diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
index 6a718ff4..8c6af7d4 100644
--- a/lib/csapi/create_room.h
+++ b/lib/csapi/create_room.h
@@ -16,47 +16,42 @@ namespace Quotient {
  * 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`` state events).
+ * 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
- * ========================  ==============  ======================
- * ================  =========
- * ``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
+ * 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`.
  */
 class CreateRoomJob : public BaseJob {
 public:
@@ -68,50 +63,44 @@ public:
     /// 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
-    /// ========================  ==============  ======================
-    /// ================  =========
-    /// ``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
+    /// 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`.
     struct Invite3pid {
         /// The hostname+port of the identity server which should be used for
         /// third party identifier lookups.
@@ -121,7 +110,7 @@ public:
         /// r0.5-compatible clients and this specification version.
         QString idAccessToken;
         /// The kind of address being passed in the address field, for example
-        /// ``email``.
+        /// `email`.
         QString medium;
         /// The invitee's third party identifier.
         QString address;
@@ -133,50 +122,44 @@ public:
     /// 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
-    /// ========================  ==============  ======================
-    /// ================  =========
-    /// ``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
+    /// 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`.
     struct StateEvent {
         /// The type of event to send.
         QString type;
@@ -191,12 +174,12 @@ public:
     /*! \brief Create a new room
      *
      * \param visibility
-     *   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`.
      *
      * \param roomAliasName
      *   The desired room alias **local part**. If this is included, a
@@ -204,20 +187,20 @@ public:
      *   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.
      *
      * \param name
-     *   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`.
      *
      * \param topic
-     *   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`.
      *
      * \param invite
      *   A list of user IDs to invite to the room. This will tell the
@@ -230,14 +213,14 @@ public:
      * \param roomVersion
      *   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 support the room version.
+     * a 400 error with the errcode `M_UNSUPPORTED_ROOM_VERSION` if it does not
+     *   support the room version.
      *
      * \param creationContent
-     *   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 may allow the server to clobber other keys.
+     *   Extra keys, such as `m.federate`, to be added to the content
+     *   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.
      *
      * \param initialState
      *   A list of state events to set in the new room. This allows
@@ -245,28 +228,30 @@ public:
      *   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.
      *
      * \param preset
      *   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`.
      *
      * \param isDirect
-     *   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](/client-server-api/#direct-messaging) for more information.
      *
      * \param powerLevelContentOverride
      *   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 content prior to it being sent to the room.
-     * Defaults to overriding nothing.
+     *   [`m.room.power_levels`](client-server-api/#mroompower_levels)
+     *   event content prior to it being sent to the room. Defaults to
+     *   overriding nothing.
      */
     explicit CreateRoomJob(const QString& visibility = {},
                            const QString& roomAliasName = {},
@@ -283,7 +268,10 @@ public:
     // Result properties
 
     /// The created room's ID.
-    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
+    QString roomId() const
+    {
+        return loadFromJson<QString>("room_id"_ls);
+    }
 };
 
 template <>
diff --git a/lib/csapi/cross_signing.cpp b/lib/csapi/cross_signing.cpp
new file mode 100644
index 00000000..9bfc026a
--- /dev/null
+++ b/lib/csapi/cross_signing.cpp
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "cross_signing.h"
+
+#include <QtCore/QStringBuilder>
+
+using namespace Quotient;
+
+UploadCrossSigningKeysJob::UploadCrossSigningKeysJob(
+    const Omittable<CrossSigningKey>& masterKey,
+    const Omittable<CrossSigningKey>& selfSigningKey,
+    const Omittable<CrossSigningKey>& userSigningKey)
+    : BaseJob(HttpVerb::Post, QStringLiteral("UploadCrossSigningKeysJob"),
+              QStringLiteral("/_matrix/client/r0")
+                  % "/keys/device_signing/upload")
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("master_key"), masterKey);
+    addParam<IfNotEmpty>(_data, QStringLiteral("self_signing_key"),
+                         selfSigningKey);
+    addParam<IfNotEmpty>(_data, QStringLiteral("user_signing_key"),
+                         userSigningKey);
+    setRequestData(std::move(_data));
+}
+
+UploadCrossSigningSignaturesJob::UploadCrossSigningSignaturesJob(
+    const QHash<QString, QHash<QString, QJsonObject>>& signatures)
+    : BaseJob(HttpVerb::Post, QStringLiteral("UploadCrossSigningSignaturesJob"),
+              QStringLiteral("/_matrix/client/r0") % "/keys/signatures/upload")
+{
+    setRequestData(Data(toJson(signatures)));
+}
diff --git a/lib/csapi/cross_signing.h b/lib/csapi/cross_signing.h
new file mode 100644
index 00000000..2ab65e06
--- /dev/null
+++ b/lib/csapi/cross_signing.h
@@ -0,0 +1,72 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "csapi/definitions/cross_signing_key.h"
+
+#include "jobs/basejob.h"
+
+namespace Quotient {
+
+/*! \brief Upload cross-signing keys.
+ *
+ * Publishes cross-signing keys for the user.
+ *
+ * This API endpoint uses the [User-Interactive Authentication
+ * API](/client-server-api/#user-interactive-authentication-api).
+ */
+class UploadCrossSigningKeysJob : public BaseJob {
+public:
+    /*! \brief Upload cross-signing keys.
+     *
+     * \param masterKey
+     *   Optional. The user\'s master key.
+     *
+     * \param selfSigningKey
+     *   Optional. The user\'s self-signing key. Must be signed by
+     *   the accompanying master key, or by the user\'s most recently
+     *   uploaded master key if no master key is included in the
+     *   request.
+     *
+     * \param userSigningKey
+     *   Optional. The user\'s user-signing key. Must be signed by
+     *   the accompanying master key, or by the user\'s most recently
+     *   uploaded master key if no master key is included in the
+     *   request.
+     */
+    explicit UploadCrossSigningKeysJob(
+        const Omittable<CrossSigningKey>& masterKey = none,
+        const Omittable<CrossSigningKey>& selfSigningKey = none,
+        const Omittable<CrossSigningKey>& userSigningKey = none);
+};
+
+/*! \brief Upload cross-signing signatures.
+ *
+ * Publishes cross-signing signatures for the user.  The request body is a
+ * map from user ID to key ID to signed JSON object.
+ */
+class UploadCrossSigningSignaturesJob : public BaseJob {
+public:
+    /*! \brief Upload cross-signing signatures.
+     *
+     * \param signatures
+     *   The signatures to be published.
+     */
+    explicit UploadCrossSigningSignaturesJob(
+        const QHash<QString, QHash<QString, QJsonObject>>& signatures = {});
+
+    // Result properties
+
+    /// 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`.
+    QHash<QString, QHash<QString, QJsonObject>> failures() const
+    {
+        return loadFromJson<QHash<QString, QHash<QString, QJsonObject>>>(
+            "failures"_ls);
+    }
+};
+
+} // namespace Quotient
diff --git a/lib/csapi/definitions/cross_signing_key.h b/lib/csapi/definitions/cross_signing_key.h
new file mode 100644
index 00000000..0cec8161
--- /dev/null
+++ b/lib/csapi/definitions/cross_signing_key.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "converters.h"
+
+namespace Quotient {
+/// Cross signing key
+struct CrossSigningKey {
+    /// The ID of the user the key belongs to.
+    QString userId;
+
+    /// What the key is used for.
+    QStringList usage;
+
+    /// The public key.  The object must have exactly one property, whose name
+    /// is in the form `<algorithm>:<unpadded_base64_public_key>`, and whose
+    /// value is the unpadded base64 public key.
+    QHash<QString, QString> keys;
+
+    /// 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.
+    QJsonObject signatures;
+};
+
+template <>
+struct JsonObjectConverter<CrossSigningKey> {
+    static void dumpTo(QJsonObject& jo, const CrossSigningKey& pod)
+    {
+        addParam<>(jo, QStringLiteral("user_id"), pod.userId);
+        addParam<>(jo, QStringLiteral("usage"), pod.usage);
+        addParam<>(jo, QStringLiteral("keys"), pod.keys);
+        addParam<IfNotEmpty>(jo, QStringLiteral("signatures"), pod.signatures);
+    }
+    static void fillFrom(const QJsonObject& jo, CrossSigningKey& pod)
+    {
+        fromJson(jo.value("user_id"_ls), pod.userId);
+        fromJson(jo.value("usage"_ls), pod.usage);
+        fromJson(jo.value("keys"_ls), pod.keys);
+        fromJson(jo.value("signatures"_ls), pod.signatures);
+    }
+};
+
+} // namespace Quotient
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index 3065f218..84ecefae 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -21,15 +21,15 @@ struct DeviceKeys {
     QStringList algorithms;
 
     /// 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.
     QHash<QString, QString> keys;
 
     /// 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`_.
+    /// The signature is calculated using the process described at [Signing
+    /// JSON](/appendices/#signing-json).
     QHash<QString, QHash<QString, QString>> signatures;
 };
 
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 67497412..c55d4f92 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -14,13 +14,13 @@ struct EventFilter {
 
     /// 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.
+    /// the `'senders'` filter.
     QStringList notSenders;
 
     /// 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 of characters.
+    /// listed in the `'types'` filter. A '*' can be used as a wildcard to match
+    /// any sequence of characters.
     QStringList notTypes;
 
     /// A list of senders IDs to include. If this list is absent then all
@@ -28,7 +28,7 @@ struct EventFilter {
     QStringList senders;
 
     /// 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
+    /// types are included. A `'*'` can be used as a wildcard to match any
     /// sequence of characters.
     QStringList types;
 };
diff --git a/lib/csapi/definitions/openid_token.h b/lib/csapi/definitions/openid_token.h
index 5e68c376..3c447321 100644
--- a/lib/csapi/definitions/openid_token.h
+++ b/lib/csapi/definitions/openid_token.h
@@ -11,10 +11,10 @@ namespace Quotient {
 struct OpenidToken {
     /// 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.
     QString accessToken;
 
-    /// The string ``Bearer``.
+    /// The string `Bearer`.
     QString tokenType;
 
     /// The homeserver domain the consumer should use when attempting to
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index 8f30e607..34b447d2 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -37,6 +37,12 @@ struct PublicRoomsChunk {
 
     /// The URL for the room's avatar, if one is set.
     QString avatarUrl;
+
+    /// The room's join rule. When not present, the room is assumed to
+    /// be `public`. Note that rooms with `invite` join rules are not
+    /// expected here, but rooms with `knock` rules are given their
+    /// near-public nature.
+    QString joinRule;
 };
 
 template <>
@@ -54,6 +60,7 @@ struct JsonObjectConverter<PublicRoomsChunk> {
         addParam<>(jo, QStringLiteral("world_readable"), pod.worldReadable);
         addParam<>(jo, QStringLiteral("guest_can_join"), pod.guestCanJoin);
         addParam<IfNotEmpty>(jo, QStringLiteral("avatar_url"), pod.avatarUrl);
+        addParam<IfNotEmpty>(jo, QStringLiteral("join_rule"), pod.joinRule);
     }
     static void fillFrom(const QJsonObject& jo, PublicRoomsChunk& pod)
     {
@@ -66,6 +73,7 @@ struct JsonObjectConverter<PublicRoomsChunk> {
         fromJson(jo.value("world_readable"_ls), pod.worldReadable);
         fromJson(jo.value("guest_can_join"_ls), pod.guestCanJoin);
         fromJson(jo.value("avatar_url"_ls), pod.avatarUrl);
+        fromJson(jo.value("join_rule"_ls), pod.joinRule);
     }
 };
 
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index a6decf1b..ce66d075 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -9,26 +9,27 @@
 namespace Quotient {
 
 struct PushCondition {
-    /// The kind of condition to apply. See `conditions <#conditions>`_ for
-    /// more information on the allowed kinds and how they work.
+    /// The kind of condition to apply. See
+    /// [conditions](/client-server-api/#conditions) for more information on the
+    /// allowed kinds and how they work.
     QString kind;
 
-    /// 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`.
     QString key;
 
-    /// 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.
     QString pattern;
 
-    /// 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/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index 43749bae..135537c1 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -25,10 +25,10 @@ struct PushRule {
 
     /// 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.
     QVector<PushCondition> conditions;
 
-    /// The glob-style pattern to match against.  Only applicable to ``content``
+    /// The glob-style pattern to match against.  Only applicable to `content`
     /// rules.
     QString pattern;
 };
diff --git a/lib/csapi/definitions/request_email_validation.h b/lib/csapi/definitions/request_email_validation.h
index ab34862e..b1781e27 100644
--- a/lib/csapi/definitions/request_email_validation.h
+++ b/lib/csapi/definitions/request_email_validation.h
@@ -16,15 +16,14 @@ struct EmailValidationData : RequestEmailValidation {
     /// 3PID verification.
     ///
     /// This parameter is deprecated with a plan to be removed in a future
-    /// specification version for ``/account/password`` and ``/register``
-    /// requests.
+    /// specification version for `/account/password` and `/register` requests.
     QString idServer;
 
     /// An access token previously registered with the identity server. Servers
     /// 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.
     QString idAccessToken;
 };
 
diff --git a/lib/csapi/definitions/request_msisdn_validation.h b/lib/csapi/definitions/request_msisdn_validation.h
index 8539cd98..4600b48c 100644
--- a/lib/csapi/definitions/request_msisdn_validation.h
+++ b/lib/csapi/definitions/request_msisdn_validation.h
@@ -16,15 +16,14 @@ struct MsisdnValidationData : RequestMsisdnValidation {
     /// 3PID verification.
     ///
     /// This parameter is deprecated with a plan to be removed in a future
-    /// specification version for ``/account/password`` and ``/register``
-    /// requests.
+    /// specification version for `/account/password` and `/register` requests.
     QString idServer;
 
     /// An access token previously registered with the identity server. Servers
     /// 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.
     QString idAccessToken;
 };
 
diff --git a/lib/csapi/definitions/request_token_response.h b/lib/csapi/definitions/request_token_response.h
index 00222839..f9981100 100644
--- a/lib/csapi/definitions/request_token_response.h
+++ b/lib/csapi/definitions/request_token_response.h
@@ -10,20 +10,20 @@ namespace Quotient {
 
 struct RequestTokenResponse {
     /// The session ID. Session IDs are opaque strings that must consist
-    /// entirely of the characters ``[0-9a-zA-Z.=_-]``. Their length must not
+    /// entirely of the characters `[0-9a-zA-Z.=_-]`. Their length must not
     /// exceed 255 characters and they must not be empty.
     QString sid;
 
     /// 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
+    /// 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).
     QString submitUrl;
 };
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 11e87fde..91caf667 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -11,30 +11,31 @@
 namespace Quotient {
 
 struct RoomEventFilter : EventFilter {
-    /// If ``true``, enables lazy-loading of membership events. See
-    /// `Lazy-loading room members <#lazy-loading-room-members>`_
-    /// for more information. Defaults to ``false``.
+    /// If `true`, enables lazy-loading of membership events. See
+    /// [Lazy-loading room
+    /// members](/client-server-api/#lazy-loading-room-members) for more
+    /// information. Defaults to `false`.
     Omittable<bool> lazyLoadMembers;
 
-    /// 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>`_ for more information. Defaults to
-    /// ``false``.
+    /// 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](/client-server-api/#lazy-loading-room-members) for more
+    /// information. Defaults to `false`.
     Omittable<bool> includeRedundantMembers;
 
     /// 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.
+    /// `'rooms'` filter.
     QStringList notRooms;
 
     /// A list of room IDs to include. If this list is absent then all rooms are
     /// included.
     QStringList rooms;
 
-    /// 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.
+    /// 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.
     Omittable<bool> containsUrl;
 };
 
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index 9c8f08d5..62e17962 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -14,13 +14,13 @@ namespace Quotient {
 struct RoomFilter {
     /// 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``
+    /// `'rooms'` filter. This filter is applied before the filters in
+    /// `ephemeral`, `state`, `timeline` or `account_data`
     QStringList notRooms;
 
     /// 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``
+    /// included. This filter is applied before the filters in `ephemeral`,
+    /// `state`, `timeline` or `account_data`
     QStringList rooms;
 
     /// The events that aren't recorded in the room history, e.g. typing and
diff --git a/lib/csapi/definitions/third_party_signed.h b/lib/csapi/definitions/third_party_signed.h
index 526545d0..7097bda4 100644
--- a/lib/csapi/definitions/third_party_signed.h
+++ b/lib/csapi/definitions/third_party_signed.h
@@ -7,7 +7,7 @@
 #include "converters.h"
 
 namespace Quotient {
-/// 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.
 struct ThirdPartySigned {
     /// The Matrix ID of the user who issued the invite.
diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index dadf6f97..cb585a6a 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -9,8 +9,9 @@
 namespace Quotient {
 /// Identification information for a user
 struct UserIdentifier {
-    /// The type of identification.  See `Identifier types`_ for supported
-    /// values and additional property descriptions.
+    /// The type of identification.  See [Identifier
+    /// types](/client-server-api/#identifier-types) for supported values and
+    /// additional property descriptions.
     QString type;
 
     /// Identification information for a user
diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
index 47dc7ec8..e2acea18 100644
--- a/lib/csapi/device_management.h
+++ b/lib/csapi/device_management.h
@@ -59,7 +59,10 @@ public:
     // Result properties
 
     /// Device information
-    Device device() const { return fromJson<Device>(jsonData()); }
+    Device device() const
+    {
+        return fromJson<Device>(jsonData());
+    }
 };
 
 /*! \brief Update a device
@@ -83,7 +86,8 @@ public:
 
 /*! \brief Delete a device
  *
- * 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.
  */
@@ -104,7 +108,8 @@ public:
 
 /*! \brief Bulk deletion of devices
  *
- * 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.
diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h
index 9b109aad..00215cae 100644
--- a/lib/csapi/directory.h
+++ b/lib/csapi/directory.h
@@ -51,7 +51,10 @@ public:
     // Result properties
 
     /// The room ID for this room alias.
-    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
+    QString roomId() const
+    {
+        return loadFromJson<QString>("room_id"_ls);
+    }
 
     /// A list of servers that are aware of this room alias.
     QStringList servers() const
@@ -68,13 +71,13 @@ public:
  * 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.
+ * **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.
+ * update the `m.room.canonical_alias` event.
  */
 class DeleteRoomAliasJob : public BaseJob {
 public:
@@ -99,18 +102,18 @@ public:
  * 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,
  * 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.
  */
 class GetLocalAliasesJob : public BaseJob {
 public:
diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index d82d16ab..6a49769f 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -16,8 +16,8 @@ namespace Quotient {
  * 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.
  */
 class GetEventContextJob : public BaseJob {
 public:
@@ -33,13 +33,13 @@ public:
      *   The maximum number of events to return. Default: 10.
      *
      * \param filter
-     *   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.
+     *   See [Filtering](/client-server-api/#filtering) for more information.
      */
     explicit GetEventContextJob(const QString& roomId, const QString& eventId,
                                 Omittable<int> limit = none,
@@ -58,10 +58,16 @@ public:
     // Result properties
 
     /// A token that can be used to paginate backwards with.
-    QString begin() const { return loadFromJson<QString>("start"_ls); }
+    QString begin() const
+    {
+        return loadFromJson<QString>("start"_ls);
+    }
 
     /// A token that can be used to paginate forwards with.
-    QString end() const { return loadFromJson<QString>("end"_ls); }
+    QString end() const
+    {
+        return loadFromJson<QString>("end"_ls);
+    }
 
     /// A list of room events that happened just before the
     /// requested event, in reverse-chronological order.
@@ -71,7 +77,10 @@ public:
     }
 
     /// Details of the requested event.
-    RoomEventPtr event() { return takeFromJson<RoomEventPtr>("event"_ls); }
+    RoomEventPtr event()
+    {
+        return takeFromJson<RoomEventPtr>("event"_ls);
+    }
 
     /// A list of room events that happened just after the
     /// requested event, in chronological order.
@@ -81,7 +90,10 @@ public:
     }
 
     /// The state of the room at the last event returned.
-    StateEvents state() { return takeFromJson<StateEvents>("state"_ls); }
+    StateEvents state()
+    {
+        return takeFromJson<StateEvents>("state"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/filter.h b/lib/csapi/filter.h
index f07b489c..7e9e14ee 100644
--- a/lib/csapi/filter.h
+++ b/lib/csapi/filter.h
@@ -32,10 +32,13 @@ public:
     // Result properties
 
     /// 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.
-    QString filterId() const { return loadFromJson<QString>("filter_id"_ls); }
+    QString filterId() const
+    {
+        return loadFromJson<QString>("filter_id"_ls);
+    }
 };
 
 /*! \brief Download a filter
@@ -64,7 +67,10 @@ public:
     // Result properties
 
     /// The filter definition.
-    Filter filter() const { return fromJson<Filter>(jsonData()); }
+    Filter filter() const
+    {
+        return fromJson<Filter>(jsonData());
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp
index 01620f9e..1e2554f4 100644
--- a/lib/csapi/inviting.cpp
+++ b/lib/csapi/inviting.cpp
@@ -8,12 +8,14 @@
 
 using namespace Quotient;
 
-InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId)
+InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId,
+                             const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("InviteUserJob"),
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/invite")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("user_id"), userId);
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(std::move(_data));
 }
diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h
index 59a61b89..eb13cc95 100644
--- a/lib/csapi/inviting.h
+++ b/lib/csapi/inviting.h
@@ -10,12 +10,11 @@ namespace Quotient {
 
 /*! \brief Invite a user to participate in a particular room.
  *
- * .. _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
@@ -25,9 +24,7 @@ namespace Quotient {
  * join that room.
  *
  * 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`_
+ * `m.room.member` event to the room.
  */
 class InviteUserJob : public BaseJob {
 public:
@@ -38,8 +35,13 @@ public:
      *
      * \param userId
      *   The fully qualified user ID of the invitee.
+     *
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
      */
-    explicit InviteUserJob(const QString& roomId, const QString& userId);
+    explicit InviteUserJob(const QString& roomId, const QString& userId,
+                           const QString& reason = {});
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 4761e949..998d0b42 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -9,13 +9,15 @@
 using namespace Quotient;
 
 JoinRoomByIdJob::JoinRoomByIdJob(
-    const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned)
+    const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned,
+    const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomByIdJob"),
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/join")
 {
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(std::move(_data));
     addExpectedKey("room_id");
 }
@@ -29,7 +31,8 @@ auto queryToJoinRoom(const QStringList& serverName)
 
 JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
                          const QStringList& serverName,
-                         const Omittable<ThirdPartySigned>& thirdPartySigned)
+                         const Omittable<ThirdPartySigned>& thirdPartySigned,
+                         const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("JoinRoomJob"),
               QStringLiteral("/_matrix/client/r0") % "/join/" % roomIdOrAlias,
               queryToJoinRoom(serverName))
@@ -37,6 +40,7 @@ JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
     QJsonObject _data;
     addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
                          thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(std::move(_data));
     addExpectedKey("room_id");
 }
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index dd936f92..6dcd1351 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -13,7 +13,7 @@ namespace Quotient {
 /*! \brief Start the requesting user participating in a particular room.
  *
  * *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
@@ -21,7 +21,9 @@ namespace Quotient {
  * 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.
  */
 class JoinRoomByIdJob : public BaseJob {
 public:
@@ -32,23 +34,31 @@ public:
      *
      * \param thirdPartySigned
      *   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.
+     *
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
      */
     explicit JoinRoomByIdJob(
         const QString& roomId,
-        const Omittable<ThirdPartySigned>& thirdPartySigned = none);
+        const Omittable<ThirdPartySigned>& thirdPartySigned = none,
+        const QString& reason = {});
 
     // Result properties
 
     /// The joined room ID.
-    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
+    QString roomId() const
+    {
+        return loadFromJson<QString>("room_id"_ls);
+    }
 };
 
 /*! \brief Start the requesting user participating in a particular room.
  *
  * *Note that this API takes either a room ID or alias, unlike*
- * ``/room/{roomId}/join``.
+ * `/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
@@ -56,7 +66,9 @@ public:
  * 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.
  */
 class JoinRoomJob : public BaseJob {
 public:
@@ -70,18 +82,26 @@ public:
      *   must be participating in the room.
      *
      * \param thirdPartySigned
-     *   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.
+     *
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
      */
     explicit JoinRoomJob(
         const QString& roomIdOrAlias, const QStringList& serverName = {},
-        const Omittable<ThirdPartySigned>& thirdPartySigned = none);
+        const Omittable<ThirdPartySigned>& thirdPartySigned = none,
+        const QString& reason = {});
 
     // Result properties
 
     /// The joined room ID.
-    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
+    QString roomId() const
+    {
+        return loadFromJson<QString>("room_id"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/keys.h b/lib/csapi/keys.h
index 8f6c8cc9..53ba6495 100644
--- a/lib/csapi/keys.h
+++ b/lib/csapi/keys.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "csapi/definitions/cross_signing_key.h"
 #include "csapi/definitions/device_keys.h"
 
 #include "jobs/basejob.h"
@@ -25,8 +26,8 @@ public:
      * \param oneTimeKeys
      *   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>`_.
+     *   `<algorithm>:<key_id>`. The format of the key is determined
+     *   by the [key algorithm](/client-server-api/#key-algorithms).
      *
      *   May be absent if no new one-time keys are required.
      */
@@ -98,7 +99,7 @@ public:
     ///
     /// 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.
     QHash<QString, QJsonObject> failures() const
     {
         return loadFromJson<QHash<QString, QJsonObject>>("failures"_ls);
@@ -107,13 +108,45 @@ public:
     /// 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.
     QHash<QString, QHash<QString, DeviceInformation>> deviceKeys() const
     {
         return loadFromJson<QHash<QString, QHash<QString, DeviceInformation>>>(
             "device_keys"_ls);
     }
+
+    /// 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
+    /// is allowed to see.
+    QHash<QString, CrossSigningKey> masterKeys() const
+    {
+        return loadFromJson<QHash<QString, CrossSigningKey>>("master_keys"_ls);
+    }
+
+    /// 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`.
+    QHash<QString, CrossSigningKey> selfSigningKeys() const
+    {
+        return loadFromJson<QHash<QString, CrossSigningKey>>(
+            "self_signing_keys"_ls);
+    }
+
+    /// Information on the user-signing key of the user making the
+    /// 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`.
+    QHash<QString, CrossSigningKey> userSigningKeys() const
+    {
+        return loadFromJson<QHash<QString, CrossSigningKey>>(
+            "user_signing_keys"_ls);
+    }
 };
 
 template <>
@@ -163,18 +196,17 @@ public:
     ///
     /// 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.
     QHash<QString, QJsonObject> failures() const
     {
         return loadFromJson<QHash<QString, QJsonObject>>("failures"_ls);
     }
 
     /// 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.
+    /// See the [key algorithms](/client-server-api/#key-algorithms) section for
+    /// information on the Key Object format.
     QHash<QString, QHash<QString, QVariant>> oneTimeKeys() const
     {
         return loadFromJson<QHash<QString, QHash<QString, QVariant>>>(
@@ -190,26 +222,28 @@ public:
  * 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`.
  */
 class GetKeysChangesJob : public BaseJob {
 public:
     /*! \brief Query users with recent device key updates.
      *
      * \param from
-     *   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
+     *   The desired start point of the list. Should be the `next_batch` field
+     *   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.
      *
      * \param to
-     *   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.
+     *   The desired end point of the list. Should be the `next_batch`
+     *   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.
      */
     explicit GetKeysChangesJob(const QString& from, const QString& to);
 
@@ -233,7 +267,10 @@ public:
     /// The Matrix User IDs of all users who may have left all
     /// the end-to-end encrypted rooms they previously shared
     /// with the user.
-    QStringList left() const { return loadFromJson<QStringList>("left"_ls); }
+    QStringList left() const
+    {
+        return loadFromJson<QStringList>("left"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
index 2645a54f..11018368 100644
--- a/lib/csapi/kicking.h
+++ b/lib/csapi/kicking.h
@@ -15,10 +15,10 @@ namespace Quotient {
  * 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
+ * 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>``.
+ * `/rooms/<room id>/state/m.room.member/<user id>`.
  */
 class KickJob : public BaseJob {
 public:
@@ -32,7 +32,8 @@ public:
      *
      * \param reason
      *   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.
      */
     explicit KickJob(const QString& roomId, const QString& userId,
                      const QString& reason = {});
diff --git a/lib/csapi/knocking.cpp b/lib/csapi/knocking.cpp
new file mode 100644
index 00000000..4b561300
--- /dev/null
+++ b/lib/csapi/knocking.cpp
@@ -0,0 +1,28 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#include "knocking.h"
+
+#include <QtCore/QStringBuilder>
+
+using namespace Quotient;
+
+auto queryToKnockRoom(const QStringList& serverName)
+{
+    BaseJob::Query _q;
+    addParam<IfNotEmpty>(_q, QStringLiteral("server_name"), serverName);
+    return _q;
+}
+
+KnockRoomJob::KnockRoomJob(const QString& roomIdOrAlias,
+                           const QStringList& serverName, const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("KnockRoomJob"),
+              QStringLiteral("/_matrix/client/r0") % "/knock/" % roomIdOrAlias,
+              queryToKnockRoom(serverName))
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
+    setRequestData(std::move(_data));
+    addExpectedKey("room_id");
+}
diff --git a/lib/csapi/knocking.h b/lib/csapi/knocking.h
new file mode 100644
index 00000000..607b55a9
--- /dev/null
+++ b/lib/csapi/knocking.h
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "jobs/basejob.h"
+
+namespace Quotient {
+
+/*! \brief Knock on a room, requesting permission to join.
+ *
+ * *Note that this API takes either a room ID or alias, unlike other membership
+ * APIs.*
+ *
+ * This API "knocks" on the room to ask for permission to join, if the user
+ * is allowed to knock on the room. Acceptance of the knock happens out of
+ * band from this API, meaning that the client will have to watch for updates
+ * regarding the acceptance/rejection of the knock.
+ *
+ * If the room history settings allow, the user will still be able to see
+ * history of the room while being in the "knock" state. The user will have
+ * to accept the invitation to join the room (acceptance of knock) to see
+ * messages reliably. See the `/join` endpoints for more information about
+ * history visibility to the user.
+ *
+ * The knock will appear as an entry in the response of the
+ * [`/sync`](/client-server-api/#get_matrixclientr0sync) API.
+ */
+class KnockRoomJob : public BaseJob {
+public:
+    /*! \brief Knock on a room, requesting permission to join.
+     *
+     * \param roomIdOrAlias
+     *   The room identifier or alias to knock upon.
+     *
+     * \param serverName
+     *   The servers to attempt to knock on the room through. One of the servers
+     *   must be participating in the room.
+     *
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
+     */
+    explicit KnockRoomJob(const QString& roomIdOrAlias,
+                          const QStringList& serverName = {},
+                          const QString& reason = {});
+
+    // Result properties
+
+    /// The knocked room ID.
+    QString roomId() const
+    {
+        return loadFromJson<QString>("room_id"_ls);
+    }
+};
+
+} // namespace Quotient
diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index 8bd170bf..f4c5f120 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -8,18 +8,15 @@
 
 using namespace Quotient;
 
-QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
-{
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/rooms/" % roomId % "/leave");
-}
-
-LeaveRoomJob::LeaveRoomJob(const QString& roomId)
+LeaveRoomJob::LeaveRoomJob(const QString& roomId, const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("LeaveRoomJob"),
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/leave")
-{}
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
+    setRequestData(std::move(_data));
+}
 
 QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
 {
diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h
index 1bea7e41..2e402d16 100644
--- a/lib/csapi/leaving.h
+++ b/lib/csapi/leaving.h
@@ -28,15 +28,12 @@ public:
      *
      * \param roomId
      *   The room identifier to leave.
-     */
-    explicit LeaveRoomJob(const QString& roomId);
-
-    /*! \brief Construct a URL without creating a full-fledged job object
      *
-     * This function can be used when a URL for LeaveRoomJob
-     * is necessary but the job itself isn't.
+     * \param reason
+     *   Optional reason to be included as the `reason` on the subsequent
+     *   membership event.
      */
-    static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
+    explicit LeaveRoomJob(const QString& roomId, const QString& reason = {});
 };
 
 /*! \brief Stop the requesting user remembering about a particular room.
diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h
index 1034aa7b..59a24a49 100644
--- a/lib/csapi/list_joined_rooms.h
+++ b/lib/csapi/list_joined_rooms.h
@@ -26,7 +26,7 @@ public:
 
     // Result properties
 
-    /// The ID of each room in which the user has ``joined`` membership.
+    /// The ID of each room in which the user has `joined` membership.
     QStringList joinedRooms() const
     {
         return loadFromJson<QStringList>("joined_rooms"_ls);
diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index b0cb79d2..1c73c0af 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -111,12 +111,18 @@ public:
     /// A pagination token for the response. The absence of this token
     /// means there are no more results to fetch and the client should
     /// stop paginating.
-    QString nextBatch() const { return loadFromJson<QString>("next_batch"_ls); }
+    QString nextBatch() const
+    {
+        return loadFromJson<QString>("next_batch"_ls);
+    }
 
     /// A pagination token that allows fetching previous results. The
     /// absence of this token means there are no results before this
     /// batch, i.e. this is the first batch.
-    QString prevBatch() const { return loadFromJson<QString>("prev_batch"_ls); }
+    QString prevBatch() const
+    {
+        return loadFromJson<QString>("prev_batch"_ls);
+    }
 
     /// An estimate on the total number of public rooms, if the
     /// server has an estimate.
@@ -170,7 +176,7 @@ public:
      *
      * \param thirdPartyInstanceId
      *   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.
      */
     explicit QueryPublicRoomsJob(const QString& server = {},
                                  Omittable<int> limit = none,
@@ -190,12 +196,18 @@ public:
     /// A pagination token for the response. The absence of this token
     /// means there are no more results to fetch and the client should
     /// stop paginating.
-    QString nextBatch() const { return loadFromJson<QString>("next_batch"_ls); }
+    QString nextBatch() const
+    {
+        return loadFromJson<QString>("next_batch"_ls);
+    }
 
     /// A pagination token that allows fetching previous results. The
     /// absence of this token means there are no results before this
     /// batch, i.e. this is the first batch.
-    QString prevBatch() const { return loadFromJson<QString>("prev_batch"_ls); }
+    QString prevBatch() const
+    {
+        return loadFromJson<QString>("prev_batch"_ls);
+    }
 
     /// An estimate on the total number of public rooms, if the
     /// server has an estimate.
diff --git a/lib/csapi/login.h b/lib/csapi/login.h
index a406fc79..ce783af2 100644
--- a/lib/csapi/login.h
+++ b/lib/csapi/login.h
@@ -14,17 +14,17 @@ namespace Quotient {
 /*! \brief Get the supported login types to authenticate users
  *
  * 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.
  */
 class GetLoginFlowsJob : public BaseJob {
 public:
     // Inner data structures
 
     /// Gets the homeserver's supported login types to authenticate users.
-    /// Clients should pick one of these and supply it as the ``type`` when
+    /// Clients should pick one of these and supply it as the `type` when
     /// logging in.
     struct LoginFlow {
-        /// The login type. This is supplied as the ``type`` when
+        /// The login type. This is supplied as the `type` when
         /// logging in.
         QString type;
     };
@@ -64,13 +64,14 @@ struct JsonObjectConverter<GetLoginFlowsJob::LoginFlow> {
  * 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`_.
+ * [Relationship between access tokens and
+ * devices](/client-server-api/#relationship-between-access-tokens-and-devices).
  */
 class LoginJob : public BaseJob {
 public:
@@ -83,30 +84,33 @@ public:
      *   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`_.
+     *   [Relationship between access tokens and
+     * devices](/client-server-api/#relationship-between-access-tokens-and-devices).
      *
      * \param password
-     *   Required when ``type`` is ``m.login.password``. The user's
+     *   Required when `type` is `m.login.password`. The user's
      *   password.
      *
      * \param token
-     *   Required when ``type`` is ``m.login.token``. Part of `Token-based`_
-     * login.
+     *   Required when `type` is `m.login.token`. Part of Token-based login.
      *
      * \param deviceId
      *   ID of the client device. If this does not correspond to a
-     *   known client device, a new device will be created. The server
-     *   will auto-generate a device_id if this is not specified.
+     *   known client device, a new device will be created. The given
+     *   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.
      *
      * \param initialDeviceDisplayName
      *   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.
      */
     explicit LoginJob(const QString& type,
                       const Omittable<UserIdentifier>& identifier = none,
@@ -117,7 +121,10 @@ public:
     // Result properties
 
     /// The fully-qualified Matrix ID for the account.
-    QString userId() const { return loadFromJson<QString>("user_id"_ls); }
+    QString userId() const
+    {
+        return loadFromJson<QString>("user_id"_ls);
+    }
 
     /// An access token for the account.
     /// This access token can then be used to authorize other requests.
@@ -130,8 +137,8 @@ public:
     /// 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.
     QString homeServer() const
     {
         return loadFromJson<QString>("home_server"_ls);
@@ -139,7 +146,10 @@ public:
 
     /// ID of the logged-in device. Will be the same as the
     /// corresponding parameter in the request, if one was specified.
-    QString deviceId() const { return loadFromJson<QString>("device_id"_ls); }
+    QString deviceId() const
+    {
+        return loadFromJson<QString>("device_id"_ls);
+    }
 
     /// Optional client configuration provided by the server. If present,
     /// clients SHOULD use the provided object to reconfigure themselves,
diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index 78f14e40..2e4c2692 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -12,7 +12,8 @@ namespace Quotient {
  *
  * 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.
  */
 class LogoutJob : public BaseJob {
 public:
@@ -31,10 +32,12 @@ public:
  *
  * 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 deleted alongside the device.
+ * devices 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
diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
index 286d4237..020ef543 100644
--- a/lib/csapi/message_pagination.h
+++ b/lib/csapi/message_pagination.h
@@ -15,8 +15,8 @@ namespace Quotient {
  * 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.
  */
 class GetRoomEventsJob : public BaseJob {
 public:
@@ -27,8 +27,8 @@ public:
      *
      * \param from
      *   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.
      *
      * \param dir
@@ -36,8 +36,8 @@ public:
      *
      * \param to
      *   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.
      *
      * \param limit
@@ -64,29 +64,41 @@ public:
 
     // Result properties
 
-    /// The token the pagination starts from. If ``dir=b`` this will be
-    /// the token supplied in ``from``.
-    QString begin() const { return loadFromJson<QString>("start"_ls); }
+    /// The token the pagination starts from. If `dir=b` this will be
+    /// the token supplied in `from`.
+    QString begin() const
+    {
+        return loadFromJson<QString>("start"_ls);
+    }
 
-    /// 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.
-    QString end() const { return loadFromJson<QString>("end"_ls); }
+    QString end() const
+    {
+        return loadFromJson<QString>("end"_ls);
+    }
 
-    /// 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.
-    RoomEvents chunk() { return takeFromJson<RoomEvents>("chunk"_ls); }
+    /// 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.
+    RoomEvents chunk()
+    {
+        return takeFromJson<RoomEvents>("chunk"_ls);
+    }
 
-    /// 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.
-    StateEvents state() { return takeFromJson<StateEvents>("state"_ls); }
+    StateEvents state()
+    {
+        return takeFromJson<StateEvents>("state"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index ff499c7a..0cc165ce 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -22,7 +22,7 @@ public:
     /// user has been, or would have been notified about.
     struct Notification {
         /// 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).
         QVector<QVariant> actions;
         /// The Event object for the event that triggered the notification.
         EventPtr event;
@@ -35,7 +35,7 @@ public:
         QString roomId;
         /// The unix timestamp at which the event notification was sent,
         /// in milliseconds.
-        int ts;
+        qint64 ts;
     };
 
     // Construction/destruction
@@ -49,7 +49,7 @@ public:
      *   Limit on the number of events to return in this request.
      *
      * \param only
-     *   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.
      */
@@ -68,10 +68,13 @@ public:
 
     // Result properties
 
-    /// 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.
-    QString nextToken() const { return loadFromJson<QString>("next_token"_ls); }
+    QString nextToken() const
+    {
+        return loadFromJson<QString>("next_token"_ls);
+    }
 
     /// The list of events that triggered notifications.
     std::vector<Notification> notifications()
diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
index efb5f623..88218c20 100644
--- a/lib/csapi/openid.h
+++ b/lib/csapi/openid.h
@@ -18,7 +18,7 @@ namespace Quotient {
  * 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.
  */
 class RequestOpenIdTokenJob : public BaseJob {
@@ -38,11 +38,15 @@ public:
     // Result properties
 
     /// 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,
+    /// 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.
-    OpenidToken tokenData() const { return fromJson<OpenidToken>(jsonData()); }
+    OpenidToken tokenData() const
+    {
+        return fromJson<OpenidToken>(jsonData());
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index cecd9f2d..1eee880f 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -13,12 +13,12 @@ namespace Quotient {
  *
  * 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.
  */
@@ -51,16 +51,25 @@ public:
 
     // Result properties
 
-    /// A token which correlates to the first value in ``chunk``. This
-    /// is usually the same token supplied to ``from=``.
-    QString begin() const { return loadFromJson<QString>("start"_ls); }
+    /// A token which correlates to the first value in `chunk`. This
+    /// is usually the same token supplied to `from=`.
+    QString begin() const
+    {
+        return loadFromJson<QString>("start"_ls);
+    }
 
-    /// A token which correlates to the last value in ``chunk``. This
-    /// token should be used in the next request to ``/events``.
-    QString end() const { return loadFromJson<QString>("end"_ls); }
+    /// A token which correlates to the last value in `chunk`. This
+    /// token should be used in the next request to `/events`.
+    QString end() const
+    {
+        return loadFromJson<QString>("end"_ls);
+    }
 
     /// An array of events.
-    RoomEvents chunk() { return takeFromJson<RoomEvents>("chunk"_ls); }
+    RoomEvents chunk()
+    {
+        return takeFromJson<RoomEvents>("chunk"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index a885bf4f..c817ad9f 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -12,7 +12,7 @@ namespace Quotient {
  *
  * 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.
  */
 class SetPresenceJob : public BaseJob {
@@ -55,7 +55,10 @@ public:
     // Result properties
 
     /// This user's presence.
-    QString presence() const { return loadFromJson<QString>("presence"_ls); }
+    QString presence() const
+    {
+        return loadFromJson<QString>("presence"_ls);
+    }
 
     /// The length of time in milliseconds since an action was performed
     /// by this user.
@@ -65,7 +68,10 @@ public:
     }
 
     /// The state message for this user if one was set.
-    QString statusMsg() const { return loadFromJson<QString>("status_msg"_ls); }
+    QString statusMsg() const
+    {
+        return loadFromJson<QString>("status_msg"_ls);
+    }
 
     /// Whether the user is currently active
     Omittable<bool> currentlyActive() const
diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h
index 3858fab2..3cda34f8 100644
--- a/lib/csapi/profile.h
+++ b/lib/csapi/profile.h
@@ -11,7 +11,7 @@ namespace Quotient {
 /*! \brief Set the user's display name.
  *
  * 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`.
  */
 class SetDisplayNameJob : public BaseJob {
 public:
@@ -61,7 +61,7 @@ public:
 /*! \brief Set the user's avatar URL.
  *
  * 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`.
  */
 class SetAvatarUrlJob : public BaseJob {
 public:
@@ -101,7 +101,10 @@ public:
     // Result properties
 
     /// The user's avatar URL if they have set one, otherwise not present.
-    QString avatarUrl() const { return loadFromJson<QString>("avatar_url"_ls); }
+    QString avatarUrl() const
+    {
+        return loadFromJson<QString>("avatar_url"_ls);
+    }
 };
 
 /*! \brief Get this user's profile information.
@@ -109,7 +112,7 @@ public:
  * 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`.
  */
 class GetUserProfileJob : public BaseJob {
 public:
@@ -130,7 +133,10 @@ public:
     // Result properties
 
     /// The user's avatar URL if they have set one, otherwise not present.
-    QString avatarUrl() const { return loadFromJson<QString>("avatar_url"_ls); }
+    QString avatarUrl() const
+    {
+        return loadFromJson<QString>("avatar_url"_ls);
+    }
 
     /// The user's display name if they have set one, otherwise not present.
     QString displayname() const
diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h
index ae0050d2..13c9ec25 100644
--- a/lib/csapi/pusher.h
+++ b/lib/csapi/pusher.h
@@ -19,7 +19,7 @@ public:
     /// A dictionary of information for the pusher implementation
     /// itself.
     struct PusherData {
-        /// Required if ``kind`` is ``http``. The URL to use to send
+        /// Required if `kind` is `http`. The URL to use to send
         /// notifications to.
         QString url;
         /// The format to use when sending notifications to the Push
@@ -29,11 +29,11 @@ public:
 
     /// Gets all currently active pushers for the authenticated user.
     struct Pusher {
-        /// 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.
         QString pushkey;
-        /// The kind of pusher. ``"http"`` is a pusher that
+        /// The kind of pusher. `"http"` is a pusher that
         /// sends HTTP pokes.
         QString kind;
         /// This is a reverse-DNS style identifier for the application.
@@ -104,27 +104,27 @@ struct JsonObjectConverter<GetPushersJob::Pusher> {
 
 /*! \brief Modify a pusher for this user on the homeserver.
  *
- * This endpoint allows the creation, modification and deletion of `pushers`_
- * for this user ID. The behaviour of this endpoint varies depending on the
- * values in the JSON body.
+ * 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.
  */
 class PostPusherJob : public BaseJob {
 public:
     // Inner data structures
 
     /// 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.
     struct PusherData {
-        /// Required if ``kind`` is ``http``. The URL to use to send
+        /// 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``.
+        /// `/_matrix/push/v1/notify`.
         QString url;
         /// 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'.
+        /// [Push Gateway Specification](/push-gateway-api/). Currently the only
+        /// format available is 'event_id_only'.
         QString format;
     };
 
@@ -140,13 +140,13 @@ public:
      *   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.
      *
      * \param kind
-     *   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.
      *
      * \param appId
      *   This is a reverse-DNS style identifier for the application.
@@ -154,7 +154,7 @@ public:
      *   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"`.
      *
      * \param appDisplayName
      *   A string that will allow the user to identify what application
@@ -170,7 +170,7 @@ public:
      *
      * \param data
      *   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.
      *
      * \param profileTag
@@ -182,7 +182,7 @@ public:
      *   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`.
      */
     explicit PostPusherJob(const QString& pushkey, const QString& kind,
                            const QString& appId, const QString& appDisplayName,
diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h
index 1c6d5c2d..90d2ce79 100644
--- a/lib/csapi/pushrules.h
+++ b/lib/csapi/pushrules.h
@@ -15,9 +15,9 @@ namespace Quotient {
 /*! \brief Retrieve all push rulesets.
  *
  * 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.
  */
 class GetPushRulesJob : public BaseJob {
 public:
@@ -49,7 +49,7 @@ public:
     /*! \brief Retrieve a push rule.
      *
      * \param scope
-     *   ``global`` to specify global rules.
+     *   `global` to specify global rules.
      *
      * \param kind
      *   The kind of rule
@@ -71,8 +71,11 @@ public:
     // Result properties
 
     /// The specific push rule. This will also include keys specific to the
-    /// rule itself such as the rule's ``actions`` and ``conditions`` if set.
-    PushRule pushRule() const { return fromJson<PushRule>(jsonData()); }
+    /// rule itself such as the rule's `actions` and `conditions` if set.
+    PushRule pushRule() const
+    {
+        return fromJson<PushRule>(jsonData());
+    }
 };
 
 /*! \brief Delete a push rule.
@@ -84,7 +87,7 @@ public:
     /*! \brief Delete a push rule.
      *
      * \param scope
-     *   ``global`` to specify global rules.
+     *   `global` to specify global rules.
      *
      * \param kind
      *   The kind of rule
@@ -117,7 +120,7 @@ public:
     /*! \brief Add or change a push rule.
      *
      * \param scope
-     *   ``global`` to specify global rules.
+     *   `global` to specify global rules.
      *
      * \param kind
      *   The kind of rule
@@ -129,7 +132,7 @@ public:
      *   The action(s) to perform when the conditions for this rule are met.
      *
      * \param before
-     *   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.
      *
@@ -141,10 +144,10 @@ public:
      * \param conditions
      *   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.
      *
      * \param pattern
-     *   Only applicable to ``content`` rules. The glob-style pattern to match
+     *   Only applicable to `content` rules. The glob-style pattern to match
      * against.
      */
     explicit SetPushRuleJob(const QString& scope, const QString& kind,
@@ -165,8 +168,8 @@ public:
     /*! \brief Get whether a push rule is enabled
      *
      * \param scope
-     *   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`.
      *
      * \param kind
      *   The kind of rule
@@ -188,7 +191,10 @@ public:
     // Result properties
 
     /// Whether the push rule is enabled or not.
-    bool enabled() const { return loadFromJson<bool>("enabled"_ls); }
+    bool enabled() const
+    {
+        return loadFromJson<bool>("enabled"_ls);
+    }
 };
 
 /*! \brief Enable or disable a push rule.
@@ -200,7 +206,7 @@ public:
     /*! \brief Enable or disable a push rule.
      *
      * \param scope
-     *   ``global`` to specify global rules.
+     *   `global` to specify global rules.
      *
      * \param kind
      *   The kind of rule
@@ -224,8 +230,8 @@ public:
     /*! \brief The actions for a push rule
      *
      * \param scope
-     *   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`.
      *
      * \param kind
      *   The kind of rule
@@ -263,7 +269,7 @@ public:
     /*! \brief Set the actions for a push rule.
      *
      * \param scope
-     *   ``global`` to specify global rules.
+     *   `global` to specify global rules.
      *
      * \param kind
      *   The kind of rule
diff --git a/lib/csapi/read_markers.h b/lib/csapi/read_markers.h
index 0e122c63..00a2aa0d 100644
--- a/lib/csapi/read_markers.h
+++ b/lib/csapi/read_markers.h
@@ -26,7 +26,7 @@ public:
      *
      * \param mRead
      *   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.
      */
     explicit SetReadMarkerJob(const QString& roomId, const QString& mFullyRead,
diff --git a/lib/csapi/receipts.h b/lib/csapi/receipts.h
index 1fac0acf..7ac093cd 100644
--- a/lib/csapi/receipts.h
+++ b/lib/csapi/receipts.h
@@ -27,8 +27,8 @@ public:
      *   The event ID to acknowledge up to.
      *
      * \param receipt
-     *   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.
      */
     explicit PostReceiptJob(const QString& roomId, const QString& receiptType,
                             const QString& eventId,
diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index 541e433a..f12e6b71 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -15,9 +15,12 @@ namespace Quotient {
  *
  * This cannot be undone.
  *
- * Users may redact their own events, and any user with a power level
- * greater than or equal to the ``redact`` power level of the room may
- * redact events there.
+ * 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
+ * of the room, the user may redact events sent by other users.
+ *
+ * Server administrators may redact events sent by users on their server.
  */
 class RedactEventJob : public BaseJob {
 public:
@@ -43,7 +46,10 @@ public:
     // Result properties
 
     /// A unique identifier for the event.
-    QString eventId() const { return loadFromJson<QString>("event_id"_ls); }
+    QString eventId() const
+    {
+        return loadFromJson<QString>("event_id"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/registration.h b/lib/csapi/registration.h
index 6864fd47..0ad8b101 100644
--- a/lib/csapi/registration.h
+++ b/lib/csapi/registration.h
@@ -15,8 +15,9 @@ namespace Quotient {
 
 /*! \brief Register for an account on this homeserver.
  *
- * This API endpoint uses the `User-Interactive Authentication API`_, except in
- * the cases where a guest account is being registered.
+ * 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.
  *
@@ -31,45 +32,46 @@ namespace Quotient {
  * 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`_.
+ * [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
- * 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
- * `Matrix specification <../appendices.html#user-identifiers>`_.
+ * [Matrix specification](/appendices/#user-identifiers).
  */
 class RegisterJob : public BaseJob {
 public:
     /*! \brief Register for an account on this homeserver.
      *
      * \param kind
-     *   The kind of account to register. Defaults to ``user``.
+     *   The kind of account to register. Defaults to `user`.
      *
      * \param auth
      *   Additional authentication information for the
      *   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.
      *
      * \param username
      *   The basis for the localpart of the desired Matrix ID. If omitted,
@@ -85,10 +87,10 @@ public:
      *
      * \param initialDeviceDisplayName
      *   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.
      *
      * \param inhibitLogin
-     *   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.
      */
@@ -105,12 +107,15 @@ public:
     /// 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>`_.
-    QString userId() const { return loadFromJson<QString>("user_id"_ls); }
+    /// the [Matrix specification](/appendices/#user-identifiers).
+    QString userId() const
+    {
+        return loadFromJson<QString>("user_id"_ls);
+    }
 
     /// 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.
     QString accessToken() const
     {
         return loadFromJson<QString>("access_token"_ls);
@@ -120,8 +125,8 @@ public:
     /// 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.
     QString homeServer() const
     {
         return loadFromJson<QString>("home_server"_ls);
@@ -129,8 +134,11 @@ public:
 
     /// 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.
-    QString deviceId() const { return loadFromJson<QString>("device_id"_ls); }
+    /// Required if the `inhibit_login` option is false.
+    QString deviceId() const
+    {
+        return loadFromJson<QString>("device_id"_ls);
+    }
 };
 
 /*! \brief Begins the validation process for an email to be used during
@@ -201,9 +209,9 @@ public:
  *
  * Changes the password for an account on this homeserver.
  *
- * This API endpoint uses the `User-Interactive Authentication API`_ to
- * ensure the user changing the password is actually the owner of the
- * account.
+ * 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.
  *
  * An access token should be submitted to this endpoint if the client has
  * an active session.
@@ -224,8 +232,8 @@ public:
      *   Whether the user's other access tokens, and their associated devices,
      * should be revoked if the request succeeds.
      *
-     *   When ``false``, the server can still take advantage of `the soft logout
-     * method <#soft-logout>`_ for the user's remaining devices.
+     *   When `false`, the server can still take advantage of the [soft logout
+     * method](/client-server-api/#soft-logout) for the user's remaining devices.
      *
      * \param auth
      *   Additional authentication information for the user-interactive
@@ -242,23 +250,18 @@ public:
  * 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
+ * [`/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.
- * ``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:
- * #post-matrix-client-r0-register-email-requesttoken
  */
 class RequestTokenToResetPasswordEmailJob : public BaseJob {
 public:
@@ -269,24 +272,18 @@ public:
      *   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
+     *   [`/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.
-     *   ``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:
-     * #post-matrix-client-r0-register-email-requesttoken
      */
     explicit RequestTokenToResetPasswordEmailJob(const EmailValidationData& body);
 
@@ -305,22 +302,18 @@ public:
  * 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
+ * [`/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.
- * ``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:
- * #post-matrix-client-r0-register-email-requesttoken
  */
 class RequestTokenToResetPasswordMSISDNJob : public BaseJob {
 public:
@@ -331,23 +324,18 @@ public:
      *   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
+     *   [`/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.
-     *   ``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:
-     * #post-matrix-client-r0-register-email-requesttoken
      */
     explicit RequestTokenToResetPasswordMSISDNJob(
         const MsisdnValidationData& body);
@@ -366,7 +354,8 @@ public:
  * 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.
@@ -374,7 +363,7 @@ public:
  * 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.
  */
@@ -388,11 +377,11 @@ public:
      *
      * \param idServer
      *   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`.
      */
     explicit DeactivateAccountJob(const Omittable<AuthenticationData>& auth = none,
                                   const QString& idServer = {});
@@ -400,12 +389,12 @@ public:
     // Result properties
 
     /// 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.
     QString idServerUnbindResult() const
     {
@@ -447,7 +436,7 @@ public:
     // Result properties
 
     /// 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.
     Omittable<bool> available() const
     {
         return loadFromJson<Omittable<bool>>("available"_ls);
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index 0a41625f..ea906380 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -9,13 +9,13 @@
 using namespace Quotient;
 
 ReportContentJob::ReportContentJob(const QString& roomId, const QString& eventId,
-                                   int score, const QString& reason)
+                                   Omittable<int> score, const QString& reason)
     : BaseJob(HttpVerb::Post, QStringLiteral("ReportContentJob"),
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/report/" % eventId)
 {
     QJsonObject _data;
-    addParam<>(_data, QStringLiteral("score"), score);
-    addParam<>(_data, QStringLiteral("reason"), reason);
+    addParam<IfNotEmpty>(_data, QStringLiteral("score"), score);
+    addParam<IfNotEmpty>(_data, QStringLiteral("reason"), reason);
     setRequestData(std::move(_data));
 }
diff --git a/lib/csapi/report_content.h b/lib/csapi/report_content.h
index 375e1829..e401c2e1 100644
--- a/lib/csapi/report_content.h
+++ b/lib/csapi/report_content.h
@@ -31,7 +31,8 @@ public:
      *   The reason the content is being reported. May be blank.
      */
     explicit ReportContentJob(const QString& roomId, const QString& eventId,
-                              int score, const QString& reason);
+                              Omittable<int> score = none,
+                              const QString& reason = {});
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h
index 39460aca..a9e7ca13 100644
--- a/lib/csapi/room_send.h
+++ b/lib/csapi/room_send.h
@@ -16,7 +16,7 @@ namespace Quotient {
  *
  * 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.
  */
 class SendMessageJob : public BaseJob {
 public:
@@ -40,7 +40,8 @@ public:
      *
      *   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.
      */
     explicit SendMessageJob(const QString& roomId, const QString& eventType,
                             const QString& txnId, const QJsonObject& body = {});
@@ -48,7 +49,10 @@ public:
     // Result properties
 
     /// A unique identifier for the event.
-    QString eventId() const { return loadFromJson<QString>("event_id"_ls); }
+    QString eventId() const
+    {
+        return loadFromJson<QString>("event_id"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/room_state.h b/lib/csapi/room_state.h
index 447605ff..99eb4fc9 100644
--- a/lib/csapi/room_state.h
+++ b/lib/csapi/room_state.h
@@ -10,22 +10,20 @@ namespace Quotient {
 
 /*! \brief Send a state event to the given room.
  *
- * .. For backwards compatibility with older links...
- * .. _`put-matrix-client-r0-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](/client-server-api/#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
@@ -46,22 +44,20 @@ public:
      *   an empty string, the trailing slash on this endpoint is optional.
      *
      * \param body
-     *   .. For backwards compatibility with older links...
-     *   .. _`put-matrix-client-r0-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](/client-server-api/#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
@@ -75,7 +71,10 @@ public:
     // Result properties
 
     /// A unique identifier for the event.
-    QString eventId() const { return loadFromJson<QString>("event_id"_ls); }
+    QString eventId() const
+    {
+        return loadFromJson<QString>("event_id"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/rooms.h b/lib/csapi/rooms.h
index f0bfa349..179d7a27 100644
--- a/lib/csapi/rooms.h
+++ b/lib/csapi/rooms.h
@@ -12,7 +12,7 @@ namespace Quotient {
 
 /*! \brief Get a single event by event ID.
  *
- * 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.
  */
 class GetOneRoomEventJob : public BaseJob {
@@ -38,14 +38,15 @@ public:
     // Result properties
 
     /// The full event.
-    EventPtr event() { return fromJson<EventPtr>(jsonData()); }
+    EventPtr event()
+
+    {
+        return fromJson<EventPtr>(jsonData());
+    }
 };
 
 /*! \brief Get the state identified by the type and key.
  *
- * .. For backwards compatibility with older links...
- * .. _`get-matrix-client-r0-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
@@ -102,7 +103,11 @@ public:
     // Result properties
 
     /// The current state of the room
-    StateEvents events() { return fromJson<StateEvents>(jsonData()); }
+    StateEvents events()
+
+    {
+        return fromJson<StateEvents>(jsonData());
+    }
 };
 
 /*! \brief Get the m.room.member events for the room.
@@ -118,16 +123,15 @@ public:
      *
      * \param at
      *   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.
      *
      * \param membership
      *   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`.
      *
      * \param notMembership
      *   The kind of membership to exclude from the results. Defaults to no
@@ -162,7 +166,7 @@ public:
  * 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
+ * respond than `/members` as it can be implemented more efficiently on the
  * server.
  */
 class GetJoinedMembersByRoomJob : public BaseJob {
@@ -173,7 +177,7 @@ public:
     /// 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
+    /// faster to respond than `/members` as it can be implemented more
     /// efficiently on the server.
     struct RoomMember {
         /// The display name of the user this object is representing.
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index c009ded6..b56d9154 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -23,15 +23,15 @@ public:
     /// returned are included in the response.
     struct IncludeEventContext {
         /// How many events before the result are
-        /// returned. By default, this is ``5``.
+        /// returned. By default, this is `5`.
         Omittable<int> beforeLimit;
         /// How many events after the result are
-        /// returned. By default, this is ``5``.
+        /// returned. By default, this is `5`.
         Omittable<int> afterLimit;
         /// 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`.
         Omittable<bool> includeProfile;
     };
 
@@ -54,10 +54,10 @@ public:
         QString searchTerm;
         /// The keys to search. Defaults to all.
         QStringList keys;
-        /// This takes a `filter`_.
+        /// This takes a [filter](/client-server-api/#filtering).
         RoomEventFilter filter;
         /// The order in which to search for results.
-        /// By default, this is ``"rank"``.
+        /// By default, this is `"rank"`.
         QString orderBy;
         /// Configures whether any context for the events
         /// returned are included in the response.
@@ -93,7 +93,7 @@ public:
         /// 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.
         QHash<QString, UserProfile> profileInfo;
         /// Events just before the result.
@@ -139,15 +139,15 @@ public:
         std::vector<Result> results;
         /// 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.
         UnorderedMap<QString, StateEvents> state;
         /// 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).
         QHash<QString, QHash<QString, GroupValue>> groups;
         /// Token that can be used to get the next batch of
@@ -172,7 +172,7 @@ public:
      *
      * \param nextBatch
      *   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.
      */
     explicit SearchJob(const Categories& searchCategories,
                        const QString& nextBatch = {});
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
index 85a18560..e3d39807 100644
--- a/lib/csapi/sso_login_redirect.cpp
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -28,3 +28,27 @@ RedirectToSSOJob::RedirectToSSOJob(const QString& redirectUrl)
               QStringLiteral("/_matrix/client/r0") % "/login/sso/redirect",
               queryToRedirectToSSO(redirectUrl), {}, false)
 {}
+
+auto queryToRedirectToIdP(const QString& redirectUrl)
+{
+    BaseJob::Query _q;
+    addParam<>(_q, QStringLiteral("redirectUrl"), redirectUrl);
+    return _q;
+}
+
+QUrl RedirectToIdPJob::makeRequestUrl(QUrl baseUrl, const QString& idpId,
+                                      const QString& redirectUrl)
+{
+    return BaseJob::makeRequestUrl(std::move(baseUrl),
+                                   QStringLiteral("/_matrix/client/r0")
+                                       % "/login/sso/redirect/" % idpId,
+                                   queryToRedirectToIdP(redirectUrl));
+}
+
+RedirectToIdPJob::RedirectToIdPJob(const QString& idpId,
+                                   const QString& redirectUrl)
+    : BaseJob(HttpVerb::Get, QStringLiteral("RedirectToIdPJob"),
+              QStringLiteral("/_matrix/client/r0") % "/login/sso/redirect/"
+                  % idpId,
+              queryToRedirectToIdP(redirectUrl), {}, false)
+{}
diff --git a/lib/csapi/sso_login_redirect.h b/lib/csapi/sso_login_redirect.h
index d6330e38..ade1eb7d 100644
--- a/lib/csapi/sso_login_redirect.h
+++ b/lib/csapi/sso_login_redirect.h
@@ -13,7 +13,9 @@ namespace Quotient {
  * A web-based Matrix client should instruct the user's browser to
  * navigate to this endpoint in order to log in via SSO.
  *
- * The server MUST respond with an HTTP redirect to the SSO interface.
+ * The server MUST respond with an HTTP redirect to the SSO interface,
+ * or present a page which lets the user select an IdP to continue
+ * with in the event multiple are supported by the server.
  */
 class RedirectToSSOJob : public BaseJob {
 public:
@@ -33,4 +35,36 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
 };
 
+/*! \brief Redirect the user's browser to the SSO interface for an IdP.
+ *
+ * This endpoint is the same as `/login/sso/redirect`, though with an
+ * IdP ID from the original `identity_providers` array to inform the
+ * server of which IdP the client/user would like to continue with.
+ *
+ * The server MUST respond with an HTTP redirect to the SSO interface
+ * for that IdP.
+ */
+class RedirectToIdPJob : public BaseJob {
+public:
+    /*! \brief Redirect the user's browser to the SSO interface for an IdP.
+     *
+     * \param idpId
+     *   The `id` of the IdP from the `m.login.sso` `identity_providers`
+     *   array denoting the user's selection.
+     *
+     * \param redirectUrl
+     *   URI to which the user will be redirected after the homeserver has
+     *   authenticated the user with SSO.
+     */
+    explicit RedirectToIdPJob(const QString& idpId, const QString& redirectUrl);
+
+    /*! \brief Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for RedirectToIdPJob
+     * is necessary but the job itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& idpId,
+                               const QString& redirectUrl);
+};
+
 } // namespace Quotient
diff --git a/lib/csapi/tags.h b/lib/csapi/tags.h
index a815d9b3..a854531a 100644
--- a/lib/csapi/tags.h
+++ b/lib/csapi/tags.h
@@ -18,7 +18,7 @@ public:
 
     /// List the tags set by a user on a room.
     struct Tag {
-        /// 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.
         Omittable<float> order;
         /// List the tags set by a user on a room.
@@ -83,7 +83,7 @@ public:
      *   The tag to add.
      *
      * \param order
-     *   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.
      *
      * \param additionalProperties
diff --git a/lib/csapi/third_party_membership.h b/lib/csapi/third_party_membership.h
index 55cab370..a424678f 100644
--- a/lib/csapi/third_party_membership.h
+++ b/lib/csapi/third_party_membership.h
@@ -10,14 +10,13 @@ namespace Quotient {
 
 /*! \brief Invite a user to participate in a particular room.
  *
- * .. _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`_.
+ * the* [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
@@ -27,7 +26,7 @@ namespace Quotient {
  * 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
@@ -35,7 +34,7 @@ namespace Quotient {
  * 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
@@ -51,9 +50,7 @@ namespace Quotient {
  * - 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.
- *
- * .. _joining rooms section: `invite-by-user-id-endpoint`_
+ * append a `m.room.third_party_invite` event to the room.
  */
 class InviteBy3PIDJob : public BaseJob {
 public:
@@ -73,7 +70,7 @@ public:
      *
      * \param medium
      *   The kind of address being passed in the address field, for example
-     * ``email``.
+     * `email`.
      *
      * \param address
      *   The invitee's third party identifier.
diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 28c4115a..3775174d 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -16,6 +16,6 @@ SendToDeviceJob::SendToDeviceJob(
                   % eventType % "/" % txnId)
 {
     QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("messages"), messages);
+    addParam<>(_data, QStringLiteral("messages"), messages);
     setRequestData(std::move(_data));
 }
diff --git a/lib/csapi/to_device.h b/lib/csapi/to_device.h
index f5d69d65..7a237195 100644
--- a/lib/csapi/to_device.h
+++ b/lib/csapi/to_device.h
@@ -32,7 +32,7 @@ public:
      */
     explicit SendToDeviceJob(
         const QString& eventType, const QString& txnId,
-        const QHash<QString, QHash<QString, QJsonObject>>& messages = {});
+        const QHash<QString, QHash<QString, QJsonObject>>& messages);
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/typing.h b/lib/csapi/typing.h
index 2c953949..64a310d0 100644
--- a/lib/csapi/typing.h
+++ b/lib/csapi/typing.h
@@ -11,8 +11,8 @@ namespace Quotient {
 /*! \brief Informs the server that the user has started or stopped typing.
  *
  * 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.
  */
 class SetTypingJob : public BaseJob {
@@ -26,7 +26,7 @@ public:
      *   The room in which the user is typing.
      *
      * \param typing
-     *   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.
      *
      * \param timeout
diff --git a/lib/csapi/users.h b/lib/csapi/users.h
index 6fc26f57..772a6365 100644
--- a/lib/csapi/users.h
+++ b/lib/csapi/users.h
@@ -19,7 +19,7 @@ namespace Quotient {
  *
  * 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.
+ * `Accept-Language` header provided in the request, if present.
  */
 class SearchUserDirectoryJob : public BaseJob {
 public:
@@ -34,7 +34,7 @@ public:
     ///
     /// 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.
+    /// `Accept-Language` header provided in the request, if present.
     struct User {
         /// The user's matrix user ID.
         QString userId;
@@ -66,7 +66,10 @@ public:
     }
 
     /// Indicates if the result list has been truncated by the limit.
-    bool limited() const { return loadFromJson<bool>("limited"_ls); }
+    bool limited() const
+    {
+        return loadFromJson<bool>("limited"_ls);
+    }
 };
 
 template <>
diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h
index 828a7eb9..896e2ea9 100644
--- a/lib/csapi/versions.h
+++ b/lib/csapi/versions.h
@@ -12,14 +12,14 @@ namespace Quotient {
  *
  * 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/lib/csapi/voip.h b/lib/csapi/voip.h
index 087ebbbd..85ab8b41 100644
--- a/lib/csapi/voip.h
+++ b/lib/csapi/voip.h
@@ -28,7 +28,10 @@ public:
     // Result properties
 
     /// The TURN server credentials.
-    QJsonObject data() const { return fromJson<QJsonObject>(jsonData()); }
+    QJsonObject data() const
+    {
+        return fromJson<QJsonObject>(jsonData());
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/csapi/wellknown.h b/lib/csapi/wellknown.h
index b21d9fc7..c707d232 100644
--- a/lib/csapi/wellknown.h
+++ b/lib/csapi/wellknown.h
@@ -14,7 +14,7 @@ namespace Quotient {
  *
  * 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/lib/csapi/whoami.h b/lib/csapi/whoami.h
index af8f1e8a..203742c9 100644
--- a/lib/csapi/whoami.h
+++ b/lib/csapi/whoami.h
@@ -14,8 +14,8 @@ namespace Quotient {
  *
  * 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``
+ * 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.
  */
@@ -33,8 +33,20 @@ public:
 
     // Result properties
 
-    /// The user id that owns the access token.
-    QString userId() const { return loadFromJson<QString>("user_id"_ls); }
+    /// The user ID that owns the access token.
+    QString userId() const
+    {
+        return loadFromJson<QString>("user_id"_ls);
+    }
+
+    /// Device ID associated with the access token. If no device
+    /// is associated with the access token (such as in the case
+    /// of application services) then this field can be omitted.
+    /// Otherwise this is required.
+    QString deviceId() const
+    {
+        return loadFromJson<QString>("device_id"_ls);
+    }
 };
 
 } // namespace Quotient
diff --git a/lib/identity/definitions/request_email_validation.h b/lib/identity/definitions/request_email_validation.h
index 079da953..87549505 100644
--- a/lib/identity/definitions/request_email_validation.h
+++ b/lib/identity/definitions/request_email_validation.h
@@ -11,16 +11,16 @@ namespace Quotient {
 struct RequestEmailValidation {
     /// 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.
     QString clientSecret;
 
     /// The email address to validate.
     QString email;
 
-    /// 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/lib/identity/definitions/request_msisdn_validation.h b/lib/identity/definitions/request_msisdn_validation.h
index a29fd0de..d2ea463f 100644
--- a/lib/identity/definitions/request_msisdn_validation.h
+++ b/lib/identity/definitions/request_msisdn_validation.h
@@ -11,20 +11,20 @@ namespace Quotient {
 struct RequestMsisdnValidation {
     /// 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.
     QString clientSecret;
 
     /// 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.
     QString country;
 
     /// The phone number to validate.
     QString phoneNumber;
 
-    /// 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