Merge branch 'master' into em_prex-modulerename

Author: erikmarr

src/_includes/graphql/cart-object.md

@@ -8,7 +8,7 @@ Attribute |  Data Type | Description
 `billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
 `email` | String | The customer's email address
 `id` | ID! | The ID of the cart
-`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
+`is_virtual` | Boolean! | Indicates whether the cart contains only virtual products
 `items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
 `prices` | [CartPrices][CartPrices] | Contains subtotals and totals
 `selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

src/cloud/project/project-integrate-blackfire.md

@@ -0,0 +1,6 @@
+---
+title: Blackfire.io for Magento Cloud
+redirect_from:
+  - guides/v2.2/cloud/project/project-integrate-blackfire.html
+redirect_to: https://support.blackfire.io/en/articles/771436-step-3-configure-blackfire-to-run-in-all-magento-cloud-environments
+---

src/guides/v2.3/frontend-dev-guide/themes/theme-create.md

@@ -262,7 +262,7 @@ To learn more about theme layouts, refer to the [Layout section]({{page.baseurl}
 
 ## Troubleshooting {#trouble}
 
-When your theme changes are not visible even after clearing the cache, try redeploying your static files using the `magento setup:static-content:deploy` command, or add the `-f` argument to force deploy static content in any deployment mode in case you are not in production mode.
+When your theme changes are not visible even after clearing the cache, try redeploying your static files using the `bin/magento setup:static-content:deploy` command, or add the `-f` argument to force deploy static content in any deployment mode in case you are not in production mode.
 
  {:.bs-callout-info}
 Running this command with the `-f` argument can fix issues regarding deployment of static content, but removes **all** symlinks and deploys the actual static content files.

src/guides/v2.3/graphql/queries/cart.md

@@ -564,7 +564,7 @@ query {
 
 Attribute |  Data Type | Description
 --- | --- | ---
-`cart_id` | String | A 32-character string that is created when you [create a cart]({{page.baseurl}}/graphql/mutations/create-empty-cart.html)
+`cart_id` | String! | A 32-character string that is created when you [create a cart]({{page.baseurl}}/graphql/mutations/create-empty-cart.html)
 
 ## Output attributes {#cart-output}
 
@@ -622,7 +622,7 @@ Attribute |  Data Type | Description
 --- | --- | ---
 `amount` | Money! | The cost of shipping using this shipping method
 `available` | Boolean! | Indicates whether this shipping method can be applied to the cart
-`base_amount` | Money | The base shipping cost, not including taxes or other cost adjustment. Could be null if method is not available
+`base_amount` | Money | Deprecated. This attribute is not applicable for GraphQL
 `carrier_code` | String! | A string that identifies a commercial carrier or an offline shipping method
 `carrier_title` | String! | The label for the carrier code
 `error_message` | String | Describes an error condition