diff --git a/core/includes/install.inc b/core/includes/install.inc
index 67e41f6..c48e723 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -503,7 +503,7 @@ function drupal_install_config_directories() {
     // to the drupal core repo.
     switch ($config_type) {
       case CONFIG_ACTIVE_DIRECTORY:
-        $text = 'This directory contains the active configuration for your Drupal site. To move this configuration between environments, contents from this directory should be placed in the staging directory on the target server. To make this configuration active, see admin/config/development/configuration/sync on the target server.';
+        $text = 'If you change the configuration system to use file storage instead of the database for the active Drupal site configuration, this directory will contain the active configuration. By default, this directory will be empty. If you are using files to store the active configuration, and you want to move it between environments, contents from this directory should be placed in the staging directory on the target server. To make this configuration active, see admin/config/development/configuration/sync on the target server.';
         break;
       case CONFIG_STAGING_DIRECTORY:
         $text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, see admin/config/development/configuration/sync.';
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index be30de6..98c65b4 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -216,12 +216,21 @@
 /**
  * Location of the site configuration files.
  *
- * By default, Drupal configuration files are stored in a randomly named
- * directory under the default public files path. On install the
- * named directory is created in the default files directory. For enhanced
- * security, you may set this variable to a location outside your docroot.
- *
- * @todo Flesh this out, provide more details, etc.
+ * The $config_directories array specifies the location of file system
+ * directories used to store Drupal's configuration. By default, the active
+ * configuration is stored in the database and configurations to be imported are
+ * stored in a staging directory. On install, the staging directory is created
+ * inside a randomly-named directory in the public files path.
+ *
+ * On install, Drupal will also set up an active configuration directory inside
+ * the same randomly-named directory in the public files path. The active
+ * directory is expected to be empty unless you change the configuration system
+ * to use file storage for the active configuration. See the active
+ * configuration settings documentation below.
+ *
+ * If you use files for the active configuration in production you may enhance
+ * your security by setting the path to the active configuration to a location
+ * outside your document root.
  *
  * Example:
  * @code
@@ -252,7 +261,7 @@
  * variable has the same value on each server.
  *
  * For enhanced security, you may set this variable to a value using the
- * contents of a file outside your docroot that is never saved together
+ * contents of a file outside your document root that is never saved together
  * with any backups of your Drupal files and database.
  *
  * Example:
@@ -542,13 +551,15 @@
  *
  * By default, the active configuration is stored in the database in the
  * {config} table. To install Drupal with a different active configuration
- * storage, you need to override the setting here, in addition to overriding
- * the config.storage.active service definition in a module or profile.
+ * storage, you need to override the 'bootstrap_config_storage' setting here, in
+ * addition to overriding the config.storage.active service definition in a
+ * module or profile, or by adding to the container YAML files for DrupalKernel.
  *
  * The 'bootstrap_config_storage' setting needs to be a callable that returns
- * core.services.yml.
+ * an instance implementing \Drupal\Core\Config\StorageInterface.
  */
 # $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');
+# $GLOBALS['conf']['container_yamls'][] = $conf_path . '/services.yml';
 
 /**
  * Configuration overrides.