diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst index ce3921696d..b6fc2519c2 100644 --- a/doc/contributor-guide/source/content-specs.rst +++ b/doc/contributor-guide/source/content-specs.rst @@ -23,7 +23,6 @@ Installation Guides The OpenStack Installation Guide describes a manual install process for multiple distributions based on the following packaging systems: -* Installation Guide for Debian - will be published with Liberty * `Installation Guide for openSUSE and SUSE Linux Enterprise Server`_ * `Installation Guide for Red Hat Enterprise Linux and CentOS`_ * `Installation Guide for Ubuntu`_ @@ -154,13 +153,13 @@ This guide has a review in place to get a license indicator in output: .. Links -.. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/liberty/install-guide-obs/ -.. _`Installation Guide for Red Hat Enterprise Linux and CentOS`: http://docs.openstack.org/liberty/install-guide-rdo/ -.. _`Installation Guide for Ubuntu`: http://docs.openstack.org/liberty/install-guide-ubuntu/ +.. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/mitaka/install-guide-obs/ +.. _`Installation Guide for Red Hat Enterprise Linux and CentOS`: http://docs.openstack.org/mitaka/install-guide-rdo/ +.. _`Installation Guide for Ubuntu`: http://docs.openstack.org/mitaka/install-guide-ubuntu/ -.. _`OpenStack Configuration Reference`: http://docs.openstack.org/liberty/config-reference/content/ +.. _`OpenStack Configuration Reference`: http://docs.openstack.org/mitaka/config-reference/ -.. _`OpenStack Networking Guide`: http://docs.openstack.org/liberty/networking-guide/ +.. _`OpenStack Networking Guide`: http://docs.openstack.org/mitaka/networking-guide/ .. _`release information`: https://wiki.openstack.org/wiki/Releases diff --git a/doc/contributor-guide/source/doc-tools/scripts.rst b/doc/contributor-guide/source/doc-tools/scripts.rst index 33268e285e..590db6b1ce 100644 --- a/doc/contributor-guide/source/doc-tools/scripts.rst +++ b/doc/contributor-guide/source/doc-tools/scripts.rst @@ -7,7 +7,7 @@ openstack-doc-tools repository autogenerate_config_docs Generate configuration references published on - http://docs.openstack.org/liberty/config-reference/content/. + http://docs.openstack.org/mitaka/config-reference/. build_environment directory (deprecated) A Vagrant environment for working with the guides. @@ -34,7 +34,7 @@ openstack-autohelp openstack-auto-commands Generate the command line reference published at - http://docs.openstack.org/cli-reference/content/. A helper script to use this + http://docs.openstack.org/cli-reference/. A helper script to use this tool is available at ``bin/doc-tools-update-cli-reference``. openstack-generate-docbook diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst index d9a9c8f5a0..3320f514c9 100644 --- a/doc/contributor-guide/source/docs-builds.rst +++ b/doc/contributor-guide/source/docs-builds.rst @@ -14,8 +14,8 @@ currently maintains. There are also version dependent documents. In addition to this page, the `release`_ and master branches of the openstack-manuals and other repositories indicate where docs are -published. For example, from the stable/liberty release branch, doc -source files are published to docs.openstack.org/liberty, and from the +published. For example, from the stable/mitaka release branch, doc +source files are published to docs.openstack.org/mitaka, and from the master branch, doc source files are published for versioned documents to docs.openstack.org/draft and for continuously published documents to docs.openstack.org/ by our lovely Jenkins butlers always at the ready. @@ -33,7 +33,7 @@ Installation guides ------------------- These guides are versioned and only built from the release branches -(stable/release_name) like the example above of stable/liberty. +(stable/release_name) like the example above of stable/mitaka. .. list-table:: :header-rows: 1 @@ -42,21 +42,17 @@ These guides are versioned and only built from the release branches - Source location - Target location - * - Installation Guide for Debian 8.0 - - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - - use docs-draft on review.openstack.org for interim reviews - * - Installation Guide for openSUSE and SUSE Linux Enterprise Server - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - - http://docs.openstack.org/liberty/install-guide-obs + - http://docs.openstack.org/mitaka/install-guide-obs * - Installation Guide for Red Hat Enterprise Linux and CentOS - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - - http://docs.openstack.org/liberty/install-guide-rdo + - http://docs.openstack.org/mitaka/install-guide-rdo * - Installation Guide for Ubuntu 14.04 (LTS) - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide - - http://docs.openstack.org/liberty/install-guide-ubuntu + - http://docs.openstack.org/mitaka/install-guide-ubuntu Guides for deployers and administrators --------------------------------------- @@ -74,7 +70,7 @@ Guides for deployers and administrators * - Configuration Reference - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference - - http://docs.openstack.org/liberty/config-reference/content + - http://docs.openstack.org/mitaka/config-reference/ * - Cloud Administrator Guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud @@ -86,7 +82,7 @@ Guides for deployers and administrators * - Networking Guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/networking-guide - - http://docs.openstack.org/liberty/networking-guide + - http://docs.openstack.org/mitaka/networking-guide * - Operations Guide - http://git.openstack.org/cgit/openstack/operations-guide/