Update section "Run the installer" (D7/BD)

* There are two distinct workflows, web-based and CLI-based. Put them in collapsible admonitions.
* For web-based flow, use "activate-first" / "civicrm-setup" workflow instead of
  the `sites/all/modules/civicrm/install/yaddayadda` workflow
* Remove older warning module-activation. It's no longer a bad thing if an admin
  activates on their own accord.

docs/backdrop/index.md

@@ -21,42 +21,36 @@ The result will be that the CiviCRM directory will be at `<BACKDROP ROOT>/module
 
 The most up-to-date version of CiviCRM will always be available from the [CiviCRM website](https://civicrm.org/download).
 
-**Do NOT** proceed to "activate" the module - that will happen automatically when you run the installer.
-
 ## Get the translations {:#i18n}
 
 The basic CiviCRM release includes support for US English (`en_US`). To use another language or dialect, please [download and extract the translation files](../general/i18n_l10n.md).
 
 ## Run the installer {:#installer}
 
-The installer will verify that you've downloaded the correct version of CiviCRM, and will check your server environment to make sure it meets CiviCRM requirements. It will then create and populate a database for CiviCRM as well as create your CiviCRM settings file (civicrm.settings.php).
+The installer verifies requirements, prepares the database, and initializes the configuration file. You may run the installer through the web interface (*which is simpler*) or the command-line interface (*which has more options*).
 
-* Login to your Backdrop site with Administrator level permissions.
-* Point your web browser to the following URL:
+??? example "Run installer via Backdrop web UI"
 
-    `https://example.org/modules/civicrm/install/index.php?civicrm_install_type=backdrop`
+    1. Enable the "CiviCRM" module
+        * Login to your Backdrop site with *administrator* permissions.
+        * Navigate to the "Functionality" page (`admin/modules`).
+        * Find "CiviCRM" and enable it. At the bottom, click "Save Configuration".
+    2. After enabling, the status message will display a link to "configure CiviCRM". Click it.
 
-* You should see the **CiviCRM Installer** screen.
-    * Initially, you will see a red bar with the message "These database details don't appear to be correct." This is expected as you haven't entered your database settings yet.
-    * If you see other errors, check the **Requirements** details at the bottom of the page for more information. You will need to correct any issues before continuing.
-* Fill in the CiviCRM Database Settings.
+        ??? question "What if I didn't notice the link?"
+            Use the URL bar. Navigate to the `civicrm` page (e.g. `https://example.com/civicrm`).
 
-    !!! tip "Where Should I Store CiviCRM Data?"
-         CiviCRM may be configured to use your existing Backdrop database, or a separate (new) database. Using a separate database is generally preferred - as it makes backups and upgrades easier. The installer will create a new database for CiviCRM automatically if you enter a database name that doesn't already exist on your database server AND the database user you enter has permission to create databases. In case the installer does not automatically create a new database, simply create a new one following the same process as creating a new database for Backdrop. Note that if you plan to use the Backdrop Views module to display CiviCRM data within your Backdrop pages, and if you are going to use separate databases for Backdrop and CiviCRM, you need to ensure that your Backdrop database user has `SELECT` permissions for your CiviCRM database.
+    3. The CiviCRM installer will open.
+        * *If there are unmet requirements*, the installer will list them. Consult the [Requirements](../general/requirements.md) documentation for additional advice.
+        * *If all the requirements are met*, proceed through the brief questionnaire.
+        * *If you have [a separate MySQL database for CiviCRM](../general/requirements.md#mysql-connection)*, then locate "Environment: CiviCRM Database". Click the edit icon and enter the [database URL](../general/requirements.md#mysql-connection).
+        * Finally, click "Install CiviCRM".
 
-* Fill in the Backdrop Database Settings for your existing Backdrop database (as noted [above](#db-settings)).
+??? example "Run installer via command-line"
 
-    !!! check "Loading Sample Data"
-        The Installer includes an option to load a set of sample contact, group, and relationship data by default. Sample data can provide a useful head-start in learning to use CiviCRM. However, if you do NOT want the sample data to be loaded, just uncheck **Load sample data** under **Other Settings**.
+    CiviCRM has a command-line administration tool, `cv`, which can perform installation. For details, see [command-line installer](../general/cli-cv.md).
 
-* Select the appropriate language for the base installation. You will be able to add other languages after the installation for multi-lingual sites.
-* Click the **Check Requirements and Install CiviCRM** button.
-    * The installer will configure your databases, create the settings file and redirect you to your Backdrop Home page.
-    * If you still see a red bar with the message "These database details don't appear to be correct." - check the Database Details section below your settings for specific errors and problems. Once you correct these problems, click "Recheck requirements" to verify your settings before continuing.
-    * If you are on a Windows machine and get the message:
-      > "The user account used by your web-server needs to be granted write access to the following directory in order to configure the CiviCRM settings file: `C:<BACKDROP ROOT>/`"  
-      even after changing directory permission in Explorer, see [the permissions page](../general/permissions.md) for instructions on how to set permissions on Linux, MacOS and Windows.
-    * Once you see the green "You're ready to install!" message - you can click **Check Requirements and Install CiviCRM**
+The installer will verify that you've downloaded the correct version of CiviCRM, and will check your server environment to make sure it meets CiviCRM requirements. It will then create and populate a database for CiviCRM as well as create your CiviCRM settings file (civicrm.settings.php).
 
 ## Review the permissions {:#permissions}
 

docs/drupal7/index.md

@@ -21,42 +21,35 @@ The result will be that the CiviCRM directory will be at `<DRUPAL ROOT>/sites/al
 
 The most up-to-date version of CiviCRM is always available from the [CiviCRM website](https://civicrm.org/download)
 
-**Do NOT** activate the module yet - that will happen automatically when you run the installer.
-
 ## Get the translations {:#i18n}
 
 The basic CiviCRM release includes support for US English (`en_US`). To use another language or dialect, please [download and extract the translation files](../general/i18n_l10n.md).
 
 ## Run the installer {:#installer}
 
-The installer will verify that you've downloaded the correct version of CiviCRM, and will check your server environment to make sure it meets CiviCRM requirements. It will then create and populate a database for CiviCRM as well as create your CiviCRM settings file (civicrm.settings.php).
-
-* Login to your Drupal site with Administrator level permissions.
-* Point your web browser to the following URL:
+The installer verifies requirements, prepares the database, and initializes the configuration file. You may run the installer through the web interface (*which is simpler*) or the command-line interface (*which has more options*).
 
-    `https://example.org/sites/all/modules/civicrm/install/index.php`
+??? example "Run installer via Drupal 7 web UI"
 
-* You should see the **CiviCRM Installer** screen.
-    * Initially, you will see a red bar with the message "These database details don't appear to be correct." This is expected as you haven't entered your database settings yet.
-    * If you see other errors, check the **Requirements** details at the bottom of the page for more information. You will need to correct any issues before continuing.
-* Fill in the CiviCRM Database Settings.
+    1. Enable the "CiviCRM" module
+        * Login to your Drupal site with *administrator* permissions.
+        * Navigate to the "Modules" page (`admin/modules`).
+        * Find "CiviCRM" and enable it.
+        * At the bottom, click "Save Configuration".
+    2. After enabling, the status message will display a link to "configure CiviCRM". Click it.
 
-    !!! tip "Where Should I Store CiviCRM Data?"
-        CiviCRM may be configured to use your existing Drupal database, or a separate (new) database. Using a separate database is generally preferred - as it makes backups and upgrades easier. The installer will create a new database for CiviCRM automatically if you enter a database name that doesn't already exist on your database server AND the database user you enter has permission to create databases. In case the installer does not automatically create a new database, simply create a new one following the same process as creating a new database for Drupal. Note that if you plan to use the Drupal Views module to display CiviCRM data within your Drupal pages, and if you are going to use separate databases for Drupal and CiviCRM, you need to ensure that your Drupal database user has `SELECT` permissions for your CiviCRM database.
+        ??? question "What if I didn't notice the link?"
+            Use the URL bar. Navigate to the `civicrm` page (e.g. `https://example.com/civicrm`).
 
-* Fill in the Drupal Database Settings for your existing Drupal database (as noted [above](#db-settings)).
+    3. The CiviCRM installer will open.
+        * *If there are unmet requirements*, the installer will list them. Consult the [Requirements](../general/requirements.md) documentation for additional advice.
+        * *If all the requirements are met*, proceed through the brief questionnaire.
+        * *If you have [a separate MySQL database for CiviCRM](../general/requirements.md#mysql-connection)*, then locate "Environment: CiviCRM Database". Click the edit icon and enter the [database URL](../general/requirements.md#mysql-connection).
+        * Finally, click "Install CiviCRM".
 
-    !!! check "Loading Sample Data"
-        The Installer includes an option to load a set of sample contact, group, and relationship data by default. Sample data can provide a useful head-start in learning to use CiviCRM. However, if you do NOT want the sample data to be loaded, just uncheck **Load sample data** under **Other Settings**.
+??? example "Run installer via the command-line"
 
-* Select the appropriate language for the base installation. You will be able to add other languages after the installation for multi-lingual sites.
-* Click the **Check Requirements and Install CiviCRM** button.
-    * The installer will configure your databases, create the settings file and redirect you to your Drupal Home page.
-    * If you still see a red bar with the message "These database details don't appear to be correct." - check the Database Details section below your settings for specific errors and problems. Once you correct these problems, click "Recheck requirements" to verify your settings before continuing.
-    * If you are on a Windows machine and get the message:
-      > "The user account used by your web-server needs to be granted write access to the following directory in order to configure the CiviCRM settings file: `C:<DRUPAL ROOT>/sites/default/`"  
-      even after changing directory permission in Explorer, see [the permissions page](../general/permissions.md) for instructions on how to set permissions on Linux, MacOS and Windows.
-    * Once you see the green "You're ready to install!" message - you can click **Check Requirements and Install CiviCRM**
+    CiviCRM has a command-line administration tool, `cv`, which can perform installation. For details, see [command-line installer](../general/cli-cv.md).
 
 ## Review the permissions {:#permissions}