Merge branch 'master' into kh_customizable-file

Author: keharper

src/cloud/cdn/fastly-vcl-bypass-to-origin.md

@@ -1,8 +1,6 @@
 ---
 group: cloud-guide
 title: Custom VCL to bypass Fastly cache
-redirect_from:
-   - /cloud/configure/fastly-vcl-badreferer.html
 functional_areas:
   - Cloud
   - Setup

src/cloud/docker/docker-manage-cron-jobs.md

@@ -5,8 +5,6 @@ functional_areas:
   - Cloud
   - Setup
   - Configuration
-redirect_from:
-  - /cloud/reference/docker-config.html
 ---
 
 The [Cron container] runs the scheduled cron jobs automatically based on the cron configuration defined in the [`crons` property of the `.magento.app.yaml` file]({{ site.baseurl }}/cloud/project/magento-app-properties.html#crons), and any custom configuration specified in the `docker-compose-override.yml` file.

src/guides/v2.3/graphql/authorization-tokens.md

@@ -37,6 +37,12 @@ mutation {
  }
 ```
 
+You can now use this token in the Authorization request header field for any queries and mutations.
+
+![GraphQL Authorization Bearer]({{site.baseurl}}/common/images/graphql/graphql-authorization.png)
+
+If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
+
 ## Admin tokens
 
 In Magento GraphQL, you specify an admin token only if you need to query products, categories, price rules, or other entities that are scheduled to be in a campaign (staged content). Staging is supported in {{site.data.var.ee}} only. See [Staging queries]({{page.baseurl}}/graphql/queries/index.html#staging) for more information.

src/guides/v2.3/graphql/develop/create-graphqls-file.md

@@ -1,7 +1,7 @@
 ---
 group: graphql
 title: Define the GraphQL schema for a module
-redirect_from: graphql/develop/configure-graphql-xml.html
+redirect_from: /guides/v2.3/graphql/develop/configure-graphql-xml.html
 ---
 
 Each module that adds to or extends from a GraphQL schema can do so by placing a `schema.graphqls` file in its `etc` directory. Magento Core adds [`GraphQl`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/GraphQl) modules based on the purpose of the schema being extended/added and the core modules they depend on. For example, the `CustomerGraphQl` module adds a query and multiple mutations to the `graphql` endpoint to view and modify customer data. The `CustomerGraphQl` module relies on the `Customer` core module.

src/guides/v2.3/graphql/get-customer-authorization-token.md

@@ -16,7 +16,7 @@ contributor_link: https://www.atwix.com/
 
 The procedure for creating a cart varies for logged-in customers and guests.
 
-The `customerCart` query returns the active cart for the logged-in customer. If the cart does not exist, the query creates one. You must specify the customer’s authorization token in the headers. Otherwise, the query fails. ["Get customer authorization token"]({{ page.baseurl }}/graphql/get-customer-authorization-token.html) describes describes these tokens.
+The `customerCart` query returns the active cart for the logged-in customer. If the cart does not exist, the query creates one. You must specify the customer’s authorization token in the headers. Otherwise, the query fails. ["Get customer authorization token"]({{ page.baseurl }}/graphql/authorization-tokens.html) describes describes these tokens.
 
 For guests, use the [`createEmptyCart`]({{page.baseurl}}/graphql/mutations/create-empty-cart.html) mutation to create an empty shopping cart and generate a cart ID for a guest user. If the guest later logs in as a customer, use the [`mergeCarts`]({{page.baseurl}}/graphql/mutations/merge-carts.html) mutation to transfer the contents of the guest cart into the customer's cart.
 

src/guides/v2.3/graphql/tutorials/checkout/checkout-shopping-cart.md

@@ -4,7 +4,7 @@ title: Authorization tokens
 contributor_name: Atwix
 contributor_link: https://www.atwix.com/
 redirect_from:
-  - /guides/v2.3/graphql/get-customer-authorization-token.html
+  - /guides/v2.4/graphql/get-customer-authorization-token.html
 ---
 
 Magento provides separate token services for customers and administrators. When you request a token from one of these services, the service returns a unique access token in exchange for the username and password for a Magento account.
@@ -37,6 +37,12 @@ mutation {
  }
 ```
 
+You can now use this token in the Authorization request header field for any queries and mutations.
+
+![GraphQL Authorization Bearer]({{site.baseurl}}/common/images/graphql/graphql-authorization.png)
+
+If necessary, you also can [revoke the customer's token]({{ page.baseurl }}/graphql/mutations/revoke-customer-token.html
+
 ## Admin tokens
 
 In Magento GraphQL, you specify an admin token only if you need to query products, categories, price rules, or other entities that are scheduled to be in a campaign (staged content). Staging is supported in {{site.data.var.ee}} only. See [Staging queries]({{page.baseurl}}/graphql/queries/index.html#staging) for more information.

src/guides/v2.4/graphql/authorization-tokens.md

@@ -1,7 +1,7 @@
 ---
 group: graphql
 title: Define the GraphQL schema for a module
-redirect_from: graphql/develop/configure-graphql-xml.html
+redirect_from: /guides/v2.4/graphql/develop/configure-graphql-xml.html
 ---
 
 Each module that adds to or extends from a GraphQL schema can do so by placing a `schema.graphqls` file in its `etc` directory. Magento Core adds [`GraphQl`]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/GraphQl) modules based on the purpose of the schema being extended/added and the core modules they depend on. For example, the `CustomerGraphQl` module adds a query and multiple mutations to the `graphql` endpoint to view and modify customer data. The `CustomerGraphQl` module relies on the `Customer` core module.

src/guides/v2.4/graphql/develop/create-graphqls-file.md

@@ -1,8 +1,6 @@
 ---
 group: installation-guide
 title: MySQL
-redirect_from:
-  - guides/v2.3/install-gde/trouble/tshoot_mysql_table-open-cache.html
 ---
 
 ## Help if you are just starting out {#mysql-help-beginner}

src/guides/v2.4/graphql/get-customer-authorization-token.md

@@ -5,8 +5,6 @@ functional_areas:
   - Install
   - System
   - Setup
-redirect_from: 
-  - /guides/v2.3/install-gde/prereq/php-settings-ubuntu.html
 ---
 
 This topic discusses how to set required [PHP](https://glossary.magento.com/php) options.