Merge branch 'master' of github.com:funson86/yii2 into funson

Conflicts: docs/guide-zh-CN/structure-application-components.md docs/guide-zh-CN/structure-applications.md docs/guide-zh-CN/structure-entry-scripts.md docs/guide-zh-CN/structure-overview.md

Merge branch 'master' of github.com:funson86/yii2 into funson
0cc4d9aa · AbrahamGreyson · 3b30338f · c6bd238f · 0cc4d9aa · 0cc4d9aa
Commit 0cc4d9aa authored Oct 02, 2014 by AbrahamGreyson
3 changed files
--- a/docs/guide-zh-CN/structure-application-components.md
+++ b/docs/guide-zh-CN/structure-application-components.md
--- a/docs/guide-zh-CN/structure-applications.md
+++ b/docs/guide-zh-CN/structure-applications.md
--- a/docs/guide-zh-CN/structure-entry-scripts.md
+++ b/docs/guide-zh-CN/structure-entry-scripts.md
@@ -101,4 +101,4 @@ if (!defined('YII_DEBUG')) {

 显然第一段代码更加简洁易懂。

-常量定义应该在入口脚本的开头，这样包含其他 PHP 文件时，常量就能生效。
+常量定义应该在入口脚本的开头，这样包含其他 PHP 文件时，常量就能生效。
\ No newline at end of file