mirror of https://github.com/postgres/postgres
Update to DocBook 4.5
This moves us to the latest minor version of DocBook 4. It requires no markup changes.
This commit is contained in:
parent
66bde49d96
commit
416c75cf38
|
@ -18686,13 +18686,13 @@ $as_echo "$XMLLINT" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.2" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.5" >&5
|
||||||
$as_echo_n "checking for DocBook XML V4.2... " >&6; }
|
$as_echo_n "checking for DocBook XML V4.5... " >&6; }
|
||||||
if ${pgac_cv_check_docbook+:} false; then :
|
if ${pgac_cv_check_docbook+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
cat >conftest.xml <<EOF
|
cat >conftest.xml <<EOF
|
||||||
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
|
||||||
<book>
|
<book>
|
||||||
<title>test</title>
|
<title>test</title>
|
||||||
<chapter>
|
<chapter>
|
||||||
|
|
|
@ -2257,7 +2257,7 @@ fi
|
||||||
# Check for DocBook and tools
|
# Check for DocBook and tools
|
||||||
#
|
#
|
||||||
PGAC_PATH_XMLLINT
|
PGAC_PATH_XMLLINT
|
||||||
PGAC_CHECK_DOCBOOK(4.2)
|
PGAC_CHECK_DOCBOOK(4.5)
|
||||||
PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
|
PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
|
||||||
PGAC_PATH_PROGS(XSLTPROC, xsltproc)
|
PGAC_PATH_PROGS(XSLTPROC, xsltproc)
|
||||||
PGAC_PATH_PROGS(FOP, fop)
|
PGAC_PATH_PROGS(FOP, fop)
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
This is the definition of DocBook itself. We currently use version
|
This is the definition of DocBook itself. We currently use version
|
||||||
4.2; you cannot use later or earlier versions. You need
|
4.5; you cannot use later or earlier versions. You need
|
||||||
the <acronym>XML</acronym> variant of the DocBook DTD, not
|
the <acronym>XML</acronym> variant of the DocBook DTD, not
|
||||||
the <acronym>SGML</acronym> variant.
|
the <acronym>SGML</acronym> variant.
|
||||||
</para>
|
</para>
|
||||||
|
@ -214,7 +214,7 @@ apt-get install docbook-xml docbook-xsl fop libxml2-utils xsltproc
|
||||||
<para>
|
<para>
|
||||||
If you use MacPorts, the following will get you set up:
|
If you use MacPorts, the following will get you set up:
|
||||||
<programlisting>
|
<programlisting>
|
||||||
sudo port install docbook-xml-4.2 docbook-xsl fop
|
sudo port install docbook-xml-4.5 docbook-xsl fop
|
||||||
</programlisting>
|
</programlisting>
|
||||||
If you use Homebrew, use this:
|
If you use Homebrew, use this:
|
||||||
<programlisting>
|
<programlisting>
|
||||||
|
@ -234,7 +234,7 @@ brew install docbook docbook-xsl fop
|
||||||
like this:
|
like this:
|
||||||
<screen>
|
<screen>
|
||||||
checking for xmllint... xmllint
|
checking for xmllint... xmllint
|
||||||
checking for DocBook XML V4.2... yes
|
checking for DocBook XML V4.5... yes
|
||||||
checking for dbtoepub... dbtoepub
|
checking for dbtoepub... dbtoepub
|
||||||
checking for xsltproc... xsltproc
|
checking for xsltproc... xsltproc
|
||||||
checking for fop... fop
|
checking for fop... fop
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<!-- doc/src/sgml/postgres.sgml -->
|
<!-- doc/src/sgml/postgres.sgml -->
|
||||||
|
|
||||||
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
|
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
||||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
|
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
|
||||||
[
|
[
|
||||||
|
|
||||||
<!ENTITY % version SYSTEM "version.sgml">
|
<!ENTITY % version SYSTEM "version.sgml">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
|
||||||
<!--
|
<!--
|
||||||
This file contains the stand-alone installation instructions that end up in
|
This file contains the stand-alone installation instructions that end up in
|
||||||
the INSTALL file. This document stitches together parts of the installation
|
the INSTALL file. This document stitches together parts of the installation
|
||||||
|
|
|
@ -16,8 +16,8 @@ variant without links and references to the main documentation.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<xsl:output
|
<xsl:output
|
||||||
doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
|
doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
|
||||||
doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
|
doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
|
||||||
|
|
||||||
<!-- copy everything by default -->
|
<!-- copy everything by default -->
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue