From 485274433f5f552d496d6496c573fd50ee4c842f Mon Sep 17 00:00:00 2001
From: Kun Huang <academicgareth@gmail.com>
Date: Wed, 24 Jul 2013 13:51:52 +0800
Subject: [PATCH] Text formatting changes

These are some text fixes in document, scripts and functions,
including variable usage, text aligning, adding new store class in
document

Change-Id: I98e226969d86698972870a7b3a042cb00c2206e9
---
 .mailmap                     | 3 ++-
 doc/source/glanceapi.rst     | 4 ++--
 doc/source/man/glanceapi.rst | 2 +-
 glance/common/config.py      | 2 +-
 run_tests.sh                 | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index 173333be..fb67f1f1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,7 +8,7 @@
 <jsuh@isi.edu> <jsuh@bespin>
 <josh@jk0.org> <josh.kearney@rackspace.com>
 <lorin@nimbisservices.com> <lorin@isi.edu>
-<rconradharris@gmail.com> <rick.harris@rackspace.com> 
+<rconradharris@gmail.com> <rick.harris@rackspace.com>
 <rconradharris@gmail.com> <rick@quasar.racklabs.com>
 <rick@openstack.org> <rclark@chat-blanc>
 <soren.hansen@rackspace.com> <soren@linux2go.dk>
@@ -17,4 +17,5 @@
 <jeblair@hp.com> <james.blair@rackspace.com>
 <chris@pistoncloud.com> <chris@slicehost.com>
 <ken.pepple@gmail.com> <ken.pepple@rabbityard.com>
+<gareth@unitedstack.com> <academicgareth@gmail.com>
 Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
diff --git a/doc/source/glanceapi.rst b/doc/source/glanceapi.rst
index cd227fc0..0327a6e7 100644
--- a/doc/source/glanceapi.rst
+++ b/doc/source/glanceapi.rst
@@ -404,8 +404,8 @@ The list of metadata headers that Glance accepts are listed below.
 
 * ``x-image-meta-store``
 
-  This header is optional. Valid values are one of ``file``, ``s3``, or
-  ``swift``
+  This header is optional. Valid values are one of ``file``, ``s3``, ``rbd``,
+  ``swift``, ``cinder``, ``gridfs`` or ``sheepdog``
 
   When present, Glance will attempt to store the disk image data in the
   backing store indicated by the value of the header. If the Glance node
diff --git a/doc/source/man/glanceapi.rst b/doc/source/man/glanceapi.rst
index e32ee742..cac04906 100644
--- a/doc/source/man/glanceapi.rst
+++ b/doc/source/man/glanceapi.rst
@@ -40,7 +40,7 @@ OPTIONS
   **--default_store=STORE**
         The default backend store that Glance should use when storing virtual
         machine images. The default value is `filesystem`. Choices are any of
-        `filesystem`, `swift`, or `s3`
+        `filesystem`, `swift`, `rbd`, `cinder`, `gridfs`, `sheepdog` or `s3`
 
   **--filesystem_store_datadir=DIR**
         The directory that the `filesystem` backend store should use to write
diff --git a/glance/common/config.py b/glance/common/config.py
index ae1756d3..68826cb4 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -174,7 +174,7 @@ def _get_paste_config_path():
         # to the last config file
         path = CONF.config_file[-1].replace(conf_suffix, paste_suffix)
     else:
-        path = CONF.prog + '-paste.ini'
+        path = CONF.prog + paste_suffix
     return CONF.find_file(os.path.basename(path))
 
 
diff --git a/run_tests.sh b/run_tests.sh
index cc805db6..7dbed6dd 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,8 +9,8 @@ function usage {
   echo "  -f, --force              Force a clean re-build of the virtual environment. Useful when dependencies have been added."
   echo "  -u, --update             Update the virtual environment with any newer package versions"
   echo "  --unittests-only         Run unit tests only, exclude functional tests."
-  echo "  -p, --flake8               Just run flake8"
-  echo "  -P, --no-flake8            Don't run static code checks"
+  echo "  -p, --flake8             Just run flake8"
+  echo "  -P, --no-flake8          Don't run static code checks"
   echo "  -h, --help               Print this usage message"
   echo ""
   echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"