3 files changed, 40 insertions, 14 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index f1893efa..15286760 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -19,7 +19,6 @@ Create/upload an image
         [--store <store>]
         [--container-format <container-format>]
         [--disk-format <disk-format>]
-        [--owner <project>]
         [--size <size>]
         [--min-disk <disk-gb>]
         [--min-ram <ram-mb>]
@@ -33,7 +32,7 @@ Create/upload an image
         [--public | --private]
         [--property <key=value> [...] ]
         [--tag <tag> [...] ]
-        [--project-domain <project-domain>]
+        [--project <project> [--project-domain <project-domain>]]
         <image-name>
 
 .. option:: --id <id>
@@ -54,10 +53,6 @@ Create/upload an image
 
     Image disk format (default: raw)
 
-.. option:: --owner <project>
-
-    Image owner project name or ID
-
 .. option:: --size <size>
 
     Image size, in bytes (only used with --location and --copy-from)
@@ -128,11 +123,18 @@ Create/upload an image
 
     .. versionadded:: 2
 
+.. option:: --project <project>
+
+    Set an alternate project on this image (name or ID).
+    Previously known as `--owner`.
+
 .. option:: --project-domain <project-domain>
 
     Domain the project belongs to (name or ID).
     This can be used in case collisions between project names exist.
 
+    .. versionadded:: 2
+
 .. describe:: <image-name>
 
     New image name
@@ -225,7 +227,6 @@ Set image properties
 
     os image set
         [--name <name>]
-        [--owner <project>]
         [--min-disk <disk-gb>]
         [--min-ram <disk-ram>]
         [--container-format <container-format>]
@@ -250,17 +251,13 @@ Set image properties
         [--os-version <os-version>]
         [--ramdisk-id <ramdisk-id>]
         [--activate|--deactivate]
-        [--project-domain <project-domain>]
+        [--project <project> [--project-domain <project-domain>]]
         <image>
 
 .. option:: --name <name>
 
     New image name
 
-.. option:: --owner <project>
-
-    New image owner project (name or ID)
-
 .. option:: --min-disk <disk-gb>
 
     Minimum disk size needed to boot image, in gigabytes
@@ -407,11 +404,18 @@ Set image properties
 
     .. versionadded:: 2
 
+.. option:: --project <project>
+
+    Set an alternate project on this image (name or ID).
+    Previously known as `--owner`.
+
 .. option:: --project-domain <project-domain>
 
     Domain the project belongs to (name or ID).
     This can be used in case collisions between project names exist.
 
+    .. versionadded:: 2
+
 .. describe:: <image>
 
     Image to modify (name or ID)
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>