From e43b2c68f15462fff57242e9972bcb1384cc43e4 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 14 Nov 2010 15:50:23 +0000 Subject: [PATCH] Update to docbook 4.5; fixes trac #4447 --- aclocal.m4 | 8 ++++---- docs/docbook-cheat-sheet/docbook-cheat-sheet.xml | 10 +++++----- docs/vh/vh.xml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bee5085..f386b35 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -755,7 +755,7 @@ AS_VAR_POPDEF([fp_func])dnl # FP_GEN_DOCBOOK_XML # ------------------ -# Generates a DocBook XML V4.2 document in conftest.xml. +# Generates a DocBook XML V4.5 document in conftest.xml. # # It took a lot of experimentation to find a document that will cause # xsltproc to fail with an error code when the relevant @@ -767,8 +767,8 @@ AC_DEFUN([FP_GEN_DOCBOOK_XML], [rm -f conftest.xml conftest-book.xml cat > conftest.xml << EOF - ]]> @@ -862,7 +862,7 @@ if test -n "$XmllintCmd"; then AC_MSG_RESULT([ok]) else AC_MSG_RESULT([failed]) - AC_MSG_WARN([cannot find a DTD for DocBook XML V4.2, you will not be able to validate your documentation]) + AC_MSG_WARN([cannot find a DTD for DocBook XML V4.5, you will not be able to validate your documentation]) AC_MSG_WARN([check your XML_CATALOG_FILES environment variable and/or /etc/xml/catalog]) fi rm -rf conftest* diff --git a/docs/docbook-cheat-sheet/docbook-cheat-sheet.xml b/docs/docbook-cheat-sheet/docbook-cheat-sheet.xml index f90ab7a..d48b3ef 100644 --- a/docs/docbook-cheat-sheet/docbook-cheat-sheet.xml +++ b/docs/docbook-cheat-sheet/docbook-cheat-sheet.xml @@ -1,6 +1,6 @@ - +
@@ -19,13 +19,13 @@ Document layout - The GHC documentation is written using DocBook XML V4.2, so + The GHC documentation is written using DocBook XML V4.5, so the first few lines should look like this: <?xml version="1.0" encoding="iso-8859-1"?> -<!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"> The encoding can of course be chosen according to taste. diff --git a/docs/vh/vh.xml b/docs/vh/vh.xml index d27c989..0e0f8f5 100644 --- a/docs/vh/vh.xml +++ b/docs/vh/vh.xml @@ -1,6 +1,6 @@ -
-- 1.7.10.4