Upgrade to DocBook V4.2 SGML.

12 files changed, 36 insertions, 36 deletions

diff --git a/configure b/configure
index 6e4781f396..94f0917fc2 100755
--- a/configure
+++ b/configure
@@ -17451,13 +17451,13 @@ fi
 done
 
 
-echo "$as_me:$LINENO: checking for DocBook V3.1" >&5
-echo $ECHO_N "checking for DocBook V3.1... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
+echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6
 if test "${pgac_cv_check_docbook+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.sgml <<EOF
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
 <book>
  <title>test</title>
  <chapter>
diff --git a/configure.in b/configure.in
index 4c853adaeb..a25f6b99d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1236,7 +1236,7 @@ fi
 #
 PGAC_PROG_NSGMLS
 PGAC_PROG_JADE
-PGAC_CHECK_DOCBOOK(3.1)
+PGAC_CHECK_DOCBOOK(4.2)
 PGAC_PATH_DOCBOOK_STYLESHEETS
 PGAC_PATH_COLLATEINDEX
 AC_CHECK_PROGS(SGMLSPL, sgmlspl)
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 01501d8f7e..4fa8e863ea 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,11 +1,9 @@
 <!--
 $Header$
-CVS code repository
-Thomas Lockhart
 -->
 
 <appendix id="cvs">
- <docinfo>
+ <appendixinfo>
   <authorgroup>
    <author>
     <firstname>Marc</firstname>
@@ -21,7 +19,7 @@ Thomas Lockhart
    </author>
   </authorgroup>
   <date>1999-05-20</date>
- </docinfo>
+ </appendixinfo>
 
  <title>The <productname>CVS</productname> Repository</title>
 
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 69f84520a3..b3d1b4ba7f 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -956,8 +956,8 @@ CREATE TABLE order_items (
  <sect1 id="ddl-inherit">
   <title>Inheritance</title>
 
-  <comment>This section needs to be rethought.  Some of the
-  information should go into the following chapters.</comment>
+  <remark>This section needs to be rethought.  Some of the
+  information should go into the following chapters.</remark>
 
   <para>
    Let's create two tables. The capitals  table  contains
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 8e5b490e77..f9c0084398 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -3,9 +3,9 @@
 <chapter id="dml">
  <title>Data Manipulation</title>
 
- <comment>
+ <remark>
   This chapter is still quite incomplete.
- </comment>
+ </remark>
 
  <para>
   The previous chapter discussed how to create tables and other
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index f97f288e7d..856580eaca 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -86,7 +86,7 @@
      <listitem>
       <para>
        This is the definition of DocBook itself.  We currently use
-       version 3.1; you cannot use later or earlier versions.  Note
+       version 4.2; you cannot use later or earlier versions.  Note
        that there is also an <acronym>XML</acronym> version of DocBook
        -- do not use that.
       </para>
@@ -206,15 +206,17 @@
       <para><filename>textproc/openjade</filename></para>
      </listitem>
      <listitem>
-      <para><filename>textproc/docbook-310</filename></para>
-     </listitem>
-     <listitem>
       <para><filename>textproc/iso8879</filename></para>
      </listitem>
      <listitem>
       <para><filename>textproc/dsssl-docbook-modular</filename></para>
      </listitem>
     </itemizedlist>
+    Apparently, there is no port for the DocBook V4.2 SGML DTD
+    available right now.  You will need to install it manually.
+   </para>
+
+   <para>
     A number of things from <filename>/usr/ports/print</filename>
     (<filename>tex</filename>, <filename>jadetex</filename>) might
     also be of interest.
@@ -225,7 +227,7 @@
     in <filename>/usr/local/share/sgml/catalog</filename>.  Be sure to
     have the following line in there:
 <programlisting>
-CATALOG "/usr/local/share/sgml/docbook/3.1/catalog"
+CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
 </programlisting>
     If you do not want to edit the file you can also set the
     environment variable <envar>SGML_CATALOG_FILES</envar> to a
@@ -331,20 +333,20 @@ CATALOG "dsssl/catalog"
      <step>
       <para>
        Obtain the <ulink
-       url="http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip">DocBook
-       V3.1</ulink> distribution.
+       url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">DocBook
+       V4.2</ulink> distribution.
       </para>
      </step>
 
      <step>
       <para>
        Create the directory
-       <filename>/usr/local/share/sgml/docbook31</filename> and change
+       <filename>/usr/local/share/sgml/docbook-4.2</filename> and change
        to it. (The exact location is irrelevant, but this one is
        reasonable within the layout we are following here.)
 <screen>
-<prompt>$ </prompt><userinput>mkdir /usr/local/share/sgml/docbook31</userinput>
-<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook31</userinput>
+<prompt>$ </prompt><userinput>mkdir /usr/local/share/sgml/docbook-4.2</userinput>
+<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
 </screen>
       </para>
      </step>
@@ -353,7 +355,7 @@ CATALOG "dsssl/catalog"
       <para>
        Unpack the archive.
 <screen>
-<prompt>$ </prompt><userinput>unzip -a ...../docbk31.zip</userinput>
+<prompt>$ </prompt><userinput>unzip -a ...../docbook-4.2.zip</userinput>
 </screen>
        (The archive will unpack its files into the current directory.)
       </para>
@@ -366,7 +368,7 @@ CATALOG "dsssl/catalog"
        you told jade during installation) and put a line like this
        into it:
 <programlisting>
-CATALOG "docbook31/docbook.cat"
+CATALOG "docbook-4.2/docbook.cat"
 </programlisting>
       </para>
      </step>
@@ -388,7 +390,7 @@ CATALOG "docbook31/docbook.cat"
        character entities</ulink> archive, unpack it, and put the
        files in the same directory you put the DocBook files in.
 <screen>
-<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook31</userinput>
+<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
 <prompt>$ </prompt><userinput>unzip ...../ISOEnts.zip</userinput>
 </screen>
       </para>
@@ -504,7 +506,7 @@ CATALOG "docbook-dsssl--1.<replaceable>xx</>/catalog
 <computeroutput>
 checking for onsgmls... onsgmls
 checking for openjade... openjade
-checking for DocBook V3.1... yes
+checking for DocBook V4.2... yes
 checking for DocBook stylesheets... /usr/lib/sgml/stylesheets/nwalsh-modular
 checking for sgmlspl... sgmlspl
 </computeroutput>
@@ -512,7 +514,7 @@ checking for sgmlspl... sgmlspl
    If neither <filename>onsgmls</filename> nor
    <filename>nsgmls</filename> were found then you will not see the
    remaining 4 lines.  <filename>nsgmls</filename> is part of the Jade
-   package.  If <quote>DocBook V3.1</quote> was not found then you did
+   package.  If <quote>DocBook V4.2</quote> was not found then you did
    not install the DocBook DTD kit in a place where jade can find it,
    or you have not set up the catalog files correctly.  See the
    installation hints above.  The DocBook stylesheets are looked for
@@ -1034,7 +1036,7 @@ End:
      the first line look like this:
 
 <programlisting>
-&lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN"&gt;
+&lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN"&gt;
 </programlisting>
 
      This means that anything and everything that reads
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index fa42664f06..49b71b4c82 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -668,7 +668,7 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
 EXEC SQL ALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>;
 </programlisting>
    The identifier serves as the <quote>variable name</quote> of the
-   descriptor area.  <comment>The scope of the allocated descriptor is WHAT?.</comment>
+   descriptor area.  <remark>The scope of the allocated descriptor is WHAT?.</remark>
    When you don't need the descriptor anymore, you should deallocate
    it:
 <programlisting>
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index a90cd6d61b..46e6769949 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -4,7 +4,7 @@ Genetic Optimizer
 -->
 
  <chapter id="geqo">
-  <docinfo>
+  <chapterinfo>
    <author>
     <firstname>Martin</firstname>
     <surname>Utesch</surname>
@@ -26,7 +26,7 @@ Genetic Optimizer
     </affiliation>
    </author>
    <date>1997-10-02</date>
-  </docinfo>
+  </chapterinfo>
 
   <title id="geqo-title">Genetic Query Optimizer</title>
 
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index b979d5b457..fd7d29cd14 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -3,12 +3,12 @@ $Header$
 -->
 
 <chapter id="nls">
- <docinfo>
+ <chapterinfo>
   <author>
    <firstname>Peter</firstname>
    <surname>Eisentraut</surname>
   </author>
- </docinfo>
+ </chapterinfo>
 
  <title>Native Language Support</title>
 
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 06d2a8d803..ff910fa505 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -2,7 +2,7 @@
 $Header$
 -->
 
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
 
 <!entity % version SYSTEM "version.sgml">
 %version;
diff --git a/doc/src/sgml/standalone-install.sgml b/doc/src/sgml/standalone-install.sgml
index d48b378df9..c965a66460 100644
--- a/doc/src/sgml/standalone-install.sgml
+++ b/doc/src/sgml/standalone-install.sgml
@@ -19,7 +19,7 @@ Running 'make INSTALL' in the doc/src/sgml directory will do 1 through
 3 for you.
 -->
 
-<!doctype chapter PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
 
 <!entity % version SYSTEM "version.sgml">
 %version;
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 307313a35e..d10aeb1507 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -224,7 +224,7 @@ ALTER GROUP <replaceable>name</replaceable> DROP USER <replaceable>uname1</repla
    <primary>REVOKE</primary>
   </indexterm>
 
-  <comment>Being moved to the DDL chapter.  Will eventually disappear here.</comment>
+  <remark>Being moved to the DDL chapter.  Will eventually disappear here.</remark>
 
   <para>
    When a database object is created, it is assigned an owner. The