diff --git a/README.rst b/README.rst
index 1e86f263d..44ea43ef8 100644
--- a/README.rst
+++ b/README.rst
@@ -44,13 +44,13 @@ params, but it's easier to just set them as environment variables::
     export OS_TENANT_NAME=myproject
 
 You will also need to define the authentication url with ``--os-auth-url``
-and the version of the API with ``--version``.  Or set them as an environment
-variables as well::
+and the version of the API with ``--os-volume-api-version``.  Or set them as
+environment variables as well::
 
     export OS_AUTH_URL=http://example.com:8774/v1.1/
     export OS_VOLUME_API_VERSION=1
 
-If you are using Keystone, you need to set the CINDER_URL to the keystone
+If you are using Keystone, you need to set the OS_AUTH_URL to the keystone
 endpoint::
 
     export OS_AUTH_URL=http://example.com:5000/v2.0/
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 340108deb..a16941d80 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -38,6 +38,7 @@ MASTER
 .. _1253142: http://bugs.launchpad.net/python-cinderclient/+bug/1253142
 .. _1252665: http://bugs.launchpad.net/python-cinderclient/+bug/1252665
 .. _1255876: http://bugs.launchpad.net/python-cinderclient/+bug/1255876
+.. _1251385: http://bugs.launchpad.net/python-cinderclient/+bug/1251385
 
 1.0.7
 -----