Merge pull request #2620 from magento-commerce/10-28_integration

10 28 integration

Author: dobooth

src/cloud/howtos/install-components.md

@@ -160,7 +160,7 @@ To update an extension:
    git push origin <branch-names>
    ```
 
-If you encounter errors, see [extension deployment failure][].
+If you encounter errors, see [extension deployment failure][trouble].
 
 <!-- link definitions -->
 

src/cloud/project/magento-app-properties.md

@@ -119,15 +119,16 @@ web:
 
 You can fine-tune your `locations` configuration using the following key values for each `locations` block:
 
-| Attribute  | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `allow`    | Serve files that do not match "rules". Default value = `true`                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-| `expires`  | Set the number of seconds to cache content in the browser. This key enables the `cache-control` and `expires` headers for static content. If this value is not set, the `expires` directive and resulting headers are not included when serving static content files. A negative 1 (`-1`) value results in no caching and is the default value. You can express time value with the following units:  `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours), `d` (days), `w` (weeks), `M` (months, 30d), or `y` (years, 365d) |
-| `index`    | List the static files to serve your application, such as the `index.html` file. This key expects a collection. This only works if access to the file or files is "allowed" by the `allow` or `rules` key for this location.                                                                                                                                                                                                                                                                                                            |
-| `rules`    | Specify overrides for a location. Use a regular expression to match a request. If an incoming request matches the rule, then regular handling of the request is overridden by the keys used in the rule.                                                                                                                                                                                                                                                                                                                               |
-| `passthru` | Set the URL used in the event that a static file or PHP file cannot be found. Typically, this URL is the front controller for your applications, such as `/index.php` or `/app.php`.                                                                                                                                                                                                                                                                                                                                                   |
-| `root`     | Set the path relative to the root of the application that is exposed on the web. The public directory (location "/") for a Cloud project is set to "pub" by default.                                                                                                                                                                                                                                                                                                                                                                   |
-| `scripts`  | Allow loading scripts in this location. Set the value to `true` to allow scripts.                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Attribute  | Description |
+| - | - |
+| `allow` | Serve files that do not match "rules". Default value = `true` |
+| `expires` | Set the number of seconds to cache content in the browser. This key enables the `cache-control` and `expires` headers for static content. If this value is not set, the `expires` directive and resulting headers are not included when serving static content files. A negative 1 (`-1`) value results in no caching and is the default value. You can express time value with the following units:  `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours), `d` (days), `w` (weeks), `M` (months, 30d), or `y` (years, 365d) |
+| `headers` | Set custom headers, such as `X-Frame-Options`, for static content served from this location. |
+| `index` | List the static files to serve your application, such as the `index.html` file. This key expects a collection. This only works if access to the file or files is "allowed" by the `allow` or `rules` key for this location. |
+| `rules` | Specify overrides for a location. Use a regular expression to match a request. If an incoming request matches the rule, then regular handling of the request is overridden by the keys used in the rule. |
+| `passthru` | Set the URL used in the event that a static file or PHP file cannot be found. Typically, this URL is the front controller for your applications, such as `/index.php` or `/app.php`. |
+| `root` | Set the path relative to the root of the application that is exposed on the web. The public directory (location "/") for a Cloud project is set to "pub" by default. |
+| `scripts` | Allow loading scripts in this location. Set the value to `true` to allow scripts. |
 
 Our default configuration allows the following:
 

src/contributor-guide/contributing.md

@@ -390,7 +390,7 @@ If you are sure that the problem you are experiencing is a bug, file a new issue
 
 The [Issue Reporting Template](https://github.com/magento/magento2/blob/2.3-develop/.github/ISSUE_TEMPLATE.md) is a default placeholder for every new issue. Follow the sections carefully, as it ensures it will pass `Gate 1` quickly. More information on gates is available in [Magento Issue Gates](https://github.com/magento/magento2/wiki/Magento-Issue-Gates).
 
-{.bs-callout-tip}
+{:.bs-callout-tip}
 Note that a higher level of detail in the report increases the chance that someone will be able to reproduce the issue.
 
 ### Title

src/guides/v2.3/comp-mgr/patching/composer.md

@@ -7,7 +7,7 @@ functional_areas:
 
 
 {:.bs-callout-warning}
-Always perform comprehensive testing before deploying any custom patch.
+To apply official quality patches, use the [Quality Patches Tool]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html). Always perform comprehensive testing before deploying any custom patch.
 
 {:.procedure}
 To apply a custom patch using Composer:

src/guides/v2.3/extension-dev-guide/security/uploads.md

@@ -14,7 +14,8 @@ store the file, you only need the contents of the file to add those SKUs to a ca
 SKUs, and delete it without ever moving it from the  temporary folder on the file system. Another, even better option for security and
 performance, is to never upload the file in the first place. The file can be handled on the frontend side using JavaScript
 to extract SKUs and quantities and send those to a web API endpoint on the server.
-{.:bs-callout-tip}
+
+{:.bs-callout-tip}
 The best way to avoid security issues with files is to not upload or store them in the first place
 if you don't have to.
 

src/guides/v2.4/comp-mgr/cli/cli-upgrade.md

@@ -134,6 +134,7 @@ See the examples at the end of this section for help specifying different releas
 
    ```bash
    composer update
+   ```
 
 ### Example - Minor release