From 2e166c0236e3641697873f67310ae77f7f1d28fb Mon Sep 17 00:00:00 2001
From: Stig Bakken <ssb@php.net>
Date: Mon, 28 Feb 2000 03:40:33 +0000
Subject: [PATCH] Removed the Adabas and Solid sections from the manual, they
 have not been supported in a long time.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@20645 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters.ent         |   2 -
 functions/adabas.xml | 243 -------------------------------------------
 functions/solid.xml  | 147 --------------------------
 functions/xml.xml    |   3 +-
 4 files changed, 2 insertions(+), 393 deletions(-)
 delete mode 100644 functions/adabas.xml
 delete mode 100644 functions/solid.xml

diff --git a/chapters.ent b/chapters.ent
index a40cbe1504..a5efb7e68e 100644
--- a/chapters.ent
+++ b/chapters.ent
@@ -26,7 +26,6 @@
 <!ENTITY language.control-structures SYSTEM "language/control-structures.xml">
 <!ENTITY language.oop                SYSTEM "language/oop.xml">
 
-<!ENTITY reference.adabas            SYSTEM "functions/adabas.xml">
 <!ENTITY reference.apache            SYSTEM "functions/apache.xml">
 <!ENTITY reference.array             SYSTEM "functions/array.xml">
 <!ENTITY reference.aspell            SYSTEM "functions/aspell.xml">
@@ -74,7 +73,6 @@
 <!ENTITY reference.regex             SYSTEM "functions/regex.xml">
 <!ENTITY reference.sem               SYSTEM "functions/sem.xml">
 <!ENTITY reference.session           SYSTEM "functions/session.xml">
-<!ENTITY reference.solid             SYSTEM "functions/solid.xml">
 <!ENTITY reference.snmp              SYSTEM "functions/snmp.xml">
 <!ENTITY reference.strings           SYSTEM "functions/strings.xml">
 <!ENTITY reference.uodbc             SYSTEM "functions/uodbc.xml">
diff --git a/functions/adabas.xml b/functions/adabas.xml
deleted file mode 100644
index 04f0c82c05..0000000000
--- a/functions/adabas.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-
- <reference id="ref.adabas">
-  <title>Adabas D functions</title>
-  <titleabbrev>Adabas D</titleabbrev>
-
-  <partintro>
-   <para>
-    The Adabas D functions are deprecated, you probably want to use
-    the <link linkend="ref.odbc">Unified ODBC functions</link>
-    instead.
-   </para>
-  </partintro>
-
-  <refentry id="function.ada-afetch">
-   <refnamediv>
-    <refname>ada_afetch</refname>
-    <refpurpose>Fetch a result row into an array</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_fetch_into</function>
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-autocommit">
-   <refnamediv>
-    <refname>ada_autocommit</refname>
-    <refpurpose>Toggle autocommit behaviour</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_autocommit</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-close">
-   <refnamediv>
-    <refname>ada_close</refname>
-    <refpurpose>
-     Close a connection to an Adabas D server
-    </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_close</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-commit">
-   <refnamediv>
-    <refname>ada_commit</refname>
-    <refpurpose>Commit a transaction</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_commit</function>
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-connect">
-   <refnamediv>
-    <refname>ada_connect</refname>
-    <refpurpose>Connect to an Adabas D datasource</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_connect</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-exec">
-   <refnamediv>
-    <refname>ada_exec</refname>
-    <refpurpose>Prepare and execute a SQL statement</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_exec</function> or
-     <function>odbc_do</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-fetchrow">
-   <refnamediv>
-    <refname>ada_fetchrow</refname>
-    <refpurpose>Fetch a row from a result</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_fetch_row</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-fieldname">
-   <refnamediv>
-    <refname>ada_fieldname</refname>
-    <refpurpose>Get the columnname</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para> 
-     See <function>odbc_field_name</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-fieldnum">
-   <refnamediv>
-    <refname>ada_fieldnum</refname>
-    <refpurpose>Get column number</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para> 
-     See <function>odbc_field_num</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-fieldtype">
-   <refnamediv>
-    <refname>ada_fieldtype</refname>
-    <refpurpose>Get the datatype of a field</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_field_type</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-freeresult">
-   <refnamediv>
-    <refname>ada_freeresult</refname> 
-    <refpurpose> 
-     Free resources associated with a result
-    </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_free_result</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-numfields">
-   <refnamediv>
-    <refname>ada_numfields</refname>
-    <refpurpose>Get the number of columns in a result</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_num_fields</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-numrows">
-   <refnamediv>
-    <refname>ada_numrows</refname>
-    <refpurpose>Number of rows in a result</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_num_rows</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-result">
-   <refnamediv>
-    <refname>ada_result</refname>
-    <refpurpose>Get data from results</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_result</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-resultall">
-   <refnamediv>
-    <refname>ada_resultall</refname>
-    <refpurpose>Print result as HTML table</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>odbc_result_all</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
-  <refentry id="function.ada-rollback">
-   <refnamediv>
-    <refname>ada_rollback</refname>
-    <refpurpose>Rollback a transaction</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>
-     See <function>Odbc_rollback</function>.
-    </para>
-   </refsect1>
-  </refentry>
-
- </reference>
-
-<!-- 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
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/functions/solid.xml b/functions/solid.xml
deleted file mode 100644
index 367c730c82..0000000000
--- a/functions/solid.xml
+++ /dev/null
@@ -1,147 +0,0 @@
- <reference id="ref.solid">
-  <title>Solid functions</title>
-  <titleabbrev>Solid</titleabbrev>
-  <partintro>
-   <para>
-    The Solid functions are deprecated, you probably want to use the
-    <link linkend="ref.odbc">Unified ODBC functions</link> instead.</para>
-  </partintro>
-
-  <refentry id="function.solid-close">
-   <refnamediv>
-    <refname>solid_close</refname>
-    <refpurpose>close a Solid connection</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_close</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-connect">
-   <refnamediv>
-    <refname>solid_connect</refname>
-    <refpurpose>connect to a Solid data source</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_connect</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-exec">
-   <refnamediv>
-    <refname>solid_exec</refname>
-    <refpurpose>execute a Solid query</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_exec</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-fetchrow">
-   <refnamediv>
-    <refname>solid_fetchrow</refname>
-    <refpurpose>fetch row of data from Solid query</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Descriptio</title>
-    <para>See <function>odbc_fetch_row</function></para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-fieldname">
-   <refnamediv>
-    <refname>solid_fieldname</refname>
-    <refpurpose>get name of column from Solid query</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_field_name</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-fieldnum">
-   <refnamediv>
-    <refname>solid_fieldnum</refname>
-    <refpurpose>get index of column from Solid query</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_field_num</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-freeresult">
-   <refnamediv>
-    <refname>solid_freeresult</refname>
-    <refpurpose>free result memory from Solid query</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_free_result</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-numfields">
-   <refnamediv>
-    <refname>solid_numfields</refname>
-    <refpurpose>get number of fields in Solid result</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_num_fields</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-numrows">
-   <refnamediv>
-    <refname>solid_numrows</refname>
-    <refpurpose>get number of rows in Solid result</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_num_rows</function>.</para>
-   </refsect1>
-  </refentry>
-
-
-  <refentry id="function.solid-result">
-   <refnamediv>
-    <refname>solid_result</refname>
-    <refpurpose>get data from Solid results</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <para>See <function>odbc_result</function>.</para>
-   </refsect1>
-  </refentry>
-
-
- </reference>
-
-<!-- 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
-sgml-parent-document:nil
-sgml-default-dtd-file:"../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/functions/xml.xml b/functions/xml.xml
index a3a66eadb4..8ed32f5f46 100644
--- a/functions/xml.xml
+++ b/functions/xml.xml
@@ -1739,7 +1739,8 @@ $xml_parser->parse("&lt;A ID=\"hallo\">PHP&lt;/A>");
    <refnamediv>
     <refname>utf8_decode</refname> 
     <refpurpose>
-     Converts a UTF-8 encoded string to ISO-8859-1
+     Converts a string with ISO-8859-1 characters encoded with UTF-8
+     to single-byte ISO-8859-1.
     </refpurpose>
    </refnamediv>
    <refsect1>