Merge "image: autogenerate docs"

Author: Zuul

doc/source/_extra/.htaccess

@@ -9,6 +9,8 @@ redirectmatch 301 ^/python-openstackclient/([^/]+)/specs/([^/.]+).html$ /python-
 
 redirectmatch 301 ^/python-openstackclient/([^/]+)/(command-(beta|errors|logs|options|wrappers)|developing|humaninterfaceguide|plugins).html$ /python-openstackclient/$1/contributor/$2.html
 redirectmatch 301 ^/python-openstackclient/([^/]+)/cli/plugin-commands.html$ /python-openstackclient/$1/cli/plugin-commands/index.html
-# Identity pages were split into -v2 and -v3 for common subcommand names.
+# For common subcommand names:
+# - identity pages were split into -v2 and -v3
+# - image pages were split into -v1 and -v2
 # The unversioned page is hidden but contains links to the versioned pages so links in the wild redirect somewhere sane.
-redirectmatch 301 ^/python-openstackclient/([^/]+)/cli/command-objects/(ec2-credentials|endpoint|project|role|service|token|user).html$ /python-openstackclient/$1/cli/_hidden/$2.html
+redirectmatch 301 ^/python-openstackclient/([^/]+)/cli/command-objects/(ec2-credentials|endpoint|image|project|role|service|token|user).html$ /python-openstackclient/$1/cli/_hidden/$2.html

doc/source/cli/_hidden/image.rst

@@ -0,0 +1,13 @@
+=====
+image
+=====
+
+.. NOTE(efried): This page is hidden from the main TOC; it's here so links in
+   the wild redirect somewhere sane, because previously identity v2 and v3 were
+   combined in a single page.
+
+.. toctree::
+   :maxdepth: 2
+
+   ../command-objects/image-v1
+   ../command-objects/image-v2

doc/source/cli/command-objects/image-v1.rst

@@ -0,0 +1,6 @@
+========
+image v1
+========
+
+.. autoprogram-cliff:: openstack.image.v1
+   :command: image *

doc/source/cli/command-objects/image-v2.rst

@@ -0,0 +1,6 @@
+========
+image v2
+========
+
+.. autoprogram-cliff:: openstack.image.v2
+   :command: image *