Merge branch 'master' into develop

craftcms · Apr 23, 2019 · 2fb1067 · 2fb1067
2 parents 42bcdfc + 9b1522f
commit 2fb1067
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/docs/config/config-settings.md b/docs/config/config-settings.md
@@ -2402,6 +2402,11 @@ If set to `true`, a hard copy of your system’s project config will be saved in
 and any changes to `config/project.yaml` will be applied back to the system, making it possible for
 multiple environments to share the same project config despite having separate databases.
 
+::: warning
+Make sure you’ve read the entire [Project Config](https://docs.craftcms.com/v3/project-config.html)
+documentation, and carefully follow the “Enabling the Project Config File” steps when enabling this setting.
+:::
+
 
 
 ### `useSecureCookies`

diff --git a/src/config/GeneralConfig.php b/src/config/GeneralConfig.php
@@ -814,6 +814,11 @@ class GeneralConfig extends BaseObject
      * If set to `true`, a hard copy of your system’s project config will be saved in `config/project.yaml`,
      * and any changes to `config/project.yaml` will be applied back to the system, making it possible for
      * multiple environments to share the same project config despite having separate databases.
+     *
+     * ::: warning
+     * Make sure you’ve read the entire [Project Config](https://docs.craftcms.com/v3/project-config.html)
+     * documentation, and carefully follow the “Enabling the Project Config File” steps when enabling this setting.
+     * :::
      */
     public $useProjectConfigFile = false;
     /**