From 43f2c42511fb87172feaba146d2bdf6d3594aa0e Mon Sep 17 00:00:00 2001
From: Stephen Sawchuk <sawchuk@gmail.com>
Date: Fri, 2 Sep 2016 08:52:38 -0400
Subject: [PATCH] docs: remove `nextQuery` docs & annotate arrays correctly

---
 packages/bigquery/src/dataset.js       |  2 -
 packages/bigquery/src/index.js         | 16 +------
 packages/bigquery/src/table.js         |  2 -
 packages/bigtable/src/index.js         |  2 -
 packages/bigtable/src/instance.js      |  4 --
 packages/compute/src/index.js          | 64 +++++++-------------------
 packages/compute/src/instance-group.js |  2 -
 packages/compute/src/network.js        | 10 ++--
 packages/compute/src/region.js         | 15 ++----
 packages/compute/src/zone.js           | 18 ++------
 packages/dns/src/index.js              |  2 +
 packages/dns/src/zone.js               |  8 ++--
 packages/logging/src/index.js          |  2 -
 packages/logging/src/log.js            |  2 -
 packages/prediction/src/index.js       |  6 +--
 packages/pubsub/src/index.js           |  6 +--
 packages/resource/src/index.js         |  4 +-
 packages/storage/src/bucket.js         |  2 -
 packages/storage/src/index.js          |  5 +-
 19 files changed, 40 insertions(+), 132 deletions(-)

diff --git a/packages/bigquery/src/dataset.js b/packages/bigquery/src/dataset.js
index fcb61faaed90..85291b35681c 100644
--- a/packages/bigquery/src/dataset.js
+++ b/packages/bigquery/src/dataset.js
@@ -272,8 +272,6 @@ Dataset.prototype.delete = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request
  * @param {module:bigquery/table[]} callback.tables - The list of tables from
  *     your Dataset.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/bigquery/src/index.js b/packages/bigquery/src/index.js
index c0e9055300b3..c465437145fb 100644
--- a/packages/bigquery/src/index.js
+++ b/packages/bigquery/src/index.js
@@ -152,8 +152,6 @@ BigQuery.prototype.dataset = function(id) {
  * @param {?error} callback.err - An error returned while making this request
  * @param {module:bigquery/dataset[]} callback.datasets - The list of datasets
  *     in your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -259,8 +257,6 @@ BigQuery.prototype.getDatasets = function(query, callback) {
  * @param {?error} callback.err - An error returned while making this request
  * @param {module:bigquery/job[]} callback.jobs - The list of jobs in your
  *     project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -359,20 +355,12 @@ BigQuery.prototype.job = function(id) {
 /**
  * Run a query scoped to your project.
  *
- * If you provide a callback, this method returns the results from your query to
- * it. When querying large sets of data, it is possible your results won't be
- * returned all at once. In those cases, you will receive a third argument to
- * your callback that can be passed back to this method to return more results.
- *
- * See the examples below for such a workflow.
- *
  * This method also runs as a readable stream if you do not provide a callback.
- * In cases where more results exist, this will automatically run the subsequent
- * queries for you, pushing each row to the stream.
  *
  * @resource [Jobs: query API Documentation]{@link https://cloud.google.com/bigquery/docs/reference/v2/jobs/query}
  *
  * @param {string|object} options - A string SQL query or configuration object.
+ *     See all of the options outlined [here](https://cloud.google.com/bigquery/docs/reference/v2/jobs/query#request-body).
  * @param {boolean} options.autoPaginate - Have pagination handled
  *     automatically. Default: true.
  * @param {number} options.maxApiCalls - Maximum number of API calls to make.
@@ -386,8 +374,6 @@ BigQuery.prototype.job = function(id) {
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
  * @param {array} callback.rows - The list of results from your query.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/bigquery/src/table.js b/packages/bigquery/src/table.js
index b554686e593e..7deb933a63e0 100644
--- a/packages/bigquery/src/table.js
+++ b/packages/bigquery/src/table.js
@@ -577,8 +577,6 @@ Table.prototype.export = function(destination, options, callback) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
  * @param {array} callback.rows - The table data from specified set of rows.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/bigtable/src/index.js b/packages/bigtable/src/index.js
index 943bdd12bc75..6bb8b1cabc51 100644
--- a/packages/bigtable/src/index.js
+++ b/packages/bigtable/src/index.js
@@ -435,8 +435,6 @@ Bigtable.prototype.createInstance = function(name, options, callback) {
  * @param {?error} callback.error - An error returned while making this request.
  * @param {module:bigtable/instance[]} callback.instances - List of all
  *     instances.
- * @param {object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/bigtable/src/instance.js b/packages/bigtable/src/instance.js
index 579ba6082966..ccea4af24776 100644
--- a/packages/bigtable/src/instance.js
+++ b/packages/bigtable/src/instance.js
@@ -451,8 +451,6 @@ Instance.prototype.cluster = function(name) {
  * @param {?error} callback.error - An error returned while making this request.
  * @param {module:bigtable/cluster[]} callback.clusters - List of all
  *     Clusters.
- * @param {object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -554,8 +552,6 @@ Instance.prototype.getClusters = function(query, callback) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:bigtable/table[]} callback.tables - List of all Tables.
- * @param {object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/compute/src/index.js b/packages/compute/src/index.js
index 21f7587ec481..f282f7567548 100644
--- a/packages/compute/src/index.js
+++ b/packages/compute/src/index.js
@@ -579,10 +579,8 @@ Compute.prototype.firewall = function(name) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/address} callback.addresses - Address objects from
+ * @param {module:compute/address[]} callback.addresses - Address objects from
  *     your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -698,8 +696,6 @@ Compute.prototype.getAddresses = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/autoscaler[]} callback.autoscalers - Autoscaler
  *     objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -815,9 +811,8 @@ Compute.prototype.getAutoscalers = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/disk} callback.disks - Disk objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/disk[]} callback.disks - Disk objects from your
+ *     project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -932,8 +927,6 @@ Compute.prototype.getDisks = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/instance-group[]} callback.instanceGroups -
  *     InstanceGroup objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1045,10 +1038,8 @@ Compute.prototype.getInstanceGroups = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/firewall} callback.firewalls - Firewall objects from
+ * @param {module:compute/firewall[]} callback.firewalls - Firewall objects from
  *     your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1154,10 +1145,8 @@ Compute.prototype.getFirewalls = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/health-check} callback.healthChecks - HealthCheck
+ * @param {module:compute/health-check[]} callback.healthChecks - HealthCheck
  *     objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1269,8 +1258,6 @@ Compute.prototype.getHealthChecks = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/machine-type[]} callback.machineTypes - MachineType
  *     objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1382,10 +1369,8 @@ Compute.prototype.getMachineTypes = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/network} callback.networks - Network objects from your
- *     project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/network[]} callback.networks - Network objects from
+ *     your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1488,10 +1473,8 @@ Compute.prototype.getNetworks = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/operation} callback.operations - Operation objects
+ * @param {module:compute/operation[]} callback.operations - Operation objects
  *     from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1594,10 +1577,8 @@ Compute.prototype.getOperations = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/region} callback.regions - Region objects that are
+ * @param {module:compute/region[]} callback.regions - Region objects that are
  *     available to your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1697,9 +1678,8 @@ Compute.prototype.getRegions = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/rule} callback.rules - Rule objects from this region.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/rule[]} callback.rules - Rule objects from your
+ *     project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1804,8 +1784,6 @@ Compute.prototype.getRules = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/service[]} callback.services - Service objects from
  *     your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1908,10 +1886,8 @@ Compute.prototype.getServices = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/snapshot} callback.snapshots - Snapshot objects from
+ * @param {module:compute/snapshot[]} callback.snapshots - Snapshot objects from
  *     your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -2014,10 +1990,8 @@ Compute.prototype.getSnapshots = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/subnetwork} callback.subnetworks - Subnetwork objects
- *     from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/subnetwork[]} callback.subnetworks - Subnetwork
+ *     objects from your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -2129,9 +2103,7 @@ Compute.prototype.getSubnetworks = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/vm} callback.vms - VM objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/vm[]} callback.vms - VM objects from your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -2243,10 +2215,8 @@ Compute.prototype.getVMs = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/zone} callback.zones - Zone objects that are available
- *     to your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/zone[]} callback.zones - Zone objects that are
+ *     available to your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/compute/src/instance-group.js b/packages/compute/src/instance-group.js
index 78fdd0d8aae3..3fee2713d026 100644
--- a/packages/compute/src/instance-group.js
+++ b/packages/compute/src/instance-group.js
@@ -258,8 +258,6 @@ InstanceGroup.prototype.delete = function(callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/vm[]} callback.vms - VM objects from this isntance
  *     group.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/compute/src/network.js b/packages/compute/src/network.js
index 003465777de6..91547f299510 100644
--- a/packages/compute/src/network.js
+++ b/packages/compute/src/network.js
@@ -275,10 +275,8 @@ Network.prototype.createSubnetwork = function(name, config, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/subnetwork} callback.subnetworks - Subnetwork objects
- *     from this network.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/subnetwork[]} callback.subnetworks - Subnetwork
+ *     objects from this network.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -405,10 +403,8 @@ Network.prototype.firewall = function(name) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/firewall} callback.firewalls - Firewall objects from
+ * @param {module:compute/firewall[]} callback.firewalls - Firewall objects from
  *     this network.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/compute/src/region.js b/packages/compute/src/region.js
index 64b9b748f3fb..a664a4d37080 100644
--- a/packages/compute/src/region.js
+++ b/packages/compute/src/region.js
@@ -356,10 +356,8 @@ Region.prototype.createRule = function(name, config, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/address} callback.addresses - Address objects from
+ * @param {module:compute/address[]} callback.addresses - Address objects from
  *     this region.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -462,10 +460,8 @@ Region.prototype.getAddresses = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/operation} callback.operations - Operation objects
+ * @param {module:compute/operation[]} callback.operations - Operation objects
  *     from this region.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -567,9 +563,8 @@ Region.prototype.getOperations = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/rule} callback.rules - Rule objects from this region.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/rule[]} callback.rules - Rule objects from this
+ *     region.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -674,8 +669,6 @@ Region.prototype.getRules = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/subnetwork[]} callback.subnetworks - Subnetwork
  *     objects from this region.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/compute/src/zone.js b/packages/compute/src/zone.js
index ec84f00aed77..f0ee370c77bb 100644
--- a/packages/compute/src/zone.js
+++ b/packages/compute/src/zone.js
@@ -690,8 +690,6 @@ Zone.prototype.disk = function(name) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/autoscaler[]} callback.autoscalers - Autoscaler
  *     objects from your project.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -795,9 +793,7 @@ Zone.prototype.getAutoscalers = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/disk} callback.disks - Disk objects from this zone.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/disk[]} callback.disks - Disk objects from this zone.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -903,8 +899,6 @@ Zone.prototype.getDisks = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/instance-group[]} callback.instanceGroups -
  *     InstanceGroup objects from this zone.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1004,8 +998,6 @@ Zone.prototype.getInstanceGroups = function(options, callback) {
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:compute/machine-type[]} callback.machineTypes - MachineType
  *     objects from this zone.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1084,10 +1076,8 @@ Zone.prototype.getMachineTypes = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/operation} callback.operations - Operation objects
+ * @param {module:compute/operation[]} callback.operations - Operation objects
  *     from this zone.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
@@ -1188,9 +1178,7 @@ Zone.prototype.getOperations = function(options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:compute/vm} callback.vms - VM objects from this zone.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:compute/vm[]} callback.vms - VM objects from this zone.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/dns/src/index.js b/packages/dns/src/index.js
index 62c99dd823ca..ffb13b0f149c 100644
--- a/packages/dns/src/index.js
+++ b/packages/dns/src/index.js
@@ -134,6 +134,8 @@ DNS.prototype.createZone = function(name, config, callback) {
  * @resource [ManagedZones: list API Documentation]{@link https://cloud.google.com/dns/api/v1/managedZones/list}
  *
  * @param {object=} query - Query object.
+ * @param {boolean} query.autoPaginate - Have pagination handled automatically.
+ *     Default: true.
  * @param {number} query.maxApiCalls - Maximum number of API calls to make.
  * @param {number} query.maxResults - Maximum number of results to return.
  * @param {string} query.pageToken - Page token.
diff --git a/packages/dns/src/zone.js b/packages/dns/src/zone.js
index 2667b62dab53..0fc0b2c406dd 100644
--- a/packages/dns/src/zone.js
+++ b/packages/dns/src/zone.js
@@ -436,6 +436,8 @@ Zone.prototype.export = function(localPath, callback) {
  * @resource [Changes: get API Documentation]{@link https://cloud.google.com/dns/api/v1/changes/get}
  *
  * @param {object=} query - The query object.
+ * @param {boolean} query.autoPaginate - Have pagination handled automatically.
+ *     Default: true.
  * @param {number} query.maxApiCalls - Maximum number of API calls to make.
  * @param {number} query.maxResults - Maximum number of results to return.
  * @param {string} query.pageToken - The page token.
@@ -445,8 +447,6 @@ Zone.prototype.export = function(localPath, callback) {
  * @param {?error} callback.err - An API error.
  * @param {?module:dns/change[]} callback.changes - An array of
  *     {module:dns/change} objects.
- * @param {?object} callback.nextQuery - A query object representing the next
- *     page of results.
  * @param {object} callback.apiResponse - Raw API response.
  *
  * @example
@@ -533,6 +533,8 @@ Zone.prototype.getChanges = function(query, callback) {
  * @resource [ResourceRecordSets: list API Documentation]{@link https://cloud.google.com/dns/api/v1/resourceRecordSets/list}
  *
  * @param {object=} query - The query object.
+ * @param {boolean} query.autoPaginate - Have pagination handled automatically.
+ *     Default: true.
  * @param {number} query.maxApiCalls - Maximum number of API calls to make.
  * @param {number} query.maxResults - Maximum number of results to be returned.
  * @param {string} query.name - Restricts the list to return only records with
@@ -544,8 +546,6 @@ Zone.prototype.getChanges = function(query, callback) {
  * @param {?error} callback.err - An API error.
  * @param {?module:dns/record[]} callback.records - An array of
  *     {module:dns/record} objects.
- * @param {?object} callback.nextQuery - A query object representing the next
- *     page of results.
  * @param {object} callback.apiResponse - Raw API response.
  *
  * @example
diff --git a/packages/logging/src/index.js b/packages/logging/src/index.js
index 5153d3eaf286..bf30ff118536 100644
--- a/packages/logging/src/index.js
+++ b/packages/logging/src/index.js
@@ -255,8 +255,6 @@ Logging.prototype.entry = function(resource, data) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:logging/entry[]} callback.entries - Entries from your logs.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/logging/src/log.js b/packages/logging/src/log.js
index 8c695de8bd99..db45af896346 100644
--- a/packages/logging/src/log.js
+++ b/packages/logging/src/log.js
@@ -286,8 +286,6 @@ Log.prototype.error = function(entry, options, callback) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
  * @param {module:logging/entry[]} callback.entries - Entries from this log.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/prediction/src/index.js b/packages/prediction/src/index.js
index c4bfd8fd4879..a53df586fbc9 100644
--- a/packages/prediction/src/index.js
+++ b/packages/prediction/src/index.js
@@ -186,10 +186,8 @@ Prediction.prototype.createModel = function(id, options, callback) {
  * @param {string} query.pageToken - Page token.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {?module:prediction/model[]} callback.models - An array of
- *     {module:prediction/model} objects.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:prediction/model[]} callback.models - The trained models from
+ *     your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/pubsub/src/index.js b/packages/pubsub/src/index.js
index 3c3ace2eebcd..8a5b237c62c6 100644
--- a/packages/pubsub/src/index.js
+++ b/packages/pubsub/src/index.js
@@ -153,9 +153,7 @@ PubSub.prototype.createTopic = function(name, callback) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error from the API call, may be null.
  * @param {module:pubsub/subscription[]} callback.subscriptions - The list of
- *     subscriptions returned.
- * @param {?object} callback.nextQuery - A query object representing the next
- *     page of topics.
+ *     subscriptions in your project.
  * @param {object} callback.apiResponse - The full API response from the
  *     service.
  *
@@ -279,8 +277,6 @@ PubSub.prototype.getSubscriptions = function(options, callback) {
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error from the API call, may be null.
  * @param {module:pubsub/topic[]} callback.topics - The list of topics returned.
- * @param {?object} callback.nextQuery - A query object representing the next
- *     page of topics.
  * @param {object} callback.apiResponse - The full API response from the
  *     service.
  *
diff --git a/packages/resource/src/index.js b/packages/resource/src/index.js
index f15316c47a9a..88f0134cf298 100644
--- a/packages/resource/src/index.js
+++ b/packages/resource/src/index.js
@@ -148,10 +148,8 @@ Resource.prototype.createProject = function(id, options, callback) {
  *     representing part of the larger set of results to view.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
- * @param {module:resource/project} callback.operations - Project objects from
+ * @param {module:resource/project[]} callback.operations - Project objects from
  *     your account.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/storage/src/bucket.js b/packages/storage/src/bucket.js
index 207a0b0a1f02..353cc79a1ff3 100644
--- a/packages/storage/src/bucket.js
+++ b/packages/storage/src/bucket.js
@@ -564,8 +564,6 @@ Bucket.prototype.file = function(name, options) {
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
  * @param {module:storage/file[]} callback.files - List of files.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example
diff --git a/packages/storage/src/index.js b/packages/storage/src/index.js
index f0542b005ff7..7ebb266e8c9f 100644
--- a/packages/storage/src/index.js
+++ b/packages/storage/src/index.js
@@ -293,9 +293,8 @@ Storage.prototype.createBucket = function(name, metadata, callback) {
  *     representing part of the larger set of results to view.
  * @param {function=} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request
- * @param {module:storage/bucket[]} callback.buckets - List of all Buckets.
- * @param {?object} callback.nextQuery - If present, query with this object to
- *     check for more results.
+ * @param {module:storage/bucket[]} callback.buckets - List of all buckets from
+ *     your project.
  * @param {object} callback.apiResponse - The full API response.
  *
  * @example