From c2f216f5407e9c9c6774becc8813f21172bbf609 Mon Sep 17 00:00:00 2001
From: Sebastian Picklum <spic@php.net>
Date: Thu, 22 Aug 2002 21:19:55 +0000
Subject: [PATCH] Something went very wrong... UNDO

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@93103 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../iconv/functions/iconv-get-encoding.xml     | 17 ++++++++---------
 .../iconv/functions/iconv-set-encoding.xml     | 18 +++++++++---------
 reference/iconv/functions/iconv.xml            | 18 +++++++++---------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/reference/iconv/functions/iconv-get-encoding.xml b/reference/iconv/functions/iconv-get-encoding.xml
index 425417e3ad..ab0e49244e 100644
--- a/reference/iconv/functions/iconv-get-encoding.xml
+++ b/reference/iconv/functions/iconv-get-encoding.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- EN-Revision: 1.2 Maintainer: spic Status: ready -->
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/iconv.xml, last change in rev 1.1 -->
   <refentry id="function.iconv-get-encoding">
    <refnamediv>
     <refname>iconv_get_encoding</refname>
-    <refpurpose>Aktuelle Einstellung f&uuml;r Zeichensatz-Konvertierung auslesen</refpurpose>
+    <refpurpose>Get current setting for character encoding conversion</refpurpose>
    </refnamediv>
    <refsect1>
-    <title>Beschreibung</title>
+    <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>iconv_get_encoding</methodname>
       <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
      </methodsynopsis>
     <para>
-     Die Funktion gibt die aktuelle Einstellung von 
-     <function>ob_iconv_handler</function> als Array zur&uuml;ck Bei einem Fehler wird . 
-     &false; zur&uuml;ckgegeben.
+     It returns the current settings of 
+     <function>ob_iconv_handler</function> as array or 
+     &false; in failure.
     </para>
     <para>
-     Siehe auch: 
-     <function>iconv_set_encoding</function> und
+     See also: 
+     <function>iconv_set_encoding</function> and
      <function>ob_iconv_handler</function>.
     </para>
    </refsect1>
diff --git a/reference/iconv/functions/iconv-set-encoding.xml b/reference/iconv/functions/iconv-set-encoding.xml
index eb1b31507e..c2e586d8e9 100644
--- a/reference/iconv/functions/iconv-set-encoding.xml
+++ b/reference/iconv/functions/iconv-set-encoding.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/iconv.xml, last change in rev 1.1 -->
   <refentry id="function.iconv-set-encoding">
    <refnamediv>
     <refname>iconv_set_encoding</refname>
-    <refpurpose>Einstellungen f&uuml;r die Zeichensatzkonvertierung setzen</refpurpose>
+    <refpurpose>Set current setting for character encoding conversion</refpurpose>
    </refnamediv>
    <refsect1>
-    <title>Beschreibung</title>
+    <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>iconv_set_encoding</methodname>
       <methodparam><type>string</type><parameter>type</parameter></methodparam>
       <methodparam><type>string</type><parameter>charset</parameter></methodparam>
      </methodsynopsis>
     <para>
-     Die Funktion &auml;ndert den Wert von <parameter>type</parameter> in
-     <parameter>charset</parameter> und gibt &true; bei Erfolg oder  
-      &false; bei einem Fehler in der Ausf&uuml;hrung zur&uuml;ck.
+     It changes the value of <parameter>type</parameter> to
+     <parameter>charset</parameter> and returns &true; in success or 
+      &false; in failure.
     </para>
     <para>
      <example>
-      <title><function>iconv_set_encoding</function> Beispiel:</title>
+      <title><function>iconv_set_encoding</function> example:</title>
       <programlisting role="php">
 <![CDATA[
 iconv_set_encoding("internal_encoding", "UTF-8");
@@ -30,8 +30,8 @@ iconv_set_encoding("output_encoding", "ISO-8859-1");
      </example>
     </para>
     <para>
-     Siehe auch: 
-     <function>iconv_get_encoding</function> und
+     See also: 
+     <function>iconv_get_encoding</function> and
      <function>ob_iconv_handler</function>.
     </para>
    </refsect1>
diff --git a/reference/iconv/functions/iconv.xml b/reference/iconv/functions/iconv.xml
index b907da65a7..11dbb7a633 100644
--- a/reference/iconv/functions/iconv.xml
+++ b/reference/iconv/functions/iconv.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/iconv.xml, last change in rev 1.1 -->
   <refentry id="function.iconv">
    <refnamediv>
     <refname>iconv</refname>
-    <refpurpose>Konvertiert Zeichenketten in einen anderen Zeichensatz</refpurpose>
+    <refpurpose>Convert string to requested character encoding</refpurpose>
    </refnamediv>
    <refsect1>
-    <title>Beschreibung</title>
+    <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>iconv</methodname>
       <methodparam><type>string</type><parameter>in_charset</parameter></methodparam>
@@ -15,17 +15,17 @@
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
      </methodsynopsis>
     <para>
-     Die Funktion konvertiert die in Zeichensatz 
-     <parameter>in_charset</parameter> kodierte Zeichenkette <parameter>string</parameter> in eine Zeichenkette mit Kodierung
-     <parameter>out_charset</parameter>. Es wird die konvertierte Zeichenkette zur&uuml;ckgeliefert oder
-     &false;, wenn ein Fehler aufgetreten ist.
+     It converts the string <parameter>string</parameter> encoded in
+     <parameter>in_charset</parameter> to the string encoded in
+     <parameter>out_charset</parameter>. It returns the converted
+     string or &false;, if it fails.
     </para>
     <para>
      <example>
-      <title><function>iconv</function> Beispiel:</title>
+      <title><function>iconv</function> example:</title>
       <programlisting role="php">
 <![CDATA[
-echo iconv("ISO-8859-1","UTF-8","Dies ist ein Test.");
+echo iconv("ISO-8859-1","UTF-8","This is test.");
 ]]>
       </programlisting>
      </example>