3 files changed, 39 insertions, 15 deletions
diff --git a/doc/source/command-objects/credentials.rst b/doc/source/command-objects/credential.rst
index 9f4aabe4..ed8a00db 100644
--- a/doc/source/command-objects/credentials.rst
+++ b/doc/source/command-objects/credential.rst
@@ -1,27 +1,27 @@
 ===========
-credentials
+credential
 ===========
 
 Identity v3
 
-credentials create
+credential create
 ------------------
 
 .. ''[consider rolling the ec2 creds into this too]''
 
 .. code:: bash
 
-    os credentials create
+    os credential create
         --x509
         [<private-key-file>]
         [<certificate-file>]
 
-credentials show
+credential show
 ----------------
 
 .. code:: bash
 
-    os credentials show
+    os credential show
         [--token]
         [--user]
         [--x509 [--root]]
diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst
index b0ac3c94..97cce35c 100644
--- a/doc/source/command-objects/security-group-rule.rst
+++ b/doc/source/command-objects/security-group-rule.rst
@@ -16,18 +16,14 @@ Create a new security group rule
 .. code:: bash
 
     os security group rule create
-        [--proto <proto>]
         [--src-ip <ip-address> | --src-group <group>]
-        [--dst-port <port-range>]
+        [--dst-port <port-range> | [--icmp-type <icmp-type> [--icmp-code <icmp-code>]]]
+        [--protocol <protocol>]
         [--ingress | --egress]
         [--ethertype <ethertype>]
         [--project <project> [--project-domain <project-domain>]]
         <group>
 
-.. option:: --proto <proto>
-
-    IP protocol (icmp, tcp, udp; default: tcp)
-
 .. option:: --src-ip <ip-address>
 
     Source IP address block
@@ -39,8 +35,35 @@ Create a new security group rule
 
 .. option:: --dst-port <port-range>
 
-    Destination port, may be a single port or port range: 137:139
-    (only required for IP protocols tcp and udp)
+    Destination port, may be a single port or a starting and
+    ending port range: 137:139. Required for IP protocols TCP
+    and UDP. Ignored for ICMP IP protocols.
+
+.. option:: --icmp-type <icmp-type>
+
+    ICMP type for ICMP IP protocols
+
+    *Network version 2 only*
+
+.. option:: --icmp-code <icmp-code>
+
+    ICMP code for ICMP IP protocols
+
+    *Network version 2 only*
+
+.. option:: --protocol <protocol>
+
+    IP protocol (icmp, tcp, udp; default: tcp)
+
+    *Compute version 2*
+
+    IP protocol (ah, dccp, egp, esp, gre, icmp, igmp,
+    ipv6-encap, ipv6-frag, ipv6-icmp, ipv6-nonxt,
+    ipv6-opts, ipv6-route, ospf, pgm, rsvp, sctp, tcp,
+    udp, udplite, vrrp and integer representations [0-255];
+    default: tcp)
+
+    *Network version 2*
 
 .. option:: --ingress
 
@@ -56,7 +79,8 @@ Create a new security group rule
 
 .. option:: --ethertype <ethertype>
 
-    Ethertype of network traffic (IPv4, IPv6; default: IPv4)
+    Ethertype of network traffic
+    (IPv4, IPv6; default: based on IP protocol)
 
     *Network version 2 only*
 
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 7e6e5589..12542d1c 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -83,7 +83,7 @@ referring to both Compute and Volume quotas.
 * ``console url``: (**Compute**) server remote console URL
 * ``consumer``: (**Identity**) OAuth-based delegatee
 * ``container``: (**Object Storage**) a grouping of objects
-* ``credentials``: (**Identity**) specific to identity providers
+* ``credential``: (**Identity**) specific to identity providers
 * ``domain``: (**Identity**) a grouping of projects
 * ``ec2 credentials``: (**Identity**) AWS EC2-compatible credentials
 * ``endpoint``: (**Identity**) the base URL used to contact a specific service