Few more doc tweaks for consistency's sake

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5205

diff --git a/docs/xml/FAQ.xml b/docs/xml/FAQ.xml
index 2e1b8974fbf066f132f7d75ce4c37002d0318f03..6ab229f2ecbbe8ee08716f4935b5e569d6109797 100644 (file)
--- a/docs/xml/FAQ.xml
+++ b/docs/xml/FAQ.xml
@@ -4,20 +4,21 @@
 [ <!ENTITY % vg-entities SYSTEM "vg-entities.xml"> %vg-entities; ]>
 
 <book id="FAQ" xreflabel="Valgrind FAQ">
-<title>Valgrind FAQ</title>
+
 <bookinfo>
+  <title>Valgrind FAQ</title>
   <subtitle>Valgrind Frequently Asked Questions</subtitle>
-  <releaseinfo>November 2005</releaseinfo>
-  <author>
-    <surname>
-      <ulink url="http://www.valgrind.org/info/developers.html">Valgrind Developers</ulink>
-    </surname>
-    <affiliation><orgname>
-      <ulink url="mailto:&vg-vemail;">&vg-vemail;</ulink>
-    </orgname></affiliation>
-  </author>
+  <releaseinfo>&rel-type; &rel-version; &rel-date;</releaseinfo>
+ <copyright>
+  <year>&vg-lifespan;</year>
+  <holder><ulink url="&vg-developers;">Valgrind Developers</ulink></holder>
+ </copyright>
+ <legalnotice>
+  <para>Email: <ulink url="mailto:&vg-vemail;">&vg-vemail;</ulink></para>
+ </legalnotice>
 </bookinfo>
 
+
 <sect1 id="faq.background" xreflabel="Background">
 <title>Background</title>
 

diff --git a/docs/xml/index.xml b/docs/xml/index.xml
index f40890556825184089c3a5a0d0238b152b6a9d72..f91e32905244e94ff38acb18a0d138f56cd00648 100644 (file)
--- a/docs/xml/index.xml
+++ b/docs/xml/index.xml
@@ -6,7 +6,7 @@
  <!ENTITY % vg-entities SYSTEM "vg-entities.xml"> %vg-entities;
 ]>
 
-<set lang="en" id="index">
+<set id="index" lang="en">
 
   <setinfo>
     <title>Valgrind Documentation</title>

diff --git a/docs/xml/manual.xml b/docs/xml/manual.xml
index 366bc3962097c82c00b294ac93e78dc9c40b516c..f196f9e119f23a332313cf67b005293ebb4475e2 100644 (file)
--- a/docs/xml/manual.xml
+++ b/docs/xml/manual.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0"?> <!-- -*- sgml -*- -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+[ <!ENTITY % vg-entities SYSTEM "vg-entities.xml"> %vg-entities; ]>
+
 
 <book id="manual" xreflabel="Valgrind User Manual">
 
-  <bookinfo>
-    <title>Valgrind User Manual</title>
-  </bookinfo>
+<bookinfo>
+ <title>Valgrind User Manual</title>
+ <releaseinfo>&rel-type; &rel-version; &rel-date;</releaseinfo>
+ <copyright>
+  <year>&vg-lifespan;</year>
+  <holder><ulink url="&vg-developers;">Valgrind Developers</ulink></holder>
+ </copyright>
+ <legalnotice>
+  <para>Email: <ulink url="mailto:&vg-vemail;">&vg-vemail;</ulink></para>
+ </legalnotice>
+</bookinfo>
 
   <xi:include href="manual-intro.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />

diff --git a/docs/xml/quick-start-guide.xml b/docs/xml/quick-start-guide.xml
index 4d48dfe245c20e12023a00a90c3a22d734247efb..3cc044a671e250a642290beb1f3f2f9e2f0948bf 100644 (file)
--- a/docs/xml/quick-start-guide.xml
+++ b/docs/xml/quick-start-guide.xml
@@ -5,9 +5,17 @@
 
 <book id="quick-start" xreflabel="Valgrind Quick Start Guide">
 
-  <bookinfo>
-    <title>Valgrind Quick Start Guide</title>
-  </bookinfo>
+<bookinfo>
+ <title>Valgrind Quick Start Guide</title>
+ <releaseinfo>&rel-type; &rel-version; &rel-date;</releaseinfo>
+ <copyright>
+  <year>&vg-lifespan;</year>
+  <holder><ulink url="&vg-developers;">Valgrind Developers</ulink></holder>
+ </copyright>
+ <legalnotice>
+  <para>Email: <ulink url="mailto:&vg-vemail;">&vg-vemail;</ulink></para>
+ </legalnotice>
+</bookinfo>
 
 
 <title>Valgrind Quick Start Guide</title>

diff --git a/docs/xml/vg-entities.xml b/docs/xml/vg-entities.xml
index aaf589482196585b20c01dedf47c1f7bb855b703..8053a7ede6aade7fe99b169d6d5b94cae5392625 100644 (file)
--- a/docs/xml/vg-entities.xml
+++ b/docs/xml/vg-entities.xml
@@ -4,6 +4,7 @@
 <!ENTITY vg-vemail   "valgrind@valgrind.org">
 <!ENTITY vg-lifespan "2000-2005">
 <!ENTITY vg-users-list "http://lists.sourceforge.net/lists/listinfo/valgrind-users">
+<!ENTITY vg-developers "http://www.valgrind.org/info/developers.html">
 
 <!-- valgrind release + version stuff -->
 <!ENTITY rel-type    "Release">