From 79c1f4cb4d018a5c72ef566f2743dea0fdee9af3 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Thu, 17 Nov 2011 13:25:47 +0100
Subject: [PATCH] document - support

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 build         | 8 ++++----
 doc/changelog | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build b/build
index 919360ae..085bcdf1 100755
--- a/build
+++ b/build
@@ -35,7 +35,7 @@ A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8"
 # Developer webbase
 WEBDIR=$HOME/niconetz
 WEBBASE=$WEBDIR/software/cdist
-WEBDOCBASE=$WEBBASE/$version
+WEBMAN=$WEBBASE/man/$version
 WEBPAGE=${WEBBASE}.mdwn
 
 # Documentation
@@ -98,9 +98,9 @@ case "$1" in
    ;;
       
    web)
-      cp README ${WEBDIR}/${WEBPAGE}
-      rm -rf ${WEBDIR}/${WEBBASE}/man 
-      mkdir -p ${WEBDIR}/${WEBBASE}/man/man1 ${WEBDIR}/${WEBBASE}/man/man7
+      cp README ${WEBPAGE}
+      rm -rf ${WEBMAN}
+      mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7
 
       rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches
 
diff --git a/doc/changelog b/doc/changelog
index 87fad8c0..e0841f67 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,10 +1,11 @@
-2.0.4: 2011-11-16
+2.0.4:
 	* Bugfix core: Remove traceback when sending SIGINT (aka Ctrl-C)
+	* Bugfix core: Accept parameters with - in the name (Steven Armstrong)
 	* Cleanup: __object_fq variable removed (never used)
 	* Cleanup: Environment variable __self DEPRECATED, use __object_name instead
 	* Cleanup: Environment variable __self scheduled for removal in cdist 2.1
-	* New Type: __cron (Steven Armstrong)
 	* Documentation: Many examples for use of __remote_* (Steven Armstrong)
+	* New Type: __cron (Steven Armstrong)
 
 2.0.3: 2011-10-18
 	* Improved logging, added --verbose, by more quiet by default