diff --git a/src/catalog/search-elasticsearch.md b/src/catalog/search-elasticsearch.md
index e8b3b72bd..4d076f4cd 100644
--- a/src/catalog/search-elasticsearch.md
+++ b/src/catalog/search-elasticsearch.md
@@ -7,77 +7,77 @@ Elasticsearch is a powerful and highly scalable distributed search engine that i
## Step 1: Configure Search Options
-1. On the Admin sidebar, tap **Stores**. Then under **Settings**, choose **Configuration**.
+1. On the Admin sidebar, go to **Stores** > _Settings_ > **Configuration**.
1. In the panel on the left under **Catalog**, choose **Catalog**.
1. Expand  the **Catalog Search** section.
-1. For the **Search Engine** field, clear the **Use system value** checkbox and choose the version that is installed on your server.
+1. For **Search Engine**, clear the **Use system value** checkbox and choose the version that is installed on your server.
- * Elasticsearch (Deprecated) — Elasticsearch 2.0+ has reached end of life, and is now deprecated. To learn more, see Elastic Product End of Life Dates.
+ - Elasticsearch (Deprecated) - Elasticsearch 2.x has reached end of life, and is now deprecated. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol){:target="_blank"}.
- * Elasticsearch 5.0+ (Default) — Elasticsearch 5.0+ is scheduled for end of life. To learn more, see Elastic Product End of Life Dates.
+ - Elasticsearch 5.x (Default) - Elasticsearch 5.x is scheduled for end of life. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol){:target="_blank"}.
- * Elasticsearch 6.0+ (Recommended) —For the best performance, we recommend that you use the latest version of Elasticsearch 6.0+.
+ - Elasticsearch 6.x (Recommended) - For the best performance, we recommend that you use the latest version of Elasticsearch 6.x.
{:.bs-callout-info}
To learn more about using Elasticsearch versions 2.x and 5.x, see [Change the Elasticsearch Client][2]{:target="_blank"}.
{: .zoom}
- *[Elasticsearch Settings]({% link configuration/catalog/catalog.md %})*
+ _[Elasticsearch Settings]({% link configuration/catalog/catalog.md %})_
-1. For **Enable EAV Indexer**, set if you want to enable or disable the Product EAV indexer. This feature improves indexation speed and restricts the indexer from use by 3rd party extensions. This option only displays for Elasticsearch or Elasticsearch 5.0+ Search Engines.
+1. For **Enable EAV Indexer**, set if you want to enable or disable the Product EAV indexer. This feature improves indexation speed and restricts the indexer from use by 3rd-party extensions. This option only displays for Elasticsearch or Elasticsearch 5.x Search Engines.
-1. To limit the length and word count of search query text, set the **Minimal Query Length** and **Maximum Query Length**.
+1. To limit the length and word count of search query text, seta value for **Minimal Query Length** and **Maximum Query Length**.
{:.bs-callout-info}
- **Important:** The value set for this minimum and maximum range must be compatible with the corresponding range set in your Elasticsearch search engine configurations. For example, if you set these values to 2 and 300 in Magento, update the values in your search engine.
+ **Important:** The value set for this minimum and maximum range must be compatible with the corresponding range set in your Elasticsearch search engine configurations. For example, if you set these values to `2` and `300` in Magento, update the values in your search engine.
1. To limit the amount of popular search results to cache for faster responses, set an amount for **Number of top search results to cache**.
- The default is 100. Entering a value of 0 caches all search terms and results when entered a second time.
+ The default is `100`. Entering a value of `0` caches all search terms and results when entered a second time.
-1. To limit the maximum number of search results to display for search autocomplete, set an amount for **Autocomplete Limit**. Restricting this amount increases performance of searches and reduces the displayed list size. The default amount is 8.
+1. To limit the maximum number of search results to display for search autocomplete, set an amount for **Autocomplete Limit**. Restricting this amount increases performance of searches and reduces the displayed list size. The default amount is `8`.
## Step 2: Configure the Elasticsearch Connection
{: .zoom}
-*Elasticsearch Connection Settings*
+_Elasticsearch Connection Settings_
-1. Enter the **Elasticsearch Server Hostname**. The default is: `localhost`.
+1. Enter the **Elasticsearch Server Hostname**. The default is `localhost`.
1. Enter the **Elasticsearch Server Port**.
-1. In the **Elasticsearch Index Prefix** field, enter a prefix.to identify the Elasticsearch index. For example: Magento2.
+1. For **Elasticsearch Index Prefix**, enter a prefix to identify the Elasticsearch index. Example: `Magento2`.
-1. Set **Enable Elasticsearch HTTP Auth** to “Yes” to use HTTP authentication to prompt for a username and password to access Elasticsearch Server.
+1. Set **Enable Elasticsearch HTTP Auth** to `Yes` to use HTTP authentication to prompt for a username and password to access Elasticsearch Server.
-1. In the **Elasticsearch Server Timeout** field, enter the number of seconds before the system times out. The default is: 15.
+1. For **Elasticsearch Server Timeout**, enter the number of seconds before the system times out. The default is `15`.
-1. To verify the configuration, tap Test Connection.
+1. To verify the configuration, click Test Connection.
## Step 3: Configure Suggestions and Recommendations
{:.bs-callout-info}
Search suggestions and recommendations can impact server performance.
-1. Set **Enable Search Suggestions** to “Yes”. Then, do the following:
+1. Set **Enable Search Suggestions** to `Yes` and do the following:
{: .zoom}
- *Elasticsearch Suggestion and Recommendation Settings*
+ _Elasticsearch Suggestion and Recommendation Settings_
- * In the **Search Suggestions Count** field, enter the number of search suggestions to offer.
+ - For **Search Suggestions Count**, enter the number of search suggestions to offer.
- * To show the number of results found for each suggestion, set **Show Results for Each Suggestion** to “Yes”.
+ - To show the number of results found for each suggestion, set **Show Results for Each Suggestion** to `Yes`.
-1. To offer recommendations, set **Enable Search Recommendations** to “Yes”. Then, do the following:
+1. To offer recommendations, set **Enable Search Recommendations** to `Yes` and do the following:
- * In the **Search Recommendation Count** field, enter the number of recommendations to offer.
+ - For **Search Recommendation Count**, enter the number of recommendations to offer.
- * To show the number of results found for each recommendation, set **Show Results Count for Each Recommendation** to “Yes”.
+ - To show the number of results found for each recommendation, set **Show Results Count for Each Recommendation** to `Yes`.
-1. When complete, tap Save Config.
+1. When complete, click Save Config.
[1]: http://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-overview.html
[2]: https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-downgrade.html
diff --git a/src/configuration/catalog/catalog.md b/src/configuration/catalog/catalog.md
index cf1261320..d64c2c45b 100644
--- a/src/configuration/catalog/catalog.md
+++ b/src/configuration/catalog/catalog.md
@@ -23,12 +23,12 @@ Stores > Settings > [Configuration]({% link stores/configuration.md %}) > [Cata
|Field|[Scope]({% link configuration/scope.md %})|Description|
|--- |--- |--- |
-|List Mode|Store View|Determines the format of the search results list. Options:
Grid Only - Formats the list as a grid of rows and columns. Each product appears in a single cell of the grid.
List Only - Formats the list with each product on a separate row.
Grid (default / List) - By default, products appear in Grid view and can be toggled to List view.
List (default / Grid) - By default, products appear in List View and can be toggled to Grid view.|
+|List Mode|Store View|Determines the format of the search results list. Options:
**Grid Only** - Formats the list as a grid of rows and columns. Each product appears in a single cell of the grid.
**List Only** - Formats the list with each product on a separate row.
**Grid (default / List)** - By default, products appear in Grid view and can be toggled to List view.
**List (default / Grid)** - By default, products appear in List View and can be toggled to Grid view.|
|Products per Page on Grid Allowed Values|Store View|Determines the number of products displayed in Grid View. To provide a selection of options, enter multiple values separated by commas.|
|Products per Page on Grid Default Value|Store View|Determines the number of products displayed per page by default in Grid View.|
|Products per Page on List Allowed Values|Store View|Determines the number of products displayed in List View. To provide a selection of options, enter multiple values separated by commas.|
|Products per Page on List Default Value|Store View|Determines the number of products displayed per page by default, in List View.|
-|Product Listing Sort by|Store View|Determines the sort order of the search results list. The selection of options is determined by the Display Settings of the category and the available attributes that are set to be `Used for Sorting in Product Listing`. The default is set to `Use All Available Attributes` and typically includes: Best Value, Name, Price|
+|Product Listing Sort by|Store View|Determines the sort order of the search results list. The selection of options is determined by the Display Settings of the category and the available attributes that are set to be `Used for Sorting in Product Listing`. The default is set to `Use All Available Attributes` and typically includes Best Value, Name, Price|
|Allow All Products per Page|Store View|If set to `Yes`, includes the `ALL` option in the “Show per Page” control.|
|Use [Flat Catalog]({% link catalog/catalog-flat.md %}) Category|Global|Enables the flat category structure. (not recommended) Options: Yes / No|
|Use Flat Catalog Product|Global|Enables the flat product structure. (not recommended) Options: Yes / No|
@@ -187,10 +187,10 @@ Magento offers a choice of search engines, and supports both MySQL and several v
|Field|[Scope]({% link configuration/scope.md %})|Description|
|--- |--- |--- |
-|Minimal Query Length|Store View|The minimum number of characters allowed in a catalog search. The value set for this option must be compatible with the corresponding range set in your MySQL search engine configurations. For example, if you set this value to 2 in Magento, update the value in your search engine.|
-|Maximum Query Length|Store View|The maximum number of characters allowed in a catalog search.The value set for this option must be compatible with the corresponding range set in your MySQL search engine configurations. For example, if you set this value to 300 in Magento, update the value in your search engine.|
+|Minimal Query Length|Store View|The minimum number of characters allowed in a catalog search. The value set for this option must be compatible with the corresponding range set in your MySQL search engine configurations. For example, if you set this value to `2` in Magento, update the value in your search engine.|
+|Maximum Query Length|Store View|The maximum number of characters allowed in a catalog search.The value set for this option must be compatible with the corresponding range set in your MySQL search engine configurations. For example, if you set this value to `300` in Magento, update the value in your search engine.|
|Number of top search results to cache|Store View|The number of popular search terms and results to cache for faster responses. Entering a value of `0` caches all search terms and results when entered a second time. Default value: `100`|
-|Search Engine|Global|Identifies the search engine used to process requests for catalog data. By default, Magento Enterprise uses the MySQL search engine. Selected value: MySQLEAV product indexer is always enabled for MySQL. This feature improves indexation speed and restricts the indexer from use by 3rd party extensions.|
+|Search Engine|Global|Identifies the search engine used to process requests for catalog data. By default, Magento Enterprise uses the MySQL search engine. Selected value: MySQLEAV product indexer is always enabled for MySQL. This feature improves indexation speed and restricts the indexer from use by 3rd-party extensions.|
|Autocomplete Limit|Store View|The maximum number of search results to display for search autocomplete. Restricting this amount increases performance of searches and reduces the displayed list size. Default value: `8`|
|Enable Search Suggestions|Store View|Determines if search suggestions appear for common misspellings. When enabled, search suggestions are offered for any request that returns no results. Search suggestions can impact the performance of search. Options: Yes / No.
When set to `Yes`, additional options display for Enable Search Recommendations and associated fields.|
|Search Suggestions Count|Store View|The maximum number of search suggestions offered. Default value: `2`|
@@ -201,7 +201,7 @@ Magento offers a choice of search engines, and supports both MySQL and several v
### Elasticsearch
-Magento supports the following versions of Elasticsearch: 6.0+, 5.0+, and 2.0+ (deprecated).
+Magento supports the following versions of Elasticsearch: 6.x, 5.x, and 2.x (deprecated).
{: .zoom}
[_Catalog Search - Elastic Search_]({% link catalog/search-elasticsearch.md %}) (including 6.0+)
@@ -211,12 +211,12 @@ Magento supports the following versions of Elasticsearch: 6.0+, 5.0+, and 2.0+ (
|Minimal Query Length|Store View|The minimum number of characters allowed in a catalog search. The value set for this option must be compatible with the corresponding range set in your Elasticsearch search engine configurations. For example, if you set this value to `2` in Magento, update the value in your search engine.|
|Maximum Query Length|Store View|The maximum number of characters allowed in a catalog search. The value set for this option must be compatible with the corresponding range set in your Elasticsearch search engine configurations. For example, if you set this value to `300` in Magento, update the value in your search engine.|
|Number of top search results to cache|Store View|The number of popular search terms and results to cache for faster responses. Entering a value of `0` caches all search terms and results when entered a second time. Default value: `100`|
-|Enable EAV Indexer|Global|Determines if you want to enable or disable the Product EAV indexer. This feature improves indexation speed and restricts the indexer from use by 3rd party extensions. This option only displays for Elasticsearch or Elasticsearch 5.0+ Search Engines. Default Option: Yes for enabled|
-|Search Engine|Global|Identifies the search engine used to process requests for catalog data. Options:
Elasticsearch - (Deprecated) Elasticsearch 2.0+ has reached end of life. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol).
Elasticsearch 5.0+ - (Default) Elasticsearch 5.0+ is scheduled for end of life. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol).
Elasticsearch 6.0+ - (Recommended) For the best performance, we recommend that you use the latest version of Elasticsearch 6.0+
_**Note:**_ To learn more about using Elasticsearch versions 2.x and 5.x, see [Change the Elasticsearch Client](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-downgrade.html).|
+|Enable EAV Indexer|Global|Determines if you want to enable or disable the Product EAV indexer. This feature improves indexation speed and restricts the indexer from use by 3rd party extensions. This option only displays for Elasticsearch or Elasticsearch 5.x Search Engines. Default Option: Yes for enabled|
+|Search Engine|Global|Identifies the search engine used to process requests for catalog data. Options:
Elasticsearch - (Deprecated) Elasticsearch 2.x has reached end of life. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol).
Elasticsearch 5.x - (Default) Elasticsearch 5.x is scheduled for end of life. To learn more, see [Elastic Product End of Life Dates](https://www.elastic.co/support/eol).
Elasticsearch 6.x - (Recommended) For the best performance, we recommend that you use the latest version of Elasticsearch 6.x
_**Note:**_ To learn more about using Elasticsearch versions 2.x and 5.x, see [Change the Elasticsearch Client](https://devdocs.magento.com/guides/v2.3/config-guide/elasticsearch/es-downgrade.html).|
|Autocomplete Limit|Store View|The maximum number of search results to display for search autocomplete. Restricting this amount increases performance of searches and reduces the displayed list size. Default value: `8`|
|Elasticsearch Server Hostname|Global|Specifies the name of the Elasticsearch server. Default value: `localhost`|
|Elasticsearch Server Port|Global|Specifies the number of the server port used by Elasticsearch.|
-|Elasticsearch Index Prefix|Global|Assigns a prefix to identify the Elasticsearch index. Example: Magento2|
+|Elasticsearch Index Prefix|Global|Assigns a prefix to identify the Elasticsearch index. Example: `Magento2`|
|Enable Elasticsearch HTTP Auth|Global|If enabled, uses HTTP authentication to prompt for a username and password before accessing Elasticsearch Server. Options: Yes / No|
|Elasticsearch Server Timeout|Global|Determines the number of seconds before the server times out. Default value: `15`|
|Test Connection||Validates the Elasticsearch connection.|
@@ -236,12 +236,12 @@ Magento supports the following versions of Elasticsearch: 6.0+, 5.0+, and 2.0+ (
|--- |--- |--- |
|Order Item Status to Enable Downloads|Website|Determines the status that an order must have before downloads become available. Options: Pending / Invoiced|
|Default Maximum Number of Downloads|Website|Determines the default number of downloads available to a customer.|
-|Shareable|Website|Determines if customers must log in to their accounts to access the download link. Options:
Yes - Allows the link to be sent by email, which can then be shared with others.
No - Requires customers to log in to their accounts to access the download link.|
+|Shareable|Website|Determines if customers must log in to their accounts to access the download link. Options:
**Yes** - Allows the link to be sent by email, which can then be shared with others.
**No** - Requires customers to log in to their accounts to access the download link.|
|Default Sample Title|Store View|The default title for all sample files.|
|Default Link Title|Store View|The default link for all downloadable titles.|
|Opens Links in New Window|Website|Determines if the download link opens in a new browser window. Options: Yes / No|
-|Use Content Disposition|Store View|Determines how the link to the downloadable content is delivered, as an email attachment or as an inline link in a browser window. Options:
Attachment - The download link is delivered as an email attachment.
Inline - The download link is delivered as an inline link on a web page.|
-|Disable Guest Checkout if Cart Contains Downloadable Items|Website|Determines if guests who are purchase downloadable products must register for an account and log in to complete the checkout process. Options:
Yes - If the cart contains downloadable products, the guest will have to either register for an account, or login to an existing account to complete the purchase.
No - The download link is delivered as an inline link in the body of the email message.
_**Note:**_ Guest checkout is only available for download products if Sharable is set to `Yes`.|
+|Use Content Disposition|Store View|Determines how the link to the downloadable content is delivered, as an email attachment or as an inline link in a browser window. Options:
**Attachment** - The download link is delivered as an email attachment.
**Inline** - The download link is delivered as an inline link on a web page.|
+|Disable Guest Checkout if Cart Contains Downloadable Items|Website|Determines if guests who are purchase downloadable products must register for an account and log in to complete the checkout process. Options:
**Yes** - If the cart contains downloadable products, the guest will have to either register for an account, or login to an existing account to complete the purchase.
**No** - The download link is delivered as an inline link in the body of the email message.
_**Note:**_ Guest checkout is only available for download products if Sharable is set to `Yes`.|
## Date & Time Custom Options
@@ -276,7 +276,7 @@ Magento supports the following versions of Elasticsearch: 6.0+, 5.0+, and 2.0+ (
|Field|[Scope]({% link configuration/scope.md %})|Description|
|--- |--- |--- |
|Maximum Number of Products in Related Products List|Global|Determines the maximum number of products that can appear in the Related Products list.|
-|Show Related Products|Global|Determines which list of related products appears in the store. It can be either the list that is selected manually in the Product Information, the list that is generated in response to a product relationship rule, or a combination of the two. Options: Both Selected and Rule-Based, Selected Only, Rule-Based Only|
+|Show Related Products|Global|Determines which list of related products appears in the store. It can be either the list that is selected manually in the Product Information, the list that is generated in response to a product relationship rule, or a combination of the two. Options: Both Selected and Rule-Based / Selected Only / Rule-Based Only|
|Rotation Mode for Products in Related Products List|Global|Determines the order in which products in the Related Products list appear. Options: Do not rotate / Shuffle|
|Maximum Number of Products in Cross-Sell Product List|Global|Determines the maximum number of products that can appear in the Cross-Sell list.|
|Show Cross-Sell Products|Global|Determines which list of cross-sell products appears in the store. It can be either the list that is selected manually in the Product Information, the list that is generated in response to a product relationship rule, or a combination of the two. Options: Both Selected and Rule-Based / Selected Only / Rule-Based Only|
diff --git a/src/images/images/config-catalog-catalog-search-elasticsearch-1.png b/src/images/images/config-catalog-catalog-search-elasticsearch-1.png
index ec7469c2e..6bc2c8ed2 100644
Binary files a/src/images/images/config-catalog-catalog-search-elasticsearch-1.png and b/src/images/images/config-catalog-catalog-search-elasticsearch-1.png differ
diff --git a/src/images/images/config-catalog-catalog-search-elasticsearch.png b/src/images/images/config-catalog-catalog-search-elasticsearch.png
index 49485de61..5e2916fbc 100644
Binary files a/src/images/images/config-catalog-catalog-search-elasticsearch.png and b/src/images/images/config-catalog-catalog-search-elasticsearch.png differ