summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2019-09-09 11:48:28 -0500
committerDean Troyer <dtroyer@gmail.com>2019-09-10 23:48:32 -0500
commitcb0c20b23c564dc6b260492923aef58ee66620d9 (patch)
tree89cc8e9a9b7db380d4473569293b205938ebf91a /doc
parentb7b124f32745eb4063ded5f2a175d559fba04dc9 (diff)
downloadpython-openstackclient-cb0c20b23c564dc6b260492923aef58ee66620d9.tar.gz
Update release table for Train and 4.0.0
Also clean up some docs and release notes. Change-Id: I73feec747ca1bd12be5e5700c9ca608ed3a8b2c2 Signed-off-by: Dean Troyer <dtroyer@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/source/cli/authentication.rst2
-rw-r--r--doc/source/index.rst3
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/source/cli/authentication.rst b/doc/source/cli/authentication.rst
index f8aaadf4..3b404bce 100644
--- a/doc/source/cli/authentication.rst
+++ b/doc/source/cli/authentication.rst
@@ -67,8 +67,6 @@ by the ``ClientManager`` object.
is selected based on the existing options. This is a short-circuit
evaluation, the first match wins.
- * If ``--os-url`` and ``--os-token`` are both present ``token_endpoint``
- is selected
* If ``--os-username`` is supplied ``password`` is selected
* If ``--os-token`` is supplied ``token`` is selected
* If no selection has been made by now exit with error
diff --git a/doc/source/index.rst b/doc/source/index.rst
index abe08033..ea4cd3e9 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -55,7 +55,7 @@ Contributing
OpenStackClient utilizes all of the usual OpenStack processes and requirements for
contributions. The code is hosted `on OpenStack's Git server`_. `Bug reports`_
-and `blueprints`_ may be submitted to the :code:`python-openstackclient` project
+may be submitted to the :code:`python-openstackclient` Storyboard project
on `Launchpad`_. Code may be submitted to the
:code:`openstack/python-openstackclient` project using `Gerrit`_.
Developers may also be found in the `IRC channel`_ ``#openstack-sdks``.
@@ -64,7 +64,6 @@ Developers may also be found in the `IRC channel`_ ``#openstack-sdks``.
.. _Launchpad: https://launchpad.net/python-openstackclient
.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
.. _Bug reports: https://storyboard.openstack.org/#!/project/975
-.. _blueprints: https://blueprints.launchpad.net/python-openstackclient
.. _PyPi: https://pypi.org/project/python-openstackclient
.. _tarball: http://tarballs.openstack.org/python-openstackclient
.. _IRC channel: https://wiki.openstack.org/wiki/IRC