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

This commit is contained in:
vova07
2014-01-31 19:49:47 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -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. the installed application. You only need to do these once for all.
1. Run command `init` to initialize the application with a specific environment. 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`. 3. Apply migrations with console command `yii migrate`.
4. Set document roots of your Web server: 4. Set document roots of your Web server:

View File

@@ -1 +1,2 @@
main-local.php
params-local.php params-local.php