summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/source/command-objects/port.rst21
-rw-r--r--doc/source/command-objects/server.rst5
-rw-r--r--doc/source/commands.rst3
3 files changed, 26 insertions, 3 deletions
diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst
new file mode 100644
index 00000000..78677332
--- /dev/null
+++ b/doc/source/command-objects/port.rst
@@ -0,0 +1,21 @@
+====
+port
+====
+
+Network v2
+
+port delete
+-----------
+
+Delete port(s)
+
+.. program:: port delete
+.. code:: bash
+
+ os port delete
+ <port> [<port> ...]
+
+.. _port_delete-port:
+.. describe:: <port>
+
+ Port(s) to delete (name or ID)
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index fd487b8e..fc275971 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -375,14 +375,15 @@ Rebuild server
.. code:: bash
os server rebuild
- --image <image>
+ [--image <image>]
[--password <password>]
[--wait]
<server>
.. option:: --image <image>
- Recreate server from this image
+ Recreate server from the specified image (name or ID). Defaults to the
+ currently used one.
.. option:: --password <password>
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 621a0a90..f7e8b444 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -82,7 +82,7 @@ referring to both Compute and Volume quotas.
* ``domain``: (**Identity**) a grouping of projects
* ``ec2 credentials``: (**Identity**) AWS EC2-compatible credentials
* ``endpoint``: (**Identity**) the base URL used to contact a specific service
-* ``extension``: (**Compute**, **Identity**, **Volume**) OpenStack server API extensions
+* ``extension``: (**Compute**, **Identity**, **Network**, **Volume**) OpenStack server API extensions
* ``federation protocol``: (**Identity**) the underlying protocol used while federating identities
* ``flavor``: (**Compute**) predefined server configurations: ram, root disk, etc
* ``group``: (**Identity**) a grouping of users
@@ -101,6 +101,7 @@ referring to both Compute and Volume quotas.
* ``network``: (**Network**) - a virtual network for connecting servers and other resources
* ``object``: (**Object Storage**) a single file in the Object Storage
* ``policy``: (**Identity**) determines authorization
+* ``port``: (**Network**) - a virtual port for connecting servers and other resources to a network
* ``project``: (**Identity**) owns a group of resources
* ``quota``: (**Compute**, **Volume**) resource usage restrictions
* ``region``: (**Identity**) a subset of an OpenStack deployment