Bladeren bron

[MANUAL] English:

- manual fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21994 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 15 jaren geleden
bovenliggende
commit
aef0df5f7e

+ 10 - 10
documentation/manual/en/module_specs/Zend_Filter-Boolean.xml

@@ -228,55 +228,55 @@ $filter->filter('yes');
 
 
                 <tbody>
                 <tbody>
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::BOOLEAN</entry>
+                        <entry><constant>Zend_Filter_Boolean::BOOLEAN</constant></entry>
                         <entry><constant>TRUE</constant></entry>
                         <entry><constant>TRUE</constant></entry>
                         <entry><constant>FALSE</constant></entry>
                         <entry><constant>FALSE</constant></entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::INTEGER</entry>
+                        <entry><constant>Zend_Filter_Boolean::INTEGER</constant></entry>
                         <entry>0</entry>
                         <entry>0</entry>
                         <entry>1</entry>
                         <entry>1</entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::FLOAT</entry>
+                        <entry><constant>Zend_Filter_Boolean::FLOAT</constant></entry>
                         <entry>0.0</entry>
                         <entry>0.0</entry>
                         <entry>1.0</entry>
                         <entry>1.0</entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::STRING</entry>
+                        <entry><constant>Zend_Filter_Boolean::STRING</constant></entry>
                         <entry>""</entry>
                         <entry>""</entry>
                         <entry />
                         <entry />
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::ZERO</entry>
+                        <entry><constant>Zend_Filter_Boolean::ZERO</constant></entry>
                         <entry>"0"</entry>
                         <entry>"0"</entry>
                         <entry>"1"</entry>
                         <entry>"1"</entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::EMPTY_ARRAY</entry>
-                        <entry>array()</entry>
+                        <entry><constant>Zend_Filter_Boolean::EMPTY_ARRAY</constant></entry>
+                        <entry><methodname>array()</methodname></entry>
                         <entry />
                         <entry />
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::NULL</entry>
+                        <entry><constant>Zend_Filter_Boolean::NULL</constant></entry>
                         <entry><constant>NULL</constant></entry>
                         <entry><constant>NULL</constant></entry>
                         <entry />
                         <entry />
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::FALSE_STRING</entry>
+                        <entry><constant>Zend_Filter_Boolean::FALSE_STRING</constant></entry>
                         <entry>"false" (case independently)</entry>
                         <entry>"false" (case independently)</entry>
                         <entry>"true" (case independently)</entry>
                         <entry>"true" (case independently)</entry>
                     </row>
                     </row>
 
 
                     <row>
                     <row>
-                        <entry>Zend_Filter_Boolean::YES</entry>
+                        <entry><constant>Zend_Filter_Boolean::YES</constant></entry>
                         <entry>localized "yes" (case independently)</entry>
                         <entry>localized "yes" (case independently)</entry>
                         <entry>localized "no" (case independently)</entry>
                         <entry>localized "no" (case independently)</entry>
                     </row>
                     </row>

+ 5 - 5
documentation/manual/en/module_specs/Zend_Filter-Encryption.xml

@@ -120,7 +120,7 @@ $filter->setAdapter('openssl');
         </para>
         </para>
 
 
         <para>
         <para>
-            You can get/set the encryption values also afterwards with the
+            You can get and set the encryption values also afterwards with the
             <methodname>getEncryption()</methodname> and <methodname>setEncryption()</methodname>
             <methodname>getEncryption()</methodname> and <methodname>setEncryption()</methodname>
             methods.
             methods.
         </para>
         </para>
@@ -135,13 +135,13 @@ $filter->setAdapter('openssl');
         <note>
         <note>
             <para>
             <para>
                 You should also note that all settings which be checked when you create the instance
                 You should also note that all settings which be checked when you create the instance
-                or when you call setEncryption(). If mcrypt detects problem with your settings an
-                exception will be thrown.
+                or when you call <methodname>setEncryption()</methodname>. If mcrypt detects problem
+                with your settings an exception will be thrown.
             </para>
             </para>
         </note>
         </note>
 
 
         <para>
         <para>
-            You can get/set the encryption vector by calling <methodname>getVector()</methodname>
+            You can get or set the encryption vector by calling <methodname>getVector()</methodname>
             and <methodname>setVector()</methodname>. A given string will be truncated or padded to
             and <methodname>setVector()</methodname>. A given string will be truncated or padded to
             the needed vector size of the used algorithm.
             the needed vector size of the used algorithm.
         </para>
         </para>
@@ -212,7 +212,7 @@ print $encrypted;
         </itemizedlist>
         </itemizedlist>
 
 
         <para>
         <para>
-            You can get/set the public keys also afterwards with the
+            You can get or set the public keys also afterwards with the
             <methodname>getPublicKey()</methodname> and <methodname>setPublicKey()</methodname>
             <methodname>getPublicKey()</methodname> and <methodname>setPublicKey()</methodname>
             methods. The private key can also be get and set with the related
             methods. The private key can also be get and set with the related
             <methodname>getPrivateKey()</methodname> and <methodname>setPrivateKey()</methodname>
             <methodname>getPrivateKey()</methodname> and <methodname>setPrivateKey()</methodname>

+ 7 - 6
documentation/manual/en/module_specs/Zend_Filter-Inflector.xml

@@ -53,7 +53,7 @@ $filtered = $inflector->filter(array('page' => $string));
 
 
         <para>
         <para>
             When calling <methodname>filter()</methodname>, you then pass in an array of
             When calling <methodname>filter()</methodname>, you then pass in an array of
-            key/value pairs corresponding to the variables in the target.
+            key and value pairs corresponding to the variables in the target.
         </para>
         </para>
 
 
         <para>
         <para>
@@ -68,8 +68,9 @@ $filtered = $inflector->filter(array('page' => $string));
         <para>
         <para>
             As an example, you can use any <classname>Zend_Filter</classname> concrete
             As an example, you can use any <classname>Zend_Filter</classname> concrete
             implementations; however, instead of referring to them as
             implementations; however, instead of referring to them as
-            'Zend_Filter_Alpha' or 'Zend_Filter_StringToLower', you'd specify
-            only 'Alpha' or 'StringToLower'.
+            '<classname>Zend_Filter_Alpha</classname>' or
+            '<classname>Zend_Filter_StringToLower</classname>', you'd specify
+            only '<classname>Alpha</classname>' or '<classname>StringToLower</classname>'.
         </para>
         </para>
     </sect2>
     </sect2>
 
 
@@ -304,7 +305,7 @@ class Foo
                         <emphasis>String</emphasis>. The string may be a filter
                         <emphasis>String</emphasis>. The string may be a filter
                         class name, or a class name segment minus any prefix set
                         class name, or a class name segment minus any prefix set
                         in the inflector's plugin loader (by default, minus the
                         in the inflector's plugin loader (by default, minus the
-                        'Zend_Filter' prefix).
+                        '<classname>Zend_Filter</classname>' prefix).
                     </para>
                     </para>
                 </listitem>
                 </listitem>
 
 
@@ -352,7 +353,7 @@ $inflector->setFilterRule('script', array(
             </para>
             </para>
 
 
             <para>
             <para>
-                Each method takes an array of variable/rule pairs, where the
+                Each method takes an array of variable and rule pairs, where the
                 rule may be whatever the type of rule accepts (string, filter
                 rule may be whatever the type of rule accepts (string, filter
                 object, or array). Variable names accept a special notation to
                 object, or array). Variable names accept a special notation to
                 allow setting static rules and filter rules, according to the
                 allow setting static rules and filter rules, according to the
@@ -468,7 +469,7 @@ $inflector->addRules(array(
             <listitem>
             <listitem>
                 <para>
                 <para>
                     <property>filterPrefixPath</property> specifies one or more filter
                     <property>filterPrefixPath</property> specifies one or more filter
-                    prefix/path pairs for use with the inflector.
+                    prefix and path pairs for use with the inflector.
                 </para>
                 </para>
             </listitem>
             </listitem>