summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdoc/source/conf.py7
-rw-r--r--requirements.txt6
-rw-r--r--specs/liberty/privsep.rst2
-rw-r--r--specs/mitaka/rabbitmq-pika-driver.rst4
-rw-r--r--specs/queens/external-pdp.rst4
5 files changed, 11 insertions, 12 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 930b6b8..9f37578 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,12 +33,12 @@ sys.path.insert(0, os.path.abspath('../..'))
33# Add any Sphinx extension module names here, as strings. They can be 33# Add any Sphinx extension module names here, as strings. They can be
34# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. 34# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
35extensions = [ 35extensions = [
36 'sphinx.ext.autodoc', 36 'openstackdocstheme',
37 #'sphinx.ext.intersphinx',
38 'oslosphinx',
39 'yasfb', 37 'yasfb',
40] 38]
41 39
40repository_name = 'openstack/oslo-specs'
41
42# Feed configuration for yasfb 42# Feed configuration for yasfb
43feed_base_url = 'http://specs.openstack.org/openstack/oslo-specs' 43feed_base_url = 'http://specs.openstack.org/openstack/oslo-specs'
44feed_author = 'OpenStack Oslo Team' 44feed_author = 'OpenStack Oslo Team'
@@ -89,6 +89,7 @@ pygments_style = 'sphinx'
89# html_theme_path = ["."] 89# html_theme_path = ["."]
90# html_theme = '_theme' 90# html_theme = '_theme'
91# html_static_path = ['static'] 91# html_static_path = ['static']
92html_theme = 'openstackdocs'
92 93
93# Output file base name for HTML help builder. 94# Output file base name for HTML help builder.
94htmlhelp_basename = '%sdoc' % project 95htmlhelp_basename = '%sdoc' % project
diff --git a/requirements.txt b/requirements.txt
index 7ee61bb..abe9d3e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
1pbr>=0.6,<1.0 1pbr>=0.6,<1.0
2oslosphinx 2openstackdocstheme>=1.20.0
3sphinx>=1.1.2,!=1.2.0,<1.3 3sphinx!=1.6.6,>=1.6.2
4yasfb>=0.5.0 4yasfb>=0.8.0
5simplejson>=2.2.0 5simplejson>=2.2.0
6pyOpenSSL>=0.14 # Apache-2.0 6pyOpenSSL>=0.14 # Apache-2.0
7pyasn1 # BSD 7pyasn1 # BSD
diff --git a/specs/liberty/privsep.rst b/specs/liberty/privsep.rst
index 2cd935d..82a56fa 100644
--- a/specs/liberty/privsep.rst
+++ b/specs/liberty/privsep.rst
@@ -349,7 +349,7 @@ Code coverage
349............. 349.............
350 350
351``coverage.py`` has support for collecting coverage statistics across 351``coverage.py`` has support for collecting coverage statistics across
352sub-processes[#coverage_subproc]. To do this, the privileged process 352sub-processes [#coverage_subproc]_. To do this, the privileged process
353will need to call ``coverage.process_startup()`` as early as possible 353will need to call ``coverage.process_startup()`` as early as possible
354(eg: from ``main()``), which enables coverage features if the 354(eg: from ``main()``), which enables coverage features if the
355``COVERAGE_PROCESS_START`` environment variable is set. If the 355``COVERAGE_PROCESS_START`` environment variable is set. If the
diff --git a/specs/mitaka/rabbitmq-pika-driver.rst b/specs/mitaka/rabbitmq-pika-driver.rst
index a90a382..e6bed9e 100644
--- a/specs/mitaka/rabbitmq-pika-driver.rst
+++ b/specs/mitaka/rabbitmq-pika-driver.rst
@@ -256,8 +256,8 @@ pika library
256References 256References
257========== 257==========
258 258
259.. [1] https://github.com/dukhlov/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_pika.py 259#. https://github.com/dukhlov/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_pika.py
260.. [2] https://review.openstack.org/#/c/226348/ 260#. https://review.openstack.org/#/c/226348/
261 261
262.. note:: 262.. note::
263 263
diff --git a/specs/queens/external-pdp.rst b/specs/queens/external-pdp.rst
index 1862921..00434a1 100644
--- a/specs/queens/external-pdp.rst
+++ b/specs/queens/external-pdp.rst
@@ -64,9 +64,7 @@ User will be able to choose between:
64The switch between those PDP can be configured and done through the modification of policy.json/yaml. 64The switch between those PDP can be configured and done through the modification of policy.json/yaml.
65For each rule, a URL need to be set. 65For each rule, a URL need to be set.
66Thus every components that use Oslo_Policy can benefit from this improvement. For example in Glance 66Thus every components that use Oslo_Policy can benefit from this improvement. For example in Glance
67policy.json file: 67policy.json file::
68
69.. code-block:: json
70 68
71 { 69 {
72 "context_is_admin": "role:admin", 70 "context_is_admin": "role:admin",