Cleanup for 3.8.0 release

Release notes and proofreading cleanups.

Change-Id: Iddc6a64e6ea3082aa220a2465793e6f7f2aecaa9

5 files changed, 22 insertions, 11 deletions

diff --git a/doc/source/command-objects/network-meter-rule.rst b/doc/source/command-objects/network-meter-rule.rst
index 83f8fd4f..22d50aa9 100644
--- a/doc/source/command-objects/network-meter-rule.rst
+++ b/doc/source/command-objects/network-meter-rule.rst
@@ -18,18 +18,16 @@ Create meter rule
 .. code:: bash
 
     openstack network meter rule create
-        [--project <project> [--project-domain <project-domain>]]
+        --remote-ip-prefix <remote-ip-prefix>
         [--ingress | --egress]
         [--exclude | --include]
-        --remote-ip-prefix <remote-ip-prefix>
+        [--project <project> [--project-domain <project-domain>]]
         <meter>
 
 .. option:: --project <project>
 
     Owner's project (name or ID)
 
-    *Network version 2 only*
-
 .. option:: --project-domain <project-domain>
 
     Domain the project belongs to (name of ID).
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index f18d0918..a5d22f81 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -117,11 +117,16 @@ Create a new server
 
 .. option:: --image <image>
 
-    Create server from this image (name or ID)
+    Create server boot disk from this image (name or ID)
 
 .. option:: --volume <volume>
 
-    Create server from this volume (name or ID)
+    Create server using this volume as the boot disk (name or ID)
+
+    This option automatically creates a block device mapping with a boot
+    index of 0.  On many hypervisors (libvirt/kvm for example) this will
+    be device ``vda``.  Do not create a duplicate mapping using
+    :option:`--block-device-mapping` for this volume.
 
 .. option:: --flavor <flavor>
 
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index ccda1c51..f9f0df4f 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -336,12 +336,15 @@ class CreateServer(command.ShowOne):
         disk_group.add_argument(
             '--image',
             metavar='<image>',
-            help=_('Create server from this image (name or ID)'),
+            help=_('Create server boot disk from this image (name or ID)'),
         )
         disk_group.add_argument(
             '--volume',
             metavar='<volume>',
-            help=_('Create server from this volume (name or ID)'),
+            help=_(
+                'Create server using this volume as the boot disk '
+                '(name or ID)'
+            ),
         )
         parser.add_argument(
             '--flavor',
diff --git a/releasenotes/notes/bp-neutron-client-metering-6f8f9527c2a797fd.yaml b/releasenotes/notes/bp-neutron-client-metering-6f8f9527c2a797fd.yaml
new file mode 100644
index 00000000..37ecdcb8
--- /dev/null
+++ b/releasenotes/notes/bp-neutron-client-metering-6f8f9527c2a797fd.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add meter rules commands for ``network meter rule create``,
+    ``network meter rule delete``, ``network meter rule list``,
+    and ``network meter rule show``.
+    [Blueprint :oscbp:`neutron-client-metering`]
diff --git a/releasenotes/notes/support-no-property-in-volume-snapshot-0af3fcb31a3cfc2b.yaml b/releasenotes/notes/support-no-property-in-volume-snapshot-0af3fcb31a3cfc2b.yaml
index 6a3220b2..42e06179 100644
--- a/releasenotes/notes/support-no-property-in-volume-snapshot-0af3fcb31a3cfc2b.yaml
+++ b/releasenotes/notes/support-no-property-in-volume-snapshot-0af3fcb31a3cfc2b.yaml
@@ -2,6 +2,4 @@
 features:
   - |
     Add ``--no-property`` option in ``volume snapshot set``.
-    Supporting ``--no-property`` option will apply user a convenient way to
-    clean all properties of volume snapshot in a short command.
-    [ Blueprint  `allow-overwrite-set-options <https://blueprints.launchpad.net/python-openstackclient/+spec/allow-overwrite-set-options>` _]
+    [Blueprint  `allow-overwrite-set-options <https://blueprints.launchpad.net/python-openstackclient/+spec/allow-overwrite-set-options>`_]