From 68a092d6f493d65c60c5e8b195f89d5a37fb21b4 Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Wed, 15 Sep 2004 19:12:41 +0000
Subject: [PATCH] fix #30077: encondig parameter weirdness

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@168649 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/xml/functions/xml-parser-create-ns.xml | 16 ++++++++++------
 reference/xml/functions/xml-parser-create.xml    | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/reference/xml/functions/xml-parser-create-ns.xml b/reference/xml/functions/xml-parser-create-ns.xml
index 71a1d92fdf..2a0099d709 100644
--- a/reference/xml/functions/xml-parser-create-ns.xml
+++ b/reference/xml/functions/xml-parser-create-ns.xml
@@ -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 
diff --git a/reference/xml/functions/xml-parser-create.xml b/reference/xml/functions/xml-parser-create.xml
index b3d69aedc8..3ad7897717 100644
--- a/reference/xml/functions/xml-parser-create.xml
+++ b/reference/xml/functions/xml-parser-create.xml
@@ -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