Skip to content

Commit f7c8066

Browse files
committed
Resolve conflict with master after 'order' feature landed.
2 parents 1fff643 + f898953 commit f7c8066

File tree

13 files changed

+321
-217
lines changed

13 files changed

+321
-217
lines changed

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
# List of patterns, relative to source directory, that match files and
7171
# directories to ignore when looking for source files.
72-
exclude_patterns = ['_build']
72+
exclude_patterns = ['_build', '_components/*']
7373

7474
# The reST default role (used for this markup: `text`) to use for all documents.
7575
#default_role = None

docs/index.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
.. toctree::
44
:hidden:
55

6+
common-api
67
datastore-api
8+
datastore-getting-started
9+
datastore-quickstart
10+
getting-started
711
storage-api
8-
common-api
12+
storage-getting-started
13+
storage-quickstart
14+
915

1016
Google Cloud Python API
1117
=======================

gcloud/datastore/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ def get_connection(client_email, private_key_path):
7171

7272

7373
def get_dataset(dataset_id, client_email, private_key_path):
74-
"""Shortcut method to establish a connection to a particular dataset in the Cloud Datastore.
74+
"""Establish a connection to a particular dataset in the Cloud Datastore.
75+
76+
This is a shortcut method for creating a connection and using it
77+
to connect to a dataset.
7578
7679
You'll generally use this as the first call to working with the API:
7780

0 commit comments

Comments
 (0)