Merge remote-tracking branch 'mainline/develop' into MC-3610-Remove-legacy-system-from-slide

Author: cspruiell

app/code/Magento/PageBuilder/composer.json

@@ -18,6 +18,9 @@
         "magento/module-directory": "*",
         "php": "~7.1.3||~7.2.0"
     },
+    "conflict": {
+        "gene/bluefoot": "*"
+    },
     "type": "magento2-module",
     "license": [
         "proprietary"

app/code/Magento/PageBuilder/docs/install.md

@@ -8,6 +8,7 @@
     1. [Composer installation](#composer-installation)
     1. [GitHub installation](#github-installation)
     1. [Activation](#activation)
+    1. [Disable PageBuilder](#disable-pagebuilder)
     1. [Troubleshooting](#troubleshooting)
 3. [Contribution guide]
 4. [Developer documentation]
@@ -118,6 +119,16 @@ Follow these steps to activate PageBuilder in the Admin:
 4. Under **Advanced Content Tools**, select **Yes** for **Enable Page Builder**.
 5. Click **Save Config**
 
+## Disable PageBuilder
+
+We recommend you deactivate the PageBuilder editor through the Admin instead of disabling the module itself.
+This allows the PageBuilder module to continue rendering the content on the storefront even if the editor is not used in the Admin.
+
+If you disabled or uninstalled the entire PageBuilder module instead of just the editor, you need to do the following to continue using PageBuilder-built content:
+
+1. Implement PageBuilder widgets and initialize them on dynamic blocks since JavaScript functionality provided by PageBuilder will no longer work.
+2. Change the layout in the database for entities that use the full width layout to prevent blank layout content.
+
 ## Troubleshooting
 
 ### Common access problems