nlopess Wed Sep 15 15:12:41 2004 EDT
Modified files:
/phpdoc/en/reference/xml/functions xml-parser-create-ns.xml
xml-parser-create.xml
Log:
fix #30077: encondig parameter weirdness
http://cvs.php.net/diff.php/phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml
diff -u phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml:1.7
phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml:1.8
--- phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml:1.7 Sun Sep 28
03:15:03 2003
+++ phpdoc/en/reference/xml/functions/xml-parser-create-ns.xml Wed Sep 15 15:12:40
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/xml.xml, last change in rev 1.24 -->
<refentry id='function.xml-parser-create-ns'>
<refnamediv>
@@ -28,11 +28,15 @@
default.
</para>
<para>
- The optional <parameter>encoding</parameter> specifies the
- character encoding of the XML input to be parsed. Supported
- encodings are <literal>"ISO-8859-1"</literal>, which is also
- the default if no <parameter>encoding</parameter> is specified,
- <literal>"UTF-8"</literal> and <literal>"US-ASCII"</literal>.
+ The optional <parameter>encoding</parameter> specifies the character
+ encoding for the input/output in PHP 4. Starting from PHP 5, the input
+ encoding is automatically detected, so that the
+ <parameter>encoding</parameter> parameter specifies only the output
+ encoding. In PHP 4, the default output encoding is the same as the
+ input charset. In PHP 5.0.0 and 5.0.1, the default output charset is
+ ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+ encodings are <literal>ISO-8859-1</literal>, <literal>UTF-8</literal> and
+ <literal>US-ASCII</literal>.
</para>
<para>
See also
http://cvs.php.net/diff.php/phpdoc/en/reference/xml/functions/xml-parser-create.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/xml/functions/xml-parser-create.xml
diff -u phpdoc/en/reference/xml/functions/xml-parser-create.xml:1.7
phpdoc/en/reference/xml/functions/xml-parser-create.xml:1.8
--- phpdoc/en/reference/xml/functions/xml-parser-create.xml:1.7 Mon Mar 29 09:35:03
2004
+++ phpdoc/en/reference/xml/functions/xml-parser-create.xml Wed Sep 15 15:12:41
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/xml.xml, last change in rev 1.2 -->
<refentry id="function.xml-parser-create">
<refnamediv>
@@ -18,11 +18,15 @@
other XML functions.
</para>
<para>
- The optional <parameter>encoding</parameter> specifies the
- character encoding of the XML input to be parsed. Supported
- encodings are <literal>"ISO-8859-1"</literal>, which is also
- the default if no <parameter>encoding</parameter> is specified,
- <literal>"UTF-8"</literal> and <literal>"US-ASCII"</literal>.
+ The optional <parameter>encoding</parameter> specifies the character
+ encoding for the input/output in PHP 4. Starting from PHP 5, the input
+ encoding is automatically detected, so that the
+ <parameter>encoding</parameter> parameter specifies only the output
+ encoding. In PHP 4, the default output encoding is the same as the
+ input charset. In PHP 5.0.0 and 5.0.1, the default output charset is
+ ISO-8859-1, while in PHP 5.0.2 and upper is UTF-8. The supported
+ encodings are <literal>ISO-8859-1</literal>, <literal>UTF-8</literal> and
+ <literal>US-ASCII</literal>.
</para>
<para>
See also <function>xml_parser_create_ns</function> and
