diff --git a/reference/yaf/appconfig.xml b/reference/yaf/appconfig.xml
index a986ec8101..9000cba01c 100644
--- a/reference/yaf/appconfig.xml
+++ b/reference/yaf/appconfig.xml
@@ -9,11 +9,12 @@
Yaf_Application::__construct.
- Yaf configurations could be merged with user configurations. The difference
- is, Yaf configurations are prefixed with "yaf." or "application.", if there
- are both "yaf." and "application.", "application." will be used.
+ Yaf will merge the application configurations and user configurations
+ automatically. The application configurations have prefix "yaf." or
+ "application.". If both "yaf." and "application." exist, "application."
+ will be accepcted preferentially.
- An array of yaf configuration example
+ An PHP array example
- an ini file of yaf configuration example
+ An ini file example
- This config entry is the only one which doesn't has a default value, which means you should
- always define it.
+ This config entry is the only one which doesn't has a default value.
+ You should always define it manually.
@@ -187,7 +188,7 @@ yaf.dispatcher.catchException = 0
- The file ext of the view template script.
+ The file ext of the view template scripts.
@@ -218,9 +219,9 @@ yaf.dispatcher.catchException = 0
- As of Yaf 2.1.6, this config entry can also be a array, when it is
- array, then the library path will try to use the value of application.library.directory
+ After Yaf 2.1.6, this config entry can be an array. The library path
+ will try to use the items setted in application.library.directory
@@ -277,7 +278,7 @@ yaf.dispatcher.catchException = 0
route process.
- In generally, you have no need to set this value.
+ In generally, there is no need to set this value.
@@ -288,8 +289,8 @@ yaf.dispatcher.catchException = 0
- If this is On, Yaf will throw exception while some error occurring. see
- also Yaf_Dispatcher::throwException.
+ If it set to On, Yaf will throw an exception while some error occurring.
+ See also Yaf_Dispatcher::throwException.
@@ -300,8 +301,8 @@ yaf.dispatcher.catchException = 0
- If this is On, Yaf will forward to Error controller, Error Action while
- there is a uncaught exception. see also
+ If it set to On, Yaf will forward to Error controller/Action while
+ there is an unhandled exception. See also
Yaf_Dispatcher::catchException.
@@ -314,7 +315,7 @@ yaf.dispatcher.catchException = 0
The default Route, if it is not specificed, Static route will be used
- as default route, see:
+ as default. See:
Yaf_Router::addRoute.
diff --git a/reference/yaf/tutorials.xml b/reference/yaf/tutorials.xml
index 5cd826de31..cb5e385433 100644
--- a/reference/yaf/tutorials.xml
+++ b/reference/yaf/tutorials.xml
@@ -32,7 +32,7 @@
Entry
- index.php in the top directory is the only entry point to the application; you should rewrite all requests to index.php (you can use .htaccess in Apache+php_mod)
+ index.php in the top directory is the only way in of the application, you should rewrite all request to it(you can use .htaccess in Apache+php_mod)
- Run the Application
+ Run the Applicatioin
&example.outputs.similar;