Merge pull request #1586 from turt2live/travis/as/comment-ts-section

Comment out the timestamp massaging section for now

specification/application_service_api.rst

@@ -289,27 +289,38 @@ An example request would be::
  GET /_matrix/client/%CLIENT_MAJOR_VERSION%/account/whoami?user_id=@_irc_user:example.org
  Authorization: Bearer YourApplicationServiceTokenHere
 
-
+.. TODO-TravisR: Temporarily take out timestamp massaging while we're releasing r0.
-Timestamp massaging
+   See https://github.com/matrix-org/matrix-doc/issues/1585
-+++++++++++++++++++
+.. Timestamp massaging
-The application service may want to inject events at a certain time (reflecting
+   +++++++++++++++++++
-the time on the network they are tracking e.g. irc, xmpp). Application services
+   The application service may want to inject events at a certain time (reflecting
-need to be able to adjust the ``origin_server_ts`` value to do this.
+   the time on the network they are tracking e.g. irc, xmpp). Application services
-
+   need to be able to adjust the ``origin_server_ts`` value to do this.
-Inputs:
+
+   Inputs:
    - Application service token (``as_token``)
    - Desired timestamp (in milliseconds since the unix epoch)
 
-Notes:
+   Notes:
    - This will only apply when sending events.
 
-::
+   ::
 
     PUT /_matrix/client/r0/rooms/!somewhere:domain.com/send/m.room.message/txnId?ts=1534535223283
     Authorization: Bearer YourApplicationServiceTokenHere
 
     Content: The event to send, as per the Client-Server API.
 
+Timestamp massaging
++++++++++++++++++++
+
+Previous drafts of the Application Service API permitted application services
+to alter the timestamp of their sent events by providing a ``ts`` query parameter
+when sending an event. This API has been excluded from the first release due to
+design concerns, however some servers may still support the feature. Please visit
+`issue #1585 <https://github.com/matrix-org/matrix-doc/issues/1585>`_ for more
+information.
+
 Server admin style permissions
 ++++++++++++++++++++++++++++++