mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to DocBook V4.2 SGML.

Browse Source
This commit is contained in:
Peter Eisentraut 2003-11-24 19:08:02 +00:00
parent e91e640b80
commit cf87eb4726
12 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -17451,13 +17451,13 @@ fi
done done
echo "$as_me:$LINENO: checking for DocBook V3.1" >&5 echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
echo $ECHO_N "checking for DocBook V3.1... $ECHO_C" >&6 echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6
if test "${pgac_cv_check_docbook+set}" = set; then if test "${pgac_cv_check_docbook+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.sgml <<EOF cat >conftest.sgml <<EOF
<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN"> <!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
<book> <book>
<title>test</title> <title>test</title>
<chapter> <chapter>

4
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. 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
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -1236,7 +1236,7 @@ fi
# #
PGAC_PROG_NSGMLS PGAC_PROG_NSGMLS
PGAC_PROG_JADE PGAC_PROG_JADE
PGAC_CHECK_DOCBOOK(3.1) PGAC_CHECK_DOCBOOK(4.2)
PGAC_PATH_DOCBOOK_STYLESHEETS PGAC_PATH_DOCBOOK_STYLESHEETS
PGAC_PATH_COLLATEINDEX PGAC_PATH_COLLATEINDEX
AC_CHECK_PROGS(SGMLSPL, sgmlspl) AC_CHECK_PROGS(SGMLSPL, sgmlspl)

8
doc/src/sgml/cvs.sgml
View File

@ -1,11 +1,9 @@
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.25 2003/06/11 15:28:55 tgl Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.26 2003/11/24 19:08:01 petere Exp $
CVS code repository
Thomas Lockhart
--> -->
<appendix id="cvs"> <appendix id="cvs">
<docinfo> <appendixinfo>
<authorgroup> <authorgroup>
<author> <author>
<firstname>Marc</firstname> <firstname>Marc</firstname>
@ -21,7 +19,7 @@ Thomas Lockhart
</author> </author>
</authorgroup> </authorgroup>
<date>1999-05-20</date> <date>1999-05-20</date>
</docinfo> </appendixinfo>
<title>The <productname>CVS</productname> Repository</title> <title>The <productname>CVS</productname> Repository</title>

6
doc/src/sgml/ddl.sgml
View File

@ -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"> <chapter id="ddl">
<title>Data Definition</title> <title>Data Definition</title>
@ -956,8 +956,8 @@ CREATE TABLE order_items (
<sect1 id="ddl-inherit"> <sect1 id="ddl-inherit">
<title>Inheritance</title> <title>Inheritance</title>
<comment>This section needs to be rethought. Some of the <remark>This section needs to be rethought. Some of the
information should go into the following chapters.</comment> information should go into the following chapters.</remark>
<para> <para>
Let's create two tables. The capitals table contains Let's create two tables. The capitals table contains

6
doc/src/sgml/dml.sgml
View File

@ -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"> <chapter id="dml">
<title>Data Manipulation</title> <title>Data Manipulation</title>
<comment> <remark>
This chapter is still quite incomplete. This chapter is still quite incomplete.
</comment> </remark>
<para> <para>
The previous chapter discussed how to create tables and other The previous chapter discussed how to create tables and other

36
doc/src/sgml/docguide.sgml
View File

@ -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"> <appendix id="docguide">
<title>Documentation</title> <title>Documentation</title>
@ -86,7 +86,7 @@
<listitem> <listitem>
<para> <para>
This is the definition of DocBook itself. We currently use 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 that there is also an <acronym>XML</acronym> version of DocBook
-- do not use that. -- do not use that.
</para> </para>
@ -205,9 +205,6 @@
<listitem> <listitem>
<para><filename>textproc/openjade</filename></para> <para><filename>textproc/openjade</filename></para>
</listitem> </listitem>
<listitem>
<para><filename>textproc/docbook-310</filename></para>
</listitem>
<listitem> <listitem>
<para><filename>textproc/iso8879</filename></para> <para><filename>textproc/iso8879</filename></para>
</listitem> </listitem>
@ -215,6 +212,11 @@
<para><filename>textproc/dsssl-docbook-modular</filename></para> <para><filename>textproc/dsssl-docbook-modular</filename></para>
</listitem> </listitem>
</itemizedlist> </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> A number of things from <filename>/usr/ports/print</filename>
(<filename>tex</filename>, <filename>jadetex</filename>) might (<filename>tex</filename>, <filename>jadetex</filename>) might
also be of interest. also be of interest.
@ -225,7 +227,7 @@
in <filename>/usr/local/share/sgml/catalog</filename>. Be sure to in <filename>/usr/local/share/sgml/catalog</filename>. Be sure to
have the following line in there: have the following line in there:
<programlisting> <programlisting>
CATALOG "/usr/local/share/sgml/docbook/3.1/catalog" CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
</programlisting> </programlisting>
If you do not want to edit the file you can also set the If you do not want to edit the file you can also set the
environment variable <envar>SGML_CATALOG_FILES</envar> to a environment variable <envar>SGML_CATALOG_FILES</envar> to a
@ -331,20 +333,20 @@ CATALOG "dsssl/catalog"
<step> <step>
<para> <para>
Obtain the <ulink Obtain the <ulink
url="http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip">DocBook url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">DocBook
V3.1</ulink> distribution. V4.2</ulink> distribution.
</para> </para>
</step> </step>
<step> <step>
<para> <para>
Create the directory 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 to it. (The exact location is irrelevant, but this one is
reasonable within the layout we are following here.) reasonable within the layout we are following here.)
<screen> <screen>
<prompt>$ </prompt><userinput>mkdir /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/docbook31</userinput> <prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
</screen> </screen>
</para> </para>
</step> </step>
@ -353,7 +355,7 @@ CATALOG "dsssl/catalog"
<para> <para>
Unpack the archive. Unpack the archive.
<screen> <screen>
<prompt>$ </prompt><userinput>unzip -a ...../docbk31.zip</userinput> <prompt>$ </prompt><userinput>unzip -a ...../docbook-4.2.zip</userinput>
</screen> </screen>
(The archive will unpack its files into the current directory.) (The archive will unpack its files into the current directory.)
</para> </para>
@ -366,7 +368,7 @@ CATALOG "dsssl/catalog"
you told jade during installation) and put a line like this you told jade during installation) and put a line like this
into it: into it:
<programlisting> <programlisting>
CATALOG "docbook31/docbook.cat" CATALOG "docbook-4.2/docbook.cat"
</programlisting> </programlisting>
</para> </para>
</step> </step>
@ -388,7 +390,7 @@ CATALOG "docbook31/docbook.cat"
character entities</ulink> archive, unpack it, and put the character entities</ulink> archive, unpack it, and put the
files in the same directory you put the DocBook files in. files in the same directory you put the DocBook files in.
<screen> <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> <prompt>$ </prompt><userinput>unzip ...../ISOEnts.zip</userinput>
</screen> </screen>
</para> </para>
@ -504,7 +506,7 @@ CATALOG "docbook-dsssl--1.<replaceable>xx</>/catalog
<computeroutput> <computeroutput>
checking for onsgmls... onsgmls checking for onsgmls... onsgmls
checking for openjade... openjade 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 DocBook stylesheets... /usr/lib/sgml/stylesheets/nwalsh-modular
checking for sgmlspl... sgmlspl checking for sgmlspl... sgmlspl
</computeroutput> </computeroutput>
@ -512,7 +514,7 @@ checking for sgmlspl... sgmlspl
If neither <filename>onsgmls</filename> nor If neither <filename>onsgmls</filename> nor
<filename>nsgmls</filename> were found then you will not see the <filename>nsgmls</filename> were found then you will not see the
remaining 4 lines. <filename>nsgmls</filename> is part of the Jade 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, 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 or you have not set up the catalog files correctly. See the
installation hints above. The DocBook stylesheets are looked for installation hints above. The DocBook stylesheets are looked for
@ -1034,7 +1036,7 @@ End:
the first line look like this: the first line look like this:
<programlisting> <programlisting>
&lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN"&gt; &lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN"&gt;
</programlisting> </programlisting>
This means that anything and everything that reads This means that anything and everything that reads

4
doc/src/sgml/ecpg.sgml
View File

@ -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"> <chapter id="ecpg">
@ -668,7 +668,7 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
EXEC SQL ALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>; EXEC SQL ALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>;
</programlisting> </programlisting>
The identifier serves as the <quote>variable name</quote> of the 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 When you don't need the descriptor anymore, you should deallocate
it: it:
<programlisting> <programlisting>

6
doc/src/sgml/geqo.sgml
View File

@ -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 Genetic Optimizer
--> -->
<chapter id="geqo"> <chapter id="geqo">
<docinfo> <chapterinfo>
<author> <author>
<firstname>Martin</firstname> <firstname>Martin</firstname>
<surname>Utesch</surname> <surname>Utesch</surname>
@ -26,7 +26,7 @@ Genetic Optimizer
</affiliation> </affiliation>
</author> </author>
<date>1997-10-02</date> <date>1997-10-02</date>
</docinfo> </chapterinfo>
<title id="geqo-title">Genetic Query Optimizer</title> <title id="geqo-title">Genetic Query Optimizer</title>

6
doc/src/sgml/nls.sgml
View File

@ -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"> <chapter id="nls">
<docinfo> <chapterinfo>
<author> <author>
<firstname>Peter</firstname> <firstname>Peter</firstname>
<surname>Eisentraut</surname> <surname>Eisentraut</surname>
</author> </author>
</docinfo> </chapterinfo>
<title>Native Language Support</title> <title>Native Language Support</title>

4
doc/src/sgml/postgres.sgml
View File

@ -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"> <!entity % version SYSTEM "version.sgml">
%version; %version;

4
doc/src/sgml/standalone-install.sgml
View File

@ -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 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. 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"> <!entity % version SYSTEM "version.sgml">
%version; %version;

4
doc/src/sgml/user-manag.sgml
View File

@ -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"> <chapter id="user-manag">
@ -224,7 +224,7 @@ ALTER GROUP <replaceable>name</replaceable> DROP USER <replaceable>uname1</repla
<primary>REVOKE</primary> <primary>REVOKE</primary>
</indexterm> </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> <para>
When a database object is created, it is assigned an owner. The When a database object is created, it is assigned an owner. The