Add html manual generation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e1b356f1a8b62786d6131a5023817d902ef90c66..f327c01a120eac08edaf990b9dd358b75dc55c4a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,3 +7,9 @@ htmldir = $(prefix)/share/doc/@PACKAGE@
 dist_html_DATA = @PACKAGE@.html
 
 DISTCLEANFILES = html.xsl man.xsl
+
+release-notes: www/ReleaseNotes
+       cd www && ./create-relnotes.sh
+
+upload-release-notes: release-notes
+       scp www/ReleaseNotes.html $$USER,netatalk@web.sourceforge.net:/home/project-web/netatalk/htdocs/3.0/ReleaseNotes$(VERSION).html

diff --git a/doc/manpages/man1/Makefile.am b/doc/manpages/man1/Makefile.am
index dc3d65898cd0cbf553d601cac03ff0cf4aee9e99..4b5f7581715e4bf5ce565fd1ce1dc6486f01b0b6 100644 (file)
--- a/doc/manpages/man1/Makefile.am
+++ b/doc/manpages/man1/Makefile.am
@@ -37,4 +37,4 @@ CLEANFILES += $(MAN_MANPAGES)
        @cp $@ $(top_builddir)/man/man1/$@.in
 
 html-local: $(MAN_MANPAGES)
-endif
\ No newline at end of file
+endif

diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore
index 8eb18aa7890f6df293ecbfa69edb0e6e96962797..ab1918eb62336aa2e955504bfa61bc0da150d9ca 100644 (file)
--- a/doc/manual/.gitignore
+++ b/doc/manual/.gitignore
@@ -1 +1,2 @@
 manual.xml
+*.html

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 7f2b61d2a0d0733e14e4d2a9261aefc1ebe6ed9a..4ba02ee3f509398226596aee5cc8be596ff2c2b9 100644 (file)
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -1,7 +1,62 @@
+XSLTPROC=@XSLTPROC@
+XSLTPROC_FLAGS=@XSLTPROC_FLAGS@
+HTML_STYLESHEET=$(top_srcdir)/doc/html.xsl
+CLEANFILES =
+
+XML_PAGES = \
+       manual.xml \
+       configuration.xml \
+       install.xml \
+       intro.xml \
+       upgrade.xml
+
 EXTRA_DIST = \
+       manual.xml.in \
        configuration.xml \
        install.xml \
        intro.xml \
        upgrade.xml
 
+HTML_PAGES = \
+       ad.1.html \
+       afp.conf.5.html \
+       afpd.8.html \
+       afpldaptest.1.html \
+       afppasswd.1.html \
+       afp_signature.conf.5.html  \
+       afpstats.1.html \
+       afp_voluuid.conf.5.html \
+       apple_dump.1.html \
+       asip-status.pl.1.html \
+       cnid_dbd.8.html \
+       cnid_metad.8.html \
+       configuration.html \
+       dbd.1.html \
+       example-toc.html \
+       extmap.conf.5.html \
+       index.html \
+       installation.html \
+       intro.html \
+       macusers.1.html \
+       man-pages.html \
+       manual-index.html \
+       megatron.1.html \
+       netatalk.8.html \
+       netatalkconfig.1.html \
+       pr01.html \
+       table-toc.html \
+       uniconv.1.html \
+       upgrade.html
+
 DISTCLEANFILES = manual.xml
+
+if HAVE_XSLTPROC
+CLEANFILES += $(HTML_PAGES)
+
+html-local: $(XML_PAGES)
+       @xsltproc $(HTML_STYLESHEET) manual.xml
+
+html-upload: html-local
+       scp $(HTML_PAGES) $$USER,netatalk@web.sourceforge.net:/home/project-web/netatalk/htdocs/3.0/htmldocs/
+
+endif

diff --git a/doc/manual/manual.xml.in b/doc/manual/manual.xml.in
index eab6e628afb36c73395e30cc8a2a428d7c9b11b2..64ebd6c7eb4260a29a71b1274a5e8bd36510c1ec 100644 (file)
--- a/doc/manual/manual.xml.in
+++ b/doc/manual/manual.xml.in
@@ -2,30 +2,30 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
-<!ENTITY Intro SYSTEM "netatalk/intro.xml">
-<!ENTITY Install SYSTEM "netatalk/install.xml">
-<!ENTITY Upgrade SYSTEM "netatalk/upgrade.xml">
-<!ENTITY Configuration SYSTEM "netatalk/configuration.xml">
-
-<!ENTITY ad.1 SYSTEM "man/man1/ad.1.xml">
-<!ENTITY afpd.8 SYSTEM "man/man8/afpd.8.xml">
-<!ENTITY cnid_dbd.8 SYSTEM "man/man8/cnid_dbd.8.xml">
-<!ENTITY cnid_metad.8 SYSTEM "man/man8/cnid_metad.8.xml">
-<!ENTITY afp.conf.5 SYSTEM "man/man5/afp.conf.5.xml">
-<!ENTITY afp_signature.conf.5 SYSTEM "man/man5/afp_signature.conf.5.xml">
-<!ENTITY afp_voluuid.conf.5 SYSTEM "man/man5/afp_voluuid.conf.5.xml">
-<!ENTITY afpldaptest.1 SYSTEM "man/man1/afpldaptest.1.xml">
-<!ENTITY afppasswd.1 SYSTEM "man/man1/afppasswd.1.xml">
-<!ENTITY afpstats.1 SYSTEM "man/man1/afpstats.1.xml">
-<!ENTITY apple_dump.1 SYSTEM "man/man1/apple_dump.1.xml">
-<!ENTITY extmap.conf.5 SYSTEM "man/man5/extmap.conf.5.xml">
-<!ENTITY macusers.1 SYSTEM "man/man1/macusers.1.xml">
-<!ENTITY megatron.1 SYSTEM "man/man1/megatron.1.xml">
-<!ENTITY netatalk.8 SYSTEM "man/man8/netatalk.8.xml">
-<!ENTITY netatalk-config.1 SYSTEM "man/man1/netatalk-config.1.xml">
-<!ENTITY uniconv.1 SYSTEM "man/man1/uniconv.1.xml">
-<!ENTITY asip-status.pl.1 SYSTEM "man/man1/asip-status.pl.1.xml">
-<!ENTITY dbd.1 SYSTEM "man/man1/dbd.1.xml">
+<!ENTITY Intro SYSTEM "intro.xml">
+<!ENTITY Install SYSTEM "install.xml">
+<!ENTITY Upgrade SYSTEM "upgrade.xml">
+<!ENTITY Configuration SYSTEM "configuration.xml">
+
+<!ENTITY ad.1 SYSTEM "../manpages/man1/ad.1.xml">
+<!ENTITY afpd.8 SYSTEM "../manpages//man8/afpd.8.xml">
+<!ENTITY cnid_dbd.8 SYSTEM "../manpages//man8/cnid_dbd.8.xml">
+<!ENTITY cnid_metad.8 SYSTEM "../manpages//man8/cnid_metad.8.xml">
+<!ENTITY afp.conf.5 SYSTEM "../manpages//man5/afp.conf.5.xml">
+<!ENTITY afp_signature.conf.5 SYSTEM "../manpages//man5/afp_signature.conf.5.xml">
+<!ENTITY afp_voluuid.conf.5 SYSTEM "../manpages//man5/afp_voluuid.conf.5.xml">
+<!ENTITY afpldaptest.1 SYSTEM "../manpages//man1/afpldaptest.1.xml">
+<!ENTITY afppasswd.1 SYSTEM "../manpages//man1/afppasswd.1.xml">
+<!ENTITY afpstats.1 SYSTEM "../manpages//man1/afpstats.1.xml">
+<!ENTITY apple_dump.1 SYSTEM "../manpages//man1/apple_dump.1.xml">
+<!ENTITY extmap.conf.5 SYSTEM "../manpages//man5/extmap.conf.5.xml">
+<!ENTITY macusers.1 SYSTEM "../manpages//man1/macusers.1.xml">
+<!ENTITY megatron.1 SYSTEM "../manpages//man1/megatron.1.xml">
+<!ENTITY netatalk.8 SYSTEM "../manpages//man8/netatalk.8.xml">
+<!ENTITY netatalk-config.1 SYSTEM "../manpages//man1/netatalk-config.1.xml">
+<!ENTITY uniconv.1 SYSTEM "../manpages//man1/uniconv.1.xml">
+<!ENTITY asip-status.pl.1 SYSTEM "../manpages//man1/asip-status.pl.1.xml">
+<!ENTITY dbd.1 SYSTEM "../manpages//man1/dbd.1.xml">
 ]>
 <book id="netatalk-manual">
   <title>Netatalk 3.0 Manual</title>

diff --git a/doc/manual/netatalk.html b/doc/manual/netatalk.html
new file mode 100644 (file)
index 0000000..b0b7904
--- /dev/null
+++ b/doc/manual/netatalk.html
@@ -0,0 +1,14 @@
+<html>
+    <div id="header">
+        <div id="logo"></div>
+        <div id="menlinks">
+          <a href="/" title="Return to Netatalk home">[main]</a>
+          <a href="http://netatalk.sourceforge.net/wiki/" title="Netatalk Wiki">[wiki]</a>
+          <a href="/3.0/htmldocs" title="Netatalk Manual">[documentation]</a>
+          <a href="http://sourceforge.net/project/showfiles.php?group_id=8642" title="Download Netatalk from sourceforge">[downloads]</a>
+          <a href="/support.php" title="Support">[support]</a>
+          <a href="/links.php" title="Netatalk related links">[links]</a>
+          <img src="/gfx/end.gif" alt="" width="125" height="7" />
+        </div>
+    </div>
+</html>

diff --git a/doc/netatalk.html b/doc/netatalk.html
deleted file mode 100644 (file)
index b0b7904..0000000
--- a/doc/netatalk.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-    <div id="header">
-        <div id="logo"></div>
-        <div id="menlinks">
-          <a href="/" title="Return to Netatalk home">[main]</a>
-          <a href="http://netatalk.sourceforge.net/wiki/" title="Netatalk Wiki">[wiki]</a>
-          <a href="/3.0/htmldocs" title="Netatalk Manual">[documentation]</a>
-          <a href="http://sourceforge.net/project/showfiles.php?group_id=8642" title="Download Netatalk from sourceforge">[downloads]</a>
-          <a href="/support.php" title="Support">[support]</a>
-          <a href="/links.php" title="Netatalk related links">[links]</a>
-          <img src="/gfx/end.gif" alt="" width="125" height="7" />
-        </div>
-    </div>
-</html>