summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorAkihiro Motoki <amotoki@gmail.com>2018-01-16 14:43:40 +0900
committerAkihiro Motoki <amotoki@gmail.com>2018-01-29 02:08:43 +0000
commit1791ce65400315baf075dbade52cdbaef7da0436 (patch)
treed8465a882361122bee66a192df103fb9fbb8cd77 /doc/source
parent27ab2f9f403f6c1acd03b3918755bfa0d8bc8376 (diff)
downloadpython-neutronclient-1791ce65400315baf075dbade52cdbaef7da0436.tar.gz
Drop neutronclient-specific cliff sphinx extension
Previously neutronclient has its own variant of cliff sphinx extension to support cliff app autodocument (cliff-app directive). The feature has been implemented in cliff 2.10.0. This patch switches to the cliff official version. The cliff official version also contains several nice fixes around the sphinx extension. Change-Id: If542fdf88ef57ec3ce8ecc017127b5dc194e6c9a
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/cli/neutron-reference.rst2
-rw-r--r--doc/source/conf.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/source/cli/neutron-reference.rst b/doc/source/cli/neutron-reference.rst
index 24359a5..d6640ea 100644
--- a/doc/source/cli/neutron-reference.rst
+++ b/doc/source/cli/neutron-reference.rst
@@ -36,7 +36,7 @@ neutron CLI reference
neutron usage
-------------
-.. cliff-app:: neutronclient.shell.NeutronShell
+.. autoprogram-cliff:: neutronclient.shell.NeutronShell
:application: neutron
:arguments: 2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1bcb1db..b1c6cee 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -9,10 +9,7 @@ extensions = [
'sphinx.ext.autodoc',
'reno.sphinxext',
'openstackdocstheme',
- # 'cliff.sphinxext',
- # TODO(amotoki): Switch to cliff.sphinxext once cliff bug is fixed.
- # https://bugs.launchpad.net/python-cliff/+bug/1692018
- 'neutronclient.cliff_sphinxext',
+ 'cliff.sphinxext',
]
# openstackdocstheme options