summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-16 02:28:41 +0000
committerGerrit Code Review <review@openstack.org>2015-11-16 02:28:41 +0000
commitf177160991e91e847db24b173a1c42c34ee03b12 (patch)
tree3584aa18a544d0326f1c8d4d9bb771a993540fdc /doc/source
parent6952916c48da93fac5d2d84c64cf3af5fa212956 (diff)
parent90d86ef01cb6ce93c3341562c0e0e79da0a6d4ad (diff)
downloadpython-openstackclient-f177160991e91e847db24b173a1c42c34ee03b12.tar.gz
Merge "Enable "openstack server unpause" command to take multiple servers."
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/server.rst6
-rw-r--r--doc/source/commands.rst2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 83f83ddc..211963f3 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -658,17 +658,17 @@ Unlock server
server unpause
--------------
-Unpause server
+Unpause server(s)
.. program:: server unpause
.. code:: bash
os server unpause
- <server>
+ <server> [<server> ...]
.. describe:: <server>
- Server (name or ID)
+ Server(s) to unpause (name or ID)
server unrescue
---------------
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 9a87709c..62ed7652 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -187,7 +187,7 @@ Those actions with an opposite action are noted in parens if applicable.
* ``stop`` (``start``) - stop one or more servers
* ``suspend`` (``resume``) - stop a server and save to disk freeing memory
* ``unlock`` (``lock``) - unlock a server
-* ``unpause`` (``pause``) - return a paused server to running state
+* ``unpause`` (``pause``) - return one or more paused servers to running state
* ``unrescue`` (``rescue``) - return a server to normal boot mode
* ``unset`` (``set``) - remove an attribute of the object