From 1240c8837bc0c084548cd9c351ac375eb5fbe9ac Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Sun, 16 Aug 2009 01:09:39 +0200
Subject: [PATCH] [docs] Renamed version.xml.in to version.txt.in

The version files are plain text: use as such. Also, included them in
the main XML doc files (either in ADG and CPML) using XInclude instead
of the deprecated external entity.
---
 configure.ac                                 | 4 ++--
 docs/adg/.gitignore                          | 2 +-
 docs/adg/adg-docs.xml                        | 6 ++----
 docs/adg/{version.xml.in => version.txt.in}  | 0
 docs/cpml/.gitignore                         | 2 +-
 docs/cpml/cpml-docs.xml                      | 6 ++----
 docs/cpml/{version.xml.in => version.txt.in} | 0
 7 files changed, 8 insertions(+), 12 deletions(-)
 rename docs/adg/{version.xml.in => version.txt.in} (100%)
 rename docs/cpml/{version.xml.in => version.txt.in} (100%)

diff --git a/configure.ac b/configure.ac
index 83f7cfc8..f9fc87df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,8 @@ AC_CONFIG_FILES([shave
 		 demo/Makefile
                  docs/Makefile
                  docs/adg/Makefile
-                 docs/adg/version.xml
+                 docs/adg/version.txt
                  docs/cpml/Makefile
-                 docs/cpml/version.xml
+                 docs/cpml/version.txt
                  po/Makefile.in])
 AC_OUTPUT
diff --git a/docs/adg/.gitignore b/docs/adg/.gitignore
index f185aebf..61f1c6f3 100644
--- a/docs/adg/.gitignore
+++ b/docs/adg/.gitignore
@@ -1,5 +1,5 @@
 # ./configure
-/version.xml
+/version.txt
 
 # make
 /adg-decl-list.txt
diff --git a/docs/adg/adg-docs.xml b/docs/adg/adg-docs.xml
index 9e019758..68d78905 100644
--- a/docs/adg/adg-docs.xml
+++ b/docs/adg/adg-docs.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
+                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>ADG Reference Manual</title>
-    <releaseinfo>for ADG &version;</releaseinfo>
+    <releaseinfo>for ADG <xi:include href="version.txt" parse="text"/></releaseinfo>
   </bookinfo>
 
   <part id="Introduction">
diff --git a/docs/adg/version.xml.in b/docs/adg/version.txt.in
similarity index 100%
rename from docs/adg/version.xml.in
rename to docs/adg/version.txt.in
diff --git a/docs/cpml/.gitignore b/docs/cpml/.gitignore
index 19aff851..6d623800 100644
--- a/docs/cpml/.gitignore
+++ b/docs/cpml/.gitignore
@@ -1,5 +1,5 @@
 # ./configure
-/version.xml
+/version.txt
 
 # make
 /cpml-decl-list.txt
diff --git a/docs/cpml/cpml-docs.xml b/docs/cpml/cpml-docs.xml
index 346523c1..7dbbb9e2 100644
--- a/docs/cpml/cpml-docs.xml
+++ b/docs/cpml/cpml-docs.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
+                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>CPML Reference Manual</title>
-    <releaseinfo>for CPML &version;</releaseinfo>
+    <releaseinfo>for CPML <xi:include href="version.txt" parse="text"/></releaseinfo>
   </bookinfo>
 
   <part id="Core">
diff --git a/docs/cpml/version.xml.in b/docs/cpml/version.txt.in
similarity index 100%
rename from docs/cpml/version.xml.in
rename to docs/cpml/version.txt.in
-- 
2.11.4.GIT