Merge "change os in command example to openstack(2)"

Author: Jenkins

doc/source/command-objects/federation-protocol.rst

@@ -14,7 +14,7 @@ Create new federation protocol
 .. program:: federation protocol create
 .. code:: bash
 
-    os federation protocol create
+    openstack federation protocol create
         --identity-provider <identity-provider>
         --mapping <mapping>
         <name>
@@ -39,7 +39,7 @@ Delete federation protocol(s)
 .. program:: federation protocol delete
 .. code:: bash
 
-    os federation protocol delete
+    openstack federation protocol delete
         --identity-provider <identity-provider>
         <federation-protocol> [<federation-protocol> ...]
 
@@ -59,7 +59,7 @@ List federation protocols
 .. program:: federation protocol list
 .. code:: bash
 
-    os federation protocol list
+    openstack federation protocol list
         --identity-provider <identity-provider>
 
 .. option:: --identity-provider <identity-provider>
@@ -74,7 +74,7 @@ Set federation protocol properties
 .. program:: federation protocol set
 .. code:: bash
 
-    os federation protocol set
+    openstack federation protocol set
         --identity-provider <identity-provider>
         [--mapping <mapping>]
         <federation-protocol>
@@ -99,7 +99,7 @@ Display federation protocol details
 .. program:: federation protocol show
 .. code:: bash
 
-    os federation protocol show
+    openstack federation protocol show
         --identity-provider <identity-provider>
         <federation-protocol>
 

doc/source/command-objects/flavor.rst

@@ -12,7 +12,7 @@ Create new flavor
 .. program:: flavor create
 .. code:: bash
 
-    os flavor create
+    openstack flavor create
         [--id <id>]
         [--ram <size-mb>]
         [--disk <size-gb>]
@@ -89,7 +89,7 @@ Delete flavor(s)
 .. program:: flavor delete
 .. code:: bash
 
-    os flavor delete
+    openstack flavor delete
         <flavor> [<flavor> ...]
 
 .. _flavor_delete-flavor:
@@ -105,7 +105,7 @@ List flavors
 .. program:: flavor list
 .. code:: bash
 
-    os flavor list
+    openstack flavor list
         [--public | --private | --all]
         [--long]
         [--marker <marker>]
@@ -143,7 +143,7 @@ Set flavor properties
 .. program:: flavor set
 .. code:: bash
 
-    os flavor set
+    openstack flavor set
         [--property <key=value> [...] ]
         [--project <project>]
         [--project-domain <project-domain>]
@@ -174,7 +174,7 @@ Display flavor details
 .. program:: flavor show
 .. code:: bash
 
-    os flavor show
+    openstack flavor show
         <flavor>
 
 .. _flavor_show-flavor:
@@ -190,7 +190,7 @@ Unset flavor properties
 .. program:: flavor unset
 .. code:: bash
 
-    os flavor unset
+    openstack flavor unset
         [--property <key> [...] ]
         [--project <project>]
         [--project-domain <project-domain>]

doc/source/command-objects/floating-ip-pool.rst

@@ -12,4 +12,4 @@ List pools of floating IP addresses
 .. program:: floating ip pool list
 .. code:: bash
 
-    os floating ip pool list
+    openstack floating ip pool list

doc/source/command-objects/floating-ip.rst

@@ -12,7 +12,7 @@ Create floating IP
 .. program:: floating ip create
 .. code:: bash
 
-    os floating ip create
+    openstack floating ip create
         [--subnet <subnet>]
         [--port <port>]
         [--floating-ip-address <floating-ip-address>]
@@ -71,7 +71,7 @@ Delete floating IP(s)
 .. program:: floating ip delete
 .. code:: bash
 
-    os floating ip delete <floating-ip> [<floating-ip> ...]
+    openstack floating ip delete <floating-ip> [<floating-ip> ...]
 
 .. describe:: <floating-ip>
 
@@ -85,7 +85,7 @@ List floating IP(s)
 .. program:: floating ip list
 .. code:: bash
 
-    os floating ip list
+    openstack floating ip list
         [--network <network>]
         [--port <port>]
         [--fixed-ip-address <fixed-ip-address>]
@@ -151,7 +151,7 @@ Display floating IP details
 .. program:: floating ip show
 .. code:: bash
 
-    os floating ip show <floating-ip>
+    openstack floating ip show <floating-ip>
 
 .. describe:: <floating-ip>
 

doc/source/command-objects/group.rst

@@ -48,7 +48,7 @@ Check user membership in group
 .. program:: group contains user
 .. code:: bash
 
-    os group contains user
+    openstack group contains user
         [--group-domain <group-domain>]
         [--user-domain <user-domain>]
         <group>
@@ -84,7 +84,7 @@ Create new group
 .. program:: group create
 .. code:: bash
 
-    os group create
+    openstack group create
         [--domain <domain>]
         [--description <description>]
         [--or-show]
@@ -116,7 +116,7 @@ Delete group
 .. program:: group delete
 .. code:: bash
 
-    os group delete
+    openstack group delete
         [--domain <domain>]
         <group> [<group> ...]
 
@@ -136,7 +136,7 @@ List groups
 .. program:: group list
 .. code:: bash
 
-    os group list
+    openstack group list
         [--domain <domain>]
         [--user <user> [--user-domain <user-domain>]]
         [--long]
@@ -168,7 +168,7 @@ Remove user from group
 .. program:: group remove user
 .. code:: bash
 
-    os group remove user
+    openstack group remove user
         [--group-domain <group-domain>]
         [--user-domain <user-domain>]
         <group>
@@ -204,7 +204,7 @@ Set group properties
 .. program:: group set
 .. code:: bash
 
-    os group set
+    openstack group set
         [--domain <domain>]
         [--name <name>]
         [--description <description>]
@@ -234,7 +234,7 @@ Display group details
 .. program:: group show
 .. code:: bash
 
-    os group show
+    openstack group show
         [--domain <domain>]
         <group>
 

doc/source/command-objects/host.rst

@@ -14,7 +14,7 @@ List hosts
 .. program:: host list
 .. code:: bash
 
-    os host list
+    openstack host list
         [--zone <availability-zone>]
 
 .. option:: --zone <availability-zone>
@@ -29,7 +29,7 @@ Set host properties
 .. program:: host set
 .. code:: bash
 
-    os host set
+    openstack host set
         [--enable | --disable]
         [--enable-maintenance | --disable-maintenance]
         <host>
@@ -64,7 +64,7 @@ Display host details
 .. program:: host show
 .. code:: bash
 
-    os host show
+    openstack host show
         <host>
 
 .. describe:: <host>

doc/source/command-objects/hypervisor-stats.rst

@@ -12,5 +12,5 @@ Display hypervisor stats details
 .. program:: hypervisor stats show
 .. code:: bash
 
-    os hypervisor stats show
+    openstack hypervisor stats show
 

doc/source/command-objects/hypervisor.rst

@@ -12,7 +12,7 @@ List hypervisors
 .. program:: hypervisor list
 .. code:: bash
 
-    os hypervisor list
+    openstack hypervisor list
         [--matching <hostname>]
         [--long]
 
@@ -32,7 +32,7 @@ Display hypervisor details
 .. program:: hypervisor show
 .. code:: bash
 
-    os hypervisor show
+    openstack hypervisor show
         <hypervisor>
 
 .. _hypervisor_show-flavor:

doc/source/command-objects/identity-provider.rst

@@ -14,7 +14,7 @@ Create new identity provider
 .. program:: identity provider create
 .. code:: bash
 
-    os identity provider create
+    openstack identity provider create
         [--remote-id <remote-id> [...] | --remote-id-file <file-name>]
         [--description <description>]
         [--enable | --disable]
@@ -54,7 +54,7 @@ Delete identity provider(s)
 .. program:: identity provider delete
 .. code:: bash
 
-    os identity provider delete
+    openstack identity provider delete
         <identity-provider> [<identity-provider> ...]
 
 .. describe:: <identity-provider>
@@ -69,7 +69,7 @@ List identity providers
 .. program:: identity provider list
 .. code:: bash
 
-    os identity provider list
+    openstack identity provider list
 
 identity provider set
 ---------------------
@@ -79,7 +79,7 @@ Set identity provider properties
 .. program:: identity provider set
 .. code:: bash
 
-    os identity provider set
+    openstack identity provider set
         [--remote-id <remote-id> [...] | --remote-id-file <file-name>]
         [--description <description>]
         [--enable | --disable]
@@ -119,7 +119,7 @@ Display identity provider details
 .. program:: identity provider show
 .. code:: bash
 
-    os identity provider show
+    openstack identity provider show
         <identity-provider>
 
 .. describe:: <identity-provider>

doc/source/command-objects/image.rst

@@ -14,7 +14,7 @@ Associate project with image
 .. program:: image add project
 .. code:: bash
 
-    os image add project
+    openstack image add project
         [--project-domain <project-domain>]
         <image> <project>
 
@@ -41,7 +41,7 @@ Create/upload an image
 .. program:: image create
 .. code:: bash
 
-    os image create
+    openstack image create
         [--id <id>]
         [--store <store>]
         [--container-format <container-format>]
@@ -175,7 +175,7 @@ Delete image(s)
 .. program:: image delete
 .. code:: bash
 
-    os image delete
+    openstack image delete
         <image>
 
 .. describe:: <image>
@@ -190,7 +190,7 @@ List available images
 .. program:: image list
 .. code:: bash
 
-    os image list
+    openstack image list
         [--public | --private | --shared]
         [--property <key=value>]
         [--long]
@@ -244,7 +244,7 @@ Disassociate project with image
 .. program:: image remove project
 .. code:: bash
 
-    os image remove remove
+    openstack image remove remove
         [--project-domain <project-domain>]
         <image> <project>
 
@@ -269,7 +269,7 @@ Save an image locally
 .. program:: image save
 .. code:: bash
 
-    os image save
+    openstack image save
         --file <filename>
         <image>
 
@@ -291,7 +291,7 @@ Set image properties
 .. program:: image set
 .. code:: bash
 
-    os image set
+    openstack image set
         [--name <name>]
         [--min-disk <disk-gb>]
         [--min-ram <disk-ram>]
@@ -495,7 +495,7 @@ Display image details
 .. program:: image show
 .. code:: bash
 
-    os image show
+    openstack image show
         <image>
 
 .. describe:: <image>
@@ -512,7 +512,7 @@ Unset image tags or properties
 .. program:: image unset
 .. code:: bash
 
-    os image set
+    openstack image set
         [--tag <tag>]
         [--property <property>]
         <image>