From a652e2584819c8d3f73a27952ad53bed9ec803cf Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Wed, 5 May 2010 18:15:22 +0000
Subject: [PATCH] Rewrite, as iconv is enabled by default as of PHP 5

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@299027 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/iconv/configure.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/reference/iconv/configure.xml b/reference/iconv/configure.xml
index 59730a1538..530373681e 100644
--- a/reference/iconv/configure.xml
+++ b/reference/iconv/configure.xml
@@ -3,24 +3,22 @@
 <section xml:id="iconv.installation" xmlns="http://docbook.org/ns/docbook">
  &reftitle.install;
  <para>
-  To use functions provided by this module, the
-  <application>PHP</application> binary must be built with
-  the following configure line:
-  <option role="configure">--with-iconv[=DIR]</option>.
+  This extension is enabled by default, although it may be disabled by
+  compiling with <option role="configure">--without-iconv</option>.
+ </para>
+ <para>
+  The optional <option role="configure">--with-iconv-dir</option> directive
+  is used to specify the location of <emphasis>iconv</emphasis> on the system
+  that PHP is being compiled on, otherwise only the default locations are scanned.
  </para>
  <note>
-  <title>Note to Windows® Users</title>
+  <title>Note to PHP 4 users</title>
   <simpara>
-   In order to enable this module on a Windows® environment, you need to put
-   a DLL file named <emphasis>iconv.dll</emphasis> or
-   <emphasis>iconv-1.3.dll</emphasis> (prior to 4.2.1)
-   which is bundled with the PHP/Win32 binary package into a directory
-   specified by the <literal>PATH</literal> environment variable
-   or one of the system directories of your Windows® installation.
-  </simpara>
-  <simpara>
-   This module is part of PHP as of PHP 5 thus <emphasis>iconv.dll</emphasis>
-   and <emphasis>php_iconv.dll</emphasis> is not needed anymore.
+   Enabling this extension requires building with
+   <option role="configure">--with-iconv=[DIR]</option>, or Windows
+   users may enable by having <filename>iconv.dll</filename>
+   available in the systems PATH, and <filename>php_iconv.dll</filename>
+   enabled in &php.ini;.
   </simpara>
  </note>
 </section>