From d706e8ef03eb45cc13f3161598ecf227290718b7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Wed, 16 Nov 2011 08:07:19 +0100
Subject: [PATCH 1/4] more changes for 2.0.4

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 doc/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/changelog b/doc/changelog
index 7217a6f2..87fad8c0 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,9 +1,10 @@
-2.0.4:
+2.0.4: 2011-11-16
 	* Bugfix core: Remove traceback when sending SIGINT (aka Ctrl-C)
 	* 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)
 
 2.0.3: 2011-10-18
 	* Improved logging, added --verbose, by more quiet by default

From ff5fb5dbdb60f76db62e48ae94e3eb279311d326 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Wed, 16 Nov 2011 08:10:50 +0100
Subject: [PATCH 2/4] remove obsolete cdist video link (to be replaced with new
 video)

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 README | 2 --
 build  | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 1c2139cc..c3105e26 100644
--- a/README
+++ b/README
@@ -53,8 +53,6 @@ UNIX, simplicity, familar environment | cdist is configured in POSIX shell
 The cdist documentation is included as manpages in the distribution.
 
  * You can [browse the documentation of the latest version online](man) as well.
- * Or you can watch the youtube **video**
-[cdist installation and first usage in less than 60 seconds][http://www.youtube.com/watch?v=PRMjzy48eTI).
  * Have a look at the [given speeches](speeches)
 
 ### OS support
diff --git a/build b/build
index 38fdac07..919360ae 100755
--- a/build
+++ b/build
@@ -26,13 +26,16 @@
 # exit on any error
 #set -e
 
+version=$(git describe)
+
 # Manpage and HTML
 A2XM="a2x -f manpage --no-xmllint -a encoding=UTF-8"
 A2XH="a2x -f xhtml --no-xmllint -a encoding=UTF-8"
 
 # Developer webbase
 WEBDIR=$HOME/niconetz
-WEBBASE=software/cdist
+WEBBASE=$WEBDIR/software/cdist
+WEBDOCBASE=$WEBBASE/$version
 WEBPAGE=${WEBBASE}.mdwn
 
 # Documentation

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 3/4] 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

From e380cdf7de5b981b3fa0c80df05be2775652d68e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Thu, 17 Nov 2011 15:30:21 +0100
Subject: [PATCH 4/4] build.sh is old

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index c3105e26..ff1293e8 100644
--- a/README
+++ b/README
@@ -131,7 +131,7 @@ To install cdist, execute the following commands:
     export PATH=$PATH:$(pwd -P)/bin
 
     # If you want the manpages
-    ./build.sh man
+    ./build man
     export MANPATH=$MANPATH:$(pwd -P)/doc/man
 
 
@@ -178,7 +178,7 @@ To upgrade cdist in the current branch use
     git pull
 
     # Also update the manpages
-    ./build.sh man
+    ./build man
     export MANPATH=$MANPATH:$(pwd -P)/doc/man
 
 If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.