diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-01 18:32:43 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-02 19:33:51 -0700 |
commit | b12e1b22c0ecb7009ce31aa34206a277aff12faf (patch) | |
tree | cc7eedca31a6360bcb46cfe7ab240a6adc8b1a24 | |
parent | d19d82db8672cc131be3060e80597d03c7606b0d (diff) |
Use XML tools for release notes instead of SGML tools
Document was already mostly xml-compatible
Uses newer tools for formatting, better matching other new docs
Moved from sgml/RELNOTES.sgml to general/release-notes.xml
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r-- | general/Makefile.am | 7 | ||||
-rw-r--r-- | general/ReleaseNotes.xml (renamed from sgml/RELNOTES.sgml) | 11 | ||||
-rw-r--r-- | sgml/Makefile.am | 1 | ||||
-rw-r--r-- | xmlrules.in | 5 |
4 files changed, 20 insertions, 4 deletions
diff --git a/general/Makefile.am b/general/Makefile.am index 307dfef..3e282b3 100644 --- a/general/Makefile.am +++ b/general/Makefile.am @@ -1,3 +1,10 @@ # Process this file with automake to create Makefile.in SUBDIRS = input graphics + +doc_sources = ReleaseNotes.xml + +xmldir = $(docdir) +dist_xml_DATA = $(doc_sources) + +include $(top_srcdir)/xmlrules.in diff --git a/sgml/RELNOTES.sgml b/general/ReleaseNotes.xml index 9d9d8cf..3bec5de 100644 --- a/sgml/RELNOTES.sgml +++ b/general/ReleaseNotes.xml @@ -2,7 +2,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ -<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs; +<!ENTITY % defs SYSTEM "/xorg-sgml-doctools/X11/defs.ent"> %defs; ]> <article> @@ -111,23 +111,28 @@ issued, from X11R6.7 to the current &relvers;. </para> <para> +<!-- We only do release notes for full releases now. <![ %updaterel [ The next sections describe what has changed in the update release(s) as well as what is new in the latest full release (&fullrelvers;). ]]> <![ %majorrel [ +--> The next section describes what is new in the latest full release (&relvers;) compared with the previous full release (&prevrelvers;). +<!-- ]]> <![ %minorrel [ The next section describes what is new in the latest version (&relvers;) compared with the previous full release (&prevrelvers;). ]]> + --> </para> </sect1> +<!-- <![ %updaterel [ <sect1> <title>Summary of updates in &relvers;</title> @@ -135,6 +140,7 @@ The next section describes what is new in the latest version </para> </sect1> ]]> +--> <sect1> <title>Summary of new features in X11R&relvers;</title> @@ -1311,6 +1317,7 @@ The next section describes what is new in the latest version <sect1> <title>Attributions/Acknowledgements/Credits</title> +<!-- <![ %snapshot [ <note> <title>THIS IS A DRAFT OF THE X11R&relvers; CREDITS SECTION.</title> @@ -1320,7 +1327,7 @@ The next section describes what is new in the latest version </para> </note> ]]> - + --> <para> This section lists the credits for the X11R&relvers; release. diff --git a/sgml/Makefile.am b/sgml/Makefile.am index de160b4..9053ca0 100644 --- a/sgml/Makefile.am +++ b/sgml/Makefile.am @@ -26,7 +26,6 @@ x11docdir = $(docdir) SGML_FILES = \ LICENSE.sgml \ README.sgml \ - RELNOTES.sgml \ Versions.sgml include $(top_srcdir)/sgmlrules.in diff --git a/xmlrules.in b/xmlrules.in index cfcdd02..edde341 100644 --- a/xmlrules.in +++ b/xmlrules.in @@ -32,8 +32,11 @@ if HAVE_XMLTO_TEXT xml_DATA += $(doc_sources:.xml=.txt) endif +# Path to find X11/defs.ent +XMLTO_FLAGS = --searchpath $(XORG_SGML_PATH)/X11 + if HAVE_STYLESHEETS -XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/ +XMLTO_FLAGS += -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/ xml_DATA += xorg.css xorg.css: $(STYLESHEET_SRCDIR)/xorg.css |