From e85971b1a6bb533c6169161ead7b34c910f98e5f Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Sun, 19 Apr 2015 01:43:40 -0400
Subject: [PATCH] Update the docs for new nic options

Change-Id: I4c8b93ede80f993eab8badfbba6bf1c530844d54
---
 doc/source/command-objects/server.rst | 11 ++++++++---
 openstackclient/compute/v2/server.py  |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 34555580ed..f9ea590828 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -67,7 +67,7 @@ Create a new server
         [--user-data <user-data>]
         [--availability-zone <zone-name>]
         [--block-device-mapping <dev-name=mapping> [...] ]
-        [--nic <net-id=net-uuid,v4-fixed-ip=ip-addr> [...] ]
+        [--nic <net-id=net-uuid,v4-fixed-ip=ip-addr,v6-fixed-ip=ip-addr,port-id=port-uuid> [...] ]
         [--hint <key=value> [...] ]
         [--config-drive <value>|True ]
         [--min <count>]
@@ -115,9 +115,14 @@ Create a new server
 
     Map block devices; map is <id>:<type>:<size(GB)>:<delete_on_terminate> (optional extension)
 
-.. option:: --nic <nic-config-string>
+.. option:: --nic <net-id=net-uuid,v4-fixed-ip=ip-addr,v6-fixed-ip=ip-addr,port-id=port-uuid>
 
-    Specify NIC configuration (optional extension)
+    Create a NIC on the server. Specify option multiple times to create
+    multiple NICs. Either net-id or port-id must be provided, but not both.
+    net-id: attach NIC to network with this UUID,
+    port-id: attach NIC to port with this UUID,
+    v4-fixed-ip: IPv4 fixed address for NIC (optional),
+    v6-fixed-ip: IPv6 fixed address for NIC (optional).
 
 .. option:: --hint <key=value>
 
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index e672819bb5..e4e96ee7ff 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -285,7 +285,7 @@ class CreateServer(show.ShowOne):
                    "net-id: attach NIC to network with this UUID, "
                    "port-id: attach NIC to port with this UUID, "
                    "v4-fixed-ip: IPv4 fixed address for NIC (optional), "
-                   "v6-fixed-ip: IPv6 fixed address for NIC (optional), "),
+                   "v6-fixed-ip: IPv6 fixed address for NIC (optional)."),
         )
         parser.add_argument(
             '--hint',