magento · dobooth · Oct 10, 2019 · Jun 25, 2019 · Oct 1, 2019 · Oct 5, 2019
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -137,7 +137,7 @@ cd <DEVDOCS_REPOSITORY_ROOT_DIR>
 ln -s guides/v2.2/install-gde/new-doc-topic.md guides/v2.3/install-gde/new-doc-topic.md
 ```
 
-If you have an image that is identical between versions, it is should placed in `/common/images`. Please optimize images before committing them to the repository.
+If you have an image that is identical between versions, it should placed in `/common/images`. Please optimize images before committing them to the repository.
 If done correctly, the symbolic link path will start with 3 or 4 instances of `../`, as the above example shows.
 
 ### Remove a symbolic link

diff --git a/_includes/install/web/install-web_2-db.md b/_includes/install/web/install-web_2-db.md
@@ -10,7 +10,7 @@
     </tr>
   <tr>
     <td>Database Server Host</td>
-    <td>If the web server and database server are located on the same host, enter <tt>localhost</tt>. If the database server is located on a different host, enter its fully qualified hostname or IP address.</td>
+    <td>If the web server and database server are located on the same host, enter <tt>localhost</tt>. If the database server is located on a different host, enter its fully qualified hostname or IP address. Using the IP address is preferable since using a hostname can cause additional time on each request for DNS lookup.</td>
   </tr>
   <tr>
     <td>Database Server Username</td>

diff --git a/_includes/release-notes/engcomm-2-3-3-issues.md b/_includes/release-notes/engcomm-2-3-3-issues.md
@@ -2,7 +2,7 @@
 | ------- | ------- | ------- |
 | [airbone42](https://github.com/airbone42) | [#533](https://github.com/magento/magento2/issues/533) | [magento/graphql-ce#578](https://github.com/magento/graphql-ce/pull/578) |
 | [tzyganu](https://github.com/tzyganu) | [#601](https://github.com/magento/magento2/issues/601) | [magento/graphql-ce#632](https://github.com/magento/graphql-ce/pull/632) |
-| [bsstaveley](https://github.com/bsstaveley) | [#631](https://github.com/magento/magento2/issues/631) | [magento/graphql-ce#634](https://github.com/magento/graphql-ce/pull/634) |
+| [pmclain](https://github.com/pmclain) | [#631](https://github.com/magento/magento2/issues/631) | [magento/graphql-ce#634](https://github.com/magento/graphql-ce/pull/634) |
 | [dipti2jcommerce](https://github.com/dipti2jcommerce) | [#20124](https://github.com/magento/magento2/issues/20124) | [magento/magento2#20135](https://github.com/magento/magento2/pull/20135) |
 | [WalterSmulders](https://github.com/WalterSmulders) | [#21978](https://github.com/magento/magento2/issues/21978) | [magento/magento2#22020](https://github.com/magento/magento2/pull/22020) |
 | [afavata](https://github.com/afavata) | [#22045](https://github.com/magento/magento2/issues/22045) | [magento/magento2#22260](https://github.com/magento/magento2/pull/22260) |

diff --git a/guides/v2.2/advanced-reporting/overview.md b/guides/v2.2/advanced-reporting/overview.md
@@ -28,7 +28,7 @@ To avoid system overload during its prime time, you can set the preferable time
 
 ## Extensibility
 
-Though the Analytics module provides API, it is used specifically to interchange data with the MBI. We do not recommend to extend the advanced reporting functionality in this version.
+Though the Analytics module provides an API, it is used specifically to interchange data with the MBI. We do not recommend to extend the advanced reporting functionality in this version.
 
 {:.ref-header}
 Related topics

diff --git a/guides/v2.2/architecture/archi_perspectives/service_layer.md b/guides/v2.2/architecture/archi_perspectives/service_layer.md
@@ -73,7 +73,8 @@ However, if the client code uses the interface definition only, no class change
 {:.ref-header}
 Related topics
 
-[Architectural diagrams]({{page.baseurl}}/architecture/archi_perspectives/arch_diagrams.html)
-[Architectural layers overview]({{page.baseurl}}/architecture/archi_perspectives/ALayers_intro.html)
+*  [Architectural diagrams]({{page.baseurl}}/architecture/archi_perspectives/arch_diagrams.html)
+*  [Architectural layers overview]({{page.baseurl}}/architecture/archi_perspectives/ALayers_intro.html)
+
 [catalog-api]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/Api
 [catalog-api-data]: {{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/Api/Data
diff --git a/guides/v2.2/architecture/frontend_custom_strategies.md b/guides/v2.2/architecture/frontend_custom_strategies.md
@@ -67,11 +67,11 @@ Magento supplies a default [theme](https://glossary.magento.com/theme) and a Les
 
 ### Replace PHTML template files
 
-In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or an add an extra `<div>` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript/) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams.
+In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or add an extra `<div>` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript/) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams.
 
 ### Replace Magento-Provided CSS
 
-Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.)
+Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows the use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.)
 
 In addition to replacing CSS files, you might need to replace small amounts of HTML and JavaScript.
 
@@ -105,4 +105,4 @@ Related topics
 [Overview of UI components]: {{page.baseurl}}/ui_comp_guide/bk-ui_comps.html
 [Frontend Developer Guide]: {{page.baseurl}}/frontend-dev-guide/bk-frontend-dev-guide.html
 [JavaScript Developer Guide]: {{page.baseurl}}/javascript-dev-guide/bk-javascript-dev-guide.html
-[Magento Marketplace]: https://marketplace.magento.com/
+[Magento Marketplace]: https://marketplace.magento.com/
diff --git a/guides/v2.2/architecture/storefront_customization.md b/guides/v2.2/architecture/storefront_customization.md
@@ -18,11 +18,11 @@ Magento supplies a default [theme](https://glossary.magento.com/theme) and a Les
 
 ### Replace PHTML template files
 
-In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or an add an extra `<div>` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams.
+In addition to extending the default CSS, you can generate different HTML [markup](https://glossary.magento.com/markup). For example, you might need to add a missing CSS class name, or add an extra `<div>` tag to achieve some visual effect. You might also need to tweak some [JavaScript](https://glossary.magento.com/javascript) to cope with different HTML markup. This change is more demanding than simply extending Magento CSS, but is still within the grasp of smaller projects and leaner teams.
 
 ### Replace Magento-Provided CSS
 
-Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.)
+Rather than edit the default CSS provided by Magento, you might decide to replace all the default storefront CSS code with your own. This strategy avoids tying a project to the Magento-provided CSS, but puts a greater burden on project development and integration. It also allows the use of different CSS tools or technologies not provided with Magento. Partners who build their own set of CSS libraries could reuse these libraries on different customer projects. (These unique CSS libraries may help differentiate a partner from others in the market.)
 
 In addition to replacing CSS files, you might need to replace small amounts of HTML and JavaScript.
 

diff --git a/guides/v2.2/cloud/reference/discover-deploy.md b/guides/v2.2/cloud/reference/discover-deploy.md
@@ -76,7 +76,7 @@ For detailed instructions, see [Build and deploy full steps](#steps).
 
 ### Phase 1: Code and configuration validation {#cloud-deploy-over-phases-conf}
 
-When you initially set up a project from a template, we retrieve the code from the [the {{site.data.var.ee}} template](https://github.com/magento/magento-cloud). This code repo is cloned to your project as the `master` branch.
+When you initially set up a project from a template, we retrieve the code from [the {{site.data.var.ee}} template](https://github.com/magento/magento-cloud). This code repo is cloned to your project as the `master` branch.
 
 -  **For Starter**—`master` branch is your Production environment.
 -  **For Pro**—`master` begins as origin branch for the Integration environment.

diff --git a/guides/v2.2/install-gde/basics/basics_software.md b/guides/v2.2/install-gde/basics/basics_software.md
@@ -18,7 +18,7 @@ functional_areas:
 
 The full list of software is listed in [System Requirements]({{ page.baseurl }}/install-gde/system-requirements.html) but here are the essentials:
 
-* Web server for providing access to web pages - Currently, we've documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and plan to document other web servers in the near future.
+* Web server for providing access to web pages - Currently, we have documented [Apache](http://en.wikipedia.org/wiki/Apache_HTTP_Server){:target="_blank"} and [NGINX](https://en.wikipedia.org/wiki/Nginx){:target="_blank"}.
 
 * Database management system for long-term data storage and retrieval - We support [MySQL](http://dev.mysql.com/doc/refman/4.1/en/what-is-mysql.html){:target="_blank"}.
 
@@ -27,4 +27,4 @@ The full list of software is listed in [System Requirements]({{ page.baseurl }}/
    For more information, see the [PHP manual](http://php.net/manual/en/intro-whatis.php){:target="_blank"} or the [PHP Wikipedia page](http://en.wikipedia.org/wiki/PHP){:target="_blank"}.
 
 {: .bs-callout-info }
-If you use a hosting provider, they might already have installed this software. Contact them if you're not sure.
+If you use a hosting provider, they might already have installed this software. Contact them if you are not sure.
diff --git a/guides/v2.2/install-gde/system-requirements-tech.md b/guides/v2.2/install-gde/system-requirements-tech.md
@@ -69,7 +69,7 @@ For more information, see [Required PHP settings]({{ page.baseurl }}/install-gde
 
 * A valid [security certificate](https://glossary.magento.com/security-certificate) is required for HTTPS.
 * Self-signed SSL certificates are not supported.
-* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.1 or later:
+* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.2 or later:
 
   * [More information about PayPal]({{ page.baseurl }}/install-gde/system-requirements_tls1-2.html)
 

diff --git a/guides/v2.2/javascript-dev-guide/javascript/custom_js.md b/guides/v2.2/javascript-dev-guide/javascript/custom_js.md
@@ -120,8 +120,8 @@ define([
 
 Where the following notation is used:
 
-- `<component_path>`: path to the default component that you extend
-- `<component_alias>`: variable containing the default component that you extend
+-  `<component_path>`: path to the default component that you extend
+-  `<component_alias>`: variable containing the default component that you extend
 
 For example, `Filters.js` script extends the default `filters.js`:
 
@@ -142,12 +142,17 @@ For information about how to initialize your custom JS component in a `.phtml` t
 
 ## Disable default Magento JS {#disable_default_js}
 
-To disable the auto-loading of default Magento JS components and widget
-initialization:
+To disable the auto-loading of default Magento JS components and widget initialization:
+
+1. Create a `requirejs-config.js` file with the following content:
+
+    ```javascript
+    var config = { deps: [ ] };
+    ```
 
-1. Create a `requirejs-config.js` file with the following content: `var config = { deps: [ ] };`
 2. Put the `requirejs-config.js` file in one of the following
   locations:
+
    -  Your custom theme files: `<theme_dir>`
    -  Your custom module files: `<module_dir>/view/frontend`
 

diff --git a/guides/v2.2/migration/migration-migrate-delta.md b/guides/v2.2/migration/migration-migrate-delta.md
@@ -15,7 +15,7 @@ The incremental migration tool installs deltalog tables (with prefix `m2_cl_*`)
 *  All operations with orders, products, and categories in the [Magento Admin](https://glossary.magento.com/magento-admin) panel
 
 {: .bs-callout-info }
-All new or updated entities entered through the Admin panel, such as attributes or CMS pages, are not included in the incremental migration and will not be migrated.
+All other new or updated entities entered through the Admin panel, such as attributes or CMS pages, are not included in the incremental migration and will not be migrated.
 
 ## Before you start: routine preparations
 

diff --git a/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md b/guides/v2.2/ui_comp_guide/concepts/knockout-bindings.md
@@ -219,7 +219,7 @@ The `i18n` binding is used to translate a string according to the currently enab
 <translate args="'Translate using the tag'"></translate>
 ```
 
-### keyboard
+### `keyboard`
 
 The keyboard binding allows setting up listeners for the `keypress` event of a specific key.
 
@@ -241,7 +241,7 @@ A collection in which keys represent keyboard keys codes and values are callback
 }"/>
 ```
 
-### mageInit
+### `mageInit`
 
 The `mageInit` binding is an adapter for the `[data-mage-init]` attribute that is used to initialize jQuery widgets on the associated element.
 
@@ -264,7 +264,7 @@ The `mageInit` binding is an adapter for the `[data-mage-init]` attribute that i
 }"></div>
 ```
 
-### optgroup
+### `optgroup`
 
 The `optgroup` binding is a decorator for the standard Knockout's options binding which adds the support of nested options, and renders them as the `<optgroup>` element.
 
@@ -298,7 +298,7 @@ The `optgroup` binding is a decorator for the standard Knockout's options bindin
     }]"></select>
 ```
 
-### outerClick
+### `outerClick`
 
 The `outerClick` binding allows to subscribe for the "click" event that happens outside of the boundaries of the associated element.
 
@@ -319,7 +319,7 @@ Callback that is invoked when user clicks outside of the element.
 </div>
 ```
 
-### range
+### `range`
 
 The `range` binding is an adapter for the [jQuery UI Slider widget](https://jqueryui.com/slider/). It also implements necessary handlers to work with mobile devices.
 
@@ -344,7 +344,7 @@ Configuration that is passed to the Slider widget.
 }"></div>
 ```
 
-### resizable
+### `resizable`
 
 The `resizable` binding is an adapter for the [jQuery UI Resizable](http://api.jqueryui.com/resizable/) widget.
 
@@ -387,7 +387,7 @@ Component's name by which to perform a lookup in the registry.
 <scope args="'name.of.component'"></scope>
 ```
 
-### staticChecked
+### `staticChecked`
 
 The `staticChecked` binding implements the behavior similar to the standard [`checked`](http://knockoutjs.com/documentation/checked-binding.html) binding. The difference is that `staticChecked` doesn't change the array of the already selected elements if the value of the associated DOM element changes.
 
@@ -401,7 +401,7 @@ The `staticChecked` binding implements the behavior similar to the standard [`ch
 <input type="checkbox" data-bind="staticChecked: observable"/>
 ```
 
-### template
+### `template`
 
 Magento `template` binding is a customization of the existing Knockout [`template` binding](http://knockoutjs.com/documentation/template-binding.html). It is used to render a template inside of the associated element. The original Knockout's  implementation was overridden to support asynchronous loading of templates by the provided path, instead of searching for them on the page.
 
@@ -419,7 +419,7 @@ Configuration for the `template` binding. If the provided value is a string, it
 <div data-bind="template: 'path/to/the/template'"></div>
 ```
 
-### tooltip
+### `tooltip`
 
 Magento custom knockout binding for displaying a tooltip.
 

diff --git a/guides/v2.3/comp-mgr/cli/cli-upgrade.md b/guides/v2.3/comp-mgr/cli/cli-upgrade.md
@@ -89,7 +89,7 @@ See the examples at the end of this section for help specifying different releas
 1. Specify additional packages.
 
    ```bash
-   composer require --dev allure-framework/allure-phpunit:~1.2.0 friendsofphp/php-cs-fixer:~2.14.0 lusitanian/oauth:~0.8.10 magento/magento-coding-standard:~3.0.0 magento/magento2-functional-testing-framework:2.4.3 pdepend/pdepend:2.5.2 phpmd/phpmd:@stable phpunit/phpunit:~6.5.0 sebastian/phpcpd:~3.0.0 squizlabs/php_codesniffer:~3.4.0 --sort-packages --no-update
+   composer require --dev allure-framework/allure-phpunit:~1.2.0 friendsofphp/php-cs-fixer:~2.14.0 lusitanian/oauth:~0.8.10 magento/magento-coding-standard:~3.0.0 magento/magento2-functional-testing-framework:2.4.5 pdepend/pdepend:2.5.2 phpmd/phpmd:@stable phpunit/phpunit:~6.5.0 sebastian/phpcpd:~3.0.0 squizlabs/php_codesniffer:~3.4.0 --sort-packages --no-update
    ```
 
 1. Remove unused packages.

diff --git a/guides/v2.3/install-gde/system-requirements-tech.md b/guides/v2.3/install-gde/system-requirements-tech.md
@@ -78,7 +78,7 @@ For more information, see [Required PHP settings][].
 
 * A valid [security certificate][] is required for HTTPS.
 * Self-signed SSL certificates are not supported.
-* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.1 or later:
+* Transport Layer Security (TLS) requirement - PayPal and `repo.magento.com` both require TLS 1.2 or later:
 
   * [More information about PayPal][]
 
@@ -135,7 +135,7 @@ Mail Transfer Agent (MTA) or an SMTP server
 {:.bs-callout .bs-callout-info}
 There is a known issue with `xdebug` that can affect Magento installations or access to the storefront or Magento Admin after installation. For details, see [Known issue with xdebug][].
 
-* [`mcrypt`][]{:target="_blank"}
+* [`mcrypt`](http://php.net/manual/en/book.mcrypt.php){:target="_blank"} (for PHP < 7.2)
 * PHPUnit (as a command-line tool) 6.2.0
 
 <!-- Link Definitions -->