Merge pull request googleapis#2280 from dhermes/fix-rtd-links

Updating RTD links and renaming RST docs with gcloud-* prefix
dhermes · Sep 9, 2016 · 52c5872 · 52c5872
2 parents a2afc69 + 4932a77
commit 52c5872
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 22 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -310,13 +310,6 @@ can build the docs via::
 
    $ tox -e docs
 
-In addition, to build a preview of the `readthedocs`_ theme, you can
-build via::
-
-   $ tox -e docs-rtd
-
-.. _readthedocs: http://google-cloud-python.readthedocs.org/
-
 Note About ``README`` as it pertains to PyPI
 --------------------------------------------
 

diff --git a/README.rst b/README.rst
@@ -61,7 +61,7 @@ Check out the `Authentication section`_ in our documentation to learn more.
 You may also find the `authentication document`_ shared by all the
 ``google-cloud-*`` libraries to be helpful.
 
-.. _Authentication section: http://google-cloud-python.readthedocs.org/en/latest/gcloud-auth.html
+.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html
 .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication
 
 Google Cloud Datastore

diff --git a/docs/bigtable-client-intro.rst b/docs/bigtable-client-intro.rst
@@ -23,7 +23,7 @@ Configuration
 -------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`gcloud-auth`.
+  see :doc:`google-cloud-auth`.
 
 - In addition to any authentication configuration, you can also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the Google Cloud Console

diff --git a/docs/dns-usage.rst b/docs/dns-usage.rst
@@ -8,7 +8,7 @@ Client
 configure your DNS applications.  Each instance holds both a ``project``
 and an authenticated connection to the DNS service.
 
-For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`.
+For an overview of authentication in ``google-cloud-python``, see :doc:`google-cloud-auth`.
 
 Assuming your environment is set up as described in that document,
 create an instance of :class:`Client <google.cloud.dns.client.Client>`.

diff --git a/docs/error-reporting-usage.rst b/docs/error-reporting-usage.rst
@@ -6,7 +6,7 @@ Authentication and Configuration
 --------------------------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`gcloud-auth`.
+  see :doc:`google-cloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like

diff --git a/docs/gcloud-api.rst → docs/google-cloud-api.rst b/docs/gcloud-api.rst → docs/google-cloud-api.rst
diff --git a/docs/gcloud-auth.rst → docs/google-cloud-auth.rst b/docs/gcloud-auth.rst → docs/google-cloud-auth.rst
@@ -141,7 +141,7 @@ and
 factories are provided to create a :class:`Client <google.cloud.client.Client>` with
 service account credentials.
 
-.. _oauth2client: http://oauth2client.readthedocs.org/en/latest/
+.. _oauth2client: http://oauth2client.readthedocs.io/en/latest/
 
 For example, with a JSON keyfile:
 

diff --git a/docs/gcloud-config.rst → docs/google-cloud-config.rst b/docs/gcloud-config.rst → docs/google-cloud-config.rst
@@ -43,7 +43,7 @@ Authentication
 ==============
 
 The authentication credentials can be implicitly determined from the
-environment or directly. See :doc:`gcloud-auth`.
+environment or directly. See :doc:`google-cloud-auth`.
 
 Logging in via ``gcloud beta auth application-default login`` will
 automatically configure a JSON key file with your default project ID and

diff --git a/docs/index.rst b/docs/index.rst
@@ -3,9 +3,9 @@
   :hidden:
   :caption: google-cloud
 
-  gcloud-api
-  gcloud-config
-  gcloud-auth
+  google-cloud-api
+  google-cloud-config
+  google-cloud-auth
   operation-api
 
 .. toctree::

diff --git a/docs/language-usage.rst b/docs/language-usage.rst
@@ -26,7 +26,7 @@ means to configure your application. Each instance holds
 an authenticated connection to the Natural Language service.
 
 For an overview of authentication in ``google-cloud-python``, see
-:doc:`gcloud-auth`.
+:doc:`google-cloud-auth`.
 
 Assuming your environment is set up as described in that document,
 create an instance of :class:`~google.cloud.language.client.Client`.

diff --git a/docs/logging-usage.rst b/docs/logging-usage.rst
@@ -6,7 +6,7 @@ Authentication and Configuration
 --------------------------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`gcloud-auth`.
+  see :doc:`google-cloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like

diff --git a/docs/monitoring-usage.rst b/docs/monitoring-usage.rst
@@ -49,7 +49,7 @@ GCP projects and AWS accounts. It can also simply be the ID of
 a monitored project.
 
 Most often the authentication credentials will be determined
-implicitly from your environment. See :doc:`gcloud-auth` for
+implicitly from your environment. See :doc:`google-cloud-auth` for
 more information.
 
 It is thus typical to create a client object as follows::

diff --git a/docs/vision-usage.rst b/docs/vision-usage.rst
@@ -5,7 +5,7 @@ Authentication and Configuration
 --------------------------------
 
 - For an overview of authentication in ``google-cloud-python``,
-  see :doc:`gcloud-auth`.
+  see :doc:`google-cloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
   :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like

diff --git a/google/cloud/credentials.py b/google/cloud/credentials.py
@@ -102,8 +102,8 @@ def _get_signed_query_params(credentials, expiration, string_to_sign):
               signed payload.
     """
     if not hasattr(credentials, 'sign_blob'):
-        auth_uri = ('http://gcloud-python.readthedocs.io/en/latest/'
-                    'gcloud-auth.html#setting-up-a-service-account')
+        auth_uri = ('http://google-cloud-python.readthedocs.io/en/latest/'
+                    'google-cloud-auth.html#setting-up-a-service-account')
         raise AttributeError('you need a private key to sign credentials.'
                              'the credentials you are currently using %s '
                              'just contains a token. see %s for more '