summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-15 16:54:10 +0000
committerGerrit Code Review <review@openstack.org>2016-06-15 16:54:10 +0000
commitd3cd322650efeae7321bfe386e81a6697aebe5b0 (patch)
tree3f62e99354c8f26529ee017aa3a5b87241f28aa0 /doc/source
parent4cc539fcc53c09559c9bf0f8e06743a8077db197 (diff)
parent8e2f49fbf22c242270c8162254fc83fbb4580a24 (diff)
downloadpython-openstackclient-d3cd322650efeae7321bfe386e81a6697aebe5b0.tar.gz
Merge "Support bulk deletion for commands that exist in both network and compute."
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/ip-floating.rst7
-rw-r--r--doc/source/command-objects/security-group-rule.rst6
-rw-r--r--doc/source/command-objects/security-group.rst6
3 files changed, 10 insertions, 9 deletions
diff --git a/doc/source/command-objects/ip-floating.rst b/doc/source/command-objects/ip-floating.rst
index 869b7af8..8dd94782 100644
--- a/doc/source/command-objects/ip-floating.rst
+++ b/doc/source/command-objects/ip-floating.rst
@@ -66,16 +66,17 @@ Create new floating IP address
ip floating delete
------------------
-Delete floating IP
+Delete floating IP(s)
.. program:: ip floating delete
.. code:: bash
- os ip floating delete <floating-ip>
+ os ip floating delete
+ <floating-ip> [<floating-ip> ...]
.. describe:: <floating-ip>
- Floating IP to delete (IP address or ID)
+ Floating IP(s) to delete (IP address or ID)
ip floating list
----------------
diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst
index 97cce35c..5284b2dc 100644
--- a/doc/source/command-objects/security-group-rule.rst
+++ b/doc/source/command-objects/security-group-rule.rst
@@ -104,17 +104,17 @@ Create a new security group rule
security group rule delete
--------------------------
-Delete a security group rule
+Delete security group rule(s)
.. program:: security group rule delete
.. code:: bash
os security group rule delete
- <rule>
+ <rule> [<rule> ...]
.. describe:: <rule>
- Security group rule to delete (ID only)
+ Security group rule(s) to delete (ID only)
security group rule list
------------------------
diff --git a/doc/source/command-objects/security-group.rst b/doc/source/command-objects/security-group.rst
index 3af11b5a..ba054554 100644
--- a/doc/source/command-objects/security-group.rst
+++ b/doc/source/command-objects/security-group.rst
@@ -45,17 +45,17 @@ Create a new security group
security group delete
---------------------
-Delete a security group
+Delete security group(s)
.. program:: security group delete
.. code:: bash
os security group delete
- <group>
+ <group> [<group> ...]
.. describe:: <group>
- Security group to delete (name or ID)
+ Security group(s) to delete (name or ID)
security group list
-------------------