From 16aeee430308fd1863d2f9892f09e0d928a0e6f1 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Thu, 26 Jan 2017 09:52:49 -0600 Subject: Cleanup for 3.8.0 release Release notes and proofreading cleanups. Change-Id: Iddc6a64e6ea3082aa220a2465793e6f7f2aecaa9 --- doc/source/command-objects/network-meter-rule.rst | 6 ++---- doc/source/command-objects/server.rst | 9 +++++++-- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'doc/source/command-objects') 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-domain ]] + --remote-ip-prefix [--ingress | --egress] [--exclude | --include] - --remote-ip-prefix + [--project [--project-domain ]] .. option:: --project Owner's project (name or ID) - *Network version 2 only* - .. option:: --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 - Create server from this image (name or ID) + Create server boot disk from this image (name or ID) .. option:: --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 -- cgit v1.2.1