[vhffs-dev] [701] xsltproc is now directly used for doc building.

[subversion@xxxxxxxxx]

Revision: 701
Author:   beuss
Date:     2007-07-09 08:45:53 +0000 (Mon, 09 Jul 2007)

Log Message:
-----------
xsltproc is now directly used for doc building.
use xi:include to include external files (more modular).

Modified Paths:
--------------
    trunk/configure.ac
    trunk/vhffs-doc/Makefile.am
    trunk/vhffs-doc/src/fr/part1/exim.xml
    trunk/vhffs-doc/src/fr/part1/mirror.xml
    trunk/vhffs-doc/src/fr/part1/mydns.xml
    trunk/vhffs-doc/src/fr/vhffs-doc.xml


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/configure.ac	2007-07-09 08:45:53 UTC (rev 701)
@@ -188,14 +188,14 @@
 #TODO add format/language handling
 AC_ARG_ENABLE(doc,
     AC_HELP_STRING([--enable-doc],
-        [Enable vhffs documentation, need DocBook [default=no]]))
+        [Enable vhffs documentation, need DocBook and xsltproc[default=no]]))
 
 AM_CONDITIONAL(BUILD_DOC, test "$enable_doc" = yes)
 
 if test "$enable_doc" = "yes"; then
-    AC_PATH_PROG([JW], [jw], [none])
-    if test "$JW" = 'none'; then
-        AC_MSG_ERROR([You need jw script to build the documentation])
+    AC_PATH_PROG([XSLTPROC], [xsltproc], [none])
+    if test "$XSLTPROC" = 'none'; then
+        AC_MSG_ERROR([You need xsltproc script to build the documentation])
     fi
 fi
 

Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/vhffs-doc/Makefile.am	2007-07-09 08:45:53 UTC (rev 701)
@@ -19,6 +19,8 @@
 		if test ! -d $(DESTDIR)$(docdir)/$$l ; then \
 			mkdir $(DESTDIR)$(docdir)/$$l; \
 		fi; \
-		$(JW) -f docbook -b html -u src/$$l/vhffs-doc.xml -o $(DESTDIR)$(docdir)/$$l/html; \
+		$(XSLTPROC) --xinclude --output $(DESTDIR)$(docdir)/$$l/html/vhffs-doc.html \
+			/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
+			src/$$l/vhffs-doc.xml ; \
 	done
 endif

Modified: trunk/vhffs-doc/src/fr/part1/exim.xml
===================================================================
--- trunk/vhffs-doc/src/fr/part1/exim.xml	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/vhffs-doc/src/fr/part1/exim.xml	2007-07-09 08:45:53 UTC (rev 701)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="US-ASCII"?>
-<chapter id="chap-exim">
-  <title id="title-exim">Configuration de Exim (serveur mail)</title>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>
+<section id="sec-exim">
+  <title id="title-exim">Exim (serveur mail)</title>
 
-  <section>
-    <title>Introduction</title>
-
-    <para></para>
-  </section>
-</chapter>
\ No newline at end of file
+  <para>Cette section pr&eacute;sente la configuration du serveur de mail
+  utilis&eacute; g&eacute;n&eacute;ralement avec VHFFS&nbsp;: Exim.</para>
+</section>
\ No newline at end of file

Modified: trunk/vhffs-doc/src/fr/part1/mirror.xml
===================================================================
--- trunk/vhffs-doc/src/fr/part1/mirror.xml	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/vhffs-doc/src/fr/part1/mirror.xml	2007-07-09 08:45:53 UTC (rev 701)
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>
 <chapter>
   <title>Scripts de r&eacute;plication</title>
 
@@ -207,9 +209,8 @@
       r&eacute;pertoires <filename
       class="directory">vhffs-doc/config/exim4-mx1/</filename> et <filename
       class="directory">vhffs-doc/config/exim4-mx2/</filename> &agrave; la
-      racine des sources. Vous trouverez plus d'informations dans le <xref
-      linkend="chap-exim" /> (<xref endterm="title-exim"
-      linkend="chap-exim" />).</para>
+      racine des sources. Vous trouverez plus d'informations dans <xref
+      linkend="sec-exim" />.</para>
     </section>
 
     <section>
@@ -270,27 +271,23 @@
     catchall VARCHAR
 );
 
-CREATE TABLE vhffs_boxes(
-    domain VARCHAR,
-    local_part VARCHAR
+CREATE TABLE vhffs_addresses(
+    local_part VARCHAR,
+    domain VARCHAR
 );
 
-CREATE TABLE vhffs_forward(
-    domain VARCHAR,
-    local_part VARCHAR
-);
+CREATE UNIQUE INDEX vhffs_mxdomain_unique_domain ON vhffs_mxdomain(domain);
 
-CREATE TABLE vhffs_ml(
-    domain VARCHAR,
-    local_part VARCHAR
-);
-
-CREATE UNIQUE INDEX vhffs_mxdomain_unique_domain ON vhffs_mxdomain(domain);</literallayout>
+CREATE UNIQUE INDEX vhffs_addresses_unique_couple ON vhffs_addresses(local_part, domain);</literallayout>
         </example>
 
         <para>Vous pouvez ajouter d'autres index (en particulier sur les
         couples domain/local_part) pour acc&eacute;l&eacute;rer les
         diff&eacute;rentes requ&ecirc;tes.</para>
+
+        <para><warning>
+            <para>Si vous migrez</para>
+          </warning>VHFFS-4.0</para>
       </section>
     </section>
   </section>

Modified: trunk/vhffs-doc/src/fr/part1/mydns.xml
===================================================================
--- trunk/vhffs-doc/src/fr/part1/mydns.xml	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/vhffs-doc/src/fr/part1/mydns.xml	2007-07-09 08:45:53 UTC (rev 701)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="US-ASCII"?>
-<chapter id="chap-mydns">
-  <title id="title-mydns">Configuration de myDNS</title>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>
+<section id="chap-mydns">
+  <title id="title-mydns">myDNS (serveur DNS)</title>
 
   <section>
     <title>Introduction</title>
@@ -23,7 +25,7 @@
       premi&egrave;re est une vue regroupant tous les domaines, il est
       n&eacute;cessaire que myDNS ne prenne en compte que ceux &eacute;tant
       activ&eacute;s. Vous trouverez ci-dessous les options les plus
-      significatifs, laissez les autres &agrave; leurs valeurs par
+      significatives, laissez les autres &agrave; leurs valeurs par
       d&eacute;faut&nbsp;:</para>
     </section>
 
@@ -33,4 +35,4 @@
       <para>Sch&eacute;ma de la base de donn&eacute;es</para>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</section>

Modified: trunk/vhffs-doc/src/fr/vhffs-doc.xml
===================================================================
--- trunk/vhffs-doc/src/fr/vhffs-doc.xml	2007-07-09 07:21:10 UTC (rev 700)
+++ trunk/vhffs-doc/src/fr/vhffs-doc.xml	2007-07-09 08:45:53 UTC (rev 701)
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
-<!ENTITY __mydns__f3rg7ac0 SYSTEM "part1/mydns.xml">
-<!ENTITY __exim__f3vgz5it SYSTEM "part1/exim.xml">
-<!ENTITY __mirror__f3rb0jwd SYSTEM "part1/mirror.xml">
-]>
-<book lang="fr">
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";>
+<book lang="fr" xmlns:xi="htpp://www.w3.org/2001/XInclude">
   <title>Documentation de VHFFS</title>
 
   <bookinfo>
@@ -24,14 +20,17 @@
     </authorgroup>
   </bookinfo>
 
-  <part>
+  <part id="part-admin">
     <title>Pour l'administrateur</title>
 
-    &__mydns__f3rg7ac0;
+    <xi:include href="part1/services.xml"
+                xmlns:xi="http://www.w3.org/2003/XInclude"; />
 
-    &__exim__f3vgz5it;
+    <xi:include href="part1/applis.xml"
+                xmlns:xi="http://www.w3.org/2003/XInclude"; />
 
-    &__mirror__f3rb0jwd;
+    <xi:include href="part1/mirror.xml"
+                xmlns:xi="http://www.w3.org/2003/XInclude"; />
   </part>
 
   <part>
@@ -43,4 +42,4 @@
       <para>&nbsp;</para>
     </chapter>
   </part>
-</book>
+</book>
\ No newline at end of file