Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 416c75c

Browse files
committed
Update to DocBook 4.5
This moves us to the latest minor version of DocBook 4. It requires no markup changes.
1 parent 66bde49 commit 416c75c

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18686,13 +18686,13 @@ $as_echo "$XMLLINT" >&6; }
1868618686
fi
1868718687

1868818688

18689-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.2" >&5
18690-
$as_echo_n "checking for DocBook XML V4.2... " >&6; }
18689+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.5" >&5
18690+
$as_echo_n "checking for DocBook XML V4.5... " >&6; }
1869118691
if ${pgac_cv_check_docbook+:} false; then :
1869218692
$as_echo_n "(cached) " >&6
1869318693
else
1869418694
cat >conftest.xml <<EOF
18695-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
18695+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
1869618696
<book>
1869718697
<title>test</title>
1869818698
<chapter>

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ fi
22572257
# Check for DocBook and tools
22582258
#
22592259
PGAC_PATH_XMLLINT
2260-
PGAC_CHECK_DOCBOOK(4.2)
2260+
PGAC_CHECK_DOCBOOK(4.5)
22612261
PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
22622262
PGAC_PATH_PROGS(XSLTPROC, xsltproc)
22632263
PGAC_PATH_PROGS(FOP, fop)

doc/src/sgml/docguide.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<listitem>
8585
<para>
8686
This is the definition of DocBook itself. We currently use version
87-
4.2; you cannot use later or earlier versions. You need
87+
4.5; you cannot use later or earlier versions. You need
8888
the <acronym>XML</acronym> variant of the DocBook DTD, not
8989
the <acronym>SGML</acronym> variant.
9090
</para>
@@ -214,7 +214,7 @@ apt-get install docbook-xml docbook-xsl fop libxml2-utils xsltproc
214214
<para>
215215
If you use MacPorts, the following will get you set up:
216216
<programlisting>
217-
sudo port install docbook-xml-4.2 docbook-xsl fop
217+
sudo port install docbook-xml-4.5 docbook-xsl fop
218218
</programlisting>
219219
If you use Homebrew, use this:
220220
<programlisting>
@@ -234,7 +234,7 @@ brew install docbook docbook-xsl fop
234234
like this:
235235
<screen>
236236
checking for xmllint... xmllint
237-
checking for DocBook XML V4.2... yes
237+
checking for DocBook XML V4.5... yes
238238
checking for dbtoepub... dbtoepub
239239
checking for xsltproc... xsltproc
240240
checking for fop... fop

doc/src/sgml/postgres.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- doc/src/sgml/postgres.sgml -->
22

3-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
4-
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
3+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
4+
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
55
[
66

77
<!ENTITY % version SYSTEM "version.sgml">

doc/src/sgml/standalone-install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
2+
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
33
<!--
44
This file contains the stand-alone installation instructions that end up in
55
the INSTALL file. This document stitches together parts of the installation

doc/src/sgml/standalone-profile.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ variant without links and references to the main documentation.
1616
-->
1717

1818
<xsl:output
19-
doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
20-
doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
19+
doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
20+
doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
2121

2222
<!-- copy everything by default -->
2323

0 commit comments

Comments
 (0)