Merge pull request #2745 from magento-commerce/1-13_integration

1 13 integration

Author: dobooth

src/_includes/config/redis-verify.md

@@ -52,7 +52,7 @@ If you use Redis for page caching, you'll see output similar to the following:
 
 ### Inspecting compressed data
 
-To inspect compressed Session data and Page Cache, the [Redis Desktop Manager](https://flathub.org/apps/details/dev.rdm.RDM) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
+To inspect compressed Session data and Page Cache, the [RESP.app](https://flathub.org/apps/details/app.resp.RESP) supports the automatic decompression of Magento 2 Session and Page cache and displays PHP session data in a human-readable form.
 
 ### Redis ping command
 

src/cloud/cdn/cloud-vcl-custom-snippets.md

@@ -241,7 +241,7 @@ Use the Fastly API [create snippet](https://docs.fastly.com/api/config#snippet_4
 curl -H "Fastly-Key: $FASTLY_API_TOKEN" https://api.fastly.com/service/$FASTLY_SERVICE_ID/version/$FASTLY_EDIT_VERSION/snippet -H 'Content-Type: application/json' -X POST --data @<filename.json>
 ```
 
-The `<filename.vcl>` is the name of the file you prepared in the previous step. Repeat this command for each VCL snippet.
+The `<filename.json>` is the name of the file you prepared in the previous step. Repeat this command for each VCL snippet.
 
 If you receive a `500 Internal Server Error` response from the Fastly service, check the JSON file syntax to make sure you are uploading a valid file.
 

src/cloud/project/log-locations.md

@@ -19,14 +19,7 @@ You can view the logs from the file system, the project web UI, and the `magento
 -  **Magento Cloud CLI**—You can view logs using the `magento-cloud log` command.
 
 {:.bs-callout-tip}
-For Pro environments, automatic log rotation, compression, and removal are enabled for log files with a fixed file name. Each log file type has a rotating pattern and lifetime. Starter environments do not have log rotation.
-
-Full details of the environment's log rotation and lifespan of compressed logs can be found in the following locations :
-
-```terminal
-/etc/logrotate.conf
-/etc/logrotate.d/<various>
-```
+For Pro environments, automatic log rotation, compression, and removal are enabled for log files with a fixed file name. Each log file type has a rotating pattern and lifetime. Starter environments do not have log rotation. Full details of the environment's log rotation and lifespan of compressed logs can be found in: `/etc/logrotate.conf` and `/etc/logrotate.d/<various>`
 
 ## Manage log data
 

src/cloud/project/new-relic.md

@@ -43,7 +43,7 @@ The aggregated data includes information from the following logs:
 -  Logs for cloud services from the `var/log/platform/<project-ID>` directory
 -  Fastly CDN and WAF logs
 
-As soon as your project is connected to New Relic, you can use the New Relic Logs service to complete tasks like the following:
+When your project is connected to New Relic, you can use the New Relic Logs service to complete tasks like the following:
 
 -  Use [New Relic queries][New Relic query syntax for logs] to search aggregated log data
 -  Visualize log data through the New Relic Logs application
@@ -59,9 +59,9 @@ When Adobe provisions your {{site.data.var.ece}} project, the License Owner rece
 A New Relic account can have only one person assigned to the Owner role. If you must change the account owner, assign the Admin role to the current Owner, then assign the Owner role to another user. See [Update the account owner] in the New Relic documentation for instructions.
 
 {:.bs-callout-tip}
-Before assigning the Owner role to a user, verify that the user exists on the New Relic account for {{site.data.var.ece}}. If you need to add the user to that account and an existing account Owner or Admin cannot help, any user with access to the [Adobe Partnership Owner Account] for New Relic can add users on behalf of the customer.
+Before assigning the Owner role to a user, verify that the user exists on the New Relic account for {{site.data.var.ece}}. If you must add the user to that account and an existing account Owner or Admin cannot help, any user with access to the [Adobe Partnership Owner Account] for New Relic can add users on behalf of the customer.
 
-We recommend adding at least one Admin user to your New Relic account to manage all access, integrations, and tool usage. {{site.data.var.ece}} Project Owners and Admin users can add and remove users from the New Relic account.
+We recommend adding at least one **Admin** user to your New Relic account to manage all access, integrations, and tool usage. {{site.data.var.ece}} Project Owners and Admin users can add and remove users from the New Relic account. We also recommend that you do not create more than five full-access **Users**. Only grant full access to users that strictly require access to the complete feature set. There is no specific guidance on free **Restricted** users.
 
 {:.procedure}
 To add a user:

src/guides/v2.3/extension-dev-guide/cache/partial-caching/create-cache-type.md

@@ -92,31 +92,31 @@ To store serialized data in a custom cache, follow these steps:
 
 1. Pass the argument to the constructor `Magento\Framework\App\CacheInterface` `$cache` of a required class (Repository, Model, Block, etc).
 
-```php
-/**
- * @param CacheInterface $cache
- * @param SerializerInterface $serializer
- */
-public function __construct(CacheInterface $cache, SerializerInterface $serializer)
-{
-    $this->cache = $cache;
-    $this->serializer = $serializer;
-}
-```
+    ```php
+    /**
+     * @param CacheInterface $cache
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(CacheInterface $cache, SerializerInterface $serializer)
+    {
+        $this->cache = $cache;
+        $this->serializer = $serializer;
+    }
+    ```
 
 1. Store data in the cache.
 
-```php
-$cacheKey  = \VendorName\ModuleName\Model\Cache\Type\CacheType::TYPE_IDENTIFIER;
-$cacheTag  = \VendorName\ModuleName\Model\Cache\Type\CacheType::CACHE_TAG;
-
-$storeData = $this->cache->save(
-    $this->serializer->serialize($cacheData),
-    $cacheKey,
-    [$cacheTag],
-    86400
-);
-```
+    ```php
+    $cacheKey  = \VendorName\ModuleName\Model\Cache\Type\CacheType::TYPE_IDENTIFIER;
+    $cacheTag  = \VendorName\ModuleName\Model\Cache\Type\CacheType::CACHE_TAG;
+
+    $storeData = $this->cache->save(
+        $this->serializer->serialize($cacheData),
+        $cacheKey,
+        [$cacheTag],
+        86400
+    );
+    ```
 
 ## Retrieve data from custom cache type {#m2devgde-retrieve-data-cache-type}
 
@@ -132,25 +132,25 @@ $data = $this->serializer->unserialize($this->cache->load($cacheKey));
 
 To invalidate a custom cache type, follow these steps:
 
-1. Pass the argument to the constructor `Magento\Framework\App\Cache\TypeListInterface` `$typeList` of a required class (Repository, Model, Block, etc)
+1. Pass the argument to the constructor `Magento\Framework\App\Cache\TypeListInterface` `$typeList` of a required class (Repository, Model, Block, etc).
 
-```php
-/**
- * @param TypeListInterface $typeList
- */
-public function __construct(TypeListInterface $typeList)
-{
-    $this->typeList = $typeList;
-}
-```
+    ```php
+    /**
+     * @param TypeListInterface $typeList
+     */
+    public function __construct(TypeListInterface $typeList)
+    {
+        $this->typeList = $typeList;
+    }
+    ```
 
-1. Invalidate the cache
+1. Invalidate the cache.
 
-```php
-$cacheKey  = \VendorName\ModuleName\Model\Cache\Type\CacheType::TYPE_IDENTIFIER;
+    ```php
+    $cacheKey  = \VendorName\ModuleName\Model\Cache\Type\CacheType::TYPE_IDENTIFIER;
 
-$this->typeList->invalidate($cacheKey);
-```
+    $this->typeList->invalidate($cacheKey);
+    ```
 
 ## Flush custom cache type {#m2devgde-flush-cache-type}
 

src/guides/v2.3/install-gde/prereq/nginx.md

@@ -151,7 +151,11 @@ For this example, we'll install using Composer and the command line.
    --language=en_US \
    --currency=USD \
    --timezone=America/Chicago \
-   --use-rewrites=1
+   --use-rewrites=1 \
+   --search-engine=elasticsearch7 \
+   --elasticsearch-host=es-host.example.com \
+   --elasticsearch-port=9200
+
    ```
 
 1. Switch to developer mode:

src/guides/v2.3/payments-integrations/base-integration/integration-intro.md

@@ -19,8 +19,9 @@ The Magento payment provider gateway allows creating secure and PCI-compliant in
 The topics in this chapter explain how to add an integration with a custom payment service provider (in other words, add a new payment method) and implement the authorize payment action for this [payment method](https://glossary.magento.com/payment-method). For illustration, we use code
 samples from the [Braintree]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Braintree) payment integration.
 
-To simplify the development of a new payment integration, Magento developed the [Payment sample module](https://github.com/magento/magento2-samples/tree/master/sample-module-payment-gateway).
-It contains all required infrastructure and you can use it as starting point.
+{:.bs-callout-info}
+You can also view the [Payment sample module](https://github.com/magento/magento2-samples/tree/master/sample-module-payment-gateway) in the `magento/magento2-samples`
+repository to understand the underlying principles. However, be aware that this code is NOT supported.
 
 To add a new payment method, take the following high-level steps:
 

src/guides/v2.3/payments-integrations/base-integration/module-configuration.md

@@ -10,7 +10,8 @@ functional_areas:
 
 For the sake of compatibility, upgradability and easy maintenance, do not edit the default Magento code; add your customizations in a separate [module](https://glossary.magento.com/module).
 
-You can use the [sample Magento_SamplePaymentGateway module](https://github.com/magento/magento2-samples/tree/master/sample-module-payment-gateway) files as basis for your custom module structure and files.
+{:.bs-callout-info}
+You can use the [sample Magento_SamplePaymentGateway module](https://github.com/magento/magento2-samples/tree/master/sample-module-payment-gateway) files as the basis for your custom module structure and files. However, be aware that this code is NOT supported.
 
 ## Specify your module dependencies
 

src/guides/v2.3/rest/tutorials/bulk-configurable-product/define-config-product-options.md

@@ -21,6 +21,9 @@ contributor_link: http://comwrap.com/
 
  The `POST async/bulk/V1/configurable-products/bySku/options` call assigns the specified `attribute_id` to be the configurable attribute.
 
+{:.bs-callout-warning}
+ The `attribute_id` and its value may be different on your installation. Check the values carefully before using them in your calls. To get the correct `attribute_id`, see [Get the list of attributes defined in an attribute searchCriteria]({{ page.baseurl }}/rest/tutorials/configurable-product/plan-product.html#get-attributes) for more information.
+
  The value assigned to the `value_index` must be unique within the system.
 
  **Endpoint:**
@@ -160,4 +163,4 @@ Bulk endpoint routes cannot contain input parameters, such as a `sku` value.  Yo
 ]
 },
 ...
-```
+```

src/guides/v2.4/config-guide/cli/config-cli-subcommands-static-view.md

@@ -308,6 +308,18 @@ Successful: 1993 files; errors: 0
 ---
 ```
 
+The following command deploys only Javascript, with 4 jobs, with a standard deployment strategy:
+
+```bash
+bin/magento setup:static-content:deploy -s standard --no-misc --no-html --no-fonts --no-images --no-less --no-css -j 4
+```
+
+The following command deploys only CSS and LESS with 3 jobs, and a quick deployment strategy:
+
+```bash
+bin/magento setup:static-content:deploy -s quick --no-misc --no-html --no-fonts --no-images --no-javascript -j 3
+```
+
 #### Generating static view files for one theme and one area
 
 The following command generates static view files for all languages, the [frontend](https://glossary.magento.com/frontend) area only, the Magento Luma theme only, without generating fonts: