From 12612a6fad2c4790bde169cc5f82d1e961ff755e Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sun, 23 Dec 2007 18:42:15 +0000
Subject: [PATCH] MFB: Upgrade to the new-reference-structure  - (Created
 missing setup sections in setup.xml, if any)  - Moved the intro to book.xml 
 - Changed the intro ID from <extname>.intro to intro.<extname>  - Moved the
 constants entity to book.xml  - Changed constants.xml to be an appendix  -
 Moved the examples into its own chapter (examples.xml) 	NOTE: The
 "ingres.examples" ID was renamed to ingres.examples-basic and the example
 chapter uses the 'ingres.examples' ID now  - Moved the requirements and
 resources sections to setup.xml  - Moved the configure entity to setup.xml

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@248841 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/ingres-ii/book.xml      | 57 +++++++++++++++++++
 reference/ingres-ii/constants.xml |  6 +-
 reference/ingres-ii/examples.xml  | 69 +++++++++++++++++++++++
 reference/ingres-ii/reference.xml | 93 +------------------------------
 reference/ingres-ii/setup.xml     | 57 +++++++++++++++++++
 5 files changed, 188 insertions(+), 94 deletions(-)
 create mode 100644 reference/ingres-ii/book.xml
 create mode 100644 reference/ingres-ii/examples.xml
 create mode 100644 reference/ingres-ii/setup.xml

diff --git a/reference/ingres-ii/book.xml b/reference/ingres-ii/book.xml
new file mode 100644
index 0000000000..04c5ab98ae
--- /dev/null
+++ b/reference/ingres-ii/book.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+<!-- Purpose: database.vendors -->
+<!-- Membership: pecl, external -->
+ 
+<book xml:id="book.ingres" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Ingres II</title>
+ 
+ <!-- {{{ preface -->
+ <preface xml:id="intro.ingres">
+  &reftitle.intro;
+  <para>
+   These functions allow you to access Ingres II database servers.
+  </para>
+  <note>
+   <para>
+    If you already used PHP extensions to access other database
+    servers, note that Ingres doesn't allow concurrent queries and/or
+    transaction over one connection, thus you won't find any result
+    or transaction handle in this extension. The result of a query
+    must be treated before sending another query, and a transaction
+    must be committed or rolled back before opening another
+    transaction (which is automatically done when sending the first
+    query).
+   </para>
+  </note>
+ </preface>
+ <!-- }}} -->
+ 
+ &reference.ingres-ii.setup;
+ &reference.ingres-ii.constants;
+ &reference.ingres-ii.examples;
+ &reference.ingres-ii.reference;
+
+</book>
+
+<!-- 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:"../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
diff --git a/reference/ingres-ii/constants.xml b/reference/ingres-ii/constants.xml
index 6b48b2548f..be6c455105 100644
--- a/reference/ingres-ii/constants.xml
+++ b/reference/ingres-ii/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
-<section xml:id="ingres.constants" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.12 $ -->
+<appendix xml:id="ingres.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
  &extension.constants;
  <variablelist>
@@ -301,7 +301,7 @@
    </listitem>
   </varlistentry>
  </variablelist>
-</section>
+</appendix>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/ingres-ii/examples.xml b/reference/ingres-ii/examples.xml
new file mode 100644
index 0000000000..fe85e5c953
--- /dev/null
+++ b/reference/ingres-ii/examples.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="ingres.examples" xmlns="http://docbook.org/ns/docbook">
+ &reftitle.examples;
+ <section xml:id="ingres.examples-basic">
+  <para>
+   This simple example shows how to connect, execute a query, print
+   resulting rows and disconnect from an Ingres database.
+   <example>
+    <title>Simple Ingres Example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// Connecting, selecting database
+$link = ingres_connect('database', 'user', 'password')
+    or die('Could not connect: ' . ingres_error($link));
+echo 'Connected successfully';
+
+// Select from a table that exists in all Ingres databases
+$query = 'SELECT * FROM iirelation';
+$returncode = ingres_query($query,$link) or die('Query failed: ' .
+ingres_error($link));
+
+// Print results in HTML
+// relid - table name
+// relowner - table owner
+echo "<table>\n";
+while ($iirelation = ingres_fetch_object(INGRES_BOTH, $link)) {
+    echo "\t<tr>\n";
+    echo "\t\t<td>" . $iirelation->relid . "</td>\n";
+    echo "\t\t<td>" . $iirelation->relowner . "</td>\n";
+    echo "\t</tr>\n";
+}
+echo "</table>\n";
+
+// Commit transaction
+ingres_commit($link);
+// Closing connection
+ingres_close($link);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </section>
+</chapter>
+
+<!-- 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:"../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+
diff --git a/reference/ingres-ii/reference.xml b/reference/ingres-ii/reference.xml
index d34a937fe3..51c3e1be48 100644
--- a/reference/ingres-ii/reference.xml
+++ b/reference/ingres-ii/reference.xml
@@ -1,97 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
-<!-- Purpose: database.vendors -->
-<!-- Membership: pecl, external -->
+<!-- $Revision: 1.15 $ -->
 
  <reference xml:id="ref.ingres" xmlns="http://docbook.org/ns/docbook">
-  <title>Ingres II Functions</title>
-  <titleabbrev>Ingres II</titleabbrev>
-
-  <partintro>
-   <section xml:id="ingres.intro">
-    &reftitle.intro;
-    <para>
-     These functions allow you to access Ingres II database servers.
-    </para>
-    <note>
-     <para>
-      If you already used PHP extensions to access other database
-      servers, note that Ingres doesn't allow concurrent queries and/or
-      transaction over one connection, thus you won't find any result
-      or transaction handle in this extension. The result of a query
-      must be treated before sending another query, and a transaction
-      must be committed or rolled back before opening another
-      transaction (which is automatically done when sending the first
-      query).
-     </para>
-    </note>
-   </section>
-   
-   <section xml:id="ingres.requirements">
-    &reftitle.required;
-    <para>
-     To compile PHP with Ingres support, you need the Ingres OpenAPI library
-     and header files. 
-    </para>
-   </section>
-
-   &reference.ingres-ii.configure;
-   
-   &reference.ingres-ii.ini;
-
-   <section xml:id="ingres.resources">
-    &reftitle.resources;
-    <para>
-     <function>ingres_connect</function> and
-     <function>ingres_pconnect</function> return an Ingres II link identifier.
-    </para>
-   </section>
-
-   &reference.ingres-ii.constants;
-
-   <section xml:id="ingres.examples">
-   &reftitle.examples;
-    <para>
-     This simple example shows how to connect, execute a query, print
-     resulting rows and disconnect from an Ingres database.
-     <example>
-      <title>Simple Ingres Example</title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-// Connecting, selecting database
-$link = ingres_connect('database', 'user', 'password')
-    or die('Could not connect: ' . ingres_error($link));
-echo 'Connected successfully';
-
-// Select from a table that exists in all Ingres databases
-$query = 'SELECT * FROM iirelation';
-$returncode = ingres_query($query,$link) or die('Query failed: ' .
-ingres_error($link));
-
-// Print results in HTML
-// relid - table name
-// relowner - table owner
-echo "<table>\n";
-while ($iirelation = ingres_fetch_object(INGRES_BOTH, $link)) {
-    echo "\t<tr>\n";
-    echo "\t\t<td>" . $iirelation->relid . "</td>\n";
-    echo "\t\t<td>" . $iirelation->relowner . "</td>\n";
-    echo "\t</tr>\n";
-}
-echo "</table>\n";
-
-// Commit transaction
-ingres_commit($link);
-// Closing connection
-ingres_close($link);
-?>
-]]>
-      </programlisting>
-     </example>
-    </para>
-   </section>
-  </partintro>
+  <title>Ingres II &Functions;</title>
 
 &reference.ingres-ii.entities.functions;
 
diff --git a/reference/ingres-ii/setup.xml b/reference/ingres-ii/setup.xml
new file mode 100644
index 0000000000..e3ed4ceffa
--- /dev/null
+++ b/reference/ingres-ii/setup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 1.2 $ -->
+
+<chapter xml:id="ingres.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="ingres.requirements">
+  &reftitle.required;
+  <para>
+   To compile PHP with Ingres support, you need the Ingres OpenAPI library
+   and header files. 
+  </para>
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.ingres-ii.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ &reference.ingres-ii.ini;
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="ingres.resources">
+  &reftitle.resources;
+  <para>
+   <function>ingres_connect</function> and
+   <function>ingres_pconnect</function> return an Ingres II link identifier.
+  </para>
+ </section>
+ <!-- }}} -->
+
+</chapter>
+
+<!-- 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:"../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
+