google-api-client 0.15.0 → 0.16.0

data/generated/google/apis/container_v1beta1.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://cloud.google.com/container-engine/
     module ContainerV1beta1
       VERSION = 'V1beta1'
-      REVISION = '20170922'
+      REVISION = '20170929'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/content_v2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/shopping-content
     module ContentV2
       VERSION = 'V2'
-      REVISION = '20170928'
+      REVISION = '20171020'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

data/generated/google/apis/content_v2/classes.rb

@@ -1136,7 +1136,7 @@ module Google
         # @return [String]
         attr_accessor :attribute_language
       
-        # [DEPRECATED] Please use target.language instead. The two-letter ISO 639-1
+        # [DEPRECATED] Please use targets[].language instead. The two-letter ISO 639-1
         # language of the items in the feed. Must be a valid language for targetCountry.
         # Corresponds to the JSON property `contentLanguage`
         # @return [String]
@@ -1171,7 +1171,7 @@ module Google
         # @return [Fixnum]
         attr_accessor :id
       
-        # [DEPRECATED] Please use target.includedDestination instead. The list of
+        # [DEPRECATED] Please use targets[].includedDestinations instead. The list of
         # intended destinations (corresponds to checked check boxes in Merchant Center).
         # Corresponds to the JSON property `intendedDestinations`
         # @return [Array<String>]
@@ -1188,9 +1188,9 @@ module Google
         # @return [String]
         attr_accessor :name
       
-        # [DEPRECATED] Please use target.country instead. The country where the items in
-        # the feed will be included in the search index, represented as a CLDR territory
-        # code.
+        # [DEPRECATED] Please use targets[].country instead. The country where the items
+        # in the feed will be included in the search index, represented as a CLDR
+        # territory code.
         # Corresponds to the JSON property `targetCountry`
         # @return [String]
         attr_accessor :target_country
@@ -1946,18 +1946,20 @@ module Google
         # @return [Array<String>]
         attr_accessor :postal_code_group_names
       
-        # be "infinity". For example [`"value": "10", "currency": "USD"`, `"value": "500"
-        # , "currency": "USD"`, `"value": "infinity", "currency": "USD"`] represents the
+        # A list of inclusive order price upper bounds. The last price's value can be "
+        # infinity". For example [`"value": "10", "currency": "USD"`, `"value": "500", "
+        # currency": "USD"`, `"value": "infinity", "currency": "USD"`] represents the
         # headers "<= $10", " $500". All prices within a service must have the same
         # currency. Must be non-empty. Can only be set if all other fields are not set.
         # Corresponds to the JSON property `prices`
         # @return [Array<Google::Apis::ContentV2::Price>]
         attr_accessor :prices
       
-        # be "infinity". For example [`"value": "10", "unit": "kg"`, `"value": "50", "
-        # unit": "kg"`, `"value": "infinity", "unit": "kg"`] represents the headers "<=
-        # 10kg", " 50kg". All weights within a service must have the same unit. Must be
-        # non-empty. Can only be set if all other fields are not set.
+        # A list of inclusive order weight upper bounds. The last weight's value can be "
+        # infinity". For example [`"value": "10", "unit": "kg"`, `"value": "50", "unit":
+        # "kg"`, `"value": "infinity", "unit": "kg"`] represents the headers "<= 10kg", "
+        # 50kg". All weights within a service must have the same unit. Must be non-
+        # empty. Can only be set if all other fields are not set.
         # Corresponds to the JSON property `weights`
         # @return [Array<Google::Apis::ContentV2::Weight>]
         attr_accessor :weights
@@ -4755,7 +4757,10 @@ module Google
         # @return [String]
         attr_accessor :gtin
       
-        # The REST id of the product.
+        # The REST id of the product. Content API methods that operate on products take
+        # this as their productId parameter.
+        # The REST id for a product is of the form channel:contentLanguage:targetCountry:
+        # offerId.
         # Corresponds to the JSON property `id`
         # @return [String]
         attr_accessor :id
@@ -4836,10 +4841,12 @@ module Google
         # @return [Fixnum]
         attr_accessor :multipack
       
-        # An identifier of the item. Leading and trailing whitespaces are stripped and
-        # multiple whitespaces are replaced by a single whitespace upon submission. Only
-        # valid unicode characters are accepted. See the products feed specification for
-        # details.
+        # A unique identifier for the item. Leading and trailing whitespaces are
+        # stripped and multiple whitespaces are replaced by a single whitespace upon
+        # submission. Only valid unicode characters are accepted. See the products feed
+        # specification for details.
+        # Note: Content API methods that operate on products take the REST id of the
+        # product, not this identifier.
         # Corresponds to the JSON property `offerId`
         # @return [String]
         attr_accessor :offer_id

data/generated/google/apis/content_v2/service.rb

@@ -86,12 +86,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Claims the website of a Merchant Center sub-account. This method can only be
-        # called for accounts to which the managing account has access: either the
-        # managing account itself for any Merchant Center account, or any sub-account
-        # when the managing account is a multi-client account.
+        # Claims the website of a Merchant Center sub-account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account whose website is claimed.
         # @param [Boolean] overwrite
@@ -171,10 +169,9 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a Merchant Center sub-account. This method can only be called for
-        # multi-client accounts.
+        # Deletes a Merchant Center sub-account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Boolean] dry_run
@@ -214,12 +211,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a Merchant Center account. This method can only be called for
-        # accounts to which the managing account has access: either the managing account
-        # itself for any Merchant Center account, or any sub-account when the managing
-        # account is a multi-client account.
+        # Retrieves a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [String] fields
@@ -255,10 +250,9 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a Merchant Center sub-account. This method can only be called for
-        # multi-client accounts.
+        # Creates a Merchant Center sub-account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Google::Apis::ContentV2::Account] account_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -297,10 +291,9 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the sub-accounts in your Merchant Center account. This method can only
-        # be called for multi-client accounts.
+        # Lists the sub-accounts in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of accounts to return in the response, used for paging.
         # @param [String] page_token
@@ -339,12 +332,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a Merchant Center account. This method can only be called for accounts
-        # to which the managing account has access: either the managing account itself
-        # for any Merchant Center account, or any sub-account when the managing account
-        # is a multi-client account. This method supports patch semantics.
+        # Updates a Merchant Center account. This method supports patch semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Google::Apis::ContentV2::Account] account_object
@@ -386,12 +377,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a Merchant Center account. This method can only be called for accounts
-        # to which the managing account has access: either the managing account itself
-        # for any Merchant Center account, or any sub-account when the managing account
-        # is a multi-client account.
+        # Updates a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [Google::Apis::ContentV2::Account] account_object
@@ -468,12 +457,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the status of a Merchant Center account. This method can only be
-        # called for accounts to which the managing account has access: either the
-        # managing account itself for any Merchant Center account, or any sub-account
-        # when the managing account is a multi-client account.
+        # Retrieves the status of a Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account.
         # @param [String] fields
@@ -509,10 +496,9 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the statuses of the sub-accounts in your Merchant Center account. This
-        # method can only be called for multi-client accounts.
+        # Lists the statuses of the sub-accounts in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of account statuses to return in the response, used for
         #   paging.
@@ -590,12 +576,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the tax settings of the account. This method can only be called for
-        # accounts to which the managing account has access: either the managing account
-        # itself for any Merchant Center account, or any sub-account when the managing
-        # account is a multi-client account.
+        # Retrieves the tax settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [String] fields
@@ -632,9 +616,8 @@ module Google
         end
         
         # Lists the tax settings of the sub-accounts in your Merchant Center account.
-        # This method can only be called for multi-client accounts.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of tax settings to return in the response, used for paging.
         # @param [String] page_token
@@ -673,12 +656,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the tax settings of the account. This method can only be called for
-        # accounts to which the managing account has access: either the managing account
-        # itself for any Merchant Center account, or any sub-account when the managing
-        # account is a multi-client account. This method supports patch semantics.
+        # Updates the tax settings of the account. This method supports patch semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [Google::Apis::ContentV2::AccountTax] account_tax_object
@@ -720,12 +701,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the tax settings of the account. This method can only be called for
-        # accounts to which the managing account has access: either the managing account
-        # itself for any Merchant Center account, or any sub-account when the managing
-        # account is a multi-client account.
+        # Updates the tax settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update account tax settings.
         # @param [Google::Apis::ContentV2::AccountTax] account_tax_object
@@ -805,10 +784,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a datafeed configuration from your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Deletes a datafeed configuration from your Merchant Center account.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] datafeed_id
+        #   The ID of the datafeed.
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
         # @param [String] fields
@@ -843,10 +824,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a datafeed configuration from your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Retrieves a datafeed configuration from your Merchant Center account.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] datafeed_id
+        #   The ID of the datafeed.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -880,9 +863,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Registers a datafeed configuration with your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Registers a datafeed configuration with your Merchant Center account.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Google::Apis::ContentV2::Datafeed] datafeed_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -921,10 +905,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the datafeeds in your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Lists the datafeeds in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the datafeeds. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of products to return in the response, used for paging.
         # @param [String] page_token
@@ -964,10 +948,12 @@ module Google
         end
         
         # Updates a datafeed configuration of your Merchant Center account. This method
-        # can only be called for non-multi-client accounts. This method supports patch
-        # semantics.
+        # supports patch semantics.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] datafeed_id
+        #   The ID of the datafeed.
         # @param [Google::Apis::ContentV2::Datafeed] datafeed_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -1007,10 +993,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a datafeed configuration of your Merchant Center account. This method
-        # can only be called for non-multi-client accounts.
+        # Updates a datafeed configuration of your Merchant Center account.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] datafeed_id
+        #   The ID of the datafeed.
         # @param [Google::Apis::ContentV2::Datafeed] datafeed_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -1085,10 +1073,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the status of a datafeed from your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Retrieves the status of a datafeed from your Merchant Center account.
         # @param [Fixnum] merchant_id
+        #   The ID of the account that manages the datafeed. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] datafeed_id
+        #   The ID of the datafeed.
         # @param [String] country
         #   The country for which to get the datafeed status. If this parameter is
         #   provided then language must also be provided. Note that this parameter is
@@ -1134,10 +1124,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the statuses of the datafeeds in your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Lists the statuses of the datafeeds in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the datafeeds. This account cannot be a
+        #   multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of products to return in the response, used for paging.
         # @param [String] page_token
@@ -1178,7 +1168,6 @@ module Google
         
         # Updates price and availability for multiple products or stores in a single
         # request. This operation does not update the expiration date of the products.
-        # This method can only be called for non-multi-client accounts.
         # @param [Google::Apis::ContentV2::BatchInventoryRequest] batch_inventory_request_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -1217,15 +1206,14 @@ module Google
         end
         
         # Updates price and availability of a product in your Merchant Center account.
-        # This operation does not update the expiration date of the product. This method
-        # can only be called for non-multi-client accounts.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the product. This account cannot be a
+        #   multi-client account.
         # @param [String] store_code
         #   The code of the store for which to update price and availability. Use online
         #   to update price and availability of an online product.
         # @param [String] product_id
-        #   The ID of the product for which to update price and availability.
+        #   The REST id of the product for which to update price and availability.
         # @param [Google::Apis::ContentV2::SetInventoryRequest] set_inventory_request_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -1266,10 +1254,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Marks an order as acknowledged. This method can only be called for non-multi-
-        # client accounts.
+        # Marks an order as acknowledged.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersAcknowledgeRequest] orders_acknowledge_request_object
@@ -1309,9 +1297,10 @@ module Google
         end
         
         # Sandbox only. Moves a test order from state "inProgress" to state "
-        # pendingShipment". This method can only be called for non-multi-client accounts.
+        # pendingShipment".
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the test order to modify.
         # @param [String] fields
@@ -1347,10 +1336,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Cancels all line items in an order, making a full refund. This method can only
-        # be called for non-multi-client accounts.
+        # Cancels all line items in an order, making a full refund.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order to cancel.
         # @param [Google::Apis::ContentV2::OrdersCancelRequest] orders_cancel_request_object
@@ -1389,10 +1378,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Cancels a line item, making a full refund. This method can only be called for
-        # non-multi-client accounts.
+        # Cancels a line item, making a full refund.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersCancelLineItemRequest] orders_cancel_line_item_request_object
@@ -1431,10 +1420,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Sandbox only. Creates a test order. This method can only be called for non-
-        # multi-client accounts.
+        # Sandbox only. Creates a test order.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that should manage the order. This cannot be a multi-
+        #   client account.
         # @param [Google::Apis::ContentV2::OrdersCreateTestOrderRequest] orders_create_test_order_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -1470,8 +1459,7 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves or modifies multiple orders in a single request. This method can
-        # only be called for non-multi-client accounts.
+        # Retrieves or modifies multiple orders in a single request.
         # @param [Google::Apis::ContentV2::OrdersCustomBatchRequest] orders_custom_batch_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -1506,10 +1494,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves an order from your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Retrieves an order from your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [String] fields
@@ -1545,10 +1533,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves an order using merchant order id. This method can only be called for
-        # non-multi-client accounts.
+        # Retrieves an order using merchant order id.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] merchant_order_id
         #   The merchant order id to be looked for.
         # @param [String] fields
@@ -1585,10 +1573,10 @@ module Google
         end
         
         # Sandbox only. Retrieves an order template that can be used to quickly create a
-        # new order in sandbox. This method can only be called for non-multi-client
-        # accounts.
+        # new order in sandbox.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that should manage the order. This cannot be a multi-
+        #   client account.
         # @param [String] template_name
         #   The name of the template to retrieve.
         # @param [String] fields
@@ -1624,10 +1612,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the orders in your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Lists the orders in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [Boolean] acknowledged
         #   Obtains orders that match the acknowledgement status. When set to true,
         #   obtains orders that have been acknowledged. When false, obtains orders that
@@ -1698,10 +1686,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Refund a portion of the order, up to the full amount paid. This method can
-        # only be called for non-multi-client accounts.
+        # Refund a portion of the order, up to the full amount paid.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order to refund.
         # @param [Google::Apis::ContentV2::OrdersRefundRequest] orders_refund_request_object
@@ -1740,10 +1728,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Returns a line item. This method can only be called for non-multi-client
-        # accounts.
+        # Returns a line item.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersReturnLineItemRequest] orders_return_line_item_request_object
@@ -1782,10 +1770,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Marks line item(s) as shipped. This method can only be called for non-multi-
-        # client accounts.
+        # Marks line item(s) as shipped.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersShipLineItemsRequest] orders_ship_line_items_request_object
@@ -1824,10 +1812,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the merchant order ID for a given order. This method can only be
-        # called for non-multi-client accounts.
+        # Updates the merchant order ID for a given order.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersUpdateMerchantOrderIdRequest] orders_update_merchant_order_id_request_object
@@ -1866,10 +1854,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a shipment's status, carrier, and/or tracking ID. This method can only
-        # be called for non-multi-client accounts.
+        # Updates a shipment's status, carrier, and/or tracking ID.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that manages the order. This cannot be a multi-client
+        #   account.
         # @param [String] order_id
         #   The ID of the order.
         # @param [Google::Apis::ContentV2::OrdersUpdateShipmentRequest] orders_update_shipment_request_object
@@ -1908,8 +1896,7 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves, inserts, and deletes multiple products in a single request. This
-        # method can only be called for non-multi-client accounts.
+        # Retrieves, inserts, and deletes multiple products in a single request.
         # @param [Google::Apis::ContentV2::BatchProductsRequest] batch_products_request_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -1947,12 +1934,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes a product from your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Deletes a product from your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the product. This account cannot be a
+        #   multi-client account.
         # @param [String] product_id
-        #   The ID of the product.
+        #   The REST id of the product.
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
         # @param [String] fields
@@ -1987,12 +1974,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves a product from your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Retrieves a product from your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the product. This account cannot be a
+        #   multi-client account.
         # @param [String] product_id
-        #   The ID of the product.
+        #   The REST id of the product.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -2028,10 +2015,10 @@ module Google
         
         # Uploads a product to your Merchant Center account. If an item with the same
         # channel, contentLanguage, offerId, and targetCountry already exists, this
-        # method updates that entry. This method can only be called for non-multi-client
-        # accounts.
+        # method updates that entry.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the product. This account cannot be a
+        #   multi-client account.
         # @param [Google::Apis::ContentV2::Product] product_object
         # @param [Boolean] dry_run
         #   Flag to run the request in dry-run mode.
@@ -2070,10 +2057,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the products in your Merchant Center account. This method can only be
-        # called for non-multi-client accounts.
+        # Lists the products in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the products. This account cannot be a
+        #   multi-client account.
         # @param [Boolean] include_invalid_inserted_items
         #   Flag to include the invalid inserted items in the result of the list request.
         #   By default the invalid items are not shown (the default value is false).
@@ -2116,8 +2103,7 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the statuses of multiple products in a single request. This method can
-        # only be called for non-multi-client accounts.
+        # Gets the statuses of multiple products in a single request.
         # @param [Google::Apis::ContentV2::BatchProductStatusesRequest] batch_product_statuses_request_object
         # @param [Boolean] include_attributes
         #   Flag to include full product data in the results of this request. The default
@@ -2156,12 +2142,12 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the status of a product from your Merchant Center account. This method
-        # can only be called for non-multi-client accounts.
+        # Gets the status of a product from your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the product. This account cannot be a
+        #   multi-client account.
         # @param [String] product_id
-        #   The ID of the product.
+        #   The REST id of the product.
         # @param [Boolean] include_attributes
         #   Flag to include full product data in the result of this get request. The
         #   default value is false.
@@ -2199,10 +2185,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the statuses of the products in your Merchant Center account. This
-        # method can only be called for non-multi-client accounts.
+        # Lists the statuses of the products in your Merchant Center account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the account that contains the products. This account cannot be a
+        #   multi-client account.
         # @param [Boolean] include_attributes
         #   Flag to include full product data in the results of the list request. The
         #   default value is false.
@@ -2289,12 +2275,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Retrieves the shipping settings of the account. This method can only be called
-        # for accounts to which the managing account has access: either the managing
-        # account itself for any Merchant Center account, or any sub-account when the
-        # managing account is a multi-client account.
+        # Retrieves the shipping settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [String] fields
@@ -2366,9 +2350,9 @@ module Google
         end
         
         # Lists the shipping settings of the sub-accounts in your Merchant Center
-        # account. This method can only be called for multi-client accounts.
+        # account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. This must be a multi-client account.
         # @param [Fixnum] max_results
         #   The maximum number of shipping settings to return in the response, used for
         #   paging.
@@ -2408,13 +2392,11 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the shipping settings of the account. This method can only be called
-        # for accounts to which the managing account has access: either the managing
-        # account itself for any Merchant Center account, or any sub-account when the
-        # managing account is a multi-client account. This method supports patch
+        # Updates the shipping settings of the account. This method supports patch
         # semantics.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [Google::Apis::ContentV2::ShippingSettings] shipping_settings_object
@@ -2456,12 +2438,10 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the shipping settings of the account. This method can only be called
-        # for accounts to which the managing account has access: either the managing
-        # account itself for any Merchant Center account, or any sub-account when the
-        # managing account is a multi-client account.
+        # Updates the shipping settings of the account.
         # @param [Fixnum] merchant_id
-        #   The ID of the managing account.
+        #   The ID of the managing account. If this account is not a multi-client account,
+        #   then this parameter must be the same as accountId.
         # @param [Fixnum] account_id
         #   The ID of the account for which to get/update shipping settings.
         # @param [Google::Apis::ContentV2::ShippingSettings] shipping_settings_object