Browse Source

[DOCUMENTATION] English:

- manual fixes (<code>string</code> ==> <type>String</type>)

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

+ 2 - 2
documentation/manual/en/module_specs/Zend_Cache-Frontends.xml

@@ -501,7 +501,7 @@ $result = $cache->foobar2('1', '2');
                      <tbody>
                      <tbody>
                           <row>
                           <row>
                               <entry><code>master_file (deprecated)</code></entry>
                               <entry><code>master_file (deprecated)</code></entry>
-                              <entry><code>string</code></entry>
+                              <entry><type>String</type></entry>
                               <entry><code></code></entry>
                               <entry><code></code></entry>
                               <entry>
                               <entry>
                                   the complete path and name of the master file
                                   the complete path and name of the master file
@@ -517,7 +517,7 @@ $result = $cache->foobar2('1', '2');
                          </row>
                          </row>
                          <row>
                          <row>
                               <entry><code>master_files_mode</code></entry>
                               <entry><code>master_files_mode</code></entry>
-                              <entry><code>string</code></entry>
+                              <entry><type>String</type></entry>
                               <entry><classname>Zend_Cache_Frontend_File::MODE_OR</classname></entry>
                               <entry><classname>Zend_Cache_Frontend_File::MODE_OR</classname></entry>
                               <entry>
                               <entry>
                                   <classname>Zend_Cache_Frontend_File::MODE_AND</classname> or <classname>Zend_Cache_Frontend_File::MODE_OR</classname> ;
                                   <classname>Zend_Cache_Frontend_File::MODE_AND</classname> or <classname>Zend_Cache_Frontend_File::MODE_OR</classname> ;

+ 1 - 1
documentation/manual/en/module_specs/Zend_Measure-Creation.xml

@@ -10,7 +10,7 @@
         <link linkend="zend.measure.creation.number"><code>numeric argument</code>
         <link linkend="zend.measure.creation.number"><code>numeric argument</code>
         </link>
         </link>
         , a
         , a
-        <link linkend="zend.measure.creation.string"><code>string</code>
+        <link linkend="zend.measure.creation.string"><type>String</type>
         </link>
         </link>
         without units, or a
         without units, or a
         <link linkend="zend.measure.creation.localized"><code>localized string</code> with unit(s) specified.
         <link linkend="zend.measure.creation.localized"><code>localized string</code> with unit(s) specified.

+ 9 - 9
documentation/manual/en/module_specs/Zend_Navigation-Pages-Common.xml

@@ -37,7 +37,7 @@
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>label</code></entry>
                     <entry><code>label</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         A page label, such as 'Home' or 'Blog'.
                         A page label, such as 'Home' or 'Blog'.
@@ -45,7 +45,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>id</code></entry>
                     <entry><code>id</code></entry>
-                    <entry><code>string</code> | <code>int</code></entry>
+                    <entry><type>String</type> | <code>int</code></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         An id tag/attribute that may be used when rendering
                         An id tag/attribute that may be used when rendering
@@ -54,7 +54,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>class</code></entry>
                     <entry><code>class</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         A CSS class that may be used when rendering the page,
                         A CSS class that may be used when rendering the page,
@@ -63,7 +63,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>title</code></entry>
                     <entry><code>title</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         A short page description, typically for using
                         A short page description, typically for using
@@ -72,7 +72,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>target</code></entry>
                     <entry><code>target</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Specifies a target that may be used for the page,
                         Specifies a target that may be used for the page,
@@ -107,7 +107,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>order</code></entry>
                     <entry><code>order</code></entry>
-                    <entry><code>string</code> | <code>int</code> | <constant>NULL</constant></entry>
+                    <entry><type>String</type> | <code>int</code> | <constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Works like order for elements in
                         Works like order for elements in
@@ -116,7 +116,7 @@
                         the page will be iterated in a specific order, meaning
                         the page will be iterated in a specific order, meaning
                         you can force a page to be iterated before others by
                         you can force a page to be iterated before others by
                         setting the <code>order</code> attribute to a low number,
                         setting the <code>order</code> attribute to a low number,
-                        e.g. -100. If a <code>string</code> is given, it must
+                        e.g. -100. If a <type>String</type> is given, it must
                         parse to a valid <code>int</code>. If <constant>NULL</constant>
                         parse to a valid <code>int</code>. If <constant>NULL</constant>
                         is given, it will be reset, meaning the order in which
                         is given, it will be reset, meaning the order in which
                         the page was added to the container will be used.
                         the page was added to the container will be used.
@@ -124,7 +124,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>resource</code></entry>
                     <entry><code>resource</code></entry>
-                    <entry><code>string</code> | <classname>Zend_Acl_Resource_Interface</classname> | <constant>NULL</constant></entry>
+                    <entry><type>String</type> | <classname>Zend_Acl_Resource_Interface</classname> | <constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         ACL resource to associate with the page. Read more in
                         ACL resource to associate with the page. Read more in
@@ -134,7 +134,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>privilege</code></entry>
                     <entry><code>privilege</code></entry>
-                    <entry><code>string</code> | <constant>NULL</constant></entry>
+                    <entry><type>String</type> | <constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         ACL privilege to associate with the page. Read more in
                         ACL privilege to associate with the page. Read more in

+ 4 - 4
documentation/manual/en/module_specs/Zend_Navigation-Pages-MVC.xml

@@ -27,7 +27,7 @@
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>action</code></entry>
                     <entry><code>action</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Action name to use when generating
                         Action name to use when generating
@@ -36,7 +36,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>controller</code></entry>
                     <entry><code>controller</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Controller name to use when generating
                         Controller name to use when generating
@@ -45,7 +45,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>module</code></entry>
                     <entry><code>module</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Module name to use when generating
                         Module name to use when generating
@@ -62,7 +62,7 @@
                 </row>
                 </row>
                 <row>
                 <row>
                     <entry><code>route</code></entry>
                     <entry><code>route</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         Route name to use when generating
                         Route name to use when generating

+ 2 - 2
documentation/manual/en/module_specs/Zend_Navigation-Pages-URI.xml

@@ -10,7 +10,7 @@
         to the common page options, a URI page takes only one option —
         to the common page options, a URI page takes only one option —
         <code>uri</code>. The <code>uri</code> will be returned when
         <code>uri</code>. The <code>uri</code> will be returned when
         calling <code>$page->getHref()</code>, and may be a
         calling <code>$page->getHref()</code>, and may be a
-        <code>string</code> or <constant>NULL</constant>.
+        <type>String</type> or <constant>NULL</constant>.
     </para>
     </para>
 
 
     <note>
     <note>
@@ -37,7 +37,7 @@
             <tbody>
             <tbody>
                 <row>
                 <row>
                     <entry><code>uri</code></entry>
                     <entry><code>uri</code></entry>
-                    <entry><code>string</code></entry>
+                    <entry><type>String</type></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry><constant>NULL</constant></entry>
                     <entry>
                     <entry>
                         URI to page. This can be any string or null.
                         URI to page. This can be any string or null.

+ 9 - 9
documentation/manual/en/module_specs/Zend_View-Helpers-Navigation.xml

@@ -80,7 +80,7 @@
                 <para>
                 <para>
                     <code>{get|set}Acl()</code>, <code>{get|set}Role()</code>,
                     <code>{get|set}Acl()</code>, <code>{get|set}Role()</code>,
                     gets/sets ACL (<classname>Zend_Acl</classname>) instance and
                     gets/sets ACL (<classname>Zend_Acl</classname>) instance and
-                    role (<code>string</code> or
+                    role (<type>String</type> or
                     <classname>Zend_Acl_Role_Interface</classname>) used for
                     <classname>Zend_Acl_Role_Interface</classname>) used for
                     filtering out pages when rendering, and
                     filtering out pages when rendering, and
                     <code>{get|set}UseAcl()</code> controls whether ACL should
                     <code>{get|set}UseAcl()</code> controls whether ACL should
@@ -111,7 +111,7 @@
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <code>{get|set}Indent()</code> gets/set indentation. The
                     <code>{get|set}Indent()</code> gets/set indentation. The
-                    setter accepts a <code>string</code> or an <code>int</code>.
+                    setter accepts a <type>String</type> or an <code>int</code>.
                     In the case of an <code>int</code>, the helper will use
                     In the case of an <code>int</code>, the helper will use
                     the given number of spaces for indentation. I.e.,
                     the given number of spaces for indentation. I.e.,
                     <code>setIndent(4)</code> means 4 initial spaces of
                     <code>setIndent(4)</code> means 4 initial spaces of
@@ -595,9 +595,9 @@ Zend_View_Helper_Navigation_HelperAbstract::setDefaultRole('member');
                    <code>render()</code> method will use the
                    <code>render()</code> method will use the
                    <code>renderPartial()</code> method. If no partial is
                    <code>renderPartial()</code> method. If no partial is
                    set, the <code>renderStraight()</code> method is used.
                    set, the <code>renderStraight()</code> method is used.
-                   The helper expects the partial to be a <code>string</code>
+                   The helper expects the partial to be a <type>String</type>
                    or an <type>Array</type> with two elements. If the partial
                    or an <type>Array</type> with two elements. If the partial
-                   is a <code>string</code>, it denotes the name of the partial
+                   is a <type>String</type>, it denotes the name of the partial
                    script to use. If it is an <type>Array</type>, the first
                    script to use. If it is an <type>Array</type>, the first
                    element will be used as the name of the partial view
                    element will be used as the name of the partial view
                    script, and the second element is the module where the
                    script, and the second element is the module where the
@@ -848,7 +848,7 @@ Products, Foo Server, FAQ
                 When looking for relations in the the page instance
                 When looking for relations in the the page instance
                 (<code>$page->getRel($type)</code> or
                 (<code>$page->getRel($type)</code> or
                 <code>$page->getRev($type)</code>), the helper accepts the
                 <code>$page->getRev($type)</code>), the helper accepts the
-                values of type <code>string</code>, <type>Array</type>,
+                values of type <type>String</type>, <type>Array</type>,
                 <classname>Zend_Config</classname>, or
                 <classname>Zend_Config</classname>, or
                 <classname>Zend_Navigation_Page</classname>. If a string
                 <classname>Zend_Navigation_Page</classname>. If a string
                 is found, it will be converted to a
                 is found, it will be converted to a
@@ -1206,9 +1206,9 @@ Output:
                     <code>render()</code> method will use the
                     <code>render()</code> method will use the
                     <code>renderPartial()</code> method. If no partial is
                     <code>renderPartial()</code> method. If no partial is
                     set, the <code>renderMenu()</code> method is used.
                     set, the <code>renderMenu()</code> method is used.
-                    The helper expects the partial to be a <code>string</code>
+                    The helper expects the partial to be a <type>String</type>
                     or an <type>Array</type> with two elements. If the partial
                     or an <type>Array</type> with two elements. If the partial
-                    is a <code>string</code>, it denotes the name of the partial
+                    is a <type>String</type>, it denotes the name of the partial
                     script to use. If it is an <type>Array</type>, the first
                     script to use. If it is an <type>Array</type>, the first
                     element will be used as the name of the partial view
                     element will be used as the name of the partial view
                     script, and the second element is the module where the
                     script, and the second element is the module where the
@@ -1244,7 +1244,7 @@ Output:
                         <listitem>
                         <listitem>
                             <para>
                             <para>
                                 <code>indent</code>; indentation. Expects a
                                 <code>indent</code>; indentation. Expects a
-                                <code>string</code> or an <code>int</code>
+                                <type>String</type> or an <code>int</code>
                                 value.
                                 value.
                             </para>
                             </para>
                         </listitem>
                         </listitem>
@@ -1266,7 +1266,7 @@ Output:
                             <para>
                             <para>
                                 <code>ulClass</code>; CSS class for
                                 <code>ulClass</code>; CSS class for
                                 <code>ul</code> element. Expects a
                                 <code>ul</code> element. Expects a
-                                <code>string</code>.
+                                <type>String</type>.
                             </para>
                             </para>
                         </listitem>
                         </listitem>
                         <listitem>
                         <listitem>

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

@@ -48,7 +48,7 @@ echo $client->call('test.sayHello');
         <para>
         <para>
             The XML-RPC value returned from the remote method call will be
             The XML-RPC value returned from the remote method call will be
             automatically unmarshaled and cast to the equivalent PHP native
             automatically unmarshaled and cast to the equivalent PHP native
-            type. In the example above, a PHP <code>string</code> is returned
+            type. In the example above, a PHP <type>String</type> is returned
             and is immediately ready to be used.
             and is immediately ready to be used.
         </para>
         </para>
 
 
@@ -106,7 +106,7 @@ $result = $client->call('test.sayHello', array($arg1, $arg2));
             <title>PHP Native Types as Parameters</title>
             <title>PHP Native Types as Parameters</title>
             <para>
             <para>
                 Parameters may be passed to <code>call()</code> as native PHP
                 Parameters may be passed to <code>call()</code> as native PHP
-                variables, meaning as a <code>string</code>,
+                variables, meaning as a <type>String</type>,
                 <code>integer</code>, <code>float</code>,
                 <code>integer</code>, <code>float</code>,
                 <type>Boolean</type>, <type>Array</type>, or an
                 <type>Boolean</type>, <type>Array</type>, or an
                 <code>object</code>. In this case, each PHP native type will
                 <code>object</code>. In this case, each PHP native type will