# HG changeset patch
# User Stephan Holl <stephan.holl@intevation.de>
# Date 1311751426 -7200
# Node ID e412fad185ad0e20973e3ac2f05d347a14ffd26c
# Parent  316a2b3d4126f29fe5252ac93fd733286426336f# Parent  671737e8edc29e67c6495eef7c012fb4b5dc5e6d
Merged with upstream

diff -r 316a2b3d4126 -r e412fad185ad doku/Makefile
--- a/doku/Makefile	Mon Jul 25 12:37:08 2011 +0200
+++ b/doku/Makefile	Wed Jul 27 09:23:46 2011 +0200
@@ -7,6 +7,7 @@
 PAPER         =
 BUILDDIR      = build
 MAKE          = make
+WEBSITE       = ../website/documentation
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
@@ -132,3 +133,6 @@
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+
+online: html
+	rm -rf $(WEBSITE) && mkdir -p $(WEBSITE) && cp -r build/html/* $(WEBSITE)
diff -r 316a2b3d4126 -r e412fad185ad doku/source/conf.py
--- a/doku/source/conf.py	Mon Jul 25 12:37:08 2011 +0200
+++ b/doku/source/conf.py	Wed Jul 27 09:23:46 2011 +0200
@@ -60,7 +60,7 @@
 # non-false value, then it is used:
 #today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+today_fmt = '%d.%m.%Y %H:%M'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -124,7 +124,7 @@
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%d.%m.%Y, %H:%M'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
diff -r 316a2b3d4126 -r e412fad185ad website/buildhtml.mk
--- a/website/buildhtml.mk	Mon Jul 25 12:37:08 2011 +0200
+++ b/website/buildhtml.mk	Wed Jul 27 09:23:46 2011 +0200
@@ -17,7 +17,7 @@
 # Installation configuration
 INSTALL_DIR = ./mxd2map-www
 ADD_INST_TYPES = *.css *.php *.png .htaccess
-ADD_INST_DIRS = img
+ADD_INST_DIRS = img documentation
 
 CURDIR=$(shell pwd)
 
@@ -31,6 +31,9 @@
 $(TARGETS): template.m4 template_header.m4 \
             header.m4 style.css
 
+documentation:
+	$(MAKE) -C ../doku online
+
 images:
 	$(MAKE) -C ../doku/funktionsweise/ all
 
@@ -39,7 +42,7 @@
 	  $(MAKE) -C $$dir SUBDIRS="" ; \
 	done
 
-online: all
+online: all documentation
 	echo "Going to put current contents online for www.mxd2mapp.org ..."
 	rsync -urvPL --exclude='.hg' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \
         sholl@wald.intevation.org:/mxd2map/htdocs/