[vhffs-dev] [677] This morning, I woke up and head God.

[subversion@xxxxxxxxx]

Revision: 677
Author:   beuss
Date:     2007-07-06 11:08:57 +0000 (Fri, 06 Jul 2007)

Log Message:
-----------
This morning, I woke up and head God. He was saying "Things to do that seems rather important to me : compile documentation or not", so I did what he wanted.
Modified doc layout so that each language has its own directory.
Doc isn't build anymore unless you specify --enable-doc.

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

Added Paths:
-----------
    trunk/vhffs-doc/src/
    trunk/vhffs-doc/src/fr/
    trunk/vhffs-doc/src/fr/part1/
    trunk/vhffs-doc/src/fr/vhffs-doc.xml

Removed Paths:
-------------
    trunk/vhffs-doc/part1/
    trunk/vhffs-doc/vhffs-doc.xml


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-07-06 02:38:28 UTC (rev 676)
+++ trunk/configure.ac	2007-07-06 11:08:57 UTC (rev 677)
@@ -13,7 +13,7 @@
 fi
 
 AC_PATH_PROG([BASH], [bash], [not found])
-if test "$PERL" = 'not found'; then
+if test "$BASH" = 'not found'; then
     AC_MSG_ERROR([bash is needed to run $PACKAGE_NAME])
 fi
 
@@ -183,6 +183,20 @@
 )
 AC_SUBST(MINGID)
 
+dnl Modular build (if someone wants to imrove...)
+AC_ARG_ENABLE(doc,
+    AC_HELP_STRING([--enable-doc],
+        [Enable vhffs documentation (need DocBook)]))
+
+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])
+    fi
+fi
+
 # -- Starting system checks
 AC_CHECK_HEADERS([stdlib.h string.h sys/time.h syslog.h unistd.h])
 

Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am	2007-07-06 02:38:28 UTC (rev 676)
+++ trunk/vhffs-doc/Makefile.am	2007-07-06 11:08:57 UTC (rev 677)
@@ -1,12 +1,24 @@
 EXTRA_DIST = config
 docdir = @DOCDIR@
 
+languages = fr
+
 doc_DATA = 
 	
 nobase_doc_DATA = \
 	config/apache/panelconf \
 	config/exim4-mx1/exim4.conf \
-	config/exim4-mx2/exim4.conf
+	config/exim4-mx2/exim4.conf \
+	src/fr/vhffs-doc.xml \
+	src/fr/part1/mydns.xml \
+	src/fr/part1/mirror.xml
 
+if BUILD_DOC
 install-data-hook:
-	db2html vhffs-doc.xml -o $(DESTDIR)$(docdir)/html
+	for l in $(languages); do \
+		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; \
+	done
+endif

Copied: trunk/vhffs-doc/src/fr/part1 (from rev 676, trunk/vhffs-doc/part1)

Modified: trunk/vhffs-doc/src/fr/part1/mydns.xml
===================================================================
--- trunk/vhffs-doc/part1/mydns.xml	2007-07-06 02:38:28 UTC (rev 676)
+++ trunk/vhffs-doc/src/fr/part1/mydns.xml	2007-07-06 11:08:57 UTC (rev 677)
@@ -1,12 +1,36 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <chapter id="chap-mydns">
-  <title>Configuration de myDNS</title>
+  <title id="title-mydns">Configuration de myDNS</title>
 
-  <titleabbrev id="title-mydns">Configuration de myDNS</titleabbrev>
+  <section>
+    <title>Introduction</title>
 
+    <para>La configuration de myDNS est relativement simple. Deux cas peuvent
+    se pr&eacute;senter, soit vous utilisez directgement la vue
+    <literal><literal>vhffs_dns_soa</literal></literal> et la table
+    <literal>vhffs_dns_rr</literal>, soit vous les dupliquez sur un serveur
+    secondaire. Dans les deux cas, la configuration est la m&ecirc;me.</para>
+  </section>
+
   <section>
-    <title></title>
+    <title>Configuration</title>
 
-    <para></para>
+    <section>
+      <title>Configuration commune</title>
+
+      <para>Comme nous l'avons vu, l'utilisation directe repose sur
+      l'exploitation de la vue vhffs_dns_soa et de la table vhffs_dns_rr. La
+      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
+      d&eacute;faut&nbsp;:</para>
+    </section>
+
+    <section>
+      <title>R&eacute;plication</title>
+
+      <para>Sch&eacute;ma de la base de donn&eacute;es</para>
+    </section>
   </section>
 </chapter>
\ No newline at end of file

Copied: trunk/vhffs-doc/src/fr/vhffs-doc.xml (from rev 676, trunk/vhffs-doc/vhffs-doc.xml)
===================================================================
--- trunk/vhffs-doc/vhffs-doc.xml	2007-07-06 02:38:28 UTC (rev 676)
+++ trunk/vhffs-doc/src/fr/vhffs-doc.xml	2007-07-06 11:08:57 UTC (rev 677)
@@ -0,0 +1,43 @@
+<?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 __mirror__f3rb0jwd SYSTEM "part1/mirror.xml">
+]>
+<book lang="fr">
+  <title>Documentation de VHFFS</title>
+
+  <bookinfo>
+    <date>Juillet 2007</date>
+
+    <authorgroup>
+      <corpauthor>&Eacute;quipe VHFFS</corpauthor>
+
+      <author>
+        <surname>Le Ray</surname>
+
+        <firstname>S&eacute;bastien</firstname>
+
+        <contrib>Cr&eacute;ation du document</contrib>
+      </author>
+    </authorgroup>
+  </bookinfo>
+
+  <part>
+    <title>Pour l'administrateur</title>
+
+    &__mydns__f3rg7ac0;
+
+    &__mirror__f3rb0jwd;
+  </part>
+
+  <part>
+    <title>Pour le d&eacute;veloppeur</title>
+
+    <chapter>
+      <title>Concepts g&eacute;n&eacute;raux</title>
+
+      <para>&nbsp;</para>
+    </chapter>
+  </part>
+</book>
\ No newline at end of file

Deleted: trunk/vhffs-doc/vhffs-doc.xml
===================================================================
--- trunk/vhffs-doc/vhffs-doc.xml	2007-07-06 02:38:28 UTC (rev 676)
+++ trunk/vhffs-doc/vhffs-doc.xml	2007-07-06 11:08:57 UTC (rev 677)
@@ -1,43 +0,0 @@
-<?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 __mirror__f3rb0jwd SYSTEM "part1/mirror.xml">
-]>
-<book lang="fr">
-  <title>Documentation de VHFFS</title>
-
-  <bookinfo>
-    <date>Juillet 2007</date>
-
-    <authorgroup>
-      <corpauthor>&Eacute;quipe VHFFS</corpauthor>
-
-      <author>
-        <surname>Le Ray</surname>
-
-        <firstname>S&eacute;bastien</firstname>
-
-        <contrib>Cr&eacute;ation du document</contrib>
-      </author>
-    </authorgroup>
-  </bookinfo>
-
-  <part>
-    <title>Pour l'administrateur</title>
-
-    &__mydns__f3rg7ac0;
-
-    &__mirror__f3rb0jwd;
-  </part>
-
-  <part>
-    <title>Pour le d&eacute;veloppeur</title>
-
-    <chapter>
-      <title>Un chapitre pour &eacute;viter les erreurs</title>
-
-      <para>et un paragraphe pour la m&ecirc;me raison</para>
-    </chapter>
-  </part>
-</book>
\ No newline at end of file