From 11f2d48e601de90a5a07d99cf0fa3937c42d8714 Mon Sep 17 00:00:00 2001 From: Yannick Torres Date: Sun, 23 Jan 2005 20:04:36 +0000 Subject: [PATCH] add missing cdata section, use more entities & some wz git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@178032 c90b9560-bf6c-de11-be94-00142212c4b1 --- appendices/about.xml | 14 ++++++-- features/file-upload.xml | 8 +++-- language/oop.xml | 26 +++++++------- language/oop5/object-comparison.xml | 12 ++++--- language/operators.xml | 16 ++++----- language/types.xml | 34 +++++++------------ .../functions/iconv-mime-decode-headers.xml | 34 ++++++++++--------- .../iconv/functions/iconv-mime-decode.xml | 10 +++--- .../iconv/functions/iconv-mime-encode.xml | 12 ++++--- reference/ldap/functions/ldap-add.xml | 30 +++++++++------- .../ldap/functions/ldap-get-attributes.xml | 13 ++++--- reference/ldap/functions/ldap-get-entries.xml | 21 +++++++----- 12 files changed, 127 insertions(+), 103 deletions(-) diff --git a/appendices/about.xml b/appendices/about.xml index a79b2c5a0c..6bf6e7853e 100644 --- a/appendices/about.xml +++ b/appendices/about.xml @@ -1,5 +1,5 @@ - + About the manual @@ -140,7 +140,8 @@ Let's use the definition for strlen as our first example: - + + @@ -208,7 +210,9 @@ Returns the length of string. + @@ -217,7 +221,9 @@ Returns the length of string. + @@ -247,7 +253,9 @@ Returns the length of string. - (PHP 4 >= 4.3.0, PHP 5) += 4.3.0, PHP 5) +]]> diff --git a/features/file-upload.xml b/features/file-upload.xml index eef2626ae6..6a495b1eb7 100644 --- a/features/file-upload.xml +++ b/features/file-upload.xml @@ -1,5 +1,5 @@ - + Handling file uploads @@ -456,8 +456,10 @@ fclose($putdata); PUT requests are much simpler than a file upload and they look something like this: - + + @@ -474,7 +476,9 @@ PUT /path/filename.html HTTP/1.1 a <Virtualhost> block. A line like this would do the trick: + diff --git a/language/oop.xml b/language/oop.xml index 0e3ff3c35d..b682b91f04 100644 --- a/language/oop.xml +++ b/language/oop.xml @@ -1,5 +1,5 @@ - + Classes and Objects (PHP 4) @@ -972,9 +972,7 @@ $a->c->echoValue(); ?> ]]> - - This example will output: - + &example.outputs; ]]> - - We will see: - + &example.outputs; + + +]]> + + Which is the output we will expect to obtain given the comparison rules above. Only instances with the same values for their attributes and from the same class are considered equal and identical. @@ -1122,9 +1122,9 @@ compareObjects($u, $w); ?> ]]> - - Which gives the expected output: - + &example.outputs; + + +]]> + + diff --git a/language/oop5/object-comparison.xml b/language/oop5/object-comparison.xml index a9665373fc..65cefa5799 100755 --- a/language/oop5/object-comparison.xml +++ b/language/oop5/object-comparison.xml @@ -1,5 +1,5 @@ - + Comparing objects @@ -76,9 +76,9 @@ compareObjects($o, $r); ?> ]]> - - This example will output: - + &example.outputs; + + +]]> + + diff --git a/language/operators.xml b/language/operators.xml index f2704da29f..03d69b17b7 100644 --- a/language/operators.xml +++ b/language/operators.xml @@ -1,5 +1,5 @@ - + Operators @@ -775,21 +775,19 @@ echo "Should be 4: " . $a . "
\n"; $i = 'W'; for($n=0; $n<6; $n++) echo ++$i . "\n"; - -/* - Produces the output similar to the following: - +]]> + + &example.outputs; + + ]]> - + diff --git a/language/types.xml b/language/types.xml index ea357b6b91..d006ee1825 100644 --- a/language/types.xml +++ b/language/types.xml @@ -1,5 +1,5 @@ - + Types @@ -559,10 +559,12 @@ $c = 7E-10; Formally: - + + The size of a float is platform-dependent, @@ -1475,9 +1477,8 @@ print_r($array); ?> ]]> - - The above example would produce the following output: - + &example.outputs; + 7 ) ]]> - - + @@ -1609,9 +1609,8 @@ for ($i = 0; $i < $count; $i++) { ]]> - - The output from the above is: - + &example.outputs; + - - + More examples to demonstrate this fact: @@ -1895,9 +1893,7 @@ foreach ($colors as $color) { ?> ]]> - - This will output: - + &example.outputs; ]]> - - This will output: - + &example.outputs; ]]> - - This will output: - + &example.outputs; - + iconv_mime_decode_headers @@ -82,14 +82,15 @@ <function>iconv_mime_decode_headers</function> example -<?php -$headers_string = <<<EOF + Received: from localhost (localhost [127.0.0.1]) by localhost - with SMTP id example for <example@example.com> + with SMTP id example for Thu, 1 Jan 1970 00:00:00 +0000 (UTC) (envelope-from example-return-0000-example=example.com@example.com) Received: (qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000 @@ -98,25 +99,26 @@ EOF; $headers = iconv_mime_decode_headers($headers_string, 0, "ISO-8859-1"); print_r($headers); -?> +?> +]]> - - The output of this script should look like: - + &example.outputs; + Prüfung Prüfung + [To] => example@example.com + [Date] => Thu, 1 Jan 1970 00:00:00 +0000 + [Message-Id] => + [Received] => Array ( - [0] => from localhost (localhost [127.0.0.1]) by localhost with SMTP id example for <example@example.com>; Thu, 1 Jan 1970 00:00:00 +0000 (UTC) (envelope-from example-return-0000-example=example.com@example.com) - [1] => (qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000 + [0] => from localhost (localhost [127.0.0.1]) by localhost with SMTP id example for ; Thu, 1 Jan 1970 00:00:00 +0000 (UTC) (envelope-from example-return-0000-example=example.com@example.com) + [1] => (qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000 ) ) +]]> diff --git a/reference/iconv/functions/iconv-mime-decode.xml b/reference/iconv/functions/iconv-mime-decode.xml index 3e16c2d66d..4a3fa123ea 100644 --- a/reference/iconv/functions/iconv-mime-decode.xml +++ b/reference/iconv/functions/iconv-mime-decode.xml @@ -1,5 +1,5 @@ - + @@ -72,11 +72,13 @@ <function>iconv_mime_decode</function> example -<?php -// This yields "Subject: Prüfung Prüfung" + +]]> diff --git a/reference/iconv/functions/iconv-mime-encode.xml b/reference/iconv/functions/iconv-mime-encode.xml index 84b97e7639..582ae2b003 100644 --- a/reference/iconv/functions/iconv-mime-encode.xml +++ b/reference/iconv/functions/iconv-mime-encode.xml @@ -1,5 +1,5 @@ - + @@ -124,7 +124,8 @@ Subject: =?ISO-8859-1?Q?Pr=FCfung_f=FCr?= Entwerfen von einer MIME kopfzeile <function>iconv_mime_encode</function> example: -<?php + "ISO-8859-1", "output-charset" => "UTF-8", @@ -133,12 +134,13 @@ $preferences = array( ); $preferences["scheme"] = "Q"; // This yields "Subject: =?UTF-8?Q?Pr=C3=BCfung_Pr=C3=BCfung?=" -echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences); +echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences); $preferences["scheme"] = "B"; // This yields "Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=" -echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences); -?> +echo iconv_mime_encode("Subject", "Prüfung Prüfung", $preferences); +?> +]]> diff --git a/reference/ldap/functions/ldap-add.xml b/reference/ldap/functions/ldap-add.xml index fb92d56a2e..dcd5ace336 100644 --- a/reference/ldap/functions/ldap-add.xml +++ b/reference/ldap/functions/ldap-add.xml @@ -1,5 +1,5 @@ - + @@ -25,16 +25,20 @@ In case of multiple values for an attribute, they are indexed using integers starting with 0. - - - entry["attribute1"] = value - entry["attribute2"][0] = value1 - entry["attribute2"][1] = value2 - - - - Complete example with authenticated bind - + + + +]]> + + + + Complete example with authenticated bind + ]]> - - + + ¬e.bin-safe; diff --git a/reference/ldap/functions/ldap-get-attributes.xml b/reference/ldap/functions/ldap-get-attributes.xml index 55896ee498..7f02bd2cf1 100644 --- a/reference/ldap/functions/ldap-get-attributes.xml +++ b/reference/ldap/functions/ldap-get-attributes.xml @@ -1,5 +1,5 @@ - + @@ -28,9 +28,12 @@ directory entries and/or where you do not know the structure of the directory entries. In many applications you will be searching for a specific attribute such as an email address or a surname, - and won't care what other data is held. + and won't care what other data is held. + - + + + +]]> + + diff --git a/reference/ldap/functions/ldap-get-entries.xml b/reference/ldap/functions/ldap-get-entries.xml index 58cc2fd4b9..51cc9b3b23 100644 --- a/reference/ldap/functions/ldap-get-entries.xml +++ b/reference/ldap/functions/ldap-get-entries.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <!-- splitted from ./en/functions/ldap.xml, last change in rev 1.2 --> <refentry id="function.ldap-get-entries"> <refnamediv> @@ -28,9 +28,9 @@ The attribute index is converted to lowercase. (Attributes are case-insensitive for directory servers, but not when used as array indices.) - - <informalexample> -<literallayout> + <example> + <programlisting> +<![CDATA[ return_value["count"] = number of entries in the result return_value[0] : refers to the details of first entry @@ -42,12 +42,15 @@ return_value[i][j] = jth attribute in the ith entry in the result return_value[i]["attribute"]["count"] = number of values for attribute in ith entry return_value[i]["attribute"][j] = jth value of attribute in ith entry -</literallayout> - </informalexample></para> +]]> + </programlisting> + </example> + </para> - <para> - See also <function>ldap_first_entry</function> and - <function>ldap_next_entry</function></para> + <para> + See also <function>ldap_first_entry</function> and + <function>ldap_next_entry</function>. + </para> </refsect1> </refentry>