Merge pull request #4204 from magento/small_changes

Small changes

Author: dobooth

_data/toc/cloud-guide.yml

@@ -307,7 +307,7 @@ pages:
         - label: Cloud deployment process
           url: /cloud/deploy/cloud-deployment-process.html
 
-        - label: Reduce downtime
+        - label: Zero downtime deployment
           url: /cloud/deploy/reduce-downtime.html
 
         - label: Static content deployment

common/images/fdg/lib-map.png

@@ -14,11 +14,11 @@ The following topics can help you to better understand how to optimize the deplo
 -  [Cloud deployment process]({{page.baseurl}}/cloud/deploy/cloud-deployment-process.html)  
     There are three phases in the Cloud deployment process, and you can use the strengths and weaknesses of each phase to your advantage.
 
+-  [Zero downtime deployment]({{page.baseurl}}/cloud/deploy/reduce-downtime.html)  
+    Understand what happens during deployment and how to reduce the amount of downtime your store experiences during an update to the Production environment.
+
 -  [Static content deployment]({{page.baseurl}}/cloud/deploy/static-content-deployment.html)  
     The best way to optimize your Cloud deployment is to control how and when to generate static content.
 
--  [Reduce downtime]({{page.baseurl}}/cloud/deploy/reduce-downtime.html)  
-    Understand what happens during deployment and how to reduce the amount of downtime your store experiences during an update to the Production environment.
-
 -  [Smart wizards]({{page.baseurl}}/cloud/deploy/smart-wizards.html)  
     The `{{site.data.var.ct}}` package provides the smart wizard commands to quickly evaluate your project configuration.

guides/v2.1/cloud/deploy/optimize-cloud-deployment.md

@@ -1,15 +1,15 @@
 ---
 group: cloud-guide
-title: Reduce downtime
+title: Zero downtime deployment
 functional_areas:
   - Cloud
   - Deploy
   - SCD
 ---
 
-{{site.data.var.ece}} runs Magento in [_maintenance_ mode]({{page.baseurl}}/config-guide/bootstrap/magento-modes.html#maintenance-mode) during the deploy phase, which takes your site offline until the deployment is complete. The length of time your Production site is in maintenance mode depends on the size of the site, the number of changes applied during the deployment, and the configuration for static content deployment.
+{{site.data.var.ece}} runs Magento in [_maintenance_ mode]({{page.baseurl}}/config-guide/bootstrap/magento-modes.html#maintenance-mode) during the deploy phase, which takes your site offline until the deployment is complete. The length of time your Production site is in maintenance mode depends on the size of the site, the number of changes applied during the deployment, and the configuration for static content deployment. It is possible to configure your project so that it deploys with a **zero** downtime effect.
 
-During the deployment process, all connections queue for up to 5 minutes preserving any active sessions and pending actions, such as adding to cart or checkout. After deployment, the queue is released and connections continue without interruption. To use this _connection hold_ to your advantage and reduce downtime to **zero**, you must configure your project to use the most efficient deploy strategy.
+During the deployment process, all connections queue for up to 5 minutes preserving any active sessions and pending actions, such as adding to cart or checkout. After deployment, the queue is released and connections continue without interruption. To use this _connection hold_ to your advantage and reduce deployment to _zero_ downtime, you must configure your project to use the most efficient deploy strategy.
 
 Use the following steps to reduce the amount of time it takes your store to deploy an update to Production:
 

guides/v2.1/cloud/deploy/reduce-downtime.md

@@ -37,17 +37,20 @@ The assertions that the Magento application is installed and not in maintenance
 
 Sample entry point script that modifies the bootstrap object:
 
-```php?start_inline=1
-use Magento\Framework\App\Bootstrap;
-require __DIR__ . '/app/bootstrap.php';
-$params = $_SERVER;
-$params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = true; // default false
-$params[Bootstrap::PARAM_REQUIRE_IS_INSTALLED] = false; // default true
-$bootstrap = Bootstrap::create(BP, $params);
-/** @var \Magento\Framework\App\Http $app */
-$app = $bootstrap->createApplication('Magento\Framework\App\Http');
-$bootstrap->run($app);
-```
+    ```php?start_inline=1
+    <?php
+    use Magento\Framework\App\Bootstrap;
+    require __DIR__ . '/app/bootstrap.php';
+
+    $params = $_SERVER;
+    $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = true; // default false
+    $params[Bootstrap::PARAM_REQUIRE_IS_INSTALLED] = false; // default true
+    $bootstrap = Bootstrap::create(BP, $params);
+
+    /** @var \Magento\Framework\App\Http $app */
+    $app = $bootstrap->createApplication('Magento\Framework\App\Http');
+    $bootstrap->run($app);
+    ```
 
 ## Default exception handling {#config-boot-exception}
 

guides/v2.1/config-guide/bootstrap/magento-bootstrap.md

@@ -46,7 +46,7 @@ The Magento_Shipping module adds a component rendered as a link to the Shipping
 
 
 ```xml
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="checkout.root">
             <arguments>
@@ -81,6 +81,7 @@ The Magento_Shipping module adds a component rendered as a link to the Shipping
         </referenceBlock>
     </body>
 </page>
+
 ```
 
 ## Add the new component to the checkout page layout {#add}
@@ -115,4 +116,4 @@ return $jsLayout;
 If you want to use this sample in your code, replace the `%path_to_target_node%` placeholder with real value.
 
 {: .bs-callout .bs-callout-info" }
-Disable vs remove a component: If you disable a component, it is loaded but not rendered. If you remove a component, it is not loaded.
+Disable vs remove a component: If you disable a component, it is loaded but not rendered. If you remove a component, it is removed and not loaded.

guides/v2.1/howdoi/checkout/checkout_customize.md

@@ -41,19 +41,19 @@ To get the Magento metapackage:
 
     **{{site.data.var.ce}}**
     ```bash
-    composer create-project --repository=https://repo.magento.com/magento/project-community-edition:<version-tag> <install-directory-name>
+    composer create-project --repository=https://repo.magento.com/ magento/project-community-edition:<version-tag> <install-directory-name>
     ```
 
     **{{site.data.var.ee}}**
     ```bash
-    composer create-project --repository=https://repo.magento.com/magento/project-enterprise-edition:<version-tag> <install-directory-name>
+    composer create-project --repository=https://repo.magento.com/ magento/project-enterprise-edition:<version-tag> <install-directory-name>
     ```
 
     When prompted, enter your Magento authentication keys. Your _public key_ is your username; your _private key_ is your password.
 
     To install {{site.data.var.ce}} version 2.2.2 run in current folder:
     ```bash
-    composer create-project --repository=https://repo.magento.com/magento/project-community-edition:2.2.2 .
+    composer create-project --repository=https://repo.magento.com/ magento/project-community-edition:2.2.2 .
     ```
 
     If you encounter errors, such as `Could not find package...` or `...no matching package found`, make sure there are no typos in your command. If you still encounter errors, you may not be authorized to download {{site.data.var.ee}}. Contact [Magento support](https://magento.com/support) for help.

guides/v2.1/install-gde/composer.md

@@ -30,10 +30,8 @@ Magento _strongly_ recommends you observe the following standard when you set up
 *	Familiarize yourself with [these potential MySQL trigger limitations](http://dev.mysql.com/doc/mysql-reslimits-excerpt/5.1/en/stored-program-restrictions.html){:target="_blank"} before you continue.
 *	If you use MySQL database replication, be aware that Magento does _not_ support MySQL statement-based replication. Make sure you use _only_ [row-based replication](http://dev.mysql.com/doc/refman/5.1/en/replication-formats.html){:target="_blank"}.
 
-{:.bs-callout .bs-callout-warning} Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions,
-which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database
-implementations utilizing GTID-based replication, such as
-[Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
+{:.bs-callout .bs-callout-warning}
+Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions, which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database implementations utilizing GTID-based replication, such as [Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
 
 {:.bs-callout .bs-callout-info}
 If your web server and database server are on different hosts, perform the tasks discussed in this topic on the database server host then see [Set up a remote MySQL database connection]({{ page.baseurl }}/install-gde/prereq/mysql_remote.html).

guides/v2.1/install-gde/prereq/mysql.md

@@ -41,24 +41,27 @@ This process assumes that you have set up your [local developer workspace]({{ pa
 For a new Starter Plan project, a `master` branch was cloned from the {{site.data.var.ece}} Git repository. To start branching and working with code, you need to clone the `master` branch to your local environment.
 
 The format of the Git clone command is:
+```bash
+git fetch origin
+```
 
-    git fetch origin
-    git pull origin <environment ID>
-
+```bash
+git pull origin <environment ID>
+```
 The first time you start working in branches for your Starter project, you need to create a `staging` branch. This creates a code branch matching the `master` branch that deploys to a Staging environment to test configuration and code changes before deploying to the Production environment.
 
 Next, create branches from `staging` to develop code, add extensions, and configure 3rd party integrations. Anytime you need to develop custom code, add extensions, integrate with a 3rd party service, work in a development branch created from the `staging` branch. You will have four active Integration environments available. When you push an active branch, one of these Integration environments automatically deploys your code to test.
 
 We walk you through the process when you [set up your local]({{ page.baseurl }}/cloud/setup/first-time-setup.html) environment.
 
 The format of the Git branch command is:
-
-    git checkout <branch name>
-
+```bash
+git checkout <branch name>
+```
 The format of the Magento Cloud CLI branch command is:
-
-    magento-cloud environment:branch <environment name> <parent environment ID>
-
+```bash
+magento-cloud environment:branch <environment name> <parent environment ID>
+```
 
 ![Branch from Master]({{ site.baseurl }}/common/images/cloud_workflow-branching.png)
 

guides/v2.2/cloud/basic-information/starter-develop-deploy-workflow.md

@@ -26,10 +26,8 @@ Magento _strongly_ recommends you observe the following standard when you set up
 *	Familiarize yourself with [these potential MySQL trigger limitations](http://dev.mysql.com/doc/mysql-reslimits-excerpt/5.1/en/stored-program-restrictions.html){:target="_blank"} before you continue.
 *	If you use MySQL database replication, be aware that Magento does _not_ support MySQL statement-based replication. Make sure you use _only_ [row-based replication](http://dev.mysql.com/doc/refman/5.1/en/replication-formats.html){:target="_blank"}.
 
-{:.bs-callout .bs-callout-warning} Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions,
-which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database
-implementations utilizing GTID-based replication, such as
-[Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
+{:.bs-callout .bs-callout-warning}
+Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions, which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database implementations utilizing GTID-based replication, such as [Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
 
 {:.bs-callout .bs-callout-info}
 If your web server and database server are on different hosts, perform the tasks discussed in this topic on the database server host then see [Set up a remote MySQL database connection]({{ page.baseurl }}/install-gde/prereq/mysql_remote.html).

guides/v2.2/install-gde/prereq/mysql.md

@@ -75,7 +75,7 @@ For more information on configurations, see [Enabling Inventory Management](http
 
 You may need to disable Inventory Management modules to:
 
-* Speed up the upgrade process for merchants currently on Magento 2.0/2.1/2.2 and migrating to 2.3.0.
+* Speed up the upgrade process for merchants currently on Magento 2.0.X/2.1.X/2.2.X and migrating to 2.3.X.
 * Use custom or third party inventory and order management modules.
 * Use [Magento Order Management](https://omsdocs.magento.com) for inventory and order management. The current Order Management connector does not support Inventory Management interfaces. We plan to support this integration in a later release.
 

guides/v2.3/comp-mgr/install-extensions/inventory-management-installation.md

@@ -36,7 +36,6 @@ atlassian*
 /.idea
 /.gitattributes
 /app/config_sandbox
-/app/etc/config.php
 /app/etc/env.php
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties
@@ -123,7 +122,6 @@ atlassian*
 /.idea
 /.gitattributes
 /app/config_sandbox
-/app/etc/config.php
 /app/etc/env.php
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties

guides/v2.3/config-guide/prod/config-reference-gitignore.md

@@ -26,7 +26,7 @@ You can explicitly define EAV attributes in the schema, while a module's attribu
 The current GraphQL codebase also supports the following features:
 
 * You can perform full text searches on products in a similar manner as REST and SOAP calls. You can also simultaneously perform a full text search and filter the results. This is new functionality available only with GraphQL.
-* All product types are supported. Currently, previous versions supported simple and configurable products only.
+* All product types are supported. Previous versions support only simple and configurable products.
 * A product query returns complex price objects that include the amount, the currency code, and any adjustments.
 * You can query attributes of a logged-in customer. A session token provides authorization.
 * The REST and SOAP APIs had separate endpoints for searching across all products and individual products. In GraphQL, all product searches use the `products` query.

guides/v2.3/graphql/index.md

@@ -26,10 +26,8 @@ Magento _strongly_ recommends you observe the following standard when you set up
 *	Familiarize yourself with [these potential MySQL trigger limitations](http://dev.mysql.com/doc/mysql-reslimits-excerpt/5.1/en/stored-program-restrictions.html){:target="_blank"} before you continue.
 *	If you use MySQL database replication, be aware that Magento does _not_ support MySQL statement-based replication. Make sure you use _only_ [row-based replication](http://dev.mysql.com/doc/refman/5.1/en/replication-formats.html){:target="_blank"}.
 
-{:.bs-callout .bs-callout-warning} Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions,
-which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database
-implementations utilizing GTID-based replication, such as
-[Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
+{:.bs-callout .bs-callout-warning}
+Magento 2 currently utilizes `CREATE TEMPORARY TABLE` statements inside transactions, which are [incompatible](https://dev.mysql.com/doc/refman/5.7/en/replication-gtids-restrictions.html) with database implementations utilizing GTID-based replication, such as [Google Cloud SQL second-generation instances](https://cloud.google.com/sql/docs/features#differences).
 
 {:.bs-callout .bs-callout-info}
 If your web server and database server are on different hosts, perform the tasks discussed in this topic on the database server host then see [Set up a remote MySQL database connection]({{page.baseurl }}/install-gde/prereq/mysql_remote.html).