Merge branch 'master' into issue-8490-crontab-sample-change

Author: dobooth

src/_data/toc/contributor-guide.yml

@@ -14,6 +14,10 @@ pages:
           url: /contributor-guide/backward-compatible-development/
           versionless: true
 
+        - label: Pull Request Tests
+          url: /contributor-guide/pull-request-tests.html
+          versionless: true
+
     - label: Docs Contributions
       children:
         - label: Contribution Guidelines

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

@@ -21,6 +21,28 @@ pages:
         - label: Update and upgrade checklist
           url: /comp-mgr/prereq/prereq_compman-checklist.html
 
+    - label: Safe Upgrade Tool
+      url: /safe-upgrade-tool/introduction.html
+      versionless: true
+      edition: ee-only
+      children:
+
+        - label: Prerequisites
+          url: /safe-upgrade-tool/prerequisites.html
+          versionless: true
+
+        - label: Install
+          url: /safe-upgrade-tool/install.html
+          versionless: true
+
+        - label: Run the tool
+          url: /safe-upgrade-tool/run.html
+          versionless: true
+
+        - label: Developer information
+          url: /safe-upgrade-tool/developer.html
+          versionless: true
+
     - label: Magento Marketplace example
       url: /comp-mgr/marketplace/marketplace.html
       include_versions: ["2.3"]

src/_data/var.yml

@@ -31,7 +31,7 @@ mcp-package: magento/magento-cloud-patches
 mcp-release: 1.0.8
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
-mcd-release: 1.2.0
+mcd-release: 1.2.1
 mcc-prod: Magento Cloud Components
 mcc-package: magento/magento-cloud-components
 mcc-release: 1.0.7

src/_data/whats-new.yml

@@ -4,8 +4,38 @@ 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 4 22:34:52 2021
+updated: Mon Jan 18 15:45:43 2021
 entries:
+- description: SendGrid DKIM signatures are available only on Magento Commerce Cloud
+    Pro projects.  For more information on SendGrid, see https://devdocs.magento.com/cloud/project/sendgrid.html.
+  versions: 2.4.x
+  type: Major Update
+  date: January 14, 2021
+  link: https://github.com/magento/devdocs/pull/8440
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: New Relic Alerts now include Redis and MariaDB. See https://devdocs.magento.com/cloud/project/new-relic.html#monitor-performance-with-managed-alerts.
+  versions: 2.4.x
+  type: Major Update
+  date: January 12, 2021
+  link: https://github.com/magento/devdocs/pull/8503
+  contributor: bdenham
+  profile: https://github.com/bdenham
+- description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
+    to references of the `date_of_birth` attribute of the `customer` database entity.
+  versions: 2.3.x, 2.4.x
+  type: Major Update
+  date: January 8, 2021
+  link: https://github.com/magento/devdocs/pull/8488
+  contributor: jeff-matthews
+  profile: https://github.com/jeff-matthews
+- description: Published release notes for [Cloud Docker 1.2.1](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html#v121).
+  versions: 2.4.x
+  type: Major Update
+  date: December 22, 2020
+  link: https://github.com/magento/devdocs/pull/8429
+  contributor: bdenham
+  profile: https://github.com/bdenham
 - description: Added a new topic with instructions for [reverting from a split database
     to a single database](https://devdocs.magento.com/guides/v2.4/config-guide/revert-split-database.html)
     implementation.

src/_includes/layout/page-header.html

@@ -42,4 +42,10 @@ <h2 class="page-subtitle no_toc">{{ page.subtitle }}</h2>
   </div>
   {% endif %}
 
+  {% if page.url contains "safe-upgrade-tool/" %}
+  <div class="message-banner">
+    This tool is still in ALPHA with limited scope. If you are a Magento Commerce user you can download it at <a href="https://repo.magento.com/">Magento repo</a>.
+  </div>
+  {% endif %}
+
 </section>

src/_videos/fundamentals/add-new-product-attribute.md

@@ -87,7 +87,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 
 {% endcollapsible %}
 
-## Step 2 Create an InstallData script
+## Step 2 Create an InstallData script {#CreateProductAttributeByUpgradeScript}
 
 Next, we need to create the InstallData script.
 Because adding an attribute technically adds records into several tables, such as `eav_attribute` and `catalog_eav_attribute,` this is data manipulation, not a schema change.
@@ -196,7 +196,7 @@ For now, we’ll just quickly go through most important ones:
 *  **visible_on_front:** A flag that defines whether an attribute should be shown on the “More Information” tab on the frontend
 *  **is_html_allowed_on_front:** Defines whether an attribute value may contain HTML
 
-## Step 3: Add a source model
+## Step 3: Add a source model {#AddSourceModel}
 
 Next, we need to create the source model:
 
@@ -337,3 +337,54 @@ backend model has executed successfully, so now we’ll set it to Wool and save
 
 Having saved the product, we’ll now move to the frontend.
 It should be visible and in bold text.
+
+## Product Attribute Option Creation
+
+A product attribute of type multiselect or select will present selectable options to the user. These options may be added manually through the admin panel or by upgrade script. The script process is slightly different depending on whether the options are being added at the moment of attribute creation or whether the options are being added at a later time to an existing attribute.
+
+### Add options to a new prouduct attribute {#AddOptionsAlongNewProductAttribute}
+
+Basic instructions for creating a product attribute by setup or upgrade script can be found [above](#CreateProductAttributeByUpgradeScript). Before scripting the attribute creation, pick one of these two use cases for your options:
+
+1. You want a set of options which cannot be modified by a user through the admin panel and which can only be changed through a future code push.
+1. You want a set of options which can be modified, added or deleted through the admin panel.
+
+For use case `1` (an 'immutable' set of options), follow the above instructions ["Add a source model"](#AddSourceModel). You will create a model that contains and dynamically returns the attribute's selectable options to the client.
+
+For use case `2` (a 'mutable' set of options), see ["EAV and extension attributes"]({{ site.baseurl }}/guides/v2.4/extension-dev-guide/attributes.html). Make sure to declare 'Magento\Eav\Model\Entity\Attribute\Source\Table' as the value for the 'source' attribute option. This ensures that Magento will store options in the appropriate database table.
+
+With `\Magento\Eav\Setup\EavSetup.php::addAttribute()` and `\Magento\Eav\Setup\EavSetup.php::addAttributeOptions()` you can add a series of options with the following array:
+
+```php
+'option' => ['values' => ['Option 1', 'Option 2', 'Option 3', etc.]];
+```
+
+Alternatively, you may designate a specific option sorting order as follows:
+
+```php
+'option' => ['values' => [8 => 'Option 1', 3 => 'Option 2', 11 => 'Option 3', etc.]]
+```
+
+### Add options to an existing product attribute
+
+*  To add options to an 'immutable' set of options, modify the custom source model with the additional options you wish to provide.
+
+*  Adding options to a 'mutable' set of options leverages the same `EavSetup` object as you use when creating an attribute with options, but requires an additional step because `EavSetup` needs to know to which attribute you want to assign new options.
+
+1. Assign an array of new options to a variable:
+
+```php
+   $options = ['attribute_id' => null, 'values' => 'Option 1', 'Option 2', etc]];
+```
+
+1. Update your array with the attribute ID from the database:
+
+```php
+   $options['attribute_id'] = $eavSetup->getAttributeId($eavSetup->getEntityTypeId('catalog_product'), 'your_attribute_code');
+```
+
+1. Add your options:
+
+```php
+   $eavSetup->addAttributeOption($options);
+```

src/cloud/docker/docker-containers-service.md

@@ -163,10 +163,10 @@ The default Magento Cloud Docker configuration includes the MailHog service as a
 By default, MailHog listens on port 1025 for SMTP and port 8025 for the frontend dashboard and API (HTTP). You can change the default ports using the `--mailhog-http-port` and `--mailhog-smtp-port` options. When you build the Docker compose configuration, you can change the default ports:
 
 ```bash
-./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1026 --mailhog-http-port=8026
+./vendor/bin/ece-docker build:compose --mailhog-smtp-port=1025 --mailhog-http-port=8025
 ```
 
-After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8026`, and use port 1026 for SMTP communication.
+After updating the configuration and restarting the Docker environment, you can connect to the MailHog service from `http://magento2.docker:8025`, and use port 1025 for SMTP communication.
 
 If needed, you can disable the MailHog service when you generate the Docker compose configuration:
 

src/cloud/docker/docker-development.md

@@ -44,7 +44,7 @@ You can use the Docker environment to emulate the {{site.data.var.ece}} Integrat
 
 {{site.data.var.mcd-prod}} is a Magento Community Engineering project supported by the Magento developer community. You have several options to get support and learn more about {{site.data.var.mcd-prod}} and Magento local development.
 
--  **[Magento Community Engineering Slack organization]**–For support, questions, or discussion, chat with us in the **#cloud-docker** and **#cloud** channels. To join, send a request to _engcom@magento.com_ or [sign yourself up] using Slack.
+-  **[Magento Community Engineering Slack organization]**–For support, questions, or discussion, chat with us in the **#cloud-docker** and **#cloud** channels. To join, send a request to _engcom@adobe.com_ or [sign yourself up] using Slack.
 
 -  **[{{site.data.var.mcd-package}} GitHub repository]**–Visit the GitHub repository to read discussions about current issues, check current development, and submit issues or pull requests to improve the project.
 

src/cloud/project/new-relic.md

@@ -259,6 +259,8 @@ Based on industry best practices, the policy includes a collection of alerts tha
 | disk space    | NRI   | Pro
 | CPU usage     | NRI   | Pro
 | memory usage  | NRI   | Pro
+| Redis         | NRI   | Pro
+| MariaDB       | NRI   | Pro
 
 When site infrastructure or application conditions trigger an alert threshold, New Relic sends alert notifications so that you can proactively address the issue.  See [Managed Alerts for Magento Commerce] in the _Magento Help Center_ for details about alert thresholds and troubleshooting steps to resolve the issues that triggered the alert.
 

src/cloud/project/project-webint-snap.md

@@ -123,8 +123,9 @@ You can also backup only selected databases by appending the database names to t
 
 ```bash
 php vendor/bin/ece-tools -- main sales
+```
 
-For help, use the command: ```php vendor/bin/ece-tools db-dump --help ```
+For help, use the command: `php vendor/bin/ece-tools db-dump --help`
 
 {:.procedure}
 To create a database dump: