[passepartout] merge the nsfaq into the faq

[Sven Herzberg <herzi src gnome org>]

commit 3452111d87e46a004770f4d925d8b9a1a25ec621
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 16 11:51:42 2009 +0200

    merge the nsfaq into the faq
    
    * doc/faq.xml: include the nsfaq
    * doc/manual.xml: don't include the nsfaq anymore
    * doc/nsfaq.xml: use the same formatting as the FAQ (qandadiv, etc.)
---
 doc/faq.xml    |    2 ++
 doc/manual.xml |    1 -
 doc/nsfaq.xml  |   22 +++++++++++-----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/faq.xml b/doc/faq.xml
index e1fbafb..5d12e28 100644
--- a/doc/faq.xml
+++ b/doc/faq.xml
@@ -173,6 +173,8 @@
 
   </qandadiv>
 
+  <xi:include href="nsfaq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
+
   </qandaset>
 </article>
 
diff --git a/doc/manual.xml b/doc/manual.xml
index 2f378ff..c5ad83a 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -36,6 +36,5 @@
 
   <xi:include href="users_guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
   <xi:include href="faq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
-  <xi:include href="nsfaq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; />
 </book>
 <!-- vim:set sw=2: -->
diff --git a/doc/nsfaq.xml b/doc/nsfaq.xml
index a69231c..0541684 100644
--- a/doc/nsfaq.xml
+++ b/doc/nsfaq.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+<!DOCTYPE qandadiv PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
-<article>
-  <articleinfo>
-    <title>Not So Frequently Asked Questions</title>
-  </articleinfo>
+<qandadiv>
+  <title>Not So Frequently Asked Questions</title>
   
-  <section>
-    <title>Can I donate money to the project / pay you to develop
-      Passepartout?</title>
-    
+  <qandaentry>
+    <question><para>Can I donate money to the project / pay you to develop
+	Passepartout?</para></question>
+    <answer>
     <para>Why, certainly! Send a mail to
       <email>emission-hacks e kth se</email> and tell us what you have
       in mind.</para>
-  </section>
-</article>
+    </answer>
+  </qandaentry>
+</qandadiv>
+<!-- vim:set sw=2: -->