Merge "Fix building (make) in 'doc' directory"

This commit is contained in:
Jenkins 2016-04-22 13:19:01 +00:00 committed by Gerrit Code Review
commit c424332b16
2 changed files with 3 additions and 2 deletions

View File

@ -309,6 +309,8 @@ def authorization(parser, xml_parent, data):
"""yaml: authorization """yaml: authorization
Specifies an authorization matrix Specifies an authorization matrix
.. _authorization:
:arg list <name>: `<name>` is the name of the group or user, containing :arg list <name>: `<name>` is the name of the group or user, containing
the list of rights to grant. the list of rights to grant.
@ -333,8 +335,6 @@ def authorization(parser, xml_parent, data):
* **run-update** * **run-update**
* **scm-tag** * **scm-tag**
.. _authorization:
Example: Example:
.. literalinclude:: /../../tests/properties/fixtures/authorization.yaml .. literalinclude:: /../../tests/properties/fixtures/authorization.yaml

View File

@ -5678,6 +5678,7 @@ def slack(parser, xml_parent, data):
(default: '/') (default: '/')
:arg str room: A comma seperated list of rooms / channels to post the :arg str room: A comma seperated list of rooms / channels to post the
notifications to. (default: '') notifications to. (default: '')
Example: Example:
.. literalinclude:: .. literalinclude::