From c4762e0c508434b6219fb2f422a70607f626445a Mon Sep 17 00:00:00 2001
From: Tim Gerundt <tim@gerundt.de>
Date: Mon, 27 Jun 2011 23:36:23 +0200
Subject: [PATCH] Add "Writing Cppcheck rules" and "Cppcheck Design" articles
 as appendix to the manual

---
 man/cppcheck-design.docbook | 10 ++--------
 man/manual.docbook          | 16 +++++++++++++++-
 man/writing-rules-1.docbook | 14 +++++---------
 man/writing-rules-2.docbook | 14 +++++---------
 man/writing-rules-3.docbook | 14 +++-----------
 5 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/man/cppcheck-design.docbook b/man/cppcheck-design.docbook
index 62f3d1237..f34dc0e12 100644
--- a/man/cppcheck-design.docbook
+++ b/man/cppcheck-design.docbook
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<article version="5.0" xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         xmlns:svg="http://www.w3.org/2000/svg"
-         xmlns:m="http://www.w3.org/1998/Math/MathML"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns:db="http://docbook.org/ns/docbook">
+<appendix>
   <info>
     <title>Cppcheck Design</title>
 
@@ -191,4 +185,4 @@ void f2()
     <para>Cppcheck will just find some bugs. It is likely that you won't find
     these bugs unless you use Cppcheck.</para>
   </section>
-</article>
+</appendix>
diff --git a/man/manual.docbook b/man/manual.docbook
index e570e52d6..f0f3ef59c 100644
--- a/man/manual.docbook
+++ b/man/manual.docbook
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd">
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY writing-rules-1 SYSTEM "writing-rules-1.docbook">
+<!ENTITY writing-rules-2 SYSTEM "writing-rules-2.docbook">
+<!ENTITY writing-rules-3 SYSTEM "writing-rules-3.docbook">
+<!ENTITY cppcheck-design SYSTEM "cppcheck-design.docbook">
+]>
 <book>
   <bookinfo>
     <title>Cppcheck 1.49</title>
@@ -612,4 +617,13 @@ htmlreport/cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.<
       if you want to limit the checking.</para>
     </section>
   </chapter>
+  
+  <appendix>
+    <title>Writing Cppcheck rules</title>
+    &writing-rules-1;
+    &writing-rules-2;
+    &writing-rules-3;
+  </appendix>
+
+  &cppcheck-design;
 </book>
diff --git a/man/writing-rules-1.docbook b/man/writing-rules-1.docbook
index e94758da6..620acf1e5 100644
--- a/man/writing-rules-1.docbook
+++ b/man/writing-rules-1.docbook
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<article>
-  <articleinfo>
-    <title>Writing Cppcheck rules</title>
-
-    <subtitle>Part 1 - Getting started</subtitle>
+<section>
+  <info>
+    <title>Part 1 - Getting started</title>
 
     <author>
       <firstname>Daniel</firstname>
@@ -18,7 +14,7 @@
     </author>
 
     <pubdate>2010</pubdate>
-  </articleinfo>
+  </info>
 
   <section>
     <title>Introduction</title>
@@ -146,4 +142,4 @@ Checking dealloc.cpp...
 [dealloc.cpp:2]: (style) Redundant condition. It is valid to free a NULL pointer.</programlisting>
     </section>
   </section>
-</article>
+</section>
diff --git a/man/writing-rules-2.docbook b/man/writing-rules-2.docbook
index dffe6d605..4b4295c4e 100644
--- a/man/writing-rules-2.docbook
+++ b/man/writing-rules-2.docbook
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<article>
-  <articleinfo>
-    <title>Writing Cppcheck rules</title>
-
-    <subtitle>Part 2 - The Cppcheck data representation</subtitle>
+<section>
+  <info>
+    <title>Part 2 - The Cppcheck data representation</title>
 
     <author>
       <firstname>Daniel</firstname>
@@ -18,7 +14,7 @@
     </author>
 
     <pubdate>2010</pubdate>
-  </articleinfo>
+  </info>
 
   <section>
     <title>Introduction</title>
@@ -350,4 +346,4 @@ s8 x;</programlisting>
       </section>
     </section>
   </section>
-</article>
+</section>
diff --git a/man/writing-rules-3.docbook b/man/writing-rules-3.docbook
index 73d35e44c..102937ffe 100644
--- a/man/writing-rules-3.docbook
+++ b/man/writing-rules-3.docbook
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<article version="5.0" xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         xmlns:svg="http://www.w3.org/2000/svg"
-         xmlns:m="http://www.w3.org/1998/Math/MathML"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-         xmlns:db="http://docbook.org/ns/docbook">
+<section>
   <info>
-    <title>Writing Cppcheck rules</title>
-
-    <subtitle>Part 3 - Introduction to writing rules with C++</subtitle>
+    <title>Part 3 - Introduction to writing rules with C++</title>
 
     <author>
       <personname><firstname>Daniel</firstname><surname>Marjamäki</surname></personname>
@@ -246,4 +238,4 @@ void CheckOther::dangerousUsageStrtolError(const Token *tok)
     <para>The pattern <literal>(|,</literal> can also be written as
     <literal>[(,]</literal>.</para>
   </section>
-</article>
+</section>