summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-24 22:51:10 +0000
committerGerrit Code Review <review@openstack.org>2017-07-24 22:51:10 +0000
commit3c211f30af8976d2be518c68eae14b08fba09c6a (patch)
tree3387e24f0aaf7d05f144f5dbe561c31ea25d9f63
parentc2783e9880a9ecc7fcce078d570467179453d14a (diff)
parent7345d6ae4e6d3ba3e29129aed887f07e3c6f08e4 (diff)
downloadpython-neutronclient-3c211f30af8976d2be518c68eae14b08fba09c6a.tar.gz
Merge "Update the documentation link for doc migration"6.4.0
-rw-r--r--HACKING.rst2
-rw-r--r--README.rst2
-rw-r--r--doc/source/cli/index.rst2
-rw-r--r--doc/source/cli/neutron.rst4
-rw-r--r--doc/source/contributor/transition_to_osc.rst20
-rw-r--r--doc/source/index.rst2
-rw-r--r--doc/source/reference/index.rst2
-rw-r--r--setup.cfg2
8 files changed, 18 insertions, 18 deletions
diff --git a/HACKING.rst b/HACKING.rst
index b8b3ff9..7230971 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ Neutron Style Commandments
================================
- Step 1: Read the OpenStack Style Commandments
- http://docs.openstack.org/developer/hacking/
+ https://docs.openstack.org/hacking/latest/
- Step 2: Read on
diff --git a/README.rst b/README.rst
index 0433add..6cccade 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ provides a Python API (the ``neutronclient`` module) and a command-line tool
* `Developer's Guide`_
.. _PyPi: https://pypi.python.org/pypi/python-neutronclient
-.. _Online Documentation: http://docs.openstack.org/developer/python-neutronclient
+.. _Online Documentation: https://docs.openstack.org/python-neutronclient/latest/
.. _Launchpad project: https://launchpad.net/python-neutronclient
.. _Blueprints: https://blueprints.launchpad.net/python-neutronclient
.. _Bugs: https://bugs.launchpad.net/python-neutronclient
diff --git a/doc/source/cli/index.rst b/doc/source/cli/index.rst
index f53a83a..0a7d54d 100644
--- a/doc/source/cli/index.rst
+++ b/doc/source/cli/index.rst
@@ -26,7 +26,7 @@ Using CLI
There are two CLIs which support the Networking API:
`OpenStackClient (OSC)
-<https://docs.openstack.org/developer/python-openstackclient/>`__
+<https://docs.openstack.org/python-openstackclient/latest/>`__
and :doc:`neutron CLI <neutron>` (deprecated).
OpenStackClient
diff --git a/doc/source/cli/neutron.rst b/doc/source/cli/neutron.rst
index bc104ce..7ca6527 100644
--- a/doc/source/cli/neutron.rst
+++ b/doc/source/cli/neutron.rst
@@ -76,7 +76,7 @@ Run **neutron help** to get a full list of all possible commands, and run
Using with os-client-config
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-`os-client-config <http://docs.openstack.org/developer/os-client-config/>`_
+`os-client-config <https://docs.openstack.org/os-client-config/latest/>`_
provides more convenient way to manage a collection of client configurations
and you can easily switch multiple OpenStack-based configurations.
@@ -114,7 +114,7 @@ Then, you need to specify a configuration name defined in the above clouds.yaml.
export OS_CLOUD=devstack
For more detail information, see the
-`os-client-config <http://docs.openstack.org/developer/os-client-config/>`_
+`os-client-config <https://docs.openstack.org/os-client-config/latest/>`_
documentation.
Using with keystone token
diff --git a/doc/source/contributor/transition_to_osc.rst b/doc/source/contributor/transition_to_osc.rst
index 2f0e524..098d727 100644
--- a/doc/source/contributor/transition_to_osc.rst
+++ b/doc/source/contributor/transition_to_osc.rst
@@ -47,7 +47,7 @@ It will be available along side the networking support provided by the
OpenStack Python SDK.
Users of the neutron client's command extensions will need to transition to the
-`OSC plugin system <http://docs.openstack.org/developer/python-openstackclient/plugins.html>`_
+`OSC plugin system <https://docs.openstack.org/python-openstackclient/latest/contributor/plugins.html>`_
before the ``neutron`` CLI is removed. Such users will maintain their OSC plugin
commands within their own project and will be responsible for deprecating and
removing their ``neutron`` CLI extension.
@@ -59,7 +59,7 @@ Transition Steps
patch set: https://review.openstack.org/#/c/138745/
2. **Done:** OSC switches its networking support for the
- `network <http://docs.openstack.org/developer/python-openstackclient/command-objects/network.html>`_
+ `network <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/network.html>`_
command object to use the OpenStack Python SDK instead of the neutron
client's Python library. See the following patch set:
https://review.openstack.org/#/c/253348/
@@ -73,11 +73,11 @@ Transition Steps
See the following blueprint: https://blueprints.launchpad.net/python-openstackclient/+spec/network-command-sdk-support
5. **Done:** OSC switches its networking support for the
- `ip floating <http://docs.openstack.org/developer/python-openstackclient/command-objects/ip-floating.html>`_,
- `ip floating pool <http://docs.openstack.org/developer/python-openstackclient/command-objects/ip-floating-pool.html>`_,
- `ip fixed <http://docs.openstack.org/developer/python-openstackclient/command-objects/ip-fixed.html>`_,
- `security group <http://docs.openstack.org/developer/python-openstackclient/command-objects/security-group.html>`_, and
- `security group rule <http://docs.openstack.org/developer/python-openstackclient/command-objects/security-group-rule.html>`_
+ `ip floating <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/ip-floating.html>`_,
+ `ip floating pool <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/ip-floating-pool.html>`_,
+ `ip fixed <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/ip-fixed.html>`_,
+ `security group <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/security-group.html>`_, and
+ `security group rule <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/security-group-rule.html>`_
command objects to use the OpenStack Python SDK instead of the nova
client's Python library when neutron is enabled. When nova network
is enabled, then the nova client's Python library will continue to
@@ -112,8 +112,8 @@ Transition Steps
equivalent to the ``neutron`` CLI and it contains sufficient functional
and unit test coverage.
- * `Neutron Stadium <http://docs.openstack.org/developer/neutron/stadium/sub_projects.html>`_
- projects, Neutron documentation and `DevStack <http://docs.openstack.org/developer/devstack/>`_
+ * `Neutron Stadium <https://docs.openstack.org/neutron/latest/contributor/stadium/>`_
+ projects, Neutron documentation and `DevStack <https://docs.openstack.org/devstack/latest/>`_
use ``openstack`` CLI instead of ``neutron`` CLI.
* Most users of the neutron client's command extensions have transitioned
@@ -235,7 +235,7 @@ Developer References
to determine if an ``openstack`` command exists.
* See `OSC command spec list <https://github.com/openstack/python-openstackclient/tree/master/doc/source/specs/command-objects>`_
to determine if an ``openstack`` command spec exists.
-* See `OSC plugin command list <http://docs.openstack.org/developer/python-openstackclient/plugin-commands.html>`_
+* See `OSC plugin command list <https://docs.openstack.org/python-openstackclient/latest/cli/plugin-commands.html>`_
to determine if an ``openstack`` plugin command exists.
* See `OSC command structure <https://github.com/openstack/python-openstackclient/blob/master/doc/source/commands.rst>`_
to determine the current ``openstack`` command objects, plugin objects and actions.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9b7a0ef..64ad45a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -29,7 +29,7 @@ This is a client for OpenStack Networking API. It provides
There are two CLIs which support the Networking API:
:doc:`neutron CLI <cli/neutron>` and
-`OpenStack Client (OSC) <https://docs.openstack.org/developer/python-openstackclient/>`__.
+`OpenStack Client (OSC) <https://docs.openstack.org/python-openstackclient/latest/>`__.
OpenStack Client provides the basic network commands and
python-neutronclient provides extensions (aka OSC plugins)
for advanced networking services.
diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst
index 8ab601c..ee47610 100644
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@@ -29,7 +29,7 @@ Basic Usage
First create a client instance using a keystoneauth Session. For more
information on this keystoneauth API, see `Using Sessions`_.
-.. _Using Sessions: http://docs.openstack.org/developer/keystoneauth/using-sessions.html
+.. _Using Sessions: https://docs.openstack.org/keystoneauth/latest/using-sessions.html
.. code-block:: python
diff --git a/setup.cfg b/setup.cfg
index 00fce79..60bd860 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ description-file =
README.rst
author = OpenStack Networking Project
author-email = openstack-dev@lists.openstack.org
-home-page = http://docs.openstack.org/developer/python-neutronclient
+home-page = https://docs.openstack.org/python-neutronclient/latest/
classifier =
Environment :: OpenStack
Intended Audience :: Developers