Merge "Added sphnix build folder location"

doc/source/conf.py

@@ -98,7 +98,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'nature'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

doc/source/index.rst

@@ -12,7 +12,7 @@ Overview
 --------
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
 
    README
    refstack
@@ -41,8 +41,17 @@ Specs
 
    specs/mitaka/implemented/*
 
+**Implemented in the Ocata Cycle**
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   specs/ocata/implemented/*
+
+------------------
 Indices and tables
-==================
+------------------
 
 * :ref:`search`
 

setup.cfg

@@ -33,3 +33,9 @@ setup-hooks =
 [entry_points]
 oslo.config.opts =
     refstack = refstack.opts:list_opts
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
+

specs/newton/implemented/product-version-datamodel-api.rst

@@ -85,26 +85,26 @@ the system, "name" and "version" are user input fields. A row with two users
 input fields are created each time for a new product or a new version for an
 existing product.
 
-In the following examples, Are "ABC OpenStack®" and "ABC OpenStack" one or two
+
+.. |reg|  unicode:: U+00AE .. REGISTERED SIGN
+
+In the following examples, Are "ABC OpenStack\ |reg|." and "ABC OpenStack" one or two
 different products?
 
 * It could be one product because the users had made a mistake when creating a
-  new version for the existing "ABC OpenStack®" product.
+  new version for the existing "ABC OpenStack\ |reg|." product.
 * It could also be two products, since the 2 names are not the same.
 
 Such kind of data integrity and consistency issues should be avoid whenever
 possible with appropriate database design and/or bussiness layer code.
 
-+------------+------------------+----------+
+==========    ===================    =======
-| product_id |   Name           | Version  |
+product_id    Name                   Version
-+============+==================+==========+
+==========    ===================    =======
-| 11111      | ABC OpenStack®   |  v6.0    |
+11111         ABC OpenStack |reg|    v6.0
-+------------+------------------+----------+
+22222         ABC OpenStack          v7.0
-| 22222      | ABC OpenStack    |  v7.0    |
+33333         ABC OpenStack |reg|    v8.0
-+------------+------------------+----------+
+==========    ===================    =======
-| 33333      | ABC OpenStack®   |  v8.0    |
-+------------+------------------+----------+
-
 
 Data model impact
 -----------------

tox.ini

@@ -63,7 +63,7 @@ commands = python setup.py testr --coverage \
 commands = {toxinidir}/tools/cover.sh {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = python setup.py build_sphinx {posargs}
 
 [flake8]
 # E125 continuation line does not distinguish itself from next logical line