From d6270d0c3ba1d2b01240d009994d8a90b968c954 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 14 Feb 2007 18:57:17 +0000
Subject: [PATCH] Rework the installation/configuration/requirements sections

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@229807 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/zip/configure.xml | 95 +++++++++++++++++++++----------------
 reference/zip/reference.xml | 29 ++++-------
 2 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/reference/zip/configure.xml b/reference/zip/configure.xml
index c2aad19888..d985b85211 100644
--- a/reference/zip/configure.xml
+++ b/reference/zip/configure.xml
@@ -1,67 +1,78 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <section id="zip.installation">
  &reftitle.install;
- <para>
-  &pecl.moved;
-  &pecl.info;
-  <ulink url="&url.pecl.package;zip">&url.pecl.package;zip</ulink>.
- </para>
- <section id="zip.installation.linux">
-  <title>Installation on Linux</title>
-  <section>
-   <title>Installation when bundled with PHP4</title>
+ 
+ <section id="zip.old.installation">
+  <title>PHP4</title>
+  
+  <note>
+   <para>
+    Zip support before PHP 4.1.0 is experimental.
+   </para>
+  </note>
+  
+  <warning>
+   <para>
+    Because the PHP4 zip extension is unmaintained we recommend that the PECL
+    extension is used rather than the bundled one.
+   </para>
+  </warning>
+  
+  <section id="zip.installation.old.linux">
+   <title>Linux systems</title>
    <para>
     In order to use these functions you must compile PHP with zip support
     by using the <option role="configure">--with-zip[=DIR]</option>
     configure option, where [DIR] is the prefix of the <ulink
     url="&url.zziplib;">ZZIPlib</ulink> library install.
    </para>
-   </section>
-  <section>
-   <title>Installation with PECL or bundled with PHP 5.2 or later</title>
+  </section>
+  
+  <section id="zip.installation.old.windows">
+   <title>Windows</title>
    <para>
-    In order to use these functions you must compile PHP with zip support
-    by using the <option role="configure">--enable-zip</option>
-    configure option.  It does not require any external library.
+    Windows users need to enable <filename>php_zip.dll</filename> inside
+    of &php.ini; in order to use these functions.
    </para>
-   <note>
-    <para>
-     You can use the PECL version with PHP4. In order to do it you
-      have to disable the bundled Zip extension or recompile PHP without
-      it.
-    </para>
-   </note>
   </section>
  </section>
 
- <section id="zip.installation.windows">
-  <title>Installation on Windows</title>
-  <section>
-   <title>Installation when bundled with PHP4</title>
+ <section id="zip.installation.new">
+  <title>PHP5.2 and later</title>
+  
+  <section id="zip.installation.new.linux">
+   <title>Linux systems</title>
    <para>
-    Windows users will enable <filename>php_zip.dll</filename> inside
-    of &php.ini; in order to use these functions.
-    &pecl.windows.4;
-    &pecl.windows.download;
+    In order to use these functions you must compile PHP with zip support
+    by using the <option role="configure">--enable-zip</option>
+    configure option.
    </para>
-   <note>
-    <para>
-     Zip support before PHP 4.1.0 is experimental.  This section
-     reflects the Zip extension as it exists in PHP 4.1.0 and later.
-    </para>
-   </note>
   </section>
-  <section>
-   <title>Installation with PECL or bundled with PHP 5.2 or later</title>
+  
+  <section id="zip.installation.new.windows">
+   <title>Windows</title>
    <para>
-    Windows users will enable <filename>php_zip.dll</filename> inside
+    Windows users need to enable <filename>php_zip.dll</filename> inside
     of &php.ini; in order to use these functions.
-    &pecl.windows.4;
-    &pecl.windows.download;
    </para>
   </section>
  </section>
+
+ <section id="zip.pecl.installation">
+  <title>Installation via PECL</title>
+  <para>
+   &pecl.info;
+   <ulink url="&url.pecl.package;zip">&url.pecl.package;zip</ulink>.
+  </para>
+  <para>
+   &pecl.windows.download;
+  </para>
+  <para>
+   &pecl.windows.4;
+  </para>
+ </section>
+
 </section>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/zip/reference.xml b/reference/zip/reference.xml
index 96cb7afcc5..bb5411ed8d 100644
--- a/reference/zip/reference.xml
+++ b/reference/zip/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- Purpose: compression -->
 <!-- Membership: bundled, pecl -->
 
@@ -11,35 +11,26 @@
   <section id="zip.intro">
    &reftitle.intro;
    <para>
-    This module enables you to transparently read or write ZIP compressed
+    This extension enables you to transparently read or write ZIP compressed
     archives and the files inside them.
    </para>
   </section>
 
   <section id="zip.requirements">
    &reftitle.required;
-   <section>
-    <title>PHP 4 Bundled</title>
+   <section id="zip.requirements.old">
+    <title>PHP 4</title>
     <para>
-     The initial version is bundled in PHP 4 and is available in PECL
-     as version 1.0, see <ulink url="&url.pecl.package;zip">
-     &url.pecl.package;zip</ulink>. It can only read Zip Archives.
-    </para>
-    <para>
-     This version uses the functions of the <ulink
-     url="&url.zziplib;">ZZIPlib</ulink> library by Guido Draheim.
-     You need ZZIPlib version &gt;= 0.10.6.
+     The bundled PHP4 version requires <ulink url="&url.zziplib;">ZZIPlib</ulink>,
+     by Guido Draheim, version 0.10.6 or later 
     </para>
    </section>
 
-   <section>
-    <title>PECL and PHP 5.2 or later</title>
+   <section id="zip.requirements.new">
+    <title>PHP 5.2 or later</title>
     <para>
-     The newest version is bundled in PHP 5.2.0 or later and
-     available in PECL, as version 1.1.0 or later. It does not
-     require any external library. It can read and write Zip archives
-     when used with PHP 5.1 or later and can only read them when used
-     with PHP4.
+     This extension uses the functions of <ulink url="&url.zlib;">zlib</ulink>
+     by Jean-loup Gailly and Mark Adler.
     </para>
    </section>
   </section>