3 files changed, 62 insertions, 0 deletions
diff --git a/doc/source/command-objects/snapshot.rst b/doc/source/command-objects/snapshot.rst
index 8ac0b6b8..ce2d9c8e 100644
--- a/doc/source/command-objects/snapshot.rst
+++ b/doc/source/command-objects/snapshot.rst
@@ -68,6 +68,9 @@ List snapshots
 
     os snapshot list
         [--all-projects]
+        [--long]
+        [--limit <limit>]
+        [--marker <marker>]
 
 .. option:: --all-projects
 
@@ -77,6 +80,18 @@ List snapshots
 
     List additional fields in output
 
+.. option:: --limit <limit>
+
+    Maximum number of snapshots to display
+
+    *Volume version 2 only*
+
+.. option:: --marker <marker>
+
+    The last snapshot ID of the previous page
+
+    *Volume version 2 only*
+
 snapshot set
 ------------
 
diff --git a/doc/source/command-objects/volume-type.rst b/doc/source/command-objects/volume-type.rst
index ddc89335..d93532c7 100644
--- a/doc/source/command-objects/volume-type.rst
+++ b/doc/source/command-objects/volume-type.rst
@@ -87,11 +87,24 @@ List volume types
 
     os volume type list
         [--long]
+        [--public | --private]
 
 .. option:: --long
 
     List additional fields in output
 
+.. option:: --public
+
+    List only public types
+
+    *Volume version 2 only*
+
+.. option:: --private
+
+    List only private types (admin only)
+
+    *Volume version 2 only*
+
 volume type set
 ---------------
 
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 95a04073..c5092cc0 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -173,3 +173,37 @@ or
 .. code-block:: bash
 
    $ pip install -e .
+
+Standardize Import Format
+=========================
+
+.. _`Import Order Guide`: http://docs.openstack.org/developer/hacking/#imports
+
+The import order shows below:
+
+* {{stdlib imports in human alphabetical order}}
+* \n
+* {{third-party lib imports in human alphabetical order}}
+* \n
+* {{project imports in human alphabetical order}}
+* \n
+* \n
+* {{begin your code}}
+
+Example
+~~~~~~~
+
+.. code-block:: python
+
+    import copy
+    import fixtures
+    import mock
+    import os
+
+    from osc_lib.api import auth
+    from osc_lib import utils
+    import six
+
+    from openstackclient import shell
+    from openstackclient.tests import utils
+