summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2014-12-04 15:09:03 -0600
committerDean Troyer <dtroyer@gmail.com>2014-12-08 18:00:16 -0600
commit52d22359f100c287c375edc73b6c4bd61be4c8da (patch)
tree50a496055f2461783f6e8a2683ca4a43852de828
parentc7a5ead8c738c85016e49026b9e38c65018c3ba6 (diff)
downloadpython-openstackclient-52d22359f100c287c375edc73b6c4bd61be4c8da.tar.gz
Tweaks after the fact
Change-Id: Id96203de023b3b8bde1984a61c41dd9bc1711de4
-rw-r--r--doc/source/command-objects/server.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 4f076329..482602ee 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -139,8 +139,8 @@ List servers
os server list
[--reservation-id <reservation-id>]
- [--ip <ip-regex>]
- [--ip6 <ip6-regex>]
+ [--ip <ip-address-regex>]
+ [--ip6 <ip6-address-regex>]
[--name <name-regex>]
[--instance-name <instance-name-regex>]
[--status <status>]
@@ -210,9 +210,6 @@ Migrate server to different host
[--wait]
<server>
-:option:`--wait`
- Wait for resize to complete
-
:option:`--live` <hostname>
Target hostname
@@ -228,6 +225,9 @@ Migrate server to different host
:option:`--no-disk-overcommit`
Do not over-commit disk on the destination host (default)
+:option:`--wait`
+ Wait for resize to complete
+
:option:`<server>`
Server to migrate (name or ID)