Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 084ee0b

Browse files
sverasvera
authored
Merge branch 'master' into AC-1537_update-devdocs
2 parents 5bf277a + 799cc48 commit 084ee0b

File tree

21 files changed

+407
-69
lines changed

21 files changed

+407
-69
lines changed

‎src/_data/toc/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ pages:
99
url: /release/
1010
versionless: true
1111

12+
- label: Beta program
13+
url: /release/beta-program.html
14+
versionless: true
15+
1216
- label: Released versions
1317
url: /release/released-versions.html
1418
versionless: true

‎src/_data/toc/software-update-guide.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,22 @@ pages:
6969
- label: Add or update components
7070
url: /install-gde/install/cli/dev_add-update.html
7171

72-
- label: Apply patches
73-
url: /comp-mgr/patching.html
72+
- label: Quality Patches Tool
73+
url: /quality-patches/tool.html
74+
versionless: true
7475
children:
7576

76-
- label: Quality Patches Tool
77-
url: /comp-mgr/patching/mqp.html
78-
children:
77+
- label: Usage
78+
url: /quality-patches/usage.html
79+
versionless: true
7980

80-
- label: Quality patches for Adobe Commerce
81-
url: /quality-patches/release-notes-commerce.html
82-
versionless: true
81+
- label: Release notes
82+
url: /quality-patches/release-notes.html
83+
versionless: true
8384

84-
- label: Quality patches for Magento Open Source
85-
url: /quality-patches/release-notes-open-source.html
86-
versionless: true
85+
- label: Apply patches
86+
url: /comp-mgr/patching.html
87+
children:
8788

8889
- label: Command Line
8990
url: /comp-mgr/patching/command-line.html

‎src/_data/whats-new.yml

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,57 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Mon Oct 25 15:15:23 2021
7+
updated: Mon Nov 1 14:38:45 2021
88
entries:
9+
- description: Moved the [Adobe Commerce Beta Program](https://devdocs.magento.com/release/beta-program.html)
10+
topic from the `magento/magento2` GitHub wiki to devdocs.magento.com.
11+
versions: 2.x
12+
type: New Topic
13+
date: November 1, 2021
14+
link: https://github.com/magento-commerce/devdocs/pull/2564
15+
merge_commit: af2a640a23703ea740a9819ac27503c082526635
16+
contributor: dshevtsov
17+
membership: true
18+
labels:
19+
- 2.x
20+
- New Topic
21+
- description: Published [release notes](https://devdocs.magento.com/quality-patches/release-notes.html)
22+
for the 1.1.5 Quality Patches Tool (QPT) package release.
23+
versions: 2.x
24+
type: Major Update
25+
date: October 27, 2021
26+
link: https://github.com/magento-commerce/devdocs/pull/2618
27+
merge_commit: 4f9cf19e36c015ece29d6f550cc9f759af11575a
28+
contributor: agorbivskyi
29+
membership: true
30+
labels:
31+
- 2.x
32+
- Major Update
33+
- description: Update the [Cloud guide PrivateLink service](https://devdocs.magento.com/cloud/project/privatelink-service.html)
34+
prerequisites, clarifying some points and providing additional guidance for Azure
35+
Private Link.
36+
versions: 2.x
37+
type: Major Update
38+
date: October 26, 2021
39+
link: https://github.com/magento-commerce/devdocs/pull/2593
40+
merge_commit: 2da06e674511632801f969492b98ca35a8cbcb49
41+
contributor: hguthrie
42+
membership: true
43+
labels:
44+
- 2.x
45+
- Major Update
46+
- description: 'Cloud Release for October 25: Updated release notes for all cloud
47+
packages. See [Release notes for Cloud suite](https://devdocs.magento.com/cloud/release-notes/cloud-tools.html).'
48+
versions: 2.x
49+
type: Major Update
50+
date: October 26, 2021
51+
link: https://github.com/magento-commerce/devdocs/pull/2601
52+
merge_commit: 5a325413c97a2a50a6a993f6dfa831708fdd1dca
53+
contributor: hguthrie
54+
membership: true
55+
labels:
56+
- 2.x
57+
- Major Update
958
- description: Added the "cache" and "system" descriptions to the [env.php reference](https://devdocs.magento.com/guides/v2.4/config-guide/prod/config-reference-envphp.html)
1059
topic.
1160
versions: 2.4.x
@@ -330,7 +379,7 @@ entries:
330379
- Major Update
331380
- 2.4.3
332381
- description: Added [Community quality patches release notes](https://github.com/magento/quality-patches/blob/master/community-release-notes.md)
333-
to a table of contents at [Commerce Quality Patches](https://devdocs.magento.com/guides/v2.4/comp-mgr/patching/mqp.html).
382+
to a table of contents at [Commerce Quality Patches](https://devdocs.magento.com/quality-patches/usage.html).
334383
versions: 2.x
335384
type: Major Update
336385
date: August 27, 2021

‎src/_includes/install/patch/quality-patch-intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The [Quality Patches Tool](https://github.com/magento/quality-patches) delivers individual patches developed by Adobe and the {{ site.data.var.ce }} community. It allows you to apply, revert, and view general information about all individual patches that are available for the installed version of {{ site.data.var.ee }} or {{ site.data.var.ce }}. You can apply patches to {{site.data.var.ee}} and {{site.data.var.ce}} projects regardless of who developed the patch. For example, you can apply a patch developed by the community to {{site.data.var.ee}} projects.
22

33
{:.bs-callout-info}
4-
See [Apply patches]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) for instructions on applying patches to your {{ site.data.var.ee }} or {{ site.data.var.ce }} projects.
4+
See [Apply patches]({{ site.baseurl }}/quality-patches/usage.html) for instructions on applying patches to your {{ site.data.var.ee }} or {{ site.data.var.ce }} projects.
55
See [Patches available in the Quality Patches Tool](https://support.magento.com/hc/en-us/sections/360010506631-Patches-available-in-MQP-tool-) for additional patch details.

‎src/cloud/howtos/install-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ To update an extension:
160160
git push origin <branch-names>
161161
```
162162

163-
If you encounter errors, see [extension deployment failure][].
163+
If you encounter errors, see [extension deployment failure][trouble].
164164

165165
<!-- link definitions -->
166166

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,16 @@ web:
119119

120120
You can fine-tune your `locations` configuration using the following key values for each `locations` block:
121121

122-
| Attribute | Description |
123-
| ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
124-
| `allow` | Serve files that do not match "rules". Default value = `true` |
125-
| `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) |
126-
| `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. |
127-
| `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. |
128-
| `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`. |
129-
| `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. |
130-
| `scripts` | Allow loading scripts in this location. Set the value to `true` to allow scripts. |
122+
| Attribute | Description |
123+
| - | - |
124+
| `allow` | Serve files that do not match "rules". Default value = `true` |
125+
| `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) |
126+
| `headers` | Set custom headers, such as `X-Frame-Options`, for static content served from this location. |
127+
| `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. |
128+
| `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. |
129+
| `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`. |
130+
| `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. |
131+
| `scripts` | Allow loading scripts in this location. Set the value to `true` to allow scripts. |
131132

132133
Our default configuration allows the following:
133134

‎src/cloud/project/project-patch.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ functional_areas:
1414
Both packages improve the integration of all {{site.data.var.ee}} versions with Cloud environments and support quick delivery of critical, optional, and custom fixes. You can use these packages to apply, revert, and view general information about all individual patches that are available for Magento.
1515

1616
{:.bs-callout-tip}
17-
You can use the [Quality Patches Tool]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Quality Patches Tool for non-Cloud projects.
17+
You can use the [Quality Patches Tool]({{ site.baseurl }}/quality-patches/usage.html) and [{{ site.data.var.mcp-prod }}](#standalone) packages as stand-alone packages for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects. We recommend using the Quality Patches Tool for non-Cloud projects.
1818

1919
When you deploy changes to the remote environment, `{{site.data.var.ct}}` uses {{ site.data.var.mcp-package }} and `magento/quality-patches` to check for pending patches and applies them automatically in the following order:
2020

@@ -201,7 +201,7 @@ To apply and test a custom patch on a Cloud environment:
201201

202202
## Apply patches to a non-Cloud project {#standalone}
203203

204-
Use the [Quality Patches Tool]({{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/patching/mqp.html) for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
204+
Use the [Quality Patches Tool]({{ site.baseurl }}/quality-patches/usage.html) for {{ site.data.var.ce }} and {{ site.data.var.ee }} projects.
205205

206206
## Revert a patch in a local environment
207207

0 commit comments

Comments
 (0)