diff --git a/doc/contributor-guide/source/additional-git-workflow/backport.rst b/doc/contributor-guide/source/additional-git-workflow/backport.rst index 96ad17e924..adb2f72047 100644 --- a/doc/contributor-guide/source/additional-git-workflow/backport.rst +++ b/doc/contributor-guide/source/additional-git-workflow/backport.rst @@ -4,8 +4,8 @@ Backport a change ~~~~~~~~~~~~~~~~~ When committing to the master branch, add the ``backport`` line to your -commit message for potential backport patches (Installation Guide, -Configuration Reference, Networking Guide, and common directory). +commit message for potential backport patches (Installation Tutorials and +Guides, Configuration Reference, Networking Guide, and common directory). For example: * To backport to a single branch: diff --git a/doc/contributor-guide/source/blueprints-and-specs.rst b/doc/contributor-guide/source/blueprints-and-specs.rst index b46bb41f8d..1bf4354b81 100644 --- a/doc/contributor-guide/source/blueprints-and-specs.rst +++ b/doc/contributor-guide/source/blueprints-and-specs.rst @@ -42,8 +42,8 @@ For more information, see :ref:`doc_bugs`. Release-specific documentation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The Installation Guides, Configuration Reference, and Networking Guide -are released at release time, with draft material published to +The Installation Tutorials and Guides, Configuration Reference, and Networking +Guide are released at release time, with draft material published to http://docs.openstack.org/draft/draft-index.html. The rest of the guides are continuously released. @@ -63,8 +63,8 @@ currently developing a similar method of marking older books written in RST. The core team tracks usage of older versions, and as usage falls, can remove them entirely. -Installation Guides -------------------- +Installation Tutorials and Guides +--------------------------------- The OpenStack Installation Tutorials and Guides describe a manual install process for multiple distributions based on the following packaging systems: diff --git a/doc/contributor-guide/source/rst-conv/profiling.rst b/doc/contributor-guide/source/rst-conv/profiling.rst index fcbcf9c7a5..b8ecb2e0b7 100644 --- a/doc/contributor-guide/source/rst-conv/profiling.rst +++ b/doc/contributor-guide/source/rst-conv/profiling.rst @@ -2,7 +2,8 @@ Profiling (conditional content) =============================== -Installation Guides has content that depends upon the operating systems. +Installation Tutorials and Guides has content that depends upon the operating +systems. Use the ``only`` directive to specify the content that is operating-system specific. Define one or several tags depending on the operating system