[DOCUMENTATION] English:

 - manual fixes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16633 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/en/module_specs/Zend_Ldap-LDIF.xml

@@ -4,11 +4,14 @@
     <title>Serializing LDAP data to and from LDIF</title>
     <sect2 id="zend.ldap.ldif.encode">
         <title>Serialize a LDAP entry to LDIF</title>
-        <para>
-<programlisting role="php"><![CDATA[
+
+        <programlisting language="php"><![CDATA[
 $data = array(
     'dn'                         => 'uid=rogasawara,ou=営業部,o=Airius',
-    'objectclass'                => array('top', 'person', 'organizationalPerson', 'inetOrgPerson'),
+    'objectclass'                => array('top',
+                                          'person',
+                                          'organizationalPerson',
+                                          'inetOrgPerson'),
     'uid'                        => array('rogasawara'),
     'mail'                       => array('rogasawara@airius.co.jp'),
     'givenname;lang-ja'          => array('ロドニー'),
@@ -29,7 +32,8 @@ $data = array(
     'cn;lang-en'                 => array('Rodney Ogasawara'),
     'title;lang-en'              => array('Sales, Director'),
 );
-$ldif = Zend_Ldap_Ldif_Encoder::encode($data, array('sort' => false, 'version' => null));
+$ldif = Zend_Ldap_Ldif_Encoder::encode($data, array('sort' => false,
+                                                    'version' => null));
 /*
 $ldif contains:
 dn:: dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLG89QWlyaXVz
@@ -58,12 +62,13 @@ cn;lang-en: Rodney Ogasawara
 title;lang-en: Sales, Director
 */
 ]]></programlisting>
-        </para>
+
     </sect2>
+
     <sect2 id="zend.ldap.ldif.encode">
         <title>Deserialize a LDIF string into a LDAP entry</title>
-        <para>
-<programlisting role="php"><![CDATA[
+
+        <programlisting language="php"><![CDATA[
 $ldif = "dn:: dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLG89QWlyaXVz
 objectclass: top
 objectclass: person
@@ -92,7 +97,10 @@ $data = Zend_Ldap_Ldif_Encoder::decode($ldif);
 /*
 $data = array(
     'dn'                         => 'uid=rogasawara,ou=営業部,o=Airius',
-    'objectclass'                => array('top', 'person', 'organizationalPerson', 'inetOrgPerson'),
+    'objectclass'                => array('top',
+                                          'person',
+                                          'organizationalPerson',
+                                          'inetOrgPerson'),
     'uid'                        => array('rogasawara'),
     'mail'                       => array('rogasawara@airius.co.jp'),
     'givenname;lang-ja'          => array('ロドニー'),
@@ -115,7 +123,7 @@ $data = array(
 );
 */
 ]]></programlisting>
-        </para>
+
     </sect2>
 </sect1>
 

documentation/manual/en/module_specs/Zend_Ldap-Node.xml

@@ -40,11 +40,12 @@
 
             <example>
             <title>Traverse LDAP tree recursively</title>
-<programlisting role="php"><![CDATA[
+<programlisting language="php"><![CDATA[
 $options = array(/* ... */);
 $ldap = new Zend_Ldap($options);
 $ldap->bind();
-$ri = new RecursiveIteratorIterator($ldap->getBaseNode(), RecursiveIteratorIterator::SELF_FIRST);
+$ri = new RecursiveIteratorIterator($ldap->getBaseNode(),
+                                    RecursiveIteratorIterator::SELF_FIRST);
 foreach ($ri as $rdn => $n) {
     var_dump($n);
 }

documentation/manual/en/module_specs/Zend_Ldap-Server.xml

@@ -4,49 +4,75 @@
     <title>Getting information from the LDAP server</title>
     <sect2 id="zend.ldap.server.rootdse">
         <title>RootDSE</title>
-        <para>See the following documents for more information on the attributes contained within the RootDSE for a given LDAP server.</para>
+
+        <para>
+            See the following documents for more information on the attributes contained within
+            the RootDSE for a given <acronym>LDAP</acronym> server.
+        </para>
+
         <itemizedlist>
-  <listitem>
-    <para><ulink url="http://www.zytrax.com/books/ldap/ch3/#operational">OpenLDAP</ulink></para>
-  </listitem>
-  <listitem>
-    <para><ulink url="http://msdn.microsoft.com/en-us/library/ms684291(VS.85).aspx">Microsoft ActiveDirectory</ulink></para>
-  </listitem>
-  <listitem>
-    <para><ulink url="http://www.novell.com/documentation/edir88/edir88/index.html?page=/documentation/edir88/edir88/data/ah59jqq.html">Novell eDirectory</ulink></para>
-  </listitem>
-</itemizedlist>
-    <example id="zend.ldap.server.rootdse.getting">
-        <title>Getting hands on the RootDSE</title>
-    <programlisting role="php"><![CDATA[
+            <listitem>
+                <para>
+                    <ulink url="http://www.zytrax.com/books/ldap/ch3/#operational">OpenLDAP</ulink>
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <ulink
+                        url="http://msdn.microsoft.com/en-us/library/ms684291(VS.85).aspx">Microsoft
+                        ActiveDirectory</ulink>
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <ulink
+                        url="http://www.novell.com/documentation/edir88/edir88/index.html?page=/documentation/edir88/edir88/data/ah59jqq.html">Novell
+                        eDirectory</ulink>
+                </para>
+            </listitem>
+        </itemizedlist>
+
+        <example id="zend.ldap.server.rootdse.getting">
+            <title>Getting hands on the RootDSE</title>
+            <programlisting language="php"><![CDATA[
 $options = array(/* ... */);
 $ldap = new Zend_Ldap($options);
 $rootdse = $ldap->getRootDse();
 $serverType = $rootdse->getServerType();
 ]]></programlisting>
-    </example>
+        </example>
     </sect2>
+
     <sect2 id="zend.ldap.server.schema">
         <title>Schema Browsing</title>
+
         <example id="zend.ldap.server.schema.getting">
             <title>Getting hands on the server schema</title>
-            <programlisting role="php"><![CDATA[
+            <programlisting language="php"><![CDATA[
 $options = array(/* ... */);
 $ldap = new Zend_Ldap($options);
 $schema = $ldap->getSchema();
 $classes = $schema->getObjectClasses();
 ]]></programlisting>
         </example>
+        
         <sect3 id="zend.ldap.server.schema.openldap">
             <title>OpenLDAP</title>
             <para/>
         </sect3>
+        
         <sect3 id="zend.ldap.server.schema.activedirectory">
             <title>ActiveDirectory</title>
             <note>
                 <title>Schema browsing on ActiveDirectory servers</title>
-                <para>Due to restrictions on Microsoft ActiveDirectory servers regarding the number of entries returned by generic search routines and due to the structure of the ActiveDirectory schema repository, schema browsing is currently <emphasis>not</emphasis> available for Microsoft ActiveDirectory servers.</para>
-                </note>
+                <para>
+                    Due to restrictions on Microsoft ActiveDirectory servers regarding
+                    the number of entries returned by generic search routines and due to
+                    the structure of the ActiveDirectory schema repository, schema browsing
+                    is currently <emphasis>not</emphasis> available for Microsoft
+                    ActiveDirectory servers.
+                </para>
+            </note>
         </sect3>
     </sect2>
 </sect1>

documentation/manual/en/module_specs/Zend_Ldap-Tools.xml

@@ -2,15 +2,18 @@
 <!-- Reviewed: no -->
 <sect1 id="zend.ldap.tools">
     <title>Tools</title>
+
     <sect2 id="zend.ldap.tools.dn">
         <title>Creation and modification of DN strings</title>
         <para/>
     </sect2>
+
     <sect2 id="zend.ldap.tools.filter">
         <title>Using the filter API to create search filters</title>
+
         <example>
-        <title>Create simple LDAP filters</title>
-<programlisting role="php"><![CDATA[
+            <title>Create simple LDAP filters</title>
+            <programlisting language="php"><![CDATA[
 $f1  = Zend_Ldap_Filter::equals('name', 'value');         // (name=value)
 $f2  = Zend_Ldap_Filter::begins('name', 'value');         // (name=value*)
 $f3  = Zend_Ldap_Filter::ends('name', 'value');           // (name=*value)
@@ -23,20 +26,26 @@ $f9  = Zend_Ldap_Filter::approx('name', 'value');         // (name~=value)
 $f10 = Zend_Ldap_Filter::any('name');                     // (name=*)
 ]]></programlisting>
         </example>
+
         <example>
-        <title>Create more complex LDAP filters</title>
-<programlisting role="php"><![CDATA[
+            <title>Create more complex LDAP filters</title>
+            <programlisting language="php"><![CDATA[
 $f1 = Zend_Ldap_Filter::ends('name', 'value')->negate(); // (!(name=*value))
 
 $f2 = Zend_Ldap_Filter::equals('name', 'value');
 $f3 = Zend_Ldap_Filter::begins('name', 'value');
 $f4 = Zend_Ldap_Filter::ends('name', 'value');
-$f5 = Zend_Ldap_Filter::andFilter($f2, $f3, $f4);        // (&(name=value)(name=value*)(name=*value))
-$f6 = Zend_Ldap_Filter::orFilter($f2, $f3, $f4);         // (|(name=value)(name=value*)(name=*value))
+
+// (&(name=value)(name=value*)(name=*value))
+$f5 = Zend_Ldap_Filter::andFilter($f2, $f3, $f4);
+
+// (|(name=value)(name=value*)(name=*value))
+$f6 = Zend_Ldap_Filter::orFilter($f2, $f3, $f4);
 ]]></programlisting>
 
         </example>
     </sect2>
+
     <sect2 id="zend.ldap.tools.attribute">
         <title>Modify LDAP entries using the Attribute API</title>
         <para/>