Sync develop with master

.github/ISSUE_TEMPLATE/BUG.md

@@ -14,8 +14,8 @@ about: Create an issue about a bug on the devdocs website
 <!-- (OPTIONAL) What needs to be done to replicate this issue? (provide Gist if needed) -->
 
 1. First Step
-2. Second Step
-3. Etc.
+1. Second Step
+1. Etc.
 
 ## Expected result
 

.github/workflows/main.yml

@@ -6,7 +6,7 @@ on:
       - master
       - develop
     paths:
-      - '*.md'
+      - '**.md'
 
 jobs:
   test:

.gitignore

@@ -26,6 +26,7 @@ _algolia_api_key
 /mbi/
 /page-builder/
 /page-builder-migration/
+/page-builder-types/
 /guides/m1x/
 /mftf/
 

_checks/styles/style-rules-prod

@@ -22,7 +22,7 @@ rule 'MD025'
 exclude_rule 'MD026'
 exclude_rule 'MD027'
 exclude_rule 'MD028'
-exclude_rule 'MD029'
+rule 'MD029'
 exclude_rule 'MD030'
 exclude_rule 'MD031'
 exclude_rule 'MD032'

_data/toc/graphql.yml

@@ -234,6 +234,9 @@ pages:
         - label: ProductInterface attributes
           url: /graphql/product/product-interface.html
 
+        - label: CategoryInterface attributes
+          url: /graphql/product/category-interface.html
+
         - label: CustomizableOptionInterface
           url: /graphql/product/customizable-option-interface.html
 

_includes/backward-incompatible-changes/commerce/2.2.9-2.2.10.md

@@ -0,0 +1,6 @@
+### ({{ site.data.var.ee }} only) Class API membership changes   {#ee-class-api-membership-229-2210}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\CustomerCustomAttributes\Block\Adminhtml\Customer\ValidationMessages | Class was added. |
+| Magento\Banner\Model\Banner | Class was added. |

_includes/backward-incompatible-changes/commerce/2.3.2-2.3.3.md

@@ -0,0 +1,6 @@
+### {{ site.data.var.ee }} only changes in classes {#ee-class-232-233}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\SalesArchive\Block\Adminhtml\Sales\Order\View\Buttons::\_\_construct | [public] Method parameter typing changed. |
+| Magento\Rma\Block\Adminhtml\Order\View\Buttons::\_\_construct | [public] Method parameter typing changed. |

_includes/backward-incompatible-changes/open-source/2.2.9-2.2.10.md

@@ -0,0 +1,26 @@
+### Class changes {#class-229-2210}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Tax\Block\Adminhtml\Rate\Form::\_construct | [protected] Method return typing changed. |
+| Magento\Sales\Block\Adminhtml\Items\Column\Name::truncateString | [public] Method parameter typing removed. |
+| Magento\Review\Block\Customer\View::\_toHtml | [protected] Method return typing changed. |
+| Magento\Eav\Model\Entity\Attribute\Source\Store::getAllOptions | [public] Method return typing changed. |
+| Magento\Directory\Model\Config\Source\Country\Full::toOptionArray | [public] Method return typing changed. |
+| Magento\Config\Console\Command\ConfigSetCommand::execute | [protected] Method return typing changed. |
+| Magento\Reports\Block\Adminhtml\Grid::\_\_construct | [public] Method has been added. |
+| Magento\Eav\Model\ResourceModel\Entity\Attribute::\_beforeDelete | [protected] Method has been added. |
+| Magento\Eav\Model\Entity\Attribute\Source\Store::getAllOptions | [public] Added optional parameter(s). |
+| Magento\Directory\Model\ResourceModel\Country::\_\_construct | [public] Method has been added. |
+| Magento\Directory\Model\Config\Source\Country\Full::toOptionArray | [public] Added optional parameter(s). |
+
+### Interface changes {#interface-229-2210}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Vault\Api\PaymentTokenManagementInterface::getListByCustomerId | [public] Method return typing changed. |
+| Magento\Sales\Api\CreditmemoCommentRepositoryInterface::getList | [public] Method return typing changed. |
+| Magento\Sales\Api\CreditmemoManagementInterface::getCommentsList | [public] Method return typing changed. |
+| Magento\Sales\Api\OrderManagementInterface::getCommentsList | [public] Method return typing changed. |
+| Magento\Sales\Api\OrderStatusHistoryRepositoryInterface::getList | [public] Method return typing changed. |
+| Magento\Sales\Api\Data\CreditmemoInterface::getComments | [public] Method return typing changed. |

_includes/backward-incompatible-changes/open-source/2.3.2-2.3.3.md

@@ -0,0 +1,53 @@
+### Class changes {#class-232-233}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Framework\Mail\Template\TransportBuilder::getTransport | [public] Method return typing changed. |
+| Magento\Framework\Mail\Template\TransportBuilder::getTemplate | [protected] Method return typing changed. |
+| Magento\Framework\DataObject\Copy::copyFieldsetToTarget | [public] Method return typing changed. |
+| Magento\Framework\Data\Collection\AbstractDb::\_renderFiltersBefore | [protected] Method return typing changed. |
+| Magento\Tax\Block\Adminhtml\Rate\Form::\_construct | [protected] Method return typing changed. |
+| Magento\Swatches\Block\Product\Renderer\Configurable::getHtmlOutput | [protected] Method return typing changed. |
+| Magento\Sales\Model\Order\Config::getStateDefaultStatus | [public] Method return typing changed. |
+| Magento\Sales\Model\Order\Config::getStatusFrontendLabel | [public] Method return typing changed. |
+| Magento\Sales\Block\Order\History::\_construct | [protected] Method return typing changed. |
+| Magento\Sales\Block\Order\History::\_prepareLayout | [protected] Method return typing changed. |
+| Magento\Sales\Block\Order\Recent::\_construct | [protected] Method return typing changed. |
+| Magento\Sales\Block\Order\Recent::\_toHtml | [protected] Method return typing changed. |
+| Magento\Sales\Block\Adminhtml\Order\View::\_\_construct | [public] Method parameter typing changed. |
+| Magento\Review\Block\Customer\View::\_toHtml | [protected] Method return typing changed. |
+| Magento\Newsletter\Model\Subscriber::received | [public] Method return typing changed. |
+| Magento\Newsletter\Block\Adminhtml\Problem::\_construct | [protected] Method return typing changed. |
+| Magento\Newsletter\Block\Adminhtml\Problem::getUnsubscribeButtonHtml | [public] Method return typing changed. |
+| Magento\Newsletter\Block\Adminhtml\Problem::getDeleteButtonHtml | [public] Method return typing changed. |
+| Magento\GraphQl\Controller\GraphQl::dispatch | [public] Method return typing changed. |
+| Magento\Config\Console\Command\ConfigSetCommand::execute | [protected] Method return typing changed. |
+| Magento\Checkout\Block\Cart\Totals::\_\_construct | [public] Method parameter typing changed. |
+| Magento\CatalogRule\Model\Indexer\IndexBuilder::getActiveRules | [protected] Method return typing changed. |
+| Magento\CatalogRule\Model\Indexer\IndexBuilder::getAllRules | [protected] Method return typing changed. |
+| Magento\Catalog\Model\ResourceModel\Product::getCategoryCollection | [public] Method return typing changed. |
+| Magento\Catalog\Model\Product\Visibility::getVisibleInCatalogIds | [public] Method return typing changed. |
+| Magento\Catalog\Model\Product\Visibility::getVisibleInSearchIds | [public] Method return typing changed. |
+| Magento\Catalog\Model\Product\Visibility::getVisibleInSiteIds | [public] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::\_construct | [protected] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareCollection | [protected] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::\_addColumnFilterToCollection | [protected] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareColumns | [protected] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::\_prepareMassaction | [protected] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::getGridUrl | [public] Method return typing changed. |
+| Magento\Catalog\Block\Adminhtml\Product\Grid::getRowUrl | [public] Method return typing changed. |
+| Magento\Backend\Block\Store\Switcher::\_construct | [protected] Method return typing changed. |
+| Magento\Wishlist\Model\ResourceModel\Item\Collection::\_renderFiltersBefore | [protected] Method has been added. |
+| Magento\Sales\Model\Order\Address::beforeSave | [public] Method has been added. |
+| Magento\Reports\Block\Adminhtml\Grid::\_\_construct | [public] Method has been added. |
+| Magento\PageCache\Model\Config::VARNISH\_6\_CONFIGURATION\_PATH | Constant has been added. |
+| Magento\Eav\Model\ResourceModel\Entity\Attribute::\_beforeDelete | [protected] Method has been added. |
+| Magento\Directory\Model\ResourceModel\Country::\_\_construct | [public] Method has been added. |
+| Magento\Backend\Model\Url::setScope | [public] Method has been added. |
+
+### Interface changes {#interface-232-233}
+
+| What changed | How it changed |
+| --- | --- |
+| Magento\Vault\Api\PaymentTokenManagementInterface::getListByCustomerId | [public] Method return typing changed. |
+

_includes/cloud/backup-db.md

@@ -3,33 +3,33 @@ We recommend creating a backup of your project before an upgrade. Use the follow
 {:.procedure}
 To back up your Integration environment database and code:
 
-1.  Create a local backup of the remote database.
+1. Create a local backup of the remote database.
 
-    ```bash
-    magento-cloud db:dump
-    ```
+   ```bash
+   magento-cloud db:dump
+   ```
 
-    {: .bs-callout-info }
-    The `magento-cloud db:dump` command runs the [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) command with the `--single-transaction` flag, which allows you to back up your database without locking the tables.
+   {: .bs-callout-info }
+   The `magento-cloud db:dump` command runs the [mysqldump](https://dev.mysql.com/doc/refman/8.0/en/mysqldump.html) command with the `--single-transaction` flag, which allows you to back up your database without locking the tables.
 
-1.  Back up code and media.
+1. Back up code and media.
 
-    ```bash
-    php bin/magento setup:backup --code [--media]
-    ```
+   ```bash
+   php bin/magento setup:backup --code [--media]
+   ```
 
-    Optionally, you can omit `[--media]` if you have a large number of static files that are already in source control.
+   Optionally, you can omit `[--media]` if you have a large number of static files that are already in source control.
 
 {:.procedure}
 To back up your Staging or Production environment database before deploying:
 
-1.  Use SSH to log in to the remote server.
+1. Use SSH to log in to the remote server.
 
-2.  Create a database dump.
+1. Create a database dump.
 
-    ```bash
-    vendor/bin/ece-tools db-dump
-    ```
+   ```bash
+   vendor/bin/ece-tools db-dump
+   ```
 
--   We recommend setting the application in maintenance mode before doing a database dump in Production environments.
--   This creates an `dump-<timestamp>.sql.gz` archive file in your local project directory. See [Snapshot and backup management]({{ site.baseurl }}/guides/v2.2/cloud/project/project-webint-snap.html#db-dump).
+-  We recommend setting the application in maintenance mode before doing a database dump in Production environments.
+-  This creates an `dump-<timestamp>.sql.gz` archive file in your local project directory. See [Snapshot and backup management]({{ site.baseurl }}/guides/v2.2/cloud/project/project-webint-snap.html#db-dump).

_includes/cloud/enable-ssh.md

@@ -2,8 +2,8 @@ You must create an SSH key pair on every machine and workspace you and your team
 
 The SSH keys require the following:
 
-* Set up SSH keys as the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
-* Create the keys using the email address used for the GitHub account.
+*  Set up SSH keys as the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
+*  Create the keys using the email address used for the GitHub account.
 
 For more information on SSH keys, see the following:
 
@@ -33,8 +33,8 @@ If you do not have SSH keys, you need to generate the keys for adding to your Ma
 
 If you already have SSH keys, continue to:
 
-* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
-* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
+*  [Add a public SSH key to your Magento account](#ssh-add-to-account) section
+*  [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
 
 ## Create a new SSH key pair {#ssh-create-new-key-pair}
 
@@ -43,70 +43,70 @@ Use the `ssh-keygen` command to create an SSH key pair. `ssh-keygen` is typicall
 {:.procedure}
 To create an SSH key pair:
 
-1.  The command syntax follows, entering the email used for your GitHub account:
+1. The command syntax follows, entering the email used for your GitHub account:
 
-    ```bash
-    ssh-keygen -t rsa
-    ```
+   ```bash
+   ssh-keygen -t rsa
+   ```
 
-    GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
+   GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.
 
-1.  When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
+1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.
 
-1.  When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
+1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.
 
-1.  After creating the SSH key pair, start the ssh-agent:
+1. After creating the SSH key pair, start the ssh-agent:
 
-    For Mac or Linux:
+   For Mac or Linux:
 
-    ```bash
-    eval "$(ssh-agent -s)"
-    ```
+   ```bash
+   eval "$(ssh-agent -s)"
+   ```
 
-    For Mac, you can edit the  `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.
+   For Mac, you can edit the  `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.
 
-    ```conf
-    Host *
-        AddKeysToAgent yes
-        UseKeychain yes
-        IdentityFile ~/.ssh/id_rsa
-    ```
+   ```conf
+   Host *
+       AddKeysToAgent yes
+       UseKeychain yes
+       IdentityFile ~/.ssh/id_rsa
+   ```
 
     For Windows:
 
     ```shell
     eval $(ssh-agent -s)
     ```
 
-1.  Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.
+1. Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.
 
-    For Mac:
+   For Mac:
 
-    ```bash
-    ssh-add -K ~/.ssh/id_rsa
-    ```
+   ```bash
+   ssh-add -K ~/.ssh/id_rsa
+   ```
 
-    For Windows or Linux:
+   For Windows or Linux:
 
-    ```shell
-    ssh-add ~/.ssh/id_rsa
-    ```
+   ```shell
+   ssh-add ~/.ssh/id_rsa
+   ```
 
-1.  [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.
+1. [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.
 
 ### Test the SSH keys {#test}
 
 After adding the SSH keys, test the SSH connection to GitHub:
 
 1. In the terminal, enter the following command:
 
-    ```bash
-    ssh -T [email protected]
-    ```
+   ```bash
+   ssh -T [email protected]
+   ```
 
-2. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
+1. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
 
-3. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
+1. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
 
 ## Add a public SSH key to your Magento account {#ssh-add-to-account}
 
@@ -120,43 +120,43 @@ You can add SSH keys to your account in any of the following ways:
 To add an SSH key using the CLI:
 
 1. Open a terminal application on your local.
-2. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.
+1. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.
 
-3. Log in to your project:
+1. Log in to your project:
 
-    ```bash
-    magento-cloud login
-    ```
+   ```bash
+   magento-cloud login
+   ```
 
-3. Add the key:
+1. Add the key:
 
-    ```bash
-    magento-cloud ssh-key:add ~/.ssh/id_rsa.pub
-    ```
+   ```bash
+   magento-cloud ssh-key:add ~/.ssh/id_rsa.pub
+   ```
 
 #### Add a key using the Project Web Interface {#add-key-web}
 
 You will select and add your SSH public key to each environment in your account.
 
-* Starter: Add to Master (Production) and any environments you create by branching from Master
-* Pro: Add to Master Integration environment. After your Staging and Production environments are provisioned, you can add the SSH keys to those environments.
+*  Starter: Add to Master (Production) and any environments you create by branching from Master
+*  Pro: Add to Master Integration environment. After your Staging and Production environments are provisioned, you can add the SSH keys to those environments.
 
 To add an SSH key using the Project Web Interface:
 
 1. Copy your SSH public key to the clipboard.
 
    If you do not already have SSH keys on that machine, see [GitHub documentation](https://help.github.com/articles/generating-an-ssh-key) to create them.
 
-2. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
-3. In your selected branch, an icon displays if you do not have an SSH key added.
+1. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
+1. In your selected branch, an icon displays if you do not have an SSH key added.
 
    ![No SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-install.png)
 
-4. Copy and paste the content of your public SSH key in the screen.
+1. Copy and paste the content of your public SSH key in the screen.
 
    ![Add SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-add.png)
 
-5. Follow the prompts on your screen to complete the task.
+1. Follow the prompts on your screen to complete the task.
 
 ## Set global Git variables