Merge branch 'master' into 2.4.2-develop

Author: magento-docs

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

@@ -218,6 +218,8 @@ The Test container, based on the [magento/magento-cloud-docker-php][php-cloud] D
 **Docker base image**: [magento/magento-cloud-docker-nginx:1.19-1.2.0][tls]<br>
 **Ports**: `443` (default), `8080:80` (Varnish bypass)<br/>
 
+By default, the TLS container is included with the Docker Compose configuration. However, you can generate a configuration without TLS by adding the `--no-tls` option to the `ece-docker build:compose` command.
+
 The TLS termination proxy container facilitates the Varnish SSL termination over HTTPS.
 
 -  The default port for TLS communication is `443`.
@@ -267,6 +269,11 @@ docker-compose exec varnish varnishadm ban req.url '~' '.'
 
 The Web container uses NGINX to handle web requests after TLS and Varnish. This container passes all requests to the FPM container to serve the PHP code. See [Request flow]({{site.baseurl}}/cloud/docker/docker-containers.html#request-flow).
 
+This container provides two NGINX configuration options for building the Docker configuration:
+
+-  `--nginx-worker-processes` to set the number of worker processes for NGINX. The default is `1`.
+-  `--nginx-worker-connections` to set the maximum number of connections that each worker process can handle simultaneously. The default is `1024`.
+
 The NGINX configuration for this container is the standard Magento [nginx config], which includes the configuration to auto-generate NGINX certificates for the container. You can customize the NGINX configuration by mounting a new configuration file using a volume.
 
 {:.procedure}

src/cloud/docker/docker-containers.md

@@ -53,9 +53,9 @@ The following table shows the options to customize service container configurati
 | [redis][redis-container] | Redis     | `--redis` | 3.2, 4.0, 5.0 |   Standard redis container
 | [selenium][selenium-container]| Selenium | `--with-selenium`<br>`--selenium-version`<br>`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF)
 | [test][test-container]| PHP CLI | `--with-test`| Any | Optional container with a writable file system for running tests
-| [tls][tls-container] | SSL Endpoint | `--tls-port` | nginx 1.19-1.2.0, latest  |  Terminates SSL, can be configured to pass to varnish or nginx. Use the `--tls-port` option to change the default port (443).
+| [tls][tls-container] | SSL Endpoint | `--tls-port`<br/>`--no-tls` | nginx 1.19-1.2.0, latest  |  Terminates SSL, can be configured to pass to varnish or nginx. Use the `--tls-port` option to change the default port (443).<br/>Use the `--no-tls` option to disable tls.
 | [varnish][varnish-container] | Varnish | `--no-varnish` | 4, 6.2 | Varnish is provisioned by default. Use the `--no-varnish` option to skip Varnish service installation.
-| [web][web-container] | NGINX | `--nginx` | 1.19-1.2.0, latest | Use the `--nginx` option to install a specific nginx version.
+| [web][web-container] | NGINX | `--nginx`<br/>`--nginx-worker-processes`<br/>`--nginx-worker-connections` | 1.19-1.2.1, latest | Use the `--nginx` option to install a specific nginx version.<br/>Use the `--nginx-worker-processes` option to define the number of NGINX worker processes. The default is 1.<br/>Use the `--nginx-worker-connections` option to define the maximum number of connections that each worker process can handle simultaneously. The default is 1024 NGINX worker connections per process.
 
 Use the following command to view all available options for the `ece-docker build:compose` command:
 

src/cloud/docker/docker-quick-reference.md

@@ -54,60 +54,6 @@ View the available options for the `ece-docker build:compose` command:
 php ./vendor/bin/ece-docker build:compose -h
 ```
 
-```terminal
-Description:
-  Build docker configuration
-
-Usage:
-  build:compose [options]
-
-Options:
-      --php=PHP                                        PHP version
-      --nginx=NGINX                                    Nginx version
-      --db=DB                                          DB version
-      --db-image=DB-IMAGE                              DB image
-      --expose-db-port=EXPOSE-DB-PORT                  Expose DB port
-      --expose-db-quote-port=EXPOSE-DB-QUOTE-PORT      Expose port for DB sales
-      --expose-db-sales-port=EXPOSE-DB-SALES-PORT      Expose port for DB quote
-      --with-entrypoint                                Add DB entrypoint volume
-      --with-mariadb-conf                              Add MariaDb config volume
-      --redis=REDIS                                    Redis version
-      --es=ES                                          Elasticsearch version
-      --rmq=RMQ                                        RabbitMQ version
-      --node=NODE                                      Node.js version
-      --selenium-version=SELENIUM-VERSION              Selenium version
-      --selenium-image=SELENIUM-IMAGE                  Selenium image
-      --no-es                                          Disable Elasticsearch
-      --no-mailhog                                     Disable MailHog
-      --mailhog-http-port                              Custom HTTP port for MailHog
-      --mailhog-smtp-port                              Custom SMTP port for MailHog
-      --set-docker-host                                Sets host.docker.internal for fpm_xdebug container to
-                                                       resolve debug issue for LINUX system
-  -m, --mode=MODE                                      Mode of environment (developer, production)
-      --sync-engine=SYNC-ENGINE                        File sync engine. Works only with developer mode. Available: (docker-sync, mutagen, native)
-      --with-cron                                      Add cron container
-      --no-varnish                                     Remove Varnish container
-      --with-selenium                                  Add Selenium latest version
-      --with-test                                      Add container for running tests
-      --no-tmp-mounts                                  Remove /tmp mounted volume
-      --with-xdebug                                    Enables XDebug
-      --env-vars[=ENV-VARS]                            Cloud environment variables
-      --installation-type[=INSTALLATION-TYPE]          Sets magento installation type [default: "composer"]
-      --host[=HOST]                                    Host name
-      --port[=PORT]                                    Port
-      --tls-port                                       TLS port
-      --es-env-var=ES-ENV-VAR                          Environment variable for elasticsearch service (multiple values allowed)
-      --db-increment-increment=DB-INCREMENT-INCREMENT  "auto_increment_increment" database variable
-      --db-increment-offset=DB-INCREMENT-OFFSET        "auto_increment_offset" database variable
-  -h, --help                                           Display this help message
-  -q, --quiet                                          Do not output any message
-  -V, --version                                        Display this application version
-      --ansi                                           Force ANSI output
-      --no-ansi                                        Disable ANSI output
-  -n, --no-interaction                                 Do not ask any interactive question
-  -v|vv|vvv, --verbose                                 Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
-  ```
-
 {:.bs-callout-info}
 See [Service versions] for additional information about the service configuration options for the `ece-docker build:compose` command.
 

src/cloud/release-notes/mcd-release-notes.md

@@ -16,6 +16,32 @@ The release notes include:
 -  {:.new}New features
 -  {:.fix}Fixes and improvements
 
+## v1.2.1
+*Release date: December 21, 2020*<br/>
+
+-  {:.new}<!--MCLOUD-7259-->**NGINX command options**–Added build command options to change the number of NGINX `worker_processes` and NGINX `worker_connections` for TLS and Web services. The `worker_process` parameter retains the ability to set the value to `auto`. Examples:
+
+    ```terminal
+    ./vendor/bin/ece-docker build:compose --nginx-worker-processes=2
+    ./vendor/bin/ece-docker build:compose --nginx-worker-connections=2048
+    ```
+
+-  {:.new}<!--MCLOUD-7259-->**TLS command option**–Added build command option to create a configuration without the TLS service. Example:
+
+   ```terminal
+   ./vendor/bin/ece-docker build:compose --no-tls
+   ```
+
+-  {:.new}<!--MCLOUD-7259-->**NGINX memory consumption**–Reduced the memory consumed by the NGINX process for TLS and Web services.
+
+-  {:.new}<!--No ticket -->**Blackfire**–Disabled Blackfire PHP extension by default in the Cloud Docker image.
+
+-  {:.fix}<!--MCLOUD-7232-->**PHP-FPM container**–Fixed PHP-FPM container health check by changing the `WEB_PORT` from `80` to `8080`.
+
+-  {:.fix}<!--MCLOUD-7442-->**Invalid volume naming**–Fixed an error with invalid volume naming in developer mode.
+
+-  {:.fix}<!--Issue 295-->**NGINX upstream port**—Updated the Docker NGINX 1.19 image to use port 8080 to avoid an infinite loop. *[Fix submitted by Adarsh Manickam](https://github.com/magento/magento-cloud-docker/pull/296).*
+
 ## v1.2.0
 *Release date: November 9, 2020*<br/>
 

src/guides/v2.3/b2b/bk-b2b.md

@@ -46,6 +46,7 @@ ConfigurableSharedCatalog |Enables configurable products to be added to a shared
 GiftCardNegotiableQuote | Enables gift cards to be displayed in a negotiable quote in an B2B environment | No
 GiftCardRequisitionList | Enables gift cards to be displayed in a requisition list | No
 GiftCardSharedCatalog | Enables gift cards to be added to a shared catalog in an B2B environment. | No
+GroupedRequisitionList | Enables grouped products to be displayed in a requisition list | No
 GroupedSharedCatalog | Enables grouped products to be added to a shared catalog in an B2B environment. | No
 NegotiableQuote | Allows a buyer and a seller (admin user) to negotiate product and/or shipping prices before the buyer places an order. | Yes
 NegotiableQuoteSharedCatalog | Enables the `NegotiableQuote` module to interact with a `SharedCatalog` in an B2B environment. | No

src/guides/v2.3/config-guide/revert-split-database.md

@@ -8,9 +8,7 @@ functional_areas:
   - Setup
 ---
 
-The [split database]({{ page.baseurl }}/config-guide/multi-master/multi-master.html) feature was deprecated in version 2.4.2 of {{ site.data.var.ee }}. Follow these instructions to revert from a split database to a single database implementation.
-
-## Revert a split database implementation
+For {{ site.data.var.ee }} customers who have implemented [Split Database]({{ page.baseurl }}/config-guide/multi-master/multi-master.html), the following topic describes how to revert or migrate back to a single database. We recommend that {{ site.data.var.ee }} merchants currently using Split Database who are upgrading to 2.4.2 and above review these steps, as well as our [announcement](https://community.magento.com/t5/Magento-DevBlog/Deprecation-of-Split-Database-in-Magento-Commerce/ba-p/465187) on the planned deprecation of Split Database.
 
 Reverting from a split database to a single database implementation involves creating backups of the `magento_quote` and `magento_sales` databases before loading them into the single `magento_main` database.
 

src/guides/v2.3/extension-dev-guide/proxies.md

@@ -73,3 +73,13 @@ With the proxy used in place of `SlowLoading`, the `SlowLoading` class will not
 Because DI configuration is used to inject a proxy, proxies can be dropped in to replace their corresponding classes - or proxy replacements _removed_ - without touching application code.
 
 As a practical example of a proxy, you can see the [StoreManager]({{ site.mage2bloburl }}/{{ page.guide_version }}/app/code/Magento/Store/Model/StoreManager.php){:target="_blank"} class and then see the generated `StoreManager` proxy class.
+
+The following excerpt from the Magento code passes the `storeManager` argument as a proxy to the `Magento\Store\Model\Resolver\Store` class. The `StoreManagerInterface` model is defined as a proxy class by the added `Proxy` at the end of the original class in the `di.xml` file.
+
+```xml
+<type name="Magento\Store\Model\Resolver\Store">
+    <arguments>
+        <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
+    </arguments>
+</type>
+```

src/guides/v2.3/graphql/mutations/remove-giftcard.md

@@ -77,3 +77,10 @@ Attribute |  Data Type | Description
  {% include graphql/cart-object.md %}
 
 [Cart query output]({{page.baseurl}}/graphql/queries/cart.html#cart-output) provides more information about the `Cart` object.
+
+## Errors
+
+Error | Description
+--- | ---
+`Could not find a cart with ID \"xxxxx\"` | The ID provided in the `cart_id` field is invalid or the cart does not exist for the customer.
+`The gift card couldn't be deleted from the quote.` | The value provided in the `gift_card_code` field is invalid or the gift card with that specific ID does not exist in the cart.

src/guides/v2.4/b2b/bk-b2b.md

@@ -0,0 +1,62 @@
+---
+group: b2b-developer-guide
+subgroup: 01_Introduction
+title: B2B Developer Guide
+landing-page: B2B
+menu_title: B2B Developer Guide
+menu_order: 1
+menu_node: parent
+ee_only: True
+functional_areas:
+  - B2B
+  - Integration
+---
+
+Unlike the standard business-to-consumer model, {{site.data.var.b2b}} (Business to Business) is designed to meet the needs of sellers (Magento merchants) whose customers are primarily companies—possibly with complex organizational structures and multiple users with various roles and levels of permission.
+
+There are two basic actors in B2B model:
+
+*  A **seller** is an admin user that accesses the system from the Magento Admin panel.
+*  A **buyer** is any customer associated with a company account who accesses the system from the storefront.
+
+The Company component is the key entity within B2B on which all other features are in some way dependent. It allows joining multiple buyers that belong to the same company into a single company account (or corporate account). The company admin is able to build the company structure (divisions, subdivisions and users) in the appropriate hierarchy and provide different user roles and permissions to the company members. Such a hierarchy allows the company admin to control user activity within an account: ordering, quoting, purchasing, access to company credit info or profile, etc. In addition, a seller can configure how the buying company operates at the website: including the payment methods, pricing levels, the ability to negotiate over prices, and the ability to create requisition lists.
+
+Companies have an option to Pay on Account, or in other words make purchases in credit. The seller allocates credit for a company account and manages credit settings for a company as well as credit reimbursement.
+
+Shared catalogs are the pricing levels that allow setting custom prices per product for different companies on one or multiple websites. By using shared catalogs, a seller can sell this product by applying different pricing levels for different customer groups.
+
+The seller and a buyer representing a company can negotiate the price of an order prior to order placement. This functionality is supported by the Negotiable Quote module. It means that before making an order, the buyer can initiate negotiations with the seller on prices and discounts. Negotiations suggest that the created quote may be submitted, reviewed and modified several times before it is converted into an order.
+
+## B2B Modules
+
+{{site.data.var.b2b}} is a set of modules that are installed on top of {{site.data.var.ee}}. The following table lists the modules provided with B2B.
+
+Name | Description | WebAPI enabled?
+--- | --- | ---
+B2b | The base module for B2B. It also provides branding elements. | No
+BundleNegotiableQuote | Enables bundle products to be displayed in a negotiable quote in an B2B environment | No
+BundleRequisitionList | Enables bundle products to be displayed in a requisition list | No
+BundleSharedCatalog | Enables bundle products to be added to a shared catalog in an B2B environment. | No
+Company | Allows a seller to create a company account and assign multiple members of the company to the account. | Yes
+CompanyCredit | Adds the Payment on Account payment method for B2B companies. | Yes
+CompanyPayment | Allows a seller to configure which payment methods are available for B2B companies. | No
+ConfigurableNegotiableQuote | Enables configurable products to be displayed in a negotiable quote in an B2B environment | No
+ConfigurableRequisitionList | Enables configurable products to be displayed in a requisition list | No
+ConfigurableSharedCatalog |Enables configurable products to be added to a shared catalog in an B2B environment. | No
+GiftCardNegotiableQuote | Enables gift cards to be displayed in a negotiable quote in an B2B environment | No
+GiftCardRequisitionList | Enables gift cards to be displayed in a requisition list | No
+GiftCardSharedCatalog | Enables gift cards to be added to a shared catalog in an B2B environment. | No
+GroupedRequisitionList | Enables grouped products to be displayed in a requisition list | No
+GroupedSharedCatalog | Enables grouped products to be added to a shared catalog in an B2B environment. | No
+NegotiableQuote | Allows a buyer and a seller (admin user) to negotiate product and/or shipping prices before the buyer places an order. | Yes
+NegotiableQuoteSharedCatalog | Enables the `NegotiableQuote` module to interact with a `SharedCatalog` in an B2B environment. | No
+PurchaseOrder | Allows buyers and seller to create a purchase order. | Yes
+PurchaseOrderRule | Allows creating and enforcing approval rules for purchase orders. | No
+QuickOrder | Allows buyers to create a new order from a list of multiple SKUs. | No
+RequisitionList | Allows a buyer to create multiple lists of frequently-purchased items and use those lists for order placement. | No
+SharedCatalog | Defines the visibility of products and prices in the catalog and in B2B quotes for different company accounts. | Yes
+
+## Related information
+
+*  [Install the B2B extension]({{ site.baseurl }}/extensions/b2b/)
+*  [Getting started with {{site.data.var.b2b}}](http://docs.magento.com/m2/b2b/user_guide/getting-started.html)