Merge branch 'master' into em_prex-relnotes320

Author: erikmarr

.github/ISSUE_TEMPLATE/NEW_FEATURE.md

@@ -36,4 +36,3 @@ Issues that do not comply with our Code of Conduct or do not contain enough info
 
 Feel free to remove this section before creating this issue.
 -->
-

.github/workflows/linter.yml

@@ -19,10 +19,6 @@ on:
     branches:
       - master
       - 2.*-develop
-    paths-ignore:
-      - '**.md'
-      - '**.html'
-      - '**.xml'
 
 ###############
 # Set the Job #
@@ -54,4 +50,4 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
-          VALIDATE_MARKDOWN: false
+          MARKDOWN_CONFIG_FILE: .markdownlint.json

_checks/html_check_hook.rb

@@ -33,7 +33,7 @@
     if url_ignore
       url_ignore.push(jekyll_excludes_as_regex).flatten!.uniq!
     else
-      checks_config['html-proofer'].merge!(url_ignore: jekyll_excludes_as_regex)
+      checks_config['html-proofer'][:url_ignore] = jekyll_excludes_as_regex
     end
 
     # Read configuration options for html-proofer

src/_data/toc/how-do-i.yml

@@ -55,3 +55,6 @@ pages:
 
       - label: Customize the list of shipping methods
         url: /howdoi/checkout/checkout_shipping_methods.html
+
+  - label: Customize Magento Admin design
+    url: /howdoi/admin/customize_admin.html

src/_includes/install/sampledata/file-sys-perms-digest-24.md

@@ -0,0 +1,69 @@
+### Apply file system permissions and ownership {#rc1-samp-ownership}
+
+As part of the sample data upgrade process, you must apply current file system permission and ownership as discussed in the following sections.
+Failure to do so will cause your upgrade to fail.
+
+For more information about file system ownership and permissions, see [Overview of ownership and permissions].
+
+#### One-user ownership and permissions
+
+If you run the Magento application as one user (which is typical of shared hosting environments), change file system permissions and ownership as follows:
+
+```bash
+cd <magento_root>
+```
+
+```bash
+chmod -R g+w var vendor pub/static pub/media app/etc
+```
+
+```bash
+chmod u+x bin/magento
+```
+
+To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2`:
+
+```bash
+cd /var/www/html/magento2 && chmod -R g+w var vendor pub/static pub/media app/etc && chmod u+x bin/magento
+```
+
+After you set file system permissions, manually clear the `var/cache`, `var/page_cache`, and `generated` directories.
+
+A sample command follows:
+
+```bash
+rm -rf var/cache/* var/page_cache/* generated/*
+```
+
+#### Two-user ownership and permissions
+
+If you run the Magento application with two users, enter the following commands as a user with `root` privileges:
+
+```bash
+cd <magento_root>
+```
+
+```bash
+find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} +
+```
+
+```bash
+find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} +
+```
+
+```bash
+chown -R :<web server group> .
+```
+
+```bash
+chmod u+x bin/magento
+```
+
+To optionally enter all commands on one line, enter the following assuming Magento is installed in `/var/www/html/magento2` and the web server group name is `apache`:
+
+```bash
+cd /var/www/html/magento2 && find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} + && find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} + && chown -R :apache . && chmod u+x bin/magento
+```
+
+<!-- Link definitions -->
+[Overview of ownership and permissions]: {{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html

src/_includes/install/sampledata/sample-data-clone-24.md

@@ -0,0 +1,191 @@
+
+## Install sample data by cloning repositories   {#sample-clone}
+
+This topic discusses how to clone and add Magento sample data if you cloned the Magento GitHub repository. This method is intended only for contributing developers (that is, developers who plan to contribute to the Magento 2 codebase).
+
+If you're not a contributing developer, choose one of the other options displayed in the table of contents on the left side of the page.
+
+Contributing developers can use this method of installing sample data *only* if all of the following are true:
+
+*  You use {{site.data.var.ce}}
+*  You [cloned the Magento 2 repository]({{ page.baseurl }}/install-gde/prereq/dev_install.html).
+
+{:.bs-callout-warning}
+You can use sample data with either the `develop` branch (more current) or a released branch (such as `2.4` (more stable)). We recommend you use a released branch because it's more stable. If you're contributing code to the Magento 2 repository and you need the most recent code, use the `develop` branch. Regardless of the branch you choose, you must [clone]({{ page.baseurl }}/install-gde/prereq/dev_install.html) the corresponding branch of the Magento 2 GitHub repository. For example, sample data for the `develop` branch can be used *only* with the Magento 2 `develop` branch.
+
+See the following sections:
+
+*  [Clone the sample data repository](#clone-sample-repo)
+*  [Set file system ownership and permissions](#samp-data-perms)
+
+## Clone the sample data repository {#clone-sample-repo}
+
+This section discusses how to install Magento sample data by cloning the sample data repository. You can clone the sample data repository in any of the following ways:
+
+*  Clone with the [SSH protocol](#clone-sample-repo-ssh)
+*  Clone with the [HTTPS protocol](#instgde-prereq-compose-clone-https)
+
+### Clone with SSH {#clone-sample-repo-ssh}
+
+To clone the Magento sample data GitHub repository using the SSH protocol:
+
+1. In a web browser, go to [the Magento sample data repository](https://github.com/magento/magento2-sample-data).
+1. Next to the name of the branch, click **SSH** from the list.
+1. Click **Copy to clipboard**
+
+   The following figure shows an example.
+
+   ![Clone the Magento GitHub repository using SSH]({{ site.baseurl }}/common/images/install_mage2_clone-ssh.png){:width="650px"}
+
+1. Change to your web server's docroot directory.
+
+   Typically, for Ubuntu, it's `/var/www` and for CentOS it's `/var/www/html`.
+
+   Need [help locating the docroot?]({{ page.baseurl }}/install-gde/basics/basics_docroot.html)
+
+1. Enter `git clone` and paste the value you obtained from step 1.
+
+   An example follows:
+
+   ```bash
+   git clone git@github.com:magento/magento2-sample-data.git
+   ```
+
+1. Wait for the repository to clone on your server.
+
+   {:.bs-callout-info}
+   If the following error displays, make sure you [shared your SSH key](https://help.github.com/articles/generating-ssh-keys/) with GitHub:<br>
+
+   ```terminal
+   Cloning into 'magento2'...
+   Permission denied (publickey).
+   fatal: The remote end hung up unexpectedly
+   ```
+
+1. Ensure you checkout the branch of the sample data repository that corresponds with the branch you used from the main `magento2` repository.
+
+   For example:
+
+   If you used the `2.4-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.4-develop`.
+
+   If you used the `2.4.1` branch of the Magento 2 repository, the Sample Data branch should be `2.4.1`.
+
+   To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.1` branch):
+
+   ```bash
+   git checkout 2.4.1
+   ```
+
+1. Change to `<magento_root>`.
+1. Enter the following command to create symbolic links between the files you just cloned so sample data works properly:
+
+   ```bash
+   php -f <sample-data_clone_dir>/dev/tools/build-sample-data.php -- --ce-source="<path_to_your_magento_instance>"
+   ```
+
+1. Wait for the command to complete.
+
+1. See [Set file system permissions and ownership](#samp-data-perms).
+
+### Clone with HTTPS {#instgde-prereq-compose-clone-https}
+
+To clone the Magento sample data GitHub repository using the HTTPS protocol:
+
+1. In a web browser, go to [the Magento sample data repository](https://github.com/magento/magento2-sample-data).
+1. On the right side of the page, under the **clone URL** field, click **HTTPS**.
+1. Click **Copy to clipboard**.
+
+   The following figure shows an example.
+
+   ![Clone the Magento GitHub repository using HTTPS]({{ site.baseurl }}/common/images/install_mage2_clone-https.png){:width="650px"}
+
+1. Change to your web server's docroot directory.
+
+   Typically, for Ubuntu, it's `/var/www` and for CentOS it's `/var/www/html`.
+
+1. Enter `git clone` and paste the value you obtained from step 1.
+
+   An example follows:
+
+   ```bash
+   git clone https://github.com/magento/magento2-sample-data.git
+   ```
+
+1. Wait for the repository to clone on your server.
+1. Ensure you checkout the branch of the sample data repository that corresponds with the branch you used from the main `magento2` repository.
+
+   For example:
+
+   If you used the `2.4-develop` branch of the Magento 2 repository, the Sample Data branch should be `2.4-develop`.
+
+   If you used the `2.4.1` branch of the Magento 2 repository, the Sample Data branch should be `2.4.1`.
+
+   To checkout the correct branch, run the following command from the sample data repository's root directory (assuming you need the `2.4.1` branch):
+
+   ```bash
+   git checkout 2.4.1
+   ```
+
+1. Change to `<magento_root>`.
+1. Enter the following command to create symbolic links between the files you just cloned so sample data works properly:
+
+   ```bash
+   php -f <sample-data_clone_dir>/dev/tools/build-sample-data.php -- --ce-source="<path_to_your_magento_instance>"
+   ```
+
+   For example,
+
+   ```bash
+   php -f <sample-data_clone_dir>/dev/tools/build-sample-data.php -- --ce-source="/var/www/magento2"
+   ```
+
+1. Wait for the command to complete.
+1. See the next section.
+
+{:.bs-callout-warning}
+If you're installing sample data _after_ installing Magento, you must also run the following command to update the database and schema:
+
+```bash
+<magento_root>/bin/magento setup:upgrade
+```
+
+## Set file system ownership and permissions {#samp-data-perms}
+
+Because the `php build-sample-data.php` script creates symlinks between the sample data repository and your Magento 2 repository, you must set file system permissions and ownership in the sample data repository. Failure to do so results in errors accessing the storefront.
+
+To set file system permissions and ownership on the sample data repository:
+
+1. Change to your sample data clone directory.
+1. Set ownership:
+
+   ```bash
+   chown -R :<your web server group name> .
+   ```
+
+   Typical examples:
+
+   *  CentOS: `chown -R :apache .`
+
+   *  Ubuntu: `chown -R :www-data .`
+
+1. Set permissions:
+
+   ```bash
+   find . -type d -exec chmod g+ws {} +
+   ```
+
+1. Clear static files:
+
+   ```bash
+   cd <your {{site.data.var.ce}} install dir>
+   ```
+
+   ```bash
+   rm -rf var/cache/* var/page_cache/* generated/*
+   ```
+
+<!-- ABBREVIATIONS -->
+
+*[contributing developer]: A developer who contributes code to the Magento 2 CE codebase
+*[contributing developers]: Developers who contribute code to the Magento 2 CE codebase
+*[Contributing developers]: Developers who contribute code to the Magento 2 CE codebase

src/_includes/install/sampledata/sample-data-rc1-cli-24.md

@@ -65,12 +65,12 @@ After you have reset file system permissions:
 
 1. If you have not done so already, log in to your Magento server as, or switch to, the Magento file system owner.
 1. Change to your Magento installation directory.
-1. Manually clear the `var/cache`, `var/page_cache`, and `var/generation` directories.
+1. Manually clear the `var/cache`, `var/page_cache`, and `generated` directories.
 
    A sample command follows:
 
    ```bash
-   rm -rf var/cache/* var/page_cache/* var/generation/*
+   rm -rf var/cache/* var/page_cache/* generated/*
    ```
 
 1. Upgrade Magento:
@@ -79,7 +79,7 @@ After you have reset file system permissions:
    bin/magento setup:upgrade
    ```
 
-{% include install/sampledata/file-sys-perms-digest.md %}
+{% include install/sampledata/file-sys-perms-digest-24.md %}
 
 <!-- Link definitions -->
 [Magento file system owner]: {{ page.baseurl }}/install-gde/prereq/file-sys-perms-over.html

src/cloud/cdn/configure-fastly.md

@@ -185,6 +185,9 @@ To update your DNS configuration for development:
 
    When the CNAME records are live, Magento provisions certificates and uploads the SSL/TLS certificates.
 
+   {:.bs-callout-info}
+   If you plan to use apex domains (`your-domain.com`) for your Production site, you must configure DNS address records (A records) to point to the Fastly server IP addresses. See [Update DNS configuration with production settings]({{ site.baseurl }}/cloud/live/site-launch-checklist.html#dns).
+
 1. Add ACME challenge CNAME records for domain validation and pre-provisioning of Production SSL/TLS certificates, for example:
 
    | Domain or Subdomain  | CNAME
@@ -206,7 +209,7 @@ To update your DNS configuration for development:
 
    -  Use the Magento CLI to change the base URL for your store.
 
-      ```
+      ```bash
       php bin/magento setup:store-config:set --base-url="https://mcstaging.your-domain.com/"
       ```
 

src/cloud/live/site-launch-checklist.md

@@ -77,7 +77,7 @@ To update DNS configuration for site launch:
 
    -  Use the Magento CLI to change the base URL for your store.
 
-      ```
+      ```bash
       php bin/magento setup:store-config:set --base-url="https://www.your-domain.com/"
       ```