svn: /phpdoc/en/trunk/reference/yaf/ appconfig.xml tutorials.xml
| From: | Xinchen Hui | Date: | Sun, 20 Jul 2014 07:00:05 +0000 |
| Subject: | svn: /phpdoc/en/trunk/reference/yaf/ appconfig.xml tutorials.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-12621@lists.php.net to get a copy of this message | ||
laruence Sun, 20 Jul 2014 07:00:05 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=334329
Log:
sync with github
Changed paths:
U phpdoc/en/trunk/reference/yaf/appconfig.xml
U phpdoc/en/trunk/reference/yaf/tutorials.xml
Modified: phpdoc/en/trunk/reference/yaf/appconfig.xml
===================================================================
--- phpdoc/en/trunk/reference/yaf/appconfig.xml 2014-07-20 06:49:34 UTC (rev 334328)
+++ phpdoc/en/trunk/reference/yaf/appconfig.xml 2014-07-20 07:00:05 UTC (rev 334329)
@@ -9,11 +9,12 @@
<methodname>Yaf_Application::__construct</methodname>.
</para>
<para>
- 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.
<example>
- <title>An array of yaf configuration example</title>
+ <title>An PHP array example</title>
<programlisting role="php">
<![CDATA[
<?php
@@ -34,7 +35,7 @@
</programlisting>
</example>
<example>
- <title>an ini file of yaf configuration example</title>
+ <title>An ini file example</title>
<programlisting role="ini">
<![CDATA[
[yaf]
@@ -161,8 +162,8 @@
<para>
<note>
<para>
- 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.
</para>
</note>
</para>
@@ -187,7 +188,7 @@
</term>
<listitem>
<para>
- The file ext of the view template script.
+ The file ext of the view template scripts.
</para>
</listitem>
</varlistentry>
@@ -218,9 +219,9 @@
</para>
<note>
<para>
- 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 <link
-
linkend="configuration.yaf.library.directory">application.library.directory</link>
+ After Yaf 2.1.6, this config entry can be an array. The library path
+ will try to use the items setted in <link
+
linkend="configuration.yaf.library.directory">application.library.directory</link>
</para>
</note>
</listitem>
@@ -277,7 +278,7 @@
route process.
</para>
<para>
- In generally, you have no need to set this value.
+ In generally, there is no need to set this value.
</para>
</listitem>
</varlistentry>
@@ -288,8 +289,8 @@
</term>
<listitem>
<para>
- If this is On, Yaf will throw exception while some error occurring. see
- also <methodname>Yaf_Dispatcher::throwException</methodname>.
+ If it set to On, Yaf will throw an exception while some error occurring.
+ See also <methodname>Yaf_Dispatcher::throwException</methodname>.
</para>
</listitem>
</varlistentry>
@@ -300,8 +301,8 @@
</term>
<listitem>
<para>
- 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
<methodname>Yaf_Dispatcher::catchException</methodname>.
</para>
</listitem>
@@ -314,7 +315,7 @@
<listitem>
<para>
The default Route, if it is not specificed, Static route will be used
- as default route, see:
+ as default. See:
<methodname>Yaf_Router::addRoute</methodname>.
</para>
</listitem>
Modified: phpdoc/en/trunk/reference/yaf/tutorials.xml
===================================================================
--- phpdoc/en/trunk/reference/yaf/tutorials.xml 2014-07-20 06:49:34 UTC (rev 334328)
+++ phpdoc/en/trunk/reference/yaf/tutorials.xml 2014-07-20 07:00:05 UTC (rev 334329)
@@ -32,7 +32,7 @@
<section role="examples">
<example>
<title>Entry</title>
- <para>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) </para>
+ <para>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) </para>
<programlisting role="php">
<![CDATA[
<?php
@@ -137,7 +137,7 @@
<section role="examples">
<example>
- <title>Run the Application</title>
+ <title>Run the Applicatioin</title>
&example.outputs.similar;
<screen>
<![CDATA[