Merge pull request #1948 from tseaver/bigtable-v2-lost-docs-fixes

Bigtable V2 docs fixes lost in merge

Author: tseaver

docs/bigtable-instance-api.rst

@@ -28,16 +28,24 @@ To create a :class:`Instance <gcloud.bigtable.instance.Instance>` object:
 
 .. code:: python
 
-    instance = client.instance(instance_id, display_name=display_name)
+    instance = client.instance(instance_id, location_id,
+                               display_name=display_name)
 
-``display_name`` is optional. When not provided,
-``display_name`` defaults to the ``instance_id`` value.
+- ``location_id`` is the ID of the location in which the instance's cluster
+  will be hosted, e.g.  ``'us-central1-c'``.  ``location_id`` is required for
+  instances which do not already exist.
 
-Even if this :class:`Instance <gcloud.bigtable.instance.Instance>` already
-has been created with the API, you'll want this object to use as a
-parent of a :class:`Table <gcloud.bigtable.table.Table>` just as the
-:class:`Client <gcloud.bigtable.client.Client>` is used as the parent of
-a :class:`Instance <gcloud.bigtable.instance.Instance>`.
+- ``display_name`` is optional. When not provided, ``display_name`` defaults
+  to the ``instance_id`` value.
+
+You can also use :meth:`Client.instance` to create a local wrapper for
+instances that have already been created with the API, or through the web
+conole:
+
+.. code:: python
+
+    instance = client.instance(existing_instance_id)
+    instance.reload()
 
 Create a new Instance
 ---------------------

docs/bigtable-usage.rst

@@ -18,8 +18,8 @@ Get started by learning about the
 In the hierarchy of API concepts
 
 * a :class:`Client <gcloud.bigtable.client.Client>` owns a
-  :class:`Cluster <gcloud.bigtable.cluster.Cluster>`
-* a :class:`Cluster <gcloud.bigtable.cluster.Cluster>` owns a
+  :class:`Cluster <gcloud.bigtable.instance.Instance`
+* a :class:`Cluster <gcloud.bigtable.instance.Instance` owns a
   :class:`Table <gcloud.bigtable.table.Table>`
 * a :class:`Table <gcloud.bigtable.table.Table>` owns a
   :class:`ColumnFamily <gcloud.bigtable.column_family.ColumnFamily>`

gcloud/bigtable/client.py

@@ -18,7 +18,7 @@
 
 In the hierarchy of API concepts
 
-* a :class:`Client` owns a :class:`.Instance`
+* a :class:`Client` owns an :class:`.Instance`
 * a :class:`.Instance` owns a :class:`Table <gcloud.bigtable.table.Table>`
 * a :class:`Table <gcloud.bigtable.table.Table>` owns a
   :class:`ColumnFamily <.column_family.ColumnFamily>`