From e455b5d38696049cd433e7c7f0d41dfd55ed36f9 Mon Sep 17 00:00:00 2001 From: Luciano Baraglia Date: Mon, 19 Aug 2013 22:34:16 -0300 Subject: [PATCH 1/4] Typo in doc [skip ci] --- docs/guide/apps-advanced.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md index 25d9202..a3f8689 100644 --- a/docs/guide/apps-advanced.md +++ b/docs/guide/apps-advanced.md @@ -118,7 +118,7 @@ Another difference is that most application component configurations are moved t Configuring Composer -------------------- -After application template is installed it's a good idea to adjust defaul `composer.json` that can be found in the root +After application template is installed it's a good idea to adjust default `composer.json` that can be found in the root directory: ```javascript From 3330909497fb385731421c7d08421dfee72a4289 Mon Sep 17 00:00:00 2001 From: Luciano Baraglia Date: Mon, 19 Aug 2013 22:59:18 -0300 Subject: [PATCH 2/4] Another typo [skip ci] --- docs/guide/apps-advanced.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md index a3f8689..95227ea 100644 --- a/docs/guide/apps-advanced.md +++ b/docs/guide/apps-advanced.md @@ -85,7 +85,7 @@ Configuration and environments There are multiple problems with straightforward approach to configuration: -- Each team member has its own configuration options. Commiting such config will affect other team members. +- Each team member has its own configuration options. Committing such config will affect other team members. - Production database password and API keys should not end up in repository. - There are multiple servers: development, testing, production. Each should have its own configuration. - Defining all configuration options for each case is very repetitive and takes too much time to maintain. From f445decca2041772081d06172b16d387e819249a Mon Sep 17 00:00:00 2001 From: Luciano Baraglia Date: Mon, 19 Aug 2013 23:22:36 -0300 Subject: [PATCH 3/4] More typos [skip ci] --- docs/guide/apps-advanced.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md index 95227ea..5b6e076 100644 --- a/docs/guide/apps-advanced.md +++ b/docs/guide/apps-advanced.md @@ -94,10 +94,10 @@ In order to solve these issues Yii introduces environments concept that is very by a set of files under `environments` directory. `init` command is used to switch between these. What is really does is just copying everything from environment directory over the root directory where all applications are. -Typically environment contains application bootstrap files such as `index.php` and config files postfixed with +Typically environment contains application bootstrap files such as `index.php` and config files suffixed with `-local.php`. These are added to `.gitignore` and never added to source code repository. -In order to avoid duplication configurations are overrding each other. For example, frontend reads configuration in the +In order to avoid duplication configurations are overrading each other. For example, frontend reads configuration in the following order: - `frontend/config/main.php` From 1503d2e71e7ea23dd006d48b47ac2076dd1ed857 Mon Sep 17 00:00:00 2001 From: Luciano Baraglia Date: Mon, 19 Aug 2013 23:25:48 -0300 Subject: [PATCH 4/4] More typos [skip ci] --- docs/guide/apps-basic.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/apps-basic.md b/docs/guide/apps-basic.md index b8440a2..e61ab55 100644 --- a/docs/guide/apps-basic.md +++ b/docs/guide/apps-basic.md @@ -108,7 +108,7 @@ point for functional testing. Configuring Composer -------------------- -After application template is installed it's a good idea to adjust defaul `composer.json` that can be found in the root +After application template is installed it's a good idea to adjust default `composer.json` that can be found in the root directory: ```javascript