Skip to content

Commit cf87eb4

Browse files
peterepetere
committed
Upgrade to DocBook V4.2 SGML.
1 parent e91e640 commit cf87eb4

File tree

12 files changed

+47
-47
lines changed

12 files changed

+47
-47
lines changed

‎configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17451,13 +17451,13 @@ fi
1745117451
done
1745217452

1745317453

17454-
echo "$as_me:$LINENO: checking for DocBook V3.1" >&5
17455-
echo $ECHO_N "checking for DocBook V3.1... $ECHO_C" >&6
17454+
echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
17455+
echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6
1745617456
if test "${pgac_cv_check_docbook+set}" = set; then
1745717457
echo $ECHO_N "(cached) $ECHO_C" >&6
1745817458
else
1745917459
cat >conftest.sgml <<EOF
17460-
<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
17460+
<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
1746117461
<book>
1746217462
<title>test</title>
1746317463
<chapter>

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.304 2003/11/24 14:52:57 petere Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.305 2003/11/24 19:08:01 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1236,7 +1236,7 @@ fi
12361236
#
12371237
PGAC_PROG_NSGMLS
12381238
PGAC_PROG_JADE
1239-
PGAC_CHECK_DOCBOOK(3.1)
1239+
PGAC_CHECK_DOCBOOK(4.2)
12401240
PGAC_PATH_DOCBOOK_STYLESHEETS
12411241
PGAC_PATH_COLLATEINDEX
12421242
AC_CHECK_PROGS(SGMLSPL, sgmlspl)

‎doc/src/sgml/cvs.sgml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.25 2003/06/11 15:28:55 tgl Exp $
3-
CVS code repository
4-
Thomas Lockhart
2+
$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.26 2003/11/24 19:08:01 petere Exp $
53
-->
64

75
<appendix id="cvs">
8-
<docinfo>
6+
<appendixinfo>
97
<authorgroup>
108
<author>
119
<firstname>Marc</firstname>
@@ -21,7 +19,7 @@ Thomas Lockhart
2119
</author>
2220
</authorgroup>
2321
<date>1999-05-20</date>
24-
</docinfo>
22+
</appendixinfo>
2523

2624
<title>The <productname>CVS</productname> Repository</title>
2725

‎doc/src/sgml/ddl.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.23 2003/11/05 00:05:32 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.24 2003/11/24 19:08:01 petere Exp $ -->
22

33
<chapter id="ddl">
44
<title>Data Definition</title>
@@ -956,8 +956,8 @@ CREATE TABLE order_items (
956956
<sect1 id="ddl-inherit">
957957
<title>Inheritance</title>
958958

959-
<comment>This section needs to be rethought. Some of the
960-
information should go into the following chapters.</comment>
959+
<remark>This section needs to be rethought. Some of the
960+
information should go into the following chapters.</remark>
961961

962962
<para>
963963
Let's create two tables. The capitals table contains

‎doc/src/sgml/dml.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.6 2003/08/31 17:32:18 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/dml.sgml,v 1.7 2003/11/24 19:08:01 petere Exp $ -->
22

33
<chapter id="dml">
44
<title>Data Manipulation</title>
55

6-
<comment>
6+
<remark>
77
This chapter is still quite incomplete.
8-
</comment>
8+
</remark>
99

1010
<para>
1111
The previous chapter discussed how to create tables and other

‎doc/src/sgml/docguide.sgml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.46 2003/09/12 22:17:22 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.47 2003/11/24 19:08:01 petere Exp $ -->
22

33
<appendix id="docguide">
44
<title>Documentation</title>
@@ -86,7 +86,7 @@
8686
<listitem>
8787
<para>
8888
This is the definition of DocBook itself. We currently use
89-
version 3.1; you cannot use later or earlier versions. Note
89+
version 4.2; you cannot use later or earlier versions. Note
9090
that there is also an <acronym>XML</acronym> version of DocBook
9191
-- do not use that.
9292
</para>
@@ -205,16 +205,18 @@
205205
<listitem>
206206
<para><filename>textproc/openjade</filename></para>
207207
</listitem>
208-
<listitem>
209-
<para><filename>textproc/docbook-310</filename></para>
210-
</listitem>
211208
<listitem>
212209
<para><filename>textproc/iso8879</filename></para>
213210
</listitem>
214211
<listitem>
215212
<para><filename>textproc/dsssl-docbook-modular</filename></para>
216213
</listitem>
217214
</itemizedlist>
215+
Apparently, there is no port for the DocBook V4.2 SGML DTD
216+
available right now. You will need to install it manually.
217+
</para>
218+
219+
<para>
218220
A number of things from <filename>/usr/ports/print</filename>
219221
(<filename>tex</filename>, <filename>jadetex</filename>) might
220222
also be of interest.
@@ -225,7 +227,7 @@
225227
in <filename>/usr/local/share/sgml/catalog</filename>. Be sure to
226228
have the following line in there:
227229
<programlisting>
228-
CATALOG "/usr/local/share/sgml/docbook/3.1/catalog"
230+
CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
229231
</programlisting>
230232
If you do not want to edit the file you can also set the
231233
environment variable <envar>SGML_CATALOG_FILES</envar> to a
@@ -331,20 +333,20 @@ CATALOG "dsssl/catalog"
331333
<step>
332334
<para>
333335
Obtain the <ulink
334-
url="http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip">DocBook
335-
V3.1</ulink> distribution.
336+
url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">DocBook
337+
V4.2</ulink> distribution.
336338
</para>
337339
</step>
338340

339341
<step>
340342
<para>
341343
Create the directory
342-
<filename>/usr/local/share/sgml/docbook31</filename> and change
344+
<filename>/usr/local/share/sgml/docbook-4.2</filename> and change
343345
to it. (The exact location is irrelevant, but this one is
344346
reasonable within the layout we are following here.)
345347
<screen>
346-
<prompt>$ </prompt><userinput>mkdir /usr/local/share/sgml/docbook31</userinput>
347-
<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook31</userinput>
348+
<prompt>$ </prompt><userinput>mkdir /usr/local/share/sgml/docbook-4.2</userinput>
349+
<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
348350
</screen>
349351
</para>
350352
</step>
@@ -353,7 +355,7 @@ CATALOG "dsssl/catalog"
353355
<para>
354356
Unpack the archive.
355357
<screen>
356-
<prompt>$ </prompt><userinput>unzip -a ...../docbk31.zip</userinput>
358+
<prompt>$ </prompt><userinput>unzip -a ...../docbook-4.2.zip</userinput>
357359
</screen>
358360
(The archive will unpack its files into the current directory.)
359361
</para>
@@ -366,7 +368,7 @@ CATALOG "dsssl/catalog"
366368
you told jade during installation) and put a line like this
367369
into it:
368370
<programlisting>
369-
CATALOG "docbook31/docbook.cat"
371+
CATALOG "docbook-4.2/docbook.cat"
370372
</programlisting>
371373
</para>
372374
</step>
@@ -388,7 +390,7 @@ CATALOG "docbook31/docbook.cat"
388390
character entities</ulink> archive, unpack it, and put the
389391
files in the same directory you put the DocBook files in.
390392
<screen>
391-
<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook31</userinput>
393+
<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
392394
<prompt>$ </prompt><userinput>unzip ...../ISOEnts.zip</userinput>
393395
</screen>
394396
</para>
@@ -504,15 +506,15 @@ CATALOG "docbook-dsssl--1.<replaceable>xx</>/catalog
504506
<computeroutput>
505507
checking for onsgmls... onsgmls
506508
checking for openjade... openjade
507-
checking for DocBook V3.1... yes
509+
checking for DocBook V4.2... yes
508510
checking for DocBook stylesheets... /usr/lib/sgml/stylesheets/nwalsh-modular
509511
checking for sgmlspl... sgmlspl
510512
</computeroutput>
511513
</screen>
512514
If neither <filename>onsgmls</filename> nor
513515
<filename>nsgmls</filename> were found then you will not see the
514516
remaining 4 lines. <filename>nsgmls</filename> is part of the Jade
515-
package. If <quote>DocBook V3.1</quote> was not found then you did
517+
package. If <quote>DocBook V4.2</quote> was not found then you did
516518
not install the DocBook DTD kit in a place where jade can find it,
517519
or you have not set up the catalog files correctly. See the
518520
installation hints above. The DocBook stylesheets are looked for
@@ -1034,7 +1036,7 @@ End:
10341036
the first line look like this:
10351037

10361038
<programlisting>
1037-
&lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN"&gt;
1039+
&lt;!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN"&gt;
10381040
</programlisting>
10391041

10401042
This means that anything and everything that reads

‎doc/src/sgml/ecpg.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.54 2003/11/12 22:47:47 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.55 2003/11/24 19:08:02 petere Exp $
33
-->
44

55
<chapter id="ecpg">
@@ -668,7 +668,7 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
668668
EXEC SQL ALLOCATE DESCRIPTOR <replaceable>identifier</replaceable>;
669669
</programlisting>
670670
The identifier serves as the <quote>variable name</quote> of the
671-
descriptor area. <comment>The scope of the allocated descriptor is WHAT?.</comment>
671+
descriptor area. <remark>The scope of the allocated descriptor is WHAT?.</remark>
672672
When you don't need the descriptor anymore, you should deallocate
673673
it:
674674
<programlisting>

‎doc/src/sgml/geqo.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.24 2003/09/29 18:18:35 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.25 2003/11/24 19:08:02 petere Exp $
33
Genetic Optimizer
44
-->
55

66
<chapter id="geqo">
7-
<docinfo>
7+
<chapterinfo>
88
<author>
99
<firstname>Martin</firstname>
1010
<surname>Utesch</surname>
@@ -26,7 +26,7 @@ Genetic Optimizer
2626
</affiliation>
2727
</author>
2828
<date>1997-10-02</date>
29-
</docinfo>
29+
</chapterinfo>
3030

3131
<title id="geqo-title">Genetic Query Optimizer</title>
3232

‎doc/src/sgml/nls.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.7 2003/11/01 01:56:29 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.8 2003/11/24 19:08:02 petere Exp $
33
-->
44

55
<chapter id="nls">
6-
<docinfo>
6+
<chapterinfo>
77
<author>
88
<firstname>Peter</firstname>
99
<surname>Eisentraut</surname>
1010
</author>
11-
</docinfo>
11+
</chapterinfo>
1212

1313
<title>Native Language Support</title>
1414

‎doc/src/sgml/postgres.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.60 2003/11/04 09:55:38 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.61 2003/11/24 19:08:02 petere Exp $
33
-->
44

5-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
5+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
66

77
<!entity % version SYSTEM "version.sgml">
88
%version;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy