1 files changed, 10 insertions, 77 deletions
diff --git a/doc/source/cli/command-objects/network-meter.rst b/doc/source/cli/command-objects/network-meter.rst
index 6077ce92..5752e6f4 100644
--- a/doc/source/cli/command-objects/network-meter.rst
+++ b/doc/source/cli/command-objects/network-meter.rst
@@ -8,84 +8,17 @@ are specific to the L3 metering extension.
 
 Network v2
 
-network meter create
---------------------
+.. NOTE(efried): have to list these out one by one; 'network meter *' pulls in
+                 ... rule *.
 
-Create network meter
+.. autoprogram-cliff:: openstack.network.v2
+   :command: network meter create
 
-.. program:: network meter create
-.. code:: bash
+.. autoprogram-cliff:: openstack.network.v2
+   :command: network meter delete
 
-    openstack network meter create
-        [--project <project> [--project-domain <project-domain>]]
-        [--description <description>]
-        [--share | --no-share]
-        <name>
+.. autoprogram-cliff:: openstack.network.v2
+   :command: network meter list
 
-.. option:: --project <project>
-
-    Owner's project (name of ID)
-
-    *Network version 2 only*
-
-.. option:: --description <description>
-
-    Description of meter
-
-    *Network version 2 only*
-
-.. option:: --share
-
-    Share the meter between projects
-
-.. option:: --no-share
-
-    Do not share the meter between projects (Default)
-
-.. _network_meter_create:
-.. describe:: <name>
-
-    New meter name
-
-network meter delete
---------------------
-
-Delete network meter(s)
-
-.. program:: network meter delete
-.. code:: bash
-
-    openstack network meter delete
-        <meter> [<meter> ...]
-
-.. _network_meter_delete:
-.. describe:: <meter>
-
-    Meter(s) to delete (name or ID)
-
-network meter list
-------------------
-
-List network meters
-
-.. program:: network meter list
-.. code:: bash
-
-    openstack network meter list
-
-
-network meter show
-------------------
-
-Show network meter
-
-.. program:: network meter show
-.. code:: bash
-
-    openstack network meter show
-        <meter>
-
-.. _network_meter_show:
-.. describe:: <meter>
-
-    Meter to display (name or ID)
+.. autoprogram-cliff:: openstack.network.v2
+   :command: network meter show