Merge branch 'master' into 1-13_integration

Author: dobooth

.github/ISSUE_TEMPLATE.md

@@ -318,6 +318,11 @@ pages:
           edition: ee-only
           exclude_versions: ["2.3"]
 
+        - label: contactUs mutation
+          url: /graphql/mutations/contact-us.html
+          edition: pwa-only
+          exclude_versions: ["2.3"]
+
         - label: createBraintreeClientToken mutation
           url: /graphql/mutations/create-braintree-client-token.html
 

src/_data/toc/graphql.yml

@@ -17,6 +17,7 @@ ce: Magento Open Source
 ee: Adobe Commerce
 b2b: B2B for Adobe Commerce
 mbi: Adobe Commerce Reporting
+pwa: PWA Studio
 
 # Cloud product name variables
 

src/_data/var.yml

@@ -4,8 +4,46 @@ description: This page contains recent changes that we think you'd like to know
   We exclude from this list proofreading, spelling checks, and all minor updates.
 link: "/whats-new.html"
 thread: "/whatsnew-feed.xml"
-updated: Mon Jan 10 15:38:44 2022
+updated: Mon Jan 17 15:38:41 2022
 entries:
+- description: Added the [contactUs](https://devdocs.magento.com/guides/v2.4/graphql/mutations/contact-us.html)
+    mutation topic.
+  versions: 2.4.x
+  type: New Topic
+  date: January 14, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2737
+  merge_commit: 9b2b6d74a7e866d899ef83b4391de3d6c7e8b4ba
+  contributor: dobooth
+  membership: true
+  labels:
+  - New Topic
+  - 2.4.x
+- description: Redirected [Software Update Guide](https://devdocs.magento.com/guides/v2.4/comp-mgr/bk-compman-upgrade-guide.html)
+    topics to the new location on [Adobe Experience League](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2734
+  merge_commit: 9e570a8ea66876b5086ba909810e95f5d7d21b77
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - Major Update
+  - 2.3.x
+  - 2.4.x
+- description: Added a new Tools section to the top navigation and moved the [Quality
+    Patches Tool](https://devdocs.magento.com/quality-patches/tool.html) content to
+    the new section.
+  versions: 2.x
+  type: Major Update
+  date: January 12, 2022
+  link: https://github.com/magento-commerce/devdocs/pull/2735
+  merge_commit: dce1c7fdc03ffa7f88a12b26b8907320d1c8143a
+  contributor: jeff-matthews
+  membership: true
+  labels:
+  - 2.x
+  - Major Update
 - description: Added new supported versions of Elasticsearch, OpenSearch, Redis, RabbitMQ,
     and Varnish to the [system requirements](https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html)
     for 2.4.4 and 2.4.5

src/_data/whats-new.yml

@@ -15,19 +15,24 @@
 1. After the upload completes, refresh the cache according to the notification at the top of the page.
 
 {:.bs-callout-warning}
-The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must use the Fastly API to [manage custom snippets added through the API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
+The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
 
 ## Delete the custom VCL snippet
 
-You can delete custom VCL snippet code from your Fastly configuration by uploading an empty version of the snippet from the Admin UI, or delete it completely using the Fastly API.
+1. [Log in]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html#admin) to the Admin UI.
+
+1. Click **Stores** > **Settings** > **Configuration** > **Advanced** > **System**.
+
+1. Expand **Full Page Cache** > **Fastly Configuration** > **Custom VCL Snippets**.
+
+   ![Manage custom VCL snippets]
 
--  Upload an empty version of the snippet file to Fastly to remove the VCL logic from the active VCL version:
+1. In the _Action_ column, click the trash icon next to the snippet to delete.
 
-   -  Edit the snippet and delete the **VCL** snippet content.
-   -  Save the configuration.
-   -  Upload the VCL to Fastly to apply your changes.
+1. On the next modal window, click **DELETE** and activate a new version.
 
--  Use the Fastly API [Delete custom VCL snippet]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation to delete the snippet completely, or submit a support ticket to request deletion.
+{:.bs-callout-warning}
+The *Custom VCL snippets* UI option shows only the snippets added through the Admin UI. You must [manage custom VCL snippets using the Fastly API]({{ site.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-custom-vcl-snippets-using-the-api).
 
 [Manage custom VCL snippets]: {{site.baseurl}}/common/images/cloud/cloud-fastly-manage-snippets.png
-{:width="650px"}
+{:width="650px"}

src/_includes/cloud/cloud-fastly-manage-vcl-from-admin.md

@@ -26,6 +26,7 @@ Attribute | Data Type | Description | Default or example value
 `cms_no_route` | String | Identifies a specific CMS page that you want to appear when a 404 “Page Not Found” error occurs | `no-route`
 `code` | String | Deprecated. Use `store_code` instead. A unique identifier for the store | `default`
 `configurable_thumbnail_source` | String | Determines which thumbnail should be used in the cart for configurable products. Possible values: `parent` or `itself` (child) | `parent`
+`contact_enabled` | Boolean! | Indicates whether the Contact Us form is enabled | true or false
 `copyright` | String | The copyright statement that appears at the bottom of each page | Copyright © 2013-present Magento, Inc. All rights reserved.
 `default_description` | String | The description that provides a summary of your site for search engine listings and should not be more than 160 characters in length | null
 `default_display_currency_code` | String | The code representing the currency displayed on the store | `USD`
@@ -67,6 +68,7 @@ Attribute | Data Type | Description | Default or example value
 `magento_wishlist_general_is_enabled` | String | Indicates whether wish lists are enabled (1) or disabled (0) | 1
 `maximum_number_of_wishlists` | String | If multiple wish lists are enabled, the maximum number of wish lists the customer can have | 5
 `minimum_password_length` | String | The minimum number of characters required for a valid password. <br/>Configuration path: customer/password/minimum_password_length | 6
+`newsletter_enabled` | Boolean! | Indicates whether newsletters are enabled | true or false
 `no_route` | String | Contains the URL of the default page that you want to appear when if a 404 “Page not Found” error occurs | `cms/noroute/index`
 `payment_payflowpro_cc_vault_active` | String | Payflow Pro vault status | `0` (inactive) or `1` (active)
 `printed_card_price` | String | The default price of a printed card that accompanies an order | 10

src/_includes/graphql/store-config.md

@@ -36,7 +36,7 @@
 
   {% if page.url contains "guides/v2.3/" %}
   <div class="bs-callout-warning">
-    PHP 7.3 reaches end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.
+    PHP 7.3 reached end of support in December 2021 and {{site.data.var.ee}} 2.3.x reaches end of support in April 2022. You may want to consider planning your upgrade now to {{site.data.var.ee}} 2.4.x and PHP 7.4.x to help maintain PCI compliance.
   </div>
   {% endif %}
 

src/_includes/layout/page-header.html

@@ -108,26 +108,48 @@ stage:
 
 You can configure multiple locales per theme. This customization helps speed up the build process by reducing the number of unnecessary theme files. For example, you can build the _magento/backend_ theme in English and a custom theme in other languages.
 
-The following example builds the `magento/backend` theme with three locales:
+The following example builds the `Magento/backend` theme with three locales:
 
 ```yaml
 stage:
   build:
     SCD_MATRIX:
-      "magento/backend":
+      "Magento/backend":
         language:
           - en_US
           - fr_FR
           - af_ZA
 ```
+The following example builds three themes with three locales:
 
-Also, you can choose to _not_ deploy a theme:
+```yaml
+stage:
+  build:
+    SCD_MATRIX:
+      "Magento/backend":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+      "Magento/blank":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+      "Magento/luma":
+        language:
+          - en_US
+          - fr_FR
+          - af_ZA
+```
+
+Or, you can choose to _not_ deploy a theme:
 
 ```yaml
 stage:
   build:
     SCD_MATRIX:
-      "magento/backend": [ ]
+      "Magento/backend": [ ]
 ```
 
 ### `SCD_MAX_EXECUTION_TIME`

src/cloud/env/variables-build.md

@@ -19,7 +19,14 @@ 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}
-Automatic log rotation, compression, and removal are enabled in the Cloud environment. Each log file type has a rotating pattern and lifetime.
+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>
+```
 
 ## Manage log data
 
@@ -152,7 +159,6 @@ For example, on Pro production environments a PHP access log for 21 days in the
 ```terminal
 /var/log/platform/<project_id>/php.access.log.22.gz
 ```
-
 The archived log files are always stored in the directory where the original file was located before compression.
 
 {:.bs-callout-info}

src/cloud/project/log-locations.md

@@ -36,7 +36,7 @@ When MFA enforcement is enabled on a {{site.data.var.ece}} project, all users wi
 You can add users and assign roles using the Magento Cloud CLI or the Project Web Interface.
 
 {:.bs-callout-tip}
-Changing user configuration on a {{site.data.var.ece}} environment triggers a site deployment, which takes your site offline until deployment completes. For Production environments, we recommend completing user administration tasks during off-peak hours to prevent service disruptions.
+Changing user configuration on an {{site.data.var.ece}} environment requires a site deployment for the changes to take effect, which takes your site offline until the deployment completes. For Production environments, we recommend completing user administration tasks during off-peak hours to prevent service disruptions.
 
 **Prerequisites:**