5 files changed, 17 insertions, 20 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 60a87797..8b4202be 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,3 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
 openstackdocstheme>=2.2.1 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
diff --git a/doc/source/cli/data/glance.csv b/doc/source/cli/data/glance.csv
index 0c34c7b9..12b6851d 100644
--- a/doc/source/cli/data/glance.csv
+++ b/doc/source/cli/data/glance.csv
@@ -53,8 +53,8 @@ member-list,image member list,Describe sharing permissions by image.
 member-update,image set --accept --reject --status,Update the status of a member for a given image.
 stores-delete,,Delete image from specific store.
 stores-info,,Print available backends from Glance.
-task-create,,Create a new task.
-task-list,,List tasks you can access.
-task-show,,Describe a specific task.
+task-create,WONTFIX,Create a new task.
+task-list,image task list,List tasks you can access.
+task-show,image task show,Describe a specific task.
 bash-completion,complete,Prints arguments for bash_completion.
 help,help,Display help about this program or one of its subcommands.
diff --git a/doc/source/cli/data/neutron.csv b/doc/source/cli/data/neutron.csv
index f0caa479..2399ed82 100644
--- a/doc/source/cli/data/neutron.csv
+++ b/doc/source/cli/data/neutron.csv
@@ -230,7 +230,7 @@ subnetpool-show,subnet pool show,Show information of a given subnetpool.
 subnetpool-update,subnet pool set / subnet pool unset,Update subnetpool's information.
 tag-add,network set --tag,Add a tag into the resource.
 tag-remove,network unset --tag,Remove a tag on the resource.
-tag-replace,,Replace all tags on the resource.
+tag-replace,network set --no-tag --tag,Replace all tags on the resource.
 vpn-endpoint-group-create,,Create a VPN endpoint group.
 vpn-endpoint-group-delete,,Delete a given VPN endpoint group.
 vpn-endpoint-group-list,,List VPN endpoint groups that belong to a given tenant.
diff --git a/doc/source/cli/data/nova.csv b/doc/source/cli/data/nova.csv
index 2909bc0c..e494ce28 100644
--- a/doc/source/cli/data/nova.csv
+++ b/doc/source/cli/data/nova.csv
@@ -4,7 +4,7 @@ agent-delete,compute agent delete,Delete existing agent build.
 agent-list,compute agent list,List all builds.
 agent-modify,compute agent set,Modify existing agent build.
 aggregate-add-host,aggregate add host,Add the host to the specified aggregate.
-aggregate-cache-images,,Request images be cached. (Supported by API versions '2.81' - '2.latest') [hint: use '-- os-compute-api-version' flag to show help message for proper version]
+aggregate-cache-images,WONTFIX,Request images be cached. (Supported by API versions '2.81' - '2.latest') [hint: use '-- os-compute-api-version' flag to show help message for proper version]
 aggregate-create,aggregate create,Create a new aggregate with the specified details.
 aggregate-delete,aggregate delete,Delete the aggregate.
 aggregate-list,aggregate list,Print a list of all aggregates.
@@ -44,7 +44,7 @@ hypervisor-list,hypervisor list,List hypervisors. (Supported by API versions '2.
 hypervisor-servers,,List servers belonging to specific hypervisors.
 hypervisor-show,hypervisor show,Display the details of the specified hypervisor.
 hypervisor-stats,hypervisor stats show,Get hypervisor statistics over all compute nodes.
-hypervisor-uptime,,Display the uptime of the specified hypervisor.
+hypervisor-uptime,hypervisor show,Display the uptime of the specified hypervisor.
 image-create,server image create,Create a new image by taking a snapshot of a running server.
 instance-action,server event show,Show an action.
 instance-action-list,server event list,List actions on a server.
@@ -65,7 +65,7 @@ live-migration-force-comp,server migration force complete,Force on-going live mi
 lock,server lock,Lock a server.
 meta,server set --property / unset,Set or delete metadata on a server.
 migrate,server migrate,Migrate a server. The new host will be selected by the scheduler.
-migration-list,,Print a list of migrations.
+migration-list,server migration list,Print a list of migrations.
 pause,server pause,Pause a server.
 quota-class-show,quota show --class,List the quotas for a quota class.
 quota-class-update,quota set --class,Update the quotas for a quota class.
@@ -120,8 +120,8 @@ usage,usage show,Show usage data for a single tenant.
 usage-list,usage list,List usage data for all tenants.
 version-list,versions show --service compute,List all API versions.
 volume-attach,server add volume,Attach a volume to a server.
-volume-attachments,server show,List all the volumes attached to a server.
+volume-attachments,server volume list,List all the volumes attached to a server.
 volume-detach,server remove volume,Detach a volume from a server.
-volume-update,,Update volume attachment.
+volume-update,server volume update,Update volume attachment.
 bash-completion,complete,Prints all of the commands and options to stdout so that the nova.bash_completion script doesn't have to hard code them.
 help,help,Display help about this program or one of its subcommands.
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4b60ce4a..5eb5f59f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -51,8 +51,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenStack Command Line Client'
-copyright = u'2012-2013 OpenStack Foundation'
+project = 'OpenStack Command Line Client'
+copyright = '2012-2013 OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -189,8 +189,8 @@ latex_elements = {
 # .
 latex_documents = [
     ('index', 'OpenStackCommandLineClient.tex',
-    u'OpenStack Command Line Client Documentation',
-    u'OpenStack', 'manual'),
+    'OpenStack Command Line Client Documentation',
+    'OpenStack', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,8 +222,8 @@ man_pages = [
     (
         'cli/man/openstack',
         'openstack',
-        u'OpenStack Command Line Client',
-        [u'OpenStack contributors'],
+        'OpenStack Command Line Client',
+        ['OpenStack contributors'],
         1,
     ),
 ]
@@ -239,8 +239,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'OpenStackCommandLineClient',
-    u'OpenStack Command Line Client Documentation',
-    u'OpenStack', 'OpenStackCommandLineClient',
+    'OpenStack Command Line Client Documentation',
+    'OpenStack', 'OpenStackCommandLineClient',
      'One line description of project.',
      'Miscellaneous'),
 ]