Merge branch 'master' of git://github.com/yiisoft/yii2 into 2240-am-aliases

apps/advanced/README.md

@@ -81,7 +81,7 @@ After you install the application, you have to conduct the following steps to in
 the installed application. You only need to do these once for all.
 
 1. Run command `init` to initialize the application with a specific environment.
-2. Create a new database and adjust the `components.db` configuration in `common/config/params-local.php` accordingly.
+2. Create a new database and adjust the `components['db']` configuration in `common/config/main-local.php` accordingly.
 3. Apply migrations with console command `yii migrate`.
 4. Set document roots of your Web server:
 

apps/advanced/common/config/.gitignore

+main-local.php
 params-local.php