Merge r6389 (Fix 'make html-docs' and 'make print-docs'.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6437

diff --git a/cachegrind/docs/cg-manual.xml b/cachegrind/docs/cg-manual.xml
index 9714ddfc6e23ccaea93ab24bd9cc246514fda15b..28ea787a40354eb70e69b64fbf37ba91e9263b37 100644 (file)
--- a/cachegrind/docs/cg-manual.xml
+++ b/cachegrind/docs/cg-manual.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?> <!-- -*- sgml -*- -->
 <!DOCTYPE chapter 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 "../../docs/xml/vg-entities.xml"> %vg-entities; ]>
 
 
 <chapter id="cg-manual" xreflabel="Cachegrind: a cache-miss profiler">

diff --git a/docs/xml/manual-writing-tools.xml b/docs/xml/manual-writing-tools.xml
index 284d1d30c6a3897966d90424484fa94409a25070..b491f9880f6afc3c7cad0f4c2dbfb8b650cf3f73 100644 (file)
--- a/docs/xml/manual-writing-tools.xml
+++ b/docs/xml/manual-writing-tools.xml
@@ -198,7 +198,7 @@ names.  The first one is registered using the macro
 <computeroutput>VG_DETERMINE_INTERFACE_VERSION</computeroutput> (which also
 checks that the core/tool interface of the tool matches that of the core).
 The last three are registered using the
-<computeroutput>VG_(basic_tool_funcs)</computeroutput> function.
+<computeroutput>VG_(basic_tool_funcs)</computeroutput> function.</para>
 
 <para>In addition, if a tool wants to use some of the optional services
 provided by the core, it may have to define other functions and tell the

diff --git a/docs/xml/tech-docs.xml b/docs/xml/tech-docs.xml
index 5bb77028524e65e11822d92697714bce05957b78..8615c1d807b9f4643c6370b07a334d766373c127 100644 (file)
--- a/docs/xml/tech-docs.xml
+++ b/docs/xml/tech-docs.xml
@@ -21,7 +21,7 @@
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../callgrind/docs/cl-format.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="writing-tools.xml" parse="xml"  
+  <xi:include href="manual-writing-tools.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
 
 </book>