commit 7f0edaaf7fd73c111c759cfe8ee8f2e5bd209daa Author: Mark Labrecque Date: Thu Jun 5 13:09:34 2014 -0500 New Patch diff --git a/core/includes/install.inc b/core/includes/install.inc index a65842e..a1b1337 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -501,10 +501,10 @@ function drupal_install_config_directories() { // to the drupal core repo. switch ($config_type) { case CONFIG_ACTIVE_DIRECTORY: - $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.'; + $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, visit 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.'; + $text = 'This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync.'; break; } $text .= ' For information about deploying configuration between servers, see http://drupal.org/documentation/administer/config'; diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index e7fc117..128f1a8 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -222,20 +222,17 @@ * Location of the site configuration files. * * 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. + * directories used for configuration data. On install, "active" and "staging" + * directories are created for configuration. The staging directory is used for + * configuration imports; the active directory is not used by default, since the + * default storage for active configuration is the database rather than the file + * system (this can be changed; see "Active configuration settings" below). + * + * The default location for the active and staging directories is inside a + * randomly-named directory in the public files path; this setting allows you to + * override these locations. If you use files for the active configuration, you + * can enhance security by putting the active configuration outside your + * document root. * * Example: * @code @@ -543,6 +540,7 @@ /** * Drupal automatically generates a unique session cookie name for each site * based on its full domain name. If you have multiple domains pointing at the + * * same Drupal site, you can either redirect them all to a single domain (see * comment in .htaccess), or uncomment the line below and specify their shared * base domain. Doing so assures that users remain logged in as they cross @@ -555,14 +553,14 @@ * Active configuration settings. * * 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 'bootstrap_config_storage' setting here, in - * addition to overriding the config.storage.active service definition such as - * in a services.yml file in the same directory as settings.php which is used to - * register site-specific service definitions. - * - * The 'bootstrap_config_storage' setting needs to be a callable that returns - * an instance implementing \Drupal\Core\Config\StorageInterface. + * {config} table. To use a different storage mechanism for the active + * configuration, do the following prior to installing: + * - Override the 'bootstrap_config_storage' setting here. It must be set to a + * callable that returns an object that implements + * \Drupal\Core\Config\StorageInterface. + * - Override the service definition 'config.storage.active'. Put this + * override in a services.yml file in the same directory as settings.php + * (definitions in this file will override service definition defaults). */ # $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage');