Browse Source

[MANUAL] English:

- unified "INI" with acronym

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21823 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
145374b71b

+ 4 - 4
documentation/manual/en/module_specs/Zend_Config_Ini.xml

@@ -114,10 +114,10 @@ echo $config->database->params->dbname; // prints "dbname"
                         <entry><varname>$section</varname></entry>
                         <entry><varname>$section</varname></entry>
 
 
                         <entry>
                         <entry>
-                            The [section] within the ini file that is to be loaded. Setting
-                            this parameter to <constant>NULL</constant> will load all sections.
-                            Alternatively, an array of section names may be supplied to load
-                            multiple sections.
+                            The [section] within the <acronym>INI</acronym> file that is to be
+                            loaded. Setting this parameter to <constant>NULL</constant> will load
+                            all sections. Alternatively, an array of section names may be supplied
+                            to load multiple sections.
                         </entry>
                         </entry>
                     </row>
                     </row>
 
 

+ 2 - 2
documentation/manual/en/module_specs/Zend_Feed_Pubsubhubbub.xml

@@ -648,8 +648,8 @@ class CallbackController extends Zend_Controller_Action
         <para>
         <para>
             Actually adding the route which would map the path-appended key
             Actually adding the route which would map the path-appended key
             to a parameter for retrieval from a controller can be accomplished using
             to a parameter for retrieval from a controller can be accomplished using
-            a Route configuration such as the INI formatted example below for use
-            with <classname>Zend_Application</classname> bootstrapping.
+            a Route configuration such as the <acronym>INI</acronym> formatted example below for
+            use with <classname>Zend_Application</classname> bootstrapping.
         </para>
         </para>
 
 
         <programlisting language="dosini"><![CDATA[
         <programlisting language="dosini"><![CDATA[

+ 14 - 12
documentation/manual/en/module_specs/Zend_Tool_Framework-Extending.xml

@@ -126,7 +126,8 @@
                 <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the
                 <constant>ZF_CONFIG_FILE</constant> is set, then its value will be used as the
                 location of the configuration file to use with the Console Client. The
                 location of the configuration file to use with the Console Client. The
                 <constant>ZF_CONFIG_FILE</constant> can point to any
                 <constant>ZF_CONFIG_FILE</constant> can point to any
-                <classname>Zend_Config</classname> readable INI, XML or <acronym>PHP</acronym> File.
+                <classname>Zend_Config</classname> readable <acronym>INI</acronym>, XML or
+                <acronym>PHP</acronym> File.
             </para>
             </para>
 
 
             <para>
             <para>
@@ -141,11 +142,11 @@
 
 
             <para>
             <para>
                 The configuration file should be structured as a <classname>Zend_Config</classname>
                 The configuration file should be structured as a <classname>Zend_Config</classname>
-                configuration file, in ini format, and without any sections being defined. First
-                level keys should be used by the provider searching for a specific value. For
-                example, if the "Project" provider is expecting a "profiles" directory, then it
-                should typically be understood that it will search for the following ini key value
-                pair:
+                configuration file, in <acronym>INI</acronym> format, and without any sections being
+                defined. First level keys should be used by the provider searching for a specific
+                value. For example, if the "Project" provider is expecting a "profiles" directory,
+                then it should typically be understood that it will search for the following
+                <acronym>INI</acronym> key value pair:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -153,12 +154,12 @@ project.profile = some/path/to/some-directory
 ]]></programlisting>
 ]]></programlisting>
 
 
             <para>
             <para>
-                The only reserved ini prefix is the value "php". The "php" prefix to values will be
-                reserved to store names and values of runtime settable <acronym>PHP</acronym>
-                values, such as <property>include_path</property> or
+                The only reserved <acronym>INI</acronym> prefix is the value "php". The "php" prefix
+                to values will be reserved to store names and values of runtime settable
+                <acronym>PHP</acronym> values, such as <property>include_path</property> or
                 <property>error_reporting</property>. To override the
                 <property>error_reporting</property>. To override the
                 <property>include_path</property> and <property>error_reporting</property> with an
                 <property>include_path</property> and <property>error_reporting</property> with an
-                ini value, a developer would set:
+                <acronym>INI</acronym> value, a developer would set:
             </para>
             </para>
 
 
             <programlisting language="php"><![CDATA[
             <programlisting language="php"><![CDATA[
@@ -168,8 +169,9 @@ php.error_reporting = 1
 
 
             <important>
             <important>
                 <para>
                 <para>
-                    The reserved prefix "php" only works with INI files. You can't set
-                    <acronym>PHP</acronym> INI values with <acronym>PHP</acronym> or XML config.
+                    The reserved prefix "php" only works with <acronym>INI</acronym> files. You
+                    can't set <acronym>PHP</acronym> <acronym>INI</acronym> values with
+                    <acronym>PHP</acronym> or XML config.
                 </para>
                 </para>
             </important>
             </important>
         </sect3>
         </sect3>

+ 1 - 1
documentation/manual/en/module_specs/Zend_Translate-Adapters.xml

@@ -46,7 +46,7 @@
 
 
                 <row>
                 <row>
                     <entry>Ini</entry>
                     <entry>Ini</entry>
-                    <entry>Use simple ini (*.ini) files</entry>
+                    <entry>Use simple <acronym>INI</acronym> (*.ini) files</entry>
 
 
                     <entry>
                     <entry>
                         Simple text file format; fast; possible problems with unicode characters
                         Simple text file format; fast; possible problems with unicode characters

+ 10 - 10
documentation/manual/en/module_specs/Zend_Translate-SourceCreation.xml

@@ -376,16 +376,16 @@ $translate->addTranslation(
         </example>
         </example>
 
 
         <para>
         <para>
-            <acronym>INI</acronym> files have several restrictions. If a value in the ini file
-            contains any non-alphanumeric characters it needs to be enclosed in double-quotes
-            (<code>"</code>). There are also reserved words which must not be used as keys for ini
-            files. These include: <constant>NULL</constant>, <code>yes</code>, <code>no</code>,
-            <constant>TRUE</constant>, and <constant>FALSE</constant>. Values
-            <constant>NULL</constant>, <code>no</code> and <constant>FALSE</constant> results in
-            <code>""</code>, <code>yes</code> and <constant>TRUE</constant> results in
-            <code>1</code>. Characters <code>{}|&amp;~![()"</code> must not be used anywhere in the
-            key and have a special meaning in the value. Do not use them as it will produce
-            unexpected behaviour.
+            <acronym>INI</acronym> files have several restrictions. If a value in the
+            <acronym>INI</acronym> file contains any non-alphanumeric characters it needs to be
+            enclosed in double-quotes (<code>"</code>). There are also reserved words which must not
+            be used as keys for <acronym>INI</acronym> files. These include:
+            <constant>NULL</constant>, <code>yes</code>, <code>no</code>, <constant>TRUE</constant>,
+            and <constant>FALSE</constant>. Values <constant>NULL</constant>, <code>no</code> and
+            <constant>FALSE</constant> results in <code>""</code>, <code>yes</code> and
+            <constant>TRUE</constant> results in <code>1</code>. Characters
+            <code>{}|&amp;~![()"</code> must not be used anywhere in the key and have a special
+            meaning in the value. Do not use them as it will produce unexpected behaviour.
         </para>
         </para>
     </sect2>
     </sect2>
 </sect1>
 </sect1>

+ 3 - 3
documentation/manual/en/tutorials/multiuser-sessions.xml

@@ -65,9 +65,9 @@ resources.session.remember_me_seconds = 864000
         <para>
         <para>
             As you can see, the options passed in are the same options that you'd expect to find
             As you can see, the options passed in are the same options that you'd expect to find
             in the ext/session extension in <acronym>PHP</acronym>. Those options setup the path
             in the ext/session extension in <acronym>PHP</acronym>. Those options setup the path
-            to the session files where data will be stored within the project. Since ini files can
-            additionally use constants, the above will use the APPLICATION_PATH constant and
-            relatively point to a data session directory.
+            to the session files where data will be stored within the project. Since
+            <acronym>INI</acronym> files can additionally use constants, the above will use the
+            APPLICATION_PATH constant and relatively point to a data session directory.
         </para>
         </para>
 
 
         <para>
         <para>

+ 1 - 1
documentation/manual/en/tutorials/quickstart-create-layout.xml

@@ -68,7 +68,7 @@ resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
 ]]></programlisting>
 ]]></programlisting>
 
 
     <para>
     <para>
-        The final INI file should look as follows:
+        The final <acronym>INI</acronym> file should look as follows:
     </para>
     </para>
 
 
     <programlisting language="ini"><![CDATA[
     <programlisting language="ini"><![CDATA[

+ 7 - 7
documentation/manual/en/tutorials/quickstart-create-project.xml

@@ -202,13 +202,13 @@ phpSettings.display_errors = 1
 ]]></programlisting>
 ]]></programlisting>
 
 
         <para>
         <para>
-            Several things about this file should be noted. First, when using INI-style
-            configuration, you can reference constants directly and expand them;
-            <constant>APPLICATION_PATH</constant> is actually a constant. Additionally note that
-            there are several sections defined: production, staging, testing, and development. The
-            latter three inherit settings from the "production" environment. This is a useful way to
-            organize configuration to ensure that appropriate settings are available in each stage
-            of application development.
+            Several things about this file should be noted. First, when using
+            <acronym>INI</acronym>-style configuration, you can reference constants directly and
+            expand them; <constant>APPLICATION_PATH</constant> is actually a constant. Additionally
+            note that there are several sections defined: production, staging, testing, and
+            development. The latter three inherit settings from the "production" environment. This
+            is a useful way to organize configuration to ensure that appropriate settings are
+            available in each stage of application development.
         </para>
         </para>
     </sect2>
     </sect2>