From 0cda083487db80a9e1a64df29746307f1d1aed48 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Sat, 24 Feb 2024 19:36:14 +0000
Subject: [PATCH] Minor updates and remove outdated constants page

---
 reference/uodbc/configure.xml |   5 +-
 reference/uodbc/constants.xml | 316 +++++++++++++++++-----------------
 reference/xml/constants.xml   |  56 +++---
 reference/zlib/constants.xml  |  48 ------
 4 files changed, 186 insertions(+), 239 deletions(-)
 delete mode 100644 reference/zlib/constants.xml

diff --git a/reference/uodbc/configure.xml b/reference/uodbc/configure.xml
index e37b75ec5..2d6b82cae 100644
--- a/reference/uodbc/configure.xml
+++ b/reference/uodbc/configure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 185582af21c073e367e32d46dd528e130ce3d26b Maintainer: pastore Status: ready -->
+<!-- EN-Revision: eec6a4a36bf452bf271f116e7b6b9bb09d1181c3 Maintainer: pastore Status: ready -->
 <!-- CREDITS: darvina -->
 <section xml:id="odbc.installation" xmlns="http://docbook.org/ns/docbook">
  &reftitle.install;
@@ -161,9 +161,8 @@
    </varlistentry>
   </variablelist>
  </para>
- &windows.builtin;
  <simpara>
-  Tuttavia, da PHP 7.0.0 gli utenti Windows devono abilitare
+  Gli utenti Windows devono abilitare
   <filename>php_odbc.dll</filename> per utilizzare questa estensione.
  </simpara>
 </section>
diff --git a/reference/uodbc/constants.xml b/reference/uodbc/constants.xml
index 8c83e1c9a..9726ae547 100644
--- a/reference/uodbc/constants.xml
+++ b/reference/uodbc/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 4de5cce5d886bf7ea08db8583141ff9715b47073 Maintainer: pastore Status: ready -->
+<!-- EN-Revision: 5bc8ebe3c1e0bb133e058f1b8eb34a721149e893 Maintainer: pastore Status: ready -->
 <!-- CREDITS: darvina -->
 <appendix xml:id="uodbc.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
@@ -7,579 +7,578 @@
  <variablelist>
   <varlistentry xml:id="constant.odbc-type">
    <term>
-    <constant>ODBC_TYPE</constant> 
-    (<type>integer</type>)
+    <constant>ODBC_TYPE</constant>
+    (<type>string</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.odbc-binmode-passthru">
    <term>
-    <constant>ODBC_BINMODE_PASSTHRU</constant> 
-    (<type>integer</type>)
+    <constant>ODBC_BINMODE_PASSTHRU</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.odbc-binmode-return">
    <term>
-    <constant>ODBC_BINMODE_RETURN</constant> 
-    (<type>integer</type>)
+    <constant>ODBC_BINMODE_RETURN</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.odbc-binmode-convert">
    <term>
-    <constant>ODBC_BINMODE_CONVERT</constant> 
-    (<type>integer</type>)
+    <constant>ODBC_BINMODE_CONVERT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-odbc-cursors">
    <term>
-    <constant>SQL_ODBC_CURSORS</constant> 
-    (<type>integer</type>)
+    <constant>SQL_ODBC_CURSORS</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cur-use-driver">
    <term>
-    <constant>SQL_CUR_USE_DRIVER</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CUR_USE_DRIVER</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cur-use-if-needed">
    <term>
-    <constant>SQL_CUR_USE_IF_NEEDED</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CUR_USE_IF_NEEDED</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cur-use-odbc">
    <term>
-    <constant>SQL_CUR_USE_ODBC</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CUR_USE_ODBC</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-concurrency">
    <term>
-    <constant>SQL_CONCURRENCY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CONCURRENCY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-concur-read-only">
    <term>
-    <constant>SQL_CONCUR_READ_ONLY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CONCUR_READ_ONLY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-concur-lock">
    <term>
-    <constant>SQL_CONCUR_LOCK</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CONCUR_LOCK</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-concur-rowver">
    <term>
-    <constant>SQL_CONCUR_ROWVER</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CONCUR_ROWVER</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-concur-values">
    <term>
-    <constant>SQL_CONCUR_VALUES</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CONCUR_VALUES</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cursor-type">
    <term>
-    <constant>SQL_CURSOR_TYPE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CURSOR_TYPE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cursor-forward-only">
    <term>
-    <constant>SQL_CURSOR_FORWARD_ONLY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CURSOR_FORWARD_ONLY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cursor-keyset-driven">
    <term>
-    <constant>SQL_CURSOR_KEYSET_DRIVEN</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CURSOR_KEYSET_DRIVEN</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cursor-dynamic">
    <term>
-    <constant>SQL_CURSOR_DYNAMIC</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CURSOR_DYNAMIC</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-cursor-static">
    <term>
-    <constant>SQL_CURSOR_STATIC</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CURSOR_STATIC</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-keyset-size">
    <term>
-    <constant>SQL_KEYSET_SIZE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_KEYSET_SIZE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-char">
    <term>
-    <constant>SQL_CHAR</constant> 
-    (<type>integer</type>)
+    <constant>SQL_CHAR</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-varchar">
    <term>
-    <constant>SQL_VARCHAR</constant> 
-    (<type>integer</type>)
+    <constant>SQL_VARCHAR</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-longvarchar">
    <term>
-    <constant>SQL_LONGVARCHAR</constant> 
-    (<type>integer</type>)
+    <constant>SQL_LONGVARCHAR</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-decimal">
    <term>
-    <constant>SQL_DECIMAL</constant> 
-    (<type>integer</type>)
+    <constant>SQL_DECIMAL</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-numeric">
    <term>
-    <constant>SQL_NUMERIC</constant> 
-    (<type>integer</type>)
+    <constant>SQL_NUMERIC</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-bit">
    <term>
-    <constant>SQL_BIT</constant> 
-    (<type>integer</type>)
+    <constant>SQL_BIT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-tinyint">
    <term>
-    <constant>SQL_TINYINT</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TINYINT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-smallint">
    <term>
-    <constant>SQL_SMALLINT</constant> 
-    (<type>integer</type>)
+    <constant>SQL_SMALLINT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-integer">
    <term>
-    <constant>SQL_INTEGER</constant> 
-    (<type>integer</type>)
+    <constant>SQL_INTEGER</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-bigint">
    <term>
-    <constant>SQL_BIGINT</constant> 
-    (<type>integer</type>)
+    <constant>SQL_BIGINT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-real">
    <term>
-    <constant>SQL_REAL</constant> 
-    (<type>integer</type>)
+    <constant>SQL_REAL</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-float">
    <term>
-    <constant>SQL_FLOAT</constant> 
-    (<type>integer</type>)
+    <constant>SQL_FLOAT</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-double">
    <term>
-    <constant>SQL_DOUBLE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_DOUBLE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-binary">
    <term>
-    <constant>SQL_BINARY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_BINARY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-varbinary">
    <term>
-    <constant>SQL_VARBINARY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_VARBINARY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-longvarbinary">
    <term>
-    <constant>SQL_LONGVARBINARY</constant> 
-    (<type>integer</type>)
+    <constant>SQL_LONGVARBINARY</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-date">
    <term>
-    <constant>SQL_DATE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_DATE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-time">
    <term>
-    <constant>SQL_TIME</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TIME</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-timestamp">
    <term>
-    <constant>SQL_TIMESTAMP</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TIMESTAMP</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-type-date">
    <term>
-    <constant>SQL_TYPE_DATE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TYPE_DATE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-type-time">
    <term>
-    <constant>SQL_TYPE_TIME</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TYPE_TIME</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-type-timestamp">
    <term>
-    <constant>SQL_TYPE_TIMESTAMP</constant> 
-    (<type>integer</type>)
+    <constant>SQL_TYPE_TIMESTAMP</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-best-rowid">
    <term>
-    <constant>SQL_BEST_ROWID</constant> 
-    (<type>integer</type>)
+    <constant>SQL_BEST_ROWID</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-rowver">
    <term>
-    <constant>SQL_ROWVER</constant> 
-    (<type>integer</type>)
+    <constant>SQL_ROWVER</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-scope-currow">
    <term>
-    <constant>SQL_SCOPE_CURROW</constant> 
-    (<type>integer</type>)
+    <constant>SQL_SCOPE_CURROW</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-scope-transaction">
    <term>
-    <constant>SQL_SCOPE_TRANSACTION</constant> 
-    (<type>integer</type>)
+    <constant>SQL_SCOPE_TRANSACTION</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-scope-session">
    <term>
-    <constant>SQL_SCOPE_SESSION</constant> 
-    (<type>integer</type>)
+    <constant>SQL_SCOPE_SESSION</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-no-nulls">
    <term>
-    <constant>SQL_NO_NULLS</constant> 
-    (<type>integer</type>)
+    <constant>SQL_NO_NULLS</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-nullable">
    <term>
-    <constant>SQL_NULLABLE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_NULLABLE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-index-unique">
    <term>
-    <constant>SQL_INDEX_UNIQUE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_INDEX_UNIQUE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-index-all">
    <term>
-    <constant>SQL_INDEX_ALL</constant> 
-    (<type>integer</type>)
+    <constant>SQL_INDEX_ALL</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-ensure">
    <term>
-    <constant>SQL_ENSURE</constant> 
-    (<type>integer</type>)
+    <constant>SQL_ENSURE</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.sql-quick">
    <term>
-    <constant>SQL_QUICK</constant> 
-    (<type>integer</type>)
+    <constant>SQL_QUICK</constant>
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
-     
+
     </simpara>
    </listitem>
   </varlistentry>
  </variablelist>
 </appendix>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -600,4 +599,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/xml/constants.xml b/reference/xml/constants.xml
index ad18ac811..52a543d22 100644
--- a/reference/xml/constants.xml
+++ b/reference/xml/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 4de5cce5d886bf7ea08db8583141ff9715b47073 Maintainer: pastore Status: ready -->
+<!-- EN-Revision: 5e9500ddad6dbc2f1b01d7da8b53379c8b7c386c Maintainer: pastore Status: ready -->
 <!-- CREDITS: darvina -->
 <appendix xml:id="xml.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
@@ -8,7 +8,7 @@
   <varlistentry xml:id="constant.xml-error-none">
    <term>
     <constant>XML_ERROR_NONE</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -19,7 +19,7 @@
   <varlistentry xml:id="constant.xml-error-no-memory">
    <term>
     <constant>XML_ERROR_NO_MEMORY</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -30,7 +30,7 @@
   <varlistentry xml:id="constant.xml-error-syntax">
    <term>
     <constant>XML_ERROR_SYNTAX</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -41,7 +41,7 @@
   <varlistentry xml:id="constant.xml-error-no-elements">
    <term>
     <constant>XML_ERROR_NO_ELEMENTS</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -52,7 +52,7 @@
   <varlistentry xml:id="constant.xml-error-invalid-token">
    <term>
     <constant>XML_ERROR_INVALID_TOKEN</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -63,7 +63,7 @@
   <varlistentry xml:id="constant.xml-error-unclosed-token">
    <term>
     <constant>XML_ERROR_UNCLOSED_TOKEN</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -74,7 +74,7 @@
   <varlistentry xml:id="constant.xml-error-partial-char">
    <term>
     <constant>XML_ERROR_PARTIAL_CHAR</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -85,7 +85,7 @@
   <varlistentry xml:id="constant.xml-error-tag-mismatch">
    <term>
     <constant>XML_ERROR_TAG_MISMATCH</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -96,7 +96,7 @@
   <varlistentry xml:id="constant.xml-error-duplicate-attribute">
    <term>
     <constant>XML_ERROR_DUPLICATE_ATTRIBUTE</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -107,7 +107,7 @@
   <varlistentry xml:id="constant.xml-error-junk-after-doc-element">
    <term>
     <constant>XML_ERROR_JUNK_AFTER_DOC_ELEMENT</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -118,7 +118,7 @@
   <varlistentry xml:id="constant.xml-error-param-entity-ref">
    <term>
     <constant>XML_ERROR_PARAM_ENTITY_REF</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -129,7 +129,7 @@
   <varlistentry xml:id="constant.xml-error-undefined-entity">
    <term>
     <constant>XML_ERROR_UNDEFINED_ENTITY</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -140,7 +140,7 @@
   <varlistentry xml:id="constant.xml-error-recursive-entity-ref">
    <term>
     <constant>XML_ERROR_RECURSIVE_ENTITY_REF</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -151,7 +151,7 @@
   <varlistentry xml:id="constant.xml-error-async-entity">
    <term>
     <constant>XML_ERROR_ASYNC_ENTITY</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -162,7 +162,7 @@
   <varlistentry xml:id="constant.xml-error-bad-char-ref">
    <term>
     <constant>XML_ERROR_BAD_CHAR_REF</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -173,7 +173,7 @@
   <varlistentry xml:id="constant.xml-error-binary-entity-ref">
    <term>
     <constant>XML_ERROR_BINARY_ENTITY_REF</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -184,7 +184,7 @@
   <varlistentry xml:id="constant.xml-error-attribute-external-entity-ref">
    <term>
     <constant>XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -195,7 +195,7 @@
   <varlistentry xml:id="constant.xml-error-misplaced-xml-pi">
    <term>
     <constant>XML_ERROR_MISPLACED_XML_PI</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -206,7 +206,7 @@
   <varlistentry xml:id="constant.xml-error-unknown-encoding">
    <term>
     <constant>XML_ERROR_UNKNOWN_ENCODING</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -217,7 +217,7 @@
   <varlistentry xml:id="constant.xml-error-incorrect-encoding">
    <term>
     <constant>XML_ERROR_INCORRECT_ENCODING</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -228,7 +228,7 @@
   <varlistentry xml:id="constant.xml-error-unclosed-cdata-section">
    <term>
     <constant>XML_ERROR_UNCLOSED_CDATA_SECTION</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -239,7 +239,7 @@
   <varlistentry xml:id="constant.xml-error-external-entity-handling">
    <term>
     <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -250,7 +250,7 @@
   <varlistentry xml:id="constant.xml-option-case-folding">
    <term>
     <constant>XML_OPTION_CASE_FOLDING</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -261,7 +261,7 @@
   <varlistentry xml:id="constant.xml-option-target-encoding">
    <term>
     <constant>XML_OPTION_TARGET_ENCODING</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -272,7 +272,7 @@
   <varlistentry xml:id="constant.xml-option-skip-tagstart">
    <term>
     <constant>XML_OPTION_SKIP_TAGSTART</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -283,7 +283,7 @@
   <varlistentry xml:id="constant.xml-option-skip-white">
    <term>
     <constant>XML_OPTION_SKIP_WHITE</constant> 
-    (<type>integer</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -305,7 +305,6 @@
   </varlistentry>
  </variablelist>
 </appendix>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
@@ -326,4 +325,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-
diff --git a/reference/zlib/constants.xml b/reference/zlib/constants.xml
deleted file mode 100644
index fd0d81567..000000000
--- a/reference/zlib/constants.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 4de5cce5d886bf7ea08db8583141ff9715b47073 Maintainer: pastore Status: ready -->
-<appendix xml:id="zlib.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.force-gzip">
-   <term>
-    <constant>FORCE_GZIP</constant> 
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.force-deflate">
-   <term>
-    <constant>FORCE_DEFLATE</constant> 
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</appendix>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->