yannick Sun Jan 23 15:04:37 2005 EDT
Modified files:
/phpdoc/en/appendices about.xml
/phpdoc/en/features file-upload.xml
/phpdoc/en/language/oop5 object-comparison.xml
/phpdoc/en/language oop.xml operators.xml types.xml
/phpdoc/en/reference/iconv/functions iconv-mime-decode-headers.xml
iconv-mime-decode.xml
iconv-mime-encode.xml
/phpdoc/en/reference/ldap/functions ldap-add.xml
ldap-get-attributes.xml
ldap-get-entries.xml
Log:
add missing cdata section, use more entities & some wz
http://cvs.php.net/diff.php/phpdoc/en/appendices/about.xml?r1=1.36&r2=1.37&ty=u
Index: phpdoc/en/appendices/about.xml
diff -u phpdoc/en/appendices/about.xml:1.36 phpdoc/en/appendices/about.xml:1.37
--- phpdoc/en/appendices/about.xml:1.36 Thu Aug 12 21:00:41 2004
+++ phpdoc/en/appendices/about.xml Sun Jan 23 15:04:32 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.36 $ -->
+<!-- $Revision: 1.37 $ -->
<appendix id="about">
<title>About the manual</title>
@@ -140,7 +140,8 @@
Let's use the definition for <function>strlen</function> as our first
example:
</para>
<para>
- <screen>
+ <screen role="html">
+<![CDATA[
strlen
(PHP 3, PHP 4, PHP 5)
@@ -150,6 +151,7 @@
int strlen ( string str )
Returns the length of string.
+]]>
</screen>
</para>
<para>
@@ -208,7 +210,9 @@
</para>
<para>
<screen>
+<![CDATA[
returned type function name ( parameter type parameter name )
+]]>
</screen>
</para>
<para>
@@ -217,7 +221,9 @@
</para>
<para>
<screen>
+<![CDATA[
bool in_array ( mixed needle, array haystack [, bool strict])
+]]>
</screen>
</para>
<para>
@@ -247,7 +253,9 @@
</para>
<para>
<screen>
- (PHP 4 >= 4.3.0, PHP 5)
+<![CDATA[
+(PHP 4 >= 4.3.0, PHP 5)
+]]>
</screen>
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/features/file-upload.xml?r1=1.82&r2=1.83&ty=u
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.82
phpdoc/en/features/file-upload.xml:1.83
--- phpdoc/en/features/file-upload.xml:1.82 Tue Dec 21 14:32:45 2004
+++ phpdoc/en/features/file-upload.xml Sun Jan 23 15:04:34 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.82 $ -->
+<!-- $Revision: 1.83 $ -->
<chapter id="features.file-upload">
<title>Handling file uploads</title>
@@ -456,8 +456,10 @@
PUT requests are much simpler
than a file upload and they look something like this:
<informalexample>
- <programlisting>
+ <programlisting role="HTTP">
+<![CDATA[
PUT /path/filename.html HTTP/1.1
+]]>
</programlisting>
</informalexample>
</para>
@@ -474,7 +476,9 @@
a <Virtualhost> block. A line like this would do the trick:
<informalexample>
<programlisting>
+<![CDATA[
Script PUT /put.php
+]]>
</programlisting>
</informalexample>
</para>
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/object-comparison.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/language/oop5/object-comparison.xml
diff -u phpdoc/en/language/oop5/object-comparison.xml:1.3
phpdoc/en/language/oop5/object-comparison.xml:1.4
--- phpdoc/en/language/oop5/object-comparison.xml:1.3 Sat Oct 2 05:40:51 2004
+++ phpdoc/en/language/oop5/object-comparison.xml Sun Jan 23 15:04:35 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="language.oop5.object-comparison">
<title>Comparing objects</title>
<para>
@@ -76,9 +76,9 @@
?>
]]>
</programlisting>
- </example>
- This example will output:
- <screen>
+ &example.outputs;
+ <screen>
+<![CDATA[
Two instances of the same class
o1 == o2 : TRUE
o1 != o2 : FALSE
@@ -96,7 +96,9 @@
o1 != o2 : TRUE
o1 === o2 : FALSE
o1 !== o2 : TRUE
- </screen>
+]]>
+ </screen>
+ </example>
</para>
</sect1>
http://cvs.php.net/diff.php/phpdoc/en/language/oop.xml?r1=1.56&r2=1.57&ty=u
Index: phpdoc/en/language/oop.xml
diff -u phpdoc/en/language/oop.xml:1.56 phpdoc/en/language/oop.xml:1.57
--- phpdoc/en/language/oop.xml:1.56 Wed Dec 8 06:59:35 2004
+++ phpdoc/en/language/oop.xml Sun Jan 23 15:04:35 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.56 $ -->
+<!-- $Revision: 1.57 $ -->
<chapter id="language.oop">
<title>Classes and Objects (PHP 4)</title>
@@ -972,9 +972,7 @@
?>
]]>
</programlisting>
- <para>
- This example will output:
- </para>
+ &example.outputs;
<screen>
<![CDATA[
class A: 10
@@ -1055,9 +1053,9 @@
?>
]]>
</programlisting>
- </example>
- We will see:
- <screen>
+ &example.outputs;
+ <screen>
+<![CDATA[
Compare instances created with the same parameters
o1 == o2 : TRUE
o1 != o2 : FALSE
@@ -1075,7 +1073,9 @@
o1 != o2 : TRUE
o1 === o2 : FALSE
o1 !== o2 : TRUE
- </screen>
+]]>
+ </screen>
+ </example>
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 @@
?>
]]>
</programlisting>
- </example>
- Which gives the expected output:
- <screen>
+ &example.outputs;
+ <screen>
+<![CDATA[
Composite objects u(o,p) and v(q,p)
o1 == o2 : TRUE
o1 != o2 : FALSE
@@ -1136,7 +1136,9 @@
o1 != o2 : TRUE
o1 === o2 : FALSE
o1 !== o2 : TRUE
- </screen>
+]]>
+ </screen>
+ </example>
</para>
</sect1>
</chapter>
http://cvs.php.net/diff.php/phpdoc/en/language/operators.xml?r1=1.83&r2=1.84&ty=u
Index: phpdoc/en/language/operators.xml
diff -u phpdoc/en/language/operators.xml:1.83
phpdoc/en/language/operators.xml:1.84
--- phpdoc/en/language/operators.xml:1.83 Fri Jan 14 18:01:56 2005
+++ phpdoc/en/language/operators.xml Sun Jan 23 15:04:35 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.83 $ -->
+<!-- $Revision: 1.84 $ -->
<chapter id="language.operators">
<title>Operators</title>
<simpara>
@@ -775,21 +775,19 @@
$i = 'W';
for($n=0; $n<6; $n++)
echo ++$i . "\n";
-
-/*
- Produces the output similar to the following:
-
+]]>
+ </programlisting>
+ &example.outputs;
+ <screen>
+<![CDATA[
X
Y
Z
AA
AB
AC
-
-*/
-?>
]]>
- </programlisting>
+ </screen>
</example>
</para>
<para>
http://cvs.php.net/diff.php/phpdoc/en/language/types.xml?r1=1.147&r2=1.148&ty=u
Index: phpdoc/en/language/types.xml
diff -u phpdoc/en/language/types.xml:1.147 phpdoc/en/language/types.xml:1.148
--- phpdoc/en/language/types.xml:1.147 Mon Jan 17 06:11:19 2005
+++ phpdoc/en/language/types.xml Sun Jan 23 15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.147 $ -->
+<!-- $Revision: 1.148 $ -->
<chapter id="language.types">
<title>Types</title>
@@ -559,10 +559,12 @@
</informalexample>
Formally:
<informalexample>
- <programlisting>
+ <programlisting role="php">
+<![CDATA[
LNUM [0-9]+
DNUM ([0-9]*[\.]{LNUM}) | ({LNUM}[\.][0-9]*)
EXPONENT_DNUM ( ({LNUM} | {DNUM}) [eE][+-]? {LNUM})
+]]>
</programlisting>
</informalexample>
The size of a float is platform-dependent,
@@ -1475,9 +1477,8 @@
?>
]]>
</programlisting>
- <para>
- The above example would produce the following output:
- <screen>
+ &example.outputs;
+ <screen>
<![CDATA[
Array
(
@@ -1500,8 +1501,7 @@
[1] => 7
)
]]>
- </screen>
- </para>
+ </screen>
</informalexample>
</note>
@@ -1609,9 +1609,8 @@
]]>
</programlisting>
</informalexample>
- <para>
- The output from the above is:
- <screen>
+ &example.outputs;
+ <screen>
<![CDATA[
Checking 0:
Notice: Undefined index: $i in /path/to/script.html on line 9
@@ -1629,8 +1628,7 @@
Bad:
Good: 2
]]>
- </screen>
- </para>
+ </screen>
</note>
<para>
More examples to demonstrate this fact:
@@ -1895,9 +1893,7 @@
?>
]]>
</programlisting>
- <para>
- This will output:
- </para>
+ &example.outputs;
<screen>
<![CDATA[
Do you like red?
@@ -1934,9 +1930,7 @@
?>
]]>
</programlisting>
- <para>
- This will output:
- </para>
+ &example.outputs;
<screen>
<![CDATA[
Array
@@ -1962,9 +1956,7 @@
?>
]]>
</programlisting>
- <para>
- This will output:
- </para>
+ &example.outputs;
<screen>
<![CDATA[
Array
http://cvs.php.net/diff.php/phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml
diff -u phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml:1.9
phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml:1.10
--- phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml:1.9
Wed Aug 4 03:25:31 2004
+++ phpdoc/en/reference/iconv/functions/iconv-mime-decode-headers.xml Sun Jan
23 15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<refentry id="function.iconv-mime-decode-headers">
<refnamediv>
<refname>iconv_mime_decode_headers</refname>
@@ -82,14 +82,15 @@
<example>
<title><function>iconv_mime_decode_headers</function> example</title>
<programlisting role="php">
-<?php
-$headers_string = <<<EOF
+<![CDATA[
+<?php
+$headers_string = <<<EOF
Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=
To: [EMAIL PROTECTED]
Date: Thu, 1 Jan 1970 00:00:00 +0000
-Message-Id: <[EMAIL PROTECTED]>
+Message-Id: <[EMAIL PROTECTED]>
Received: from localhost (localhost [127.0.0.1]) by localhost
- with SMTP id example for <[EMAIL PROTECTED]>
+ with SMTP id example for <[EMAIL PROTECTED]>
Thu, 1 Jan 1970 00:00:00 +0000 (UTC)
(envelope-from [EMAIL PROTECTED])
Received: (qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000
@@ -98,25 +99,26 @@
$headers = iconv_mime_decode_headers($headers_string, 0, "ISO-8859-1");
print_r($headers);
-?>
+?>
+]]>
</programlisting>
- <simpara>
- The output of this script should look like:
- </simpara>
+ &example.outputs;
<screen>
+<![CDATA[
Array
(
- [Subject] => Prüfung Prüfung
- [To] => [EMAIL PROTECTED]
- [Date] => Thu, 1 Jan 1970 00:00:00 +0000
- [Message-Id] => <[EMAIL PROTECTED]>
- [Received] => Array
+ [Subject] => Pr�fung Pr�fung
+ [To] => [EMAIL PROTECTED]
+ [Date] => Thu, 1 Jan 1970 00:00:00 +0000
+ [Message-Id] => <[EMAIL PROTECTED]>
+ [Received] => Array
(
- [0] => from localhost (localhost [127.0.0.1]) by localhost with
SMTP id example for <[EMAIL PROTECTED]>; Thu, 1 Jan 1970 00:00:00 +0000
(UTC) (envelope-from [EMAIL PROTECTED])
- [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 <[EMAIL PROTECTED]>; Thu, 1 Jan 1970 00:00:00 +0000 (UTC)
(envelope-from [EMAIL PROTECTED])
+ [1] => (qmail 0 invoked by uid 65534); 1 Thu 2003 00:00:00 +0000
)
)
+]]>
</screen>
</example>
http://cvs.php.net/diff.php/phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml
diff -u phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml:1.6
phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml:1.7
--- phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml:1.6 Tue Dec
23 20:32:11 2003
+++ phpdoc/en/reference/iconv/functions/iconv-mime-decode.xml Sun Jan 23
15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc.
-->
<refentry id="function.iconv-mime-decode">
<refnamediv>
@@ -72,11 +72,13 @@
<example>
<title><function>iconv_mime_decode</function> example</title>
<programlisting role="php">
-<?php
-// This yields "Subject: Prüfung Prüfung"
+<![CDATA[
+<?php
+// This yields "Subject: Pr�fung Pr�fung"
echo iconv_mime_decode("Subject: =?UTF-8?B?UHLDvGZ1bmcgUHLDvGZ1bmc=?=",
0, "ISO-8859-1");
-?>
+?>
+]]>
</programlisting>
</example>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml
diff -u phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml:1.8
phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml:1.9
--- phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml:1.8 Wed Aug
4 03:25:31 2004
+++ phpdoc/en/reference/iconv/functions/iconv-mime-encode.xml Sun Jan 23
15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc.
-->
<refentry id="function.iconv-mime-encode">
<refnamediv>
@@ -124,7 +124,8 @@
<example>
<title><function>iconv_mime_encode</function> example:</title>
<programlisting role="php">
-<?php
+<![CDATA[
+<?php
$preferences = array(
"input-charset" => "ISO-8859-1",
"output-charset" => "UTF-8",
@@ -133,12 +134,13 @@
);
$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);
+?>
+]]>
</programlisting>
</example>
http://cvs.php.net/diff.php/phpdoc/en/reference/ldap/functions/ldap-add.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/ldap/functions/ldap-add.xml
diff -u phpdoc/en/reference/ldap/functions/ldap-add.xml:1.5
phpdoc/en/reference/ldap/functions/ldap-add.xml:1.6
--- phpdoc/en/reference/ldap/functions/ldap-add.xml:1.5 Thu Jul 22 18:51:11 2004
+++ phpdoc/en/reference/ldap/functions/ldap-add.xml Sun Jan 23 15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/ldap.xml, last change in rev 1.2 -->
<refentry id="function.ldap-add">
<refnamediv>
@@ -25,16 +25,20 @@
In case of multiple values for an attribute, they are indexed using
integers starting with 0.
</para>
- <informalexample>
-<literallayout>
- entry["attribute1"] = value
- entry["attribute2"][0] = value1
- entry["attribute2"][1] = value2
-</literallayout>
- </informalexample>
- <example>
- <title>Complete example with authenticated bind</title>
-<programlisting role="php">
+ <example>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$entree["attribut1"] = "value";
+$entree["attribut2"][0] = "value1";
+$entree["attribut2"][1] = "value2";
+?>
+]]>
+ </programlisting>
+ </example>
+ <example>
+ <title>Complete example with authenticated bind</title>
+ <programlisting role="php">
<![CDATA[
<?php
$ds=ldap_connect("localhost"); // assuming the LDAP server is on this host
@@ -58,8 +62,8 @@
}
?>
]]>
-</programlisting>
- </example>
+ </programlisting>
+ </example>
¬e.bin-safe;
http://cvs.php.net/diff.php/phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml
diff -u phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml:1.5
phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml:1.6
--- phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml:1.5 Thu Jan
15 07:42:44 2004
+++ phpdoc/en/reference/ldap/functions/ldap-get-attributes.xml Sun Jan 23
15:04:36 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/ldap.xml, last change in rev 1.2 -->
<refentry id="function.ldap-get-attributes">
<refnamediv>
@@ -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.</para>
+ and won't care what other data is held.
+ </para>
<para>
- <informalexample><literallayout>
+ <example>
+ <programlisting>
+<![CDATA[
return_value["count"] = number of attributes in the entry
return_value[0] = first attribute
return_value[n] = nth attribute
@@ -38,7 +41,9 @@
return_value["attribute"]["count"] = number of values for attribute
return_value["attribute"][0] = first value of the attribute
return_value["attribute"][i] = (i+1)th value of the attribute
-</literallayout></informalexample>
+]]>
+ </programlisting>
+ </example>
<example>
<title>
http://cvs.php.net/diff.php/phpdoc/en/reference/ldap/functions/ldap-get-entries.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/ldap/functions/ldap-get-entries.xml
diff -u phpdoc/en/reference/ldap/functions/ldap-get-entries.xml:1.3
phpdoc/en/reference/ldap/functions/ldap-get-entries.xml:1.4
--- phpdoc/en/reference/ldap/functions/ldap-get-entries.xml:1.3 Wed Dec 17
09:32:39 2003
+++ phpdoc/en/reference/ldap/functions/ldap-get-entries.xml Sun Jan 23
15:04:36 2005
@@ -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]["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>
