Merge branch 'master' into ds_update-bundle

dshevtsov · web-flow · commit a7564bc7849f · 2019-10-18T16:08:59.000-05:00
diff --git a/_includes/graphql/customizable-option-input.md b/_includes/graphql/customizable-option-input.md
@@ -1,4 +1,4 @@
 Attribute |  Data Type | Description
 --- | --- | ---
 `id` | Int! | A unique ID assigned to the customizable option
-`value_string` | String! | A value assigned to the the customizable option
+`value_string` | String! | A value assigned to the customizable option
diff --git a/_includes/install/auth-tokens-get.md b/_includes/install/auth-tokens-get.md
@@ -21,7 +21,9 @@ You can also disable or delete authentication keys. For example, you can disable
 *  To enable a previously disabled key: Click **Enable**.
 *  To delete keys: Click **Delete**.
 
-You cannot delete or disable keys you created by signing in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}. To manage those keys:
+### Manage SSH access token
+
+To download Magento releases using SSH, you must generate a Downloads Access Token. To generate a token:
 
 1. Log in to your [magento.com account](https://www.magentocommerce.com/products/customer/account/login){:target="_blank"}.
 1. Click **My Account** at the top of the page.
@@ -30,3 +32,11 @@ You cannot delete or disable keys you created by signing in to your [magento.com
    ![Access your keys]({{ site.baseurl }}/common/images/connect_keys1.png){:width="200px"}
 
 1. Click **Generate new token** to replace and disable an existing token.
+
+You must use your MAGEID plus your token to download a release. Your MAGEID is displayed at the top-left of your account page.
+
+For example:
+
+```bash
+curl -k https://MAGEID:TOKEN@www.magentocommerce.com/products/downloads/info/help
+```
diff --git a/guides/v2.2/b2b/shared-cat-product-assign.md b/guides/v2.2/b2b/shared-cat-product-assign.md
@@ -216,7 +216,7 @@ Unassigning a product does not remove it from its category or categories.
 
 `true`, indicating the operation was successful
 
-### List the shared catalog categories
+### List the shared catalog products
 
 The `GET` call returns an array of SKUs.
 
diff --git a/guides/v2.2/cloud/cdn/configure-fastly.md b/guides/v2.2/cloud/cdn/configure-fastly.md
@@ -220,7 +220,7 @@ Fastly sets a 180 second-timeout for HTTPS requests to the Magento Admin, so you
 
 1. In the *Fastly Configuration* section, expand **Advanced**.
 
-1. Set the **Admin path timeout** value in seconds. This value cannot be more than one hour (3600 seconds).
+1. Set the **Admin path timeout** value in seconds. This value cannot be more than 10 minutes (600 seconds).
 
 1. Click **Save Config** at the top of the page.
 
diff --git a/guides/v2.2/cloud/trouble/trouble_ce-creds.md b/guides/v2.2/cloud/trouble/trouble_ce-creds.md
@@ -95,9 +95,7 @@ To resolve the issue with credentials:
 
    A snippet of messages for a successful deployment follows:
 
-   {% collapsible Click to show/hide snippet %}
-
-   ```xml
+   ```terminal
    Building application 'mymagento' (runtime type: php:7.0, tree: e8450f9)
       Generating runtime configuration.
 
@@ -163,8 +161,6 @@ To resolve the issue with credentials:
       34afd91..98c2166  master -> master
    ```
 
-   {% endcollapsible %}
-
 #### Verify the deployment
 
 To verify the deployment was successful, enter one of the URLs displayed under `Environment routes:` in a web browser.
diff --git a/guides/v2.2/extension-dev-guide/cache/page-caching/private-content.md b/guides/v2.2/extension-dev-guide/cache/page-caching/private-content.md
@@ -21,7 +21,7 @@ The section source class is responsible for retrieving data for the section. As
 
 The public method `getSectionData` must return an array with data for private block.
 
-[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/CustomerData/CompareProducts.php#L36-L45){:target="_blank"}
+[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/CustomerData/CompareProducts.php#L45-L54){:target="_blank"}
 
 Add the following to your component's [dependency injection](https://glossary.magento.com/dependency-injection) configuration (`di.xml`):
 
@@ -52,7 +52,7 @@ Initialize the component as follows:
 </script>
 ```
 
-[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml#L46-L48){:target="_blank"}
+[Example]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml#L50-L52){:target="_blank"}
 
 ## Configure a UI component {#config-cache-priv-how-ui}
 
@@ -62,7 +62,7 @@ The UI component renders block data on the Magento [storefront](https://glossary
 
 All properties are available in the template.
 
-[Example of defining a UI component in a layout]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/layout/default.xml#L11-L22){:target="_blank"}
+[Example of defining a UI component in a layout]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Catalog/view/frontend/layout/default.xml#L11-L32){:target="_blank"}
 
 ## Invalidate private content
 
diff --git a/guides/v2.2/extension-dev-guide/test/test_object-mgr.md b/guides/v2.2/extension-dev-guide/test/test_object-mgr.md
@@ -28,7 +28,7 @@ The ObjectManager public interface methods are:
 <p><b>Syntax:</b></p>
 <pre>
 public function getObject($className,
-     array $arguments = array());
+     array $arguments = []);
 </pre>
 <p><b>Example:</b></p>
 <pre>
@@ -61,7 +61,7 @@ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
 $option = $this->getMock(
     'Magento\Bundle\Model\Option',
     array('getSelections', '__wakeup', 'getData'),
-    array(),
+    [],
     '',
     false
 );
@@ -76,7 +76,7 @@ $optionCollection =
 <p><b>Syntax:</b></p>
 <pre>
 public function getConstructArguments($className,
-     array $arguments = array());
+     array $arguments = []);
 </pre>
 <p>In the Magento system, several tests introduced mocks for abstract models and blocks.</p>
 <p><b>Example:</b></p>
diff --git a/guides/v2.2/frontend-dev-guide/tools/using_grunt.md b/guides/v2.2/frontend-dev-guide/tools/using_grunt.md
@@ -90,7 +90,7 @@ To use a custom file for Grunt configuration:
 
    ```config
    {
-    "themes": "dev/tools/grunt/configs/local-themes"
+       "themes": "dev/tools/grunt/configs/local-themes"
    }
    ```
 
@@ -122,4 +122,6 @@ To tell Grunt to use a custom configuration file, instead of the default one, ad
 
 1. Call the `get(%file_alias%)` method to get the configuration file.
 
-   `var themes = fileRouter.get('themes');`
+   ```config
+   var themes = fileRouter.get('themes');
+   ```
diff --git a/guides/v2.2/frontend-dev-guide/translations/translate_theory.md b/guides/v2.2/frontend-dev-guide/translations/translate_theory.md
@@ -32,11 +32,11 @@ In this example, the _'Hello %1'_ string is added to the dictionary when the i18
 ## Strings added in email templates {#add_strings_email}
 
 If your theme contains [custom email templates], their strings can be added to the dictionary as well.
-To add the email template strings to the dictionary, use the `{{trans}}` [directive].
+To add the email template strings to the dictionary, use the {% raw %} `{{trans}}` {% endraw %} [directive].
 
 Custom email templates [added using the Admin panel] are not stored in the file system, and their strings are not added to the dictionary.
 
-To ensure that your new string is added to the dictionary and translated, use the `trans` method when outputting a string in an [email template]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/view/frontend/email/account_new.html).
+To ensure that your new string is added to the dictionary and translated, use the {% raw %} `{{trans}}` {% endraw %} [directive] when outputting a string in an [email template]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Customer/view/frontend/email/account_new.html).
 
 For example:
 
diff --git a/guides/v2.2/frontend-dev-guide/translations/xlate.md b/guides/v2.2/frontend-dev-guide/translations/xlate.md
@@ -53,13 +53,6 @@ Depending on your needs, you can use the existing [language packages](#m2devgde-
 *  The [language package](https://glossary.magento.com/language-package) (`i18n` directory) can be saved to any directory of your [extension](https://glossary.magento.com/extension).
 *  The phrases for translations are enabled in the [Phrase] class.
 
-### More information
-
-*  [Theme dictionaries](#m2devgde-xlate-themes)
-*  [Manually translate words and phrases](#m2devgde-xlate-translating)
-*  [Translation dictionaries](#m2devgde-xlate-dictionaries)
-*  [Language packages](#m2devgde-xlate-languagepack)
-
 ## Theme dictionaries {#m2devgde-xlate-themes}
 
 You might need to add a dictionary for the default language (en_US) in the following cases:
diff --git a/guides/v2.2/javascript-dev-guide/widgets/widget_menu.md b/guides/v2.2/javascript-dev-guide/widgets/widget_menu.md
@@ -87,8 +87,8 @@ Toggles website's menu opened state.
 
 Add class for expanded option.
 
-{:.bs-callout .bs-callout-info} The following methods from [jQuery UI menu widget]
-were adjusted in scope of the widget: `expand(event)` and `select(event)`.
+{:.bs-callout .bs-callout-info}
+The following methods from [jQuery UI menu widget] were adjusted in scope of the widget: `expand(event)` and `select(event)`.
 
 [lib/web/mage/menu.js]: {{ site.mage2bloburl }}/{{ page.guide_version }}/lib/web/mage/menu.js
 [Initialize JavaScript]: {{page.baseurl}}/javascript-dev-guide/javascript/js_init.html
diff --git a/guides/v2.3/comp-mgr/cli/cli-upgrade.md b/guides/v2.3/comp-mgr/cli/cli-upgrade.md
@@ -72,13 +72,13 @@ See the examples at the end of this section for help specifying different releas
    <div class="bs-callout-tip" markdown="1">
    To see the full list of available {{ page.guide_version }} versions:
 
-   _{{site.data.var.ce}}_:
+   _{{ ce }}_:
 
    ```bash
    composer show magento/product-community-edition {{ page.guide_version }}.* --all | grep -m 1 versions
    ```
 
-   _{{site.data.var.ce}}_:
+   _{{ ee }}_:
 
    ```bash
    composer show magento/product-enterprise-edition {{ page.guide_version }}.* --all | grep -m 1 versions
diff --git a/guides/v2.3/comp-mgr/cli/upgrade-with-plugin.md b/guides/v2.3/comp-mgr/cli/upgrade-with-plugin.md
@@ -79,13 +79,13 @@ composer require magento/product-enterprise-edition={{ page.guide_version }}.2 -
 <div class="bs-callout-tip" markdown="1">
 To see a full list of available {{ page.guide_version }} versions:
 
-_Magento Open Source_:
+_{{ ce }}_:
 
 ```bash
 composer show magento/product-community-edition {{ page.guide_version }}.* --all | grep -m 1 versions
 ```
 
-_Magento Commerce_:
+_{{ ee }}_:
 
 ```bash
 composer show magento/product-enterprise-edition {{ page.guide_version }}.* --all | grep -m 1 versions
diff --git a/guides/v2.3/contributor-guide/contributing.md b/guides/v2.3/contributor-guide/contributing.md
@@ -41,7 +41,7 @@ We also recommend creating a personal access token for your account to use when
 
 ## Questions or enhancement requests? {#question}
 
-We capture code-related issues in the the [Magento 2 repo](https://github.com/magento/magento2) and documentation-related issues in the [Magento DevDocs repo](https://github.com/magento/devdocs). If you have questions about Magento functionality or processes, we recommend posting them to a question-and-answer site, such as [Stack Exchange](https://magento.stackexchange.com/) and the [Magento Forums](https://community.magento.com/), where Magento community members can quickly provide recommendations and advice.
+We capture code-related issues in the [Magento 2 repo](https://github.com/magento/magento2) and documentation-related issues in the [Magento DevDocs repo](https://github.com/magento/devdocs). If you have questions about Magento functionality or processes, we recommend posting them to a question-and-answer site, such as [Stack Exchange](https://magento.stackexchange.com/) and the [Magento Forums](https://community.magento.com/), where Magento community members can quickly provide recommendations and advice.
 
 Submit feature requests or enhancement suggestions to the [Magento 2 Feature Requests and Improvements forum](https://community.magento.com/t5/Magento-2-Feature-Requests-and/idb-p/feature-requests). For details about how requests are managed, see [Improvements to GitHub Management](https://community.magento.com/t5/News-Announcements/Improvements-to-GitHub-Management/m-p/44572#M96).
 
diff --git a/guides/v2.3/frontend-dev-guide/translations/xlate.md b/guides/v2.3/frontend-dev-guide/translations/xlate.md
@@ -57,13 +57,6 @@ Depending on your needs, you can use the existing [language packages](#m2devgde-
 *  The [language package](https://glossary.magento.com/language-package) (`i18n` directory) can be saved to any directory of your [extension](https://glossary.magento.com/extension).
 *  The phrases for translations are enabled in the [Phrase] class.
 
-### More information
-
-*  [Theme dictionaries](#m2devgde-xlate-themes)
-*  [Manually translate words and phrases](#m2devgde-xlate-translating)
-*  [Translation dictionaries](#m2devgde-xlate-dictionaries)
-*  [Language packages](#m2devgde-xlate-languagepack)
-
 ## Theme dictionaries {#m2devgde-xlate-themes}
 
 You might need to add a dictionary for the default language (en_US) in the following cases:
diff --git a/guides/v2.3/graphql/queries/products.md b/guides/v2.3/graphql/queries/products.md
@@ -100,8 +100,8 @@ weight
 The following attributes are not used in responses:
 
 *  `or` - The keyword required to perform a logical OR comparison.
-*  `news_from_date` - This attribute is transformed to `news_from_date` in a response.
-*  `news_to_date` - This attribute is transformed to `news_to_date` in a response.
+*  `news_from_date` - This attribute is transformed to `new_from_date` in a response.
+*  `news_to_date` - This attribute is transformed to `new_to_date` in a response.
 
 {%
 include note.html
diff --git a/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md b/guides/v2.3/graphql/tutorials/checkout/checkout-coupon.md
@@ -14,7 +14,7 @@ contributor_name: Atwix
 contributor_link: https://www.atwix.com/
 ---
 
-Use [applyCouponToCart]({{ page.baseurl }}/graphql/mutations/apply-coupon.html) to apply a discount coupon to the the specified `cart_id`.
+Use [applyCouponToCart]({{ page.baseurl }}/graphql/mutations/apply-coupon.html) to apply a discount coupon to the specified `cart_id`.
 
 `{ CART_ID }` is the unique shopping cart ID from [Step 2. Create empty cart]({{ page.baseurl }}/graphql/tutorials/checkout/checkout-add-product-to-cart.html).
 
diff --git a/guides/v2.3/performance-best-practices/advanced-js-bundling.md b/guides/v2.3/performance-best-practices/advanced-js-bundling.md
@@ -433,7 +433,7 @@ drwxr-xr-x 70 root root    4096 Mar 28 11:24 ../
 
 #### 4. Configure RequireJS to use bundles
 
-To get RequireJS to use your bundles, add a `onModuleBundleComplete`callback after the `modules` node in the `build.js` file:
+To get RequireJS to use your bundles, add a `onModuleBundleComplete` callback after the `modules` node in the `build.js` file:
 
 ```javascript
 [
@@ -448,8 +448,7 @@ To get RequireJS to use your bundles, add a `onModuleBundleComplete`callback aft
            'mage/bootstrap'
        ],
    },
-]
-
+],
 onModuleBundleComplete: function (data) {
    function onBundleComplete (config, data) {
        const fileName = `${config.dir}/requirejs-config.js`;
@@ -480,11 +479,11 @@ Open `requirejs-config.js` in the `pub/static/frontend/Magento/luma/en_US` direc
 
 ```javascript
 require.config({
-                bundles: {"bundles/default": ["mage/template","mage/apply/scripts","mage/apply/main","mage/mage","mage/translate","mage/loader"]
-            }});
+    bundles: { "bundles/default": ["mage/template","mage/apply/scripts","mage/apply/main","mage/mage","mage/translate","mage/loader"] }
+});
 require.config({
-                bundles: {"bundles/cart":["Magento_Ui/js/lib/validation/utils","Magento_Ui/js/lib/validation/rules","Magento_Ui/js/lib/validation/validation"]
-            }});
+    bundles: { "bundles/cart": ["Magento_Ui/js/lib/validation/utils","Magento_Ui/js/lib/validation/rules","Magento_Ui/js/lib/validation/validation"] }
+});
 ```
 
 {: .bs-callout-info }
diff --git a/guides/v2.3/performance-best-practices/advanced-setup.md b/guides/v2.3/performance-best-practices/advanced-setup.md
@@ -45,7 +45,7 @@ You could also use a Redis cluster that performs parallel read/write operations
 
 ## Set up RabbitMQ
 
-{{site.data.var.ee}} and {{site.data.var.ee}} support message queues implemented through RabbitMQ. Magento uses this service for executing numerous asynchronous operations, including B2B catalog operations and asynchronous stock updates. All interfaces for adding more jobs to the job server are distributed with the product and are available for custom asynchronous logic implementation in the scope of third-party extensions. As with any other integration, Magento provides a sample configuration file for RabbitMQ that contains all recommended settings and is fully ready for production usage.
+{{site.data.var.ce}} and {{site.data.var.ee}} support message queues implemented through RabbitMQ. Magento uses this service for executing numerous asynchronous operations, including B2B catalog operations and asynchronous stock updates. All interfaces for adding more jobs to the job server are distributed with the product and are available for custom asynchronous logic implementation in the scope of third-party extensions. As with any other integration, Magento provides a sample configuration file for RabbitMQ that contains all recommended settings and is fully ready for production usage.
 
 ## Split the database
 
diff --git a/guides/v2.3/release-notes/packages-cloud.md b/guides/v2.3/release-notes/packages-cloud.md
@@ -10,7 +10,7 @@ redirect-from: /guides/v2.3/release-notes/thirdparty-mccloud.html
 <!-- The 'packages-dev' variable contains the 'packages-dev' node of the '_data/codebase/v2_3/cloud/composer_lock.json' file
 {% assign packages-dev = site.data.codebase.v2_3.cloud.composer_lock.packages-dev %} -->
 
-<!-- The edition variable contains `ece` value from the the _data/var.yml file
+<!-- The edition variable contains `ece` value from the _data/var.yml file
 {% assign edition = site.data.var.ece %} -->
 
 {% include release-notes/packages.md %}
diff --git a/guides/v2.3/release-notes/packages-commerce.md b/guides/v2.3/release-notes/packages-commerce.md
@@ -10,7 +10,7 @@ redirect-from: /guides/v2.3/release-notes/thirdparty-ee.html
 <!-- The 'packages-dev' variable contains the 'packages-dev' node of the '_data/codebase/v2_3/commerce/composer_lock.json' file
 {% assign packages-dev = site.data.codebase.v2_3.commerce.composer_lock.packages-dev %} -->
 
-<!-- The edition variable contains `ee` value from the the _data/var.yml file
+<!-- The edition variable contains `ee` value from the _data/var.yml file
 {% assign edition = site.data.var.ee %} -->
 
 {% include release-notes/packages.md %}
diff --git a/guides/v2.3/release-notes/packages-open-source.md b/guides/v2.3/release-notes/packages-open-source.md
@@ -12,7 +12,7 @@ redirect_from:
 <!-- The 'packages-dev' variable contains the 'packages-dev' node of the '_data/codebase/v2_3/open-source/composer_lock.json' file
 {% assign packages-dev = site.data.codebase.v2_3.open-source.composer_lock.packages-dev %} -->
 
-<!-- The edition variable contains `ce` value from the the _data/var.yml file
+<!-- The edition variable contains `ce` value from the _data/var.yml file
 {% assign edition = site.data.var.ce %} -->
 
 {% include release-notes/packages.md %}

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ To use a custom file for Grunt configuration:`
`90`	`90`
`91`	`91`	```config
`92`	`92`	`{`
`93`		`- "themes": "dev/tools/grunt/configs/local-themes"`
	`93`	`+ "themes": "dev/tools/grunt/configs/local-themes"`
`94`	`94`	`}`
`95`	`95`	```
`96`	`96`
`@@ -122,4 +122,6 @@ To tell Grunt to use a custom configuration file, instead of the default one, ad`
`122`	`122`
`123`	`123`	1. Call the `get(%file_alias%)` method to get the configuration file.
`124`	`124`
`125`		- `var themes = fileRouter.get('themes');`
	`125`	+ ```config
	`126`	`+ var themes = fileRouter.get('themes');`
	`127`	+ ```