diff --git a/configure b/configure
index 6e4781f396866fd44cee46cd13e781120c9af48d..94f0917fc23b3a356a807da6086f2a71831f6f52 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 2b64964894122dc0817f66991e3a0f08b45a3ba2..6e4473c53b4753eb2d76ff717ce0e906bc6ba684 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.304 2003/11/24 14:52:57 petere Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.305 2003/11/24 19:08:01 petere Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@@ -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 26b7848b417eb0196782497d489909f6f3031536..19876c99ef23496521c3bfed6d35df3b24a7818f 100644
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,11 +1,9 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.25 2003/06/11 15:28:55 tgl Exp $
-CVS code repository
-Thomas Lockhart
+$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.26 2003/11/24 19:08:01 petere Exp $
-->
<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 627f25096b4fa36d032ef511cf3d5fca65eae5bf..afc8632789fa962e9cb011b4f60e4ca00c970516 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.23 2003/11/05 00:05:32 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.24 2003/11/24 19:08:01 petere Exp $ -->
<chapter id="ddl">
<title>Data Definition</title>
@@ -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 fb9cbf974903ddfad6929ba48a5bafeca63542a1..e7c26c10ff300ca48d4b025d3368f90b93762c78 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -1,11 +1,11 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.6 2003/08/31 17:32:18 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.7 2003/11/24 19:08:01 petere Exp $ -->
<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 6dd0d233a89f313914373cd1100bb8f542ec4f05..0284e2b5232ab508c80a21870ebc254ee2a0842a 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.46 2003/09/12 22:17:22 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.47 2003/11/24 19:08:01 petere Exp $ -->
<appendix id="docguide">
<title>Documentation</title>
@@ -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>
@@ -205,9 +205,6 @@
<listitem>
<para><filename>textproc/openjade</filename></para>
</listitem>
- <listitem>
- <para><filename>textproc/docbook-310</filename></para>
- </listitem>
<listitem>
<para><filename>textproc/iso8879</filename></para>
</listitem>
@@ -215,6 +212,11 @@
<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>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
</programlisting>
This means that anything and everything that reads
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 0e426b179bb2d72965f3a62e92dd6589fd82c97f..7bdc4df77f54be5399d012f07ca9e756516f757a 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.54 2003/11/12 22:47:47 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.55 2003/11/24 19:08:02 petere Exp $
-->
<chapter id="ecpg">
@@ -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 a4622edcf1f996a0e9bac438aa8adc65b721a90e..70d5eec96f6bc51774eb42d033a41441e803410d 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,10 +1,10 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.24 2003/09/29 18:18:35 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.25 2003/11/24 19:08:02 petere Exp $
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 d857b66bb5cbee4960178734218df50c9fabbe73..4959e452199aad80ff5477811f26555788400b46 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -1,14 +1,14 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.7 2003/11/01 01:56:29 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.8 2003/11/24 19:08:02 petere Exp $
-->
<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 c7e0864f5ca72b04c0ed54fe639dcadaaa259f28..1a629d780288cfa25ed4518f26a687dbfdb46523 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,8 +1,8 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.60 2003/11/04 09:55:38 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.61 2003/11/24 19:08:02 petere Exp $
-->
-<!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 349e5d2972d80dfee0becba8a5fd3ae68ac930cd..3e773c019758bec975f2e93da57c34543f634c93 100644
--- a/doc/src/sgml/standalone-install.sgml
+++ b/doc/src/sgml/standalone-install.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/standalone-install.sgml,v 2.4 2003/03/25 16:15:38 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/standalone-install.sgml,v 2.5 2003/11/24 19:08:02 petere Exp $ -->
<!--
This file helps in generating the INSTALL text file that lives in the
@@ -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 8eca4794833a7fd8b14177edd5fcba5ec1dd84f7..19d18eaefc2c1221298afef0f78f066468e40510 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/user-manag.sgml,v 1.22 2003/08/31 17:32:20 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/user-manag.sgml,v 1.23 2003/11/24 19:08:02 petere Exp $
-->
<chapter id="user-manag">
@@ -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