diff --git a/configure b/configure index 7a6bfc2339..2c98e80c19 100755 --- a/configure +++ b/configure @@ -18686,13 +18686,13 @@ $as_echo "$XMLLINT" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.2" >&5 -$as_echo_n "checking for DocBook XML V4.2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.5" >&5 +$as_echo_n "checking for DocBook XML V4.5... " >&6; } if ${pgac_cv_check_docbook+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.xml < + test diff --git a/configure.in b/configure.in index dde3eec89f..33edfd765b 100644 --- a/configure.in +++ b/configure.in @@ -2257,7 +2257,7 @@ fi # Check for DocBook and tools # PGAC_PATH_XMLLINT -PGAC_CHECK_DOCBOOK(4.2) +PGAC_CHECK_DOCBOOK(4.5) PGAC_PATH_PROGS(DBTOEPUB, dbtoepub) PGAC_PATH_PROGS(XSLTPROC, xsltproc) PGAC_PATH_PROGS(FOP, fop) diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 0608b8c612..8bcaf235ad 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -84,7 +84,7 @@ 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 XML variant of the DocBook DTD, not the SGML variant. @@ -214,7 +214,7 @@ apt-get install docbook-xml docbook-xsl fop libxml2-utils xsltproc If you use MacPorts, the following will get you set up: -sudo port install docbook-xml-4.2 docbook-xsl fop +sudo port install docbook-xml-4.5 docbook-xsl fop If you use Homebrew, use this: @@ -234,7 +234,7 @@ brew install docbook docbook-xsl fop like this: checking for xmllint... xmllint -checking for DocBook XML V4.2... yes +checking for DocBook XML V4.5... yes checking for dbtoepub... dbtoepub checking for xsltproc... xsltproc checking for fop... fop diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml index 3e115f1c76..e59cba7997 100644 --- a/doc/src/sgml/postgres.sgml +++ b/doc/src/sgml/postgres.sgml @@ -1,7 +1,7 @@ - diff --git a/doc/src/sgml/standalone-install.xml b/doc/src/sgml/standalone-install.xml index f584789f9a..019377a67f 100644 --- a/doc/src/sgml/standalone-install.xml +++ b/doc/src/sgml/standalone-install.xml @@ -1,5 +1,5 @@ - + + doctype-public="-//OASIS//DTD DocBook XML V4.5//EN" + doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>