From 2c4f284055e1031f17f97229056616017385d8bc Mon Sep 17 00:00:00 2001 From: zengjia Date: Thu, 23 May 2019 10:53:31 +0800 Subject: [PATCH] Modify the version path URL of the configuration file In the main branch, I think it is necessary to modify the configuration file path in the document as the main branch path, and to change the path to a stable version when the version is released. Change-Id: Ib1bc4c59ed4c7624782b8b1cdea20847c14c90bf --- doc/source/install/controller-install-debian.rst | 2 +- doc/source/install/controller-install-rdo.rst | 2 +- doc/source/install/controller-install-ubuntu.rst | 2 +- doc/source/install/finalize-installation-rdo.rst | 2 +- doc/source/install/finalize-installation-ubuntu-debian.rst | 2 +- doc/source/install/storage-install-rdo.rst | 6 +++--- doc/source/install/storage-install-ubuntu-debian.rst | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/source/install/controller-install-debian.rst b/doc/source/install/controller-install-debian.rst index bd3eefdf87..28bb0acb9a 100644 --- a/doc/source/install/controller-install-debian.rst +++ b/doc/source/install/controller-install-debian.rst @@ -47,6 +47,6 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample + # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/proxy-server.conf-sample 4. .. include:: controller-include.txt diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst index 262577ffdc..37a3c3e4e0 100644 --- a/doc/source/install/controller-install-rdo.rst +++ b/doc/source/install/controller-install-rdo.rst @@ -45,6 +45,6 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample + # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/proxy-server.conf-sample 3. .. include:: controller-include.txt diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst index caf2b8efa5..e60ba8e872 100644 --- a/doc/source/install/controller-install-ubuntu.rst +++ b/doc/source/install/controller-install-ubuntu.rst @@ -47,6 +47,6 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample + # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/proxy-server.conf-sample 4. .. include:: controller-include.txt diff --git a/doc/source/install/finalize-installation-rdo.rst b/doc/source/install/finalize-installation-rdo.rst index 5101b27a03..5514be149c 100644 --- a/doc/source/install/finalize-installation-rdo.rst +++ b/doc/source/install/finalize-installation-rdo.rst @@ -19,7 +19,7 @@ This section applies to Red Hat Enterprise Linux 7 and CentOS 7. .. code-block:: console # curl -o /etc/swift/swift.conf \ - https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/swift.conf-sample + https://opendev.org/openstack/swift/raw/branch/master/etc/swift.conf-sample #. Edit the ``/etc/swift/swift.conf`` file and complete the following actions: diff --git a/doc/source/install/finalize-installation-ubuntu-debian.rst b/doc/source/install/finalize-installation-ubuntu-debian.rst index b20f55e636..ccde2fd568 100644 --- a/doc/source/install/finalize-installation-ubuntu-debian.rst +++ b/doc/source/install/finalize-installation-ubuntu-debian.rst @@ -19,7 +19,7 @@ This section applies to Ubuntu 14.04 (LTS) and Debian. .. code-block:: console # curl -o /etc/swift/swift.conf \ - https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/swift.conf-sample + https://opendev.org/openstack/swift/raw/branch/master/etc/swift.conf-sample #. Edit the ``/etc/swift/swift.conf`` file and complete the following actions: diff --git a/doc/source/install/storage-install-rdo.rst b/doc/source/install/storage-install-rdo.rst index 9e714d86b0..621a17cfaa 100644 --- a/doc/source/install/storage-install-rdo.rst +++ b/doc/source/install/storage-install-rdo.rst @@ -133,9 +133,9 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/account-server.conf-sample - # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/container-server.conf-sample - # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/object-server.conf-sample + # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/account-server.conf-sample + # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/container-server.conf-sample + # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/object-server.conf-sample 3. .. include:: storage-include1.txt 4. .. include:: storage-include2.txt diff --git a/doc/source/install/storage-install-ubuntu-debian.rst b/doc/source/install/storage-install-ubuntu-debian.rst index 6ac18a6c88..3c0fd8e349 100644 --- a/doc/source/install/storage-install-ubuntu-debian.rst +++ b/doc/source/install/storage-install-ubuntu-debian.rst @@ -137,9 +137,9 @@ Install and configure components .. code-block:: console - # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/account-server.conf-sample - # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/container-server.conf-sample - # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/object-server.conf-sample + # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/account-server.conf-sample + # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/container-server.conf-sample + # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/master/etc/object-server.conf-sample 3. .. include:: storage-include1.txt 4. .. include:: storage-include2.txt