wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'travis/general/changelogs' into m-master

Browse source
This commit is contained in:
Travis Ralston 2018-08-31 17:40:41 -06:00
commit bd78445756
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
specification/application_service_api.rst
View file

@ -52,6 +52,7 @@ Other versions of this specification
The following other versions are also available, in reverse chronological order: The following other versions are also available, in reverse chronological order:
- `HEAD <https://matrix.org/docs/spec/application_service/unstable.html>`_: Includes all changes since the latest versioned release. - `HEAD <https://matrix.org/docs/spec/application_service/unstable.html>`_: Includes all changes since the latest versioned release.
- `r0.1.0 <https://matrix.org/docs/spec/application_service/r0.1.0.html>`_
Application Services Application Services
@ -174,7 +175,7 @@ An example registration file for an IRC-bridging application service is below:
- exclusive: true - exclusive: true
regex: "@_irc_bridge_.*" regex: "@_irc_bridge_.*"
aliases: aliases:
- exclusive: false - exclusive: false
regex: "#_irc_bridge_.*" regex: "#_irc_bridge_.*"
rooms: [] rooms: []
@ -318,7 +319,7 @@ Inputs:
Notes: Notes:
- This applies to all aspects of the Client-Server API, except for Account Management. - This applies to all aspects of the Client-Server API, except for Account Management.
- The ``as_token`` is inserted into ``access_token`` which is usually where the - The ``as_token`` is inserted into ``access_token`` which is usually where the
client token is, such as via the query string or ``Authorization`` header. This client token is, such as via the query string or ``Authorization`` header. This
is done on purpose to allow application services to reuse client SDKs. is done on purpose to allow application services to reuse client SDKs.
- The ``access_token`` should be supplied through the ``Authorization`` header where - The ``access_token`` should be supplied through the ``Authorization`` header where
possible to prevent the token appearing in HTTP request logs by accident. possible to prevent the token appearing in HTTP request logs by accident.
@ -425,7 +426,7 @@ Referencing messages from a third party network
Application services should include an ``external_url`` in the ``content`` of Application services should include an ``external_url`` in the ``content`` of
events it emits to indicate where the message came from. This typically applies events it emits to indicate where the message came from. This typically applies
to application services that bridge other networks into Matrix, such as IRC, to application services that bridge other networks into Matrix, such as IRC,
where an HTTP URL may be available to reference. where an HTTP URL may be available to reference.
Clients should provide users with a way to access the ``external_url`` if it Clients should provide users with a way to access the ``external_url`` if it
is present. Clients should additionally ensure the URL has a scheme of ``https`` is present. Clients should additionally ensure the URL has a scheme of ``https``

1
specification/client_server_api.rst
View file

@ -45,6 +45,7 @@ Other versions of this specification
The following other versions are also available, in reverse chronological order: The following other versions are also available, in reverse chronological order:
- `HEAD <https://matrix.org/docs/spec/client_server/unstable.html>`_: Includes all changes since the latest versioned release. - `HEAD <https://matrix.org/docs/spec/client_server/unstable.html>`_: Includes all changes since the latest versioned release.
- `r0.4.0 <https://matrix.org/docs/spec/client_server/r0.4.0.html>`_
- `r0.3.0 <https://matrix.org/docs/spec/client_server/r0.3.0.html>`_ - `r0.3.0 <https://matrix.org/docs/spec/client_server/r0.3.0.html>`_
- `r0.2.0 <https://matrix.org/docs/spec/client_server/r0.2.0.html>`_ - `r0.2.0 <https://matrix.org/docs/spec/client_server/r0.2.0.html>`_
- `r0.1.0 <https://matrix.org/docs/spec/client_server/r0.1.0.html>`_ - `r0.1.0 <https://matrix.org/docs/spec/client_server/r0.1.0.html>`_

1
specification/identity_service_api.rst
View file

@ -51,6 +51,7 @@ Other versions of this specification
The following other versions are also available, in reverse chronological order: The following other versions are also available, in reverse chronological order:
- `HEAD <https://matrix.org/docs/spec/identity_service/unstable.html>`_: Includes all changes since the latest versioned release. - `HEAD <https://matrix.org/docs/spec/identity_service/unstable.html>`_: Includes all changes since the latest versioned release.
- `r0.1.0 <https://matrix.org/docs/spec/identity_service/r0.1.0.html>`_
General principles General principles
------------------ ------------------