[passepartout] added the passepartout manual

[Sven Herzberg <herzi src gnome org>]

commit 6114905fefbd4d669b75c7b8d9c12edf999c6cb4
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 16 10:48:06 2009 +0200

    added the passepartout manual
    
    * .gitignore: don't ignore all xml files
    * doc/Makefile.am: changes for the new document layout
    * doc/manual.xml: a xi:include compilation of the old documentation
    * doc/passepartout-C.omf.in: updated the main document file
---
 .gitignore                |    1 +
 doc/Makefile.am           |   28 +++++++++++++++-------------
 doc/manual.xml            |   13 +++++++++++++
 doc/passepartout-C.omf.in |    2 +-
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9d65b5..f979987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ Makefile.in
 missing
 mkinstalldirs
 passepartout-*.tar.*
+passepartout.xml
 stamp-*
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0478cff..3c55d57 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,25 +1,27 @@
 SUBDIRS = examples
 
 #install docs in $(docdir)
-dist_doc_DATA = users_guide.pp faq.xml nsfaq.xml \
+dist_doc_DATA = users_guide.pp \
 	../logotype/pptout-sv.eps README
 nodist_doc_DATA=\
-	faq.html \
-	faq.txt \
-	nsfaq.html \
-	nsfaq.txt \
-	users_guide.html \
-	users_guide.txt \
+	manual.html \
+	manual.txt \
 	$(NULL)
 
-dist_help_DATA=users_guide.xml
+dist_help_DATA=\
+	faq.xml \
+	nsfaq.xml \
+	manual.xml \
+	users_guide.xml \
+	$(top_srcdir)/logotype/pptout.png \
+	$(NULL)
 helpdir=$(datadir)/gnome/help/passepartout/C
 
-check-local:
-	@for docbook in $(dist_help_DATA) $(filter %.xml,$(dist_doc_DATA)); do \
-		echo "[TEST] $$docbook"; \
-		$(XMLLINT) --valid --noout $(srcdir)/$$docbook; \
-	done
+check-local: check-manual
+
+check-manual: manual.xml
+	@echo "[TEST] $<"
+	@$(XMLLINT) --xinclude $< | $(XMLLINT) --valid --noout -
 
 omf_in_files=passepartout-C.omf.in
 omf_DATA=$(omf_in_files:.in=)
diff --git a/doc/manual.xml b/doc/manual.xml
new file mode 100644
index 0000000..f82299a
--- /dev/null
+++ b/doc/manual.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+<book>
+  <bookinfo>
+    <title>Passepartout Manual</title>
+  </bookinfo>
+
+  <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/passepartout-C.omf.in b/doc/passepartout-C.omf.in
index b699e4e..b829a01 100644
--- a/doc/passepartout-C.omf.in
+++ b/doc/passepartout-C.omf.in
@@ -13,7 +13,7 @@
     </date>
     <subject category="Applications|Office|Publishing"/>
     <format mime="text/xml"/>
-    <identifier url="file://@DATADIR@/gnome/help/passepartout/C/users_guide.xml"/>
+    <identifier url="file://@DATADIR@/gnome/help/passepartout/C/manual.xml"/>
     <language code="C"/>
     <relation seriesid="77c90ca6-25e3-11de-98e2-c5239981ef22"/>
   </resource>