diff --git a/docs/site/components/docs/docs.html b/docs/site/components/docs/docs.html
index dff1e419138..def79b9928e 100644
--- a/docs/site/components/docs/docs.html
+++ b/docs/site/components/docs/docs.html
@@ -84,7 +84,13 @@ <h4 ng-show="method.params">Parameters</h4>
           <tr
             ng-repeat="param in method.params"
             ng-class="{ 'param-optional': param.optional }">
-            <th scope="row">{{param.name}}</th>
+            <th scope="row" class="param">
+              <span ng-if="param.subparam" class="param-parent">
+                <div>{{param.name.split('.').slice(0, -1).join('.')}}</div>
+                &#8627;
+              </span>
+              {{param.name.split('.').slice(-1)[0]}}
+            </th>
             <td class="param-types" ng-bind-html="param.types"></td>
             <td class="param-description" ng-bind-html="param.description"></td>
           </tr>
diff --git a/docs/site/components/docs/docs.js b/docs/site/components/docs/docs.js
index bbd4ec34bd0..40a740d6e50 100644
--- a/docs/site/components/docs/docs.js
+++ b/docs/site/components/docs/docs.js
@@ -160,6 +160,7 @@ angular
                   tag.types = $sce.trustAsHtml(tag.types.reduceRight(
                       reduceModules, []).join(', '));
                   tag.optional = tag.types.toString().indexOf('=') > -1;
+                  tag.subparam = tag.name.indexOf('.') > -1;
                   return tag;
                 }),
               returns: obj.tags.filter(function(tag) {
diff --git a/docs/site/css/main.css b/docs/site/css/main.css
index 16a6c3042b7..3ca9a7a4883 100755
--- a/docs/site/css/main.css
+++ b/docs/site/css/main.css
@@ -788,6 +788,19 @@ ul {
     border-bottom: 1px solid rgba(0,0,0,0.05);
 }
 
+.param {
+  white-space: nowrap;
+}
+
+.param-parent {
+  font-weight: normal;
+}
+
+.param-parent > div {
+  font-size: 80%;
+  line-height: 50%;
+}
+
 .param-optional .param-types {
   font-style: italic;
 }
diff --git a/lib/datastore/request.js b/lib/datastore/request.js
index f1f5d3d36bc..e0260b5d8bf 100644
--- a/lib/datastore/request.js
+++ b/lib/datastore/request.js
@@ -472,6 +472,14 @@ DatastoreRequest.prototype.delete = function(keys, callback) {
  * @param {module:datastore/query} q - Query object.
  * @param {function=} callback - The callback function. If omitted, a readable
  *     stream instance is returned.
+ * @param {?Error} callback.err - An error returned while making this request
+ *     (may be null).
+ * @param {Array} callback.entities - The list of entities returned by this
+ *     query. Note that this is a single page of entities, not necessarily
+ *     all of the entities.
+ * @param {String} callback.endCursor - The end cursor of this current query,
+ *     which can be used as the starting cursor of the next query.
+ * @param {Object} callback.apiResponse - The full API response.
  *
  * @example
  * //-