From e5c38b24dc2ad3e8565bed5ce65ea9d86323db4b Mon Sep 17 00:00:00 2001 From: "Ian Y. Choi" Date: Mon, 16 Jan 2017 10:08:13 +0000 Subject: [PATCH] Switch to current Sphinx without :option: usage - Docs are switching to latest Sphinx 1.5.1 without auto-upgrade support. - :option: usage is not compatible to Sphinx 1.5.1. Change-Id: I40e17d68c255e3471524515db2d5c32384dcd181 --- doc/training-guides/source/slides/04-using-with-cli.rst | 3 +-- test-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/training-guides/source/slides/04-using-with-cli.rst b/doc/training-guides/source/slides/04-using-with-cli.rst index e79d9074..f063fd00 100644 --- a/doc/training-guides/source/slides/04-using-with-cli.rst +++ b/doc/training-guides/source/slides/04-using-with-cli.rst @@ -123,8 +123,7 @@ Create and source the OpenStack RC file from scratch lives in clear text format in the ``PROJECT-openrc.sh`` file. Restrict the permissions on this file to avoid security problems. You can also remove the ``OS_PASSWORD`` variable from the file, and - use the :option:`--password` parameter with OpenStack client commands - instead. + use the ``--password`` parameter with OpenStack client commands instead. .. note:: diff --git a/test-requirements.txt b/test-requirements.txt index 9d6472f3..5a31dfb6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. pbr>=1.6 openstack-doc-tools>=0.30 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx>=1.5.1,<1.6 # BSD openstackdocstheme>=1.5.0 hieroglyph>=0.7.1 doc8