Commit e43b2c68 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Update to docbook 4.5; fixes trac #4447

parent f9076f80
...@@ -755,7 +755,7 @@ AS_VAR_POPDEF([fp_func])dnl ...@@ -755,7 +755,7 @@ AS_VAR_POPDEF([fp_func])dnl
# FP_GEN_DOCBOOK_XML # 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 # It took a lot of experimentation to find a document that will cause
# xsltproc to fail with an error code when the relevant # xsltproc to fail with an error code when the relevant
...@@ -767,8 +767,8 @@ AC_DEFUN([FP_GEN_DOCBOOK_XML], ...@@ -767,8 +767,8 @@ AC_DEFUN([FP_GEN_DOCBOOK_XML],
[rm -f conftest.xml conftest-book.xml [rm -f conftest.xml conftest-book.xml
cat > conftest.xml << EOF cat > conftest.xml << EOF
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!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 conftest-book SYSTEM "conftest-book.xml"> <!ENTITY conftest-book SYSTEM "conftest-book.xml">
]]> ]]>
<book id="test"> <book id="test">
...@@ -862,7 +862,7 @@ if test -n "$XmllintCmd"; then ...@@ -862,7 +862,7 @@ if test -n "$XmllintCmd"; then
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
else else
AC_MSG_RESULT([failed]) 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]) AC_MSG_WARN([check your XML_CATALOG_FILES environment variable and/or /etc/xml/catalog])
fi fi
rm -rf conftest* rm -rf conftest*
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE article 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">
<article id="docbook-cheat-sheet"> <article id="docbook-cheat-sheet">
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
<sect1 id="doc-layout"> <sect1 id="doc-layout">
<title>Document layout</title> <title>Document layout</title>
<para>The GHC documentation is written using DocBook XML V4.2, so <para>The GHC documentation is written using DocBook XML V4.5, so
the first few lines should look like this:</para> the first few lines should look like this:</para>
<programlisting> <programlisting>
&lt;?xml version="1.0" encoding="iso-8859-1"?> &lt;?xml version="1.0" encoding="iso-8859-1"?>
&lt;!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" &lt;!DOCTYPE article 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">
</programlisting> </programlisting>
<para>The encoding can of course be chosen according to taste.</para> <para>The encoding can of course be chosen according to taste.</para>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE article 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" [
]> ]>
<article id="visual-haskell"> <article id="visual-haskell">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment