From e5b3081b9f72a228e0059f126e4ca3706255becb Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Mon, 9 Jan 2012 10:01:44 +0100
Subject: [PATCH] redo commit due to broken .git repo

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 README                                     | 26 ++++++++++++++++++----
 build                                      |  6 +++++
 doc/changelog                              |  1 +
 doc/dev/logs/2012-01-06.python3-in-distros |  3 ++-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 35a25099..46982d9f 100644
--- a/README
+++ b/README
@@ -90,8 +90,8 @@ cdist was tested or is know to run on at least
 
 ### Preperation
 
-Ensure you have Python 3.x and the **argparse** module installed on
-the machine you use to **deploy to the targets**.
+Ensure you have Python 3.2 installed on the machine you use to **deploy to the targets**
+(the ***source host***).
 
 #### Archlinux
 
@@ -101,9 +101,27 @@ Archlinux already has python >= 3.2, so you only need to do:
 
 #### Debian
 
-    aptitude install python3 python3-setuptools
-    easy_install3 argparse
+For Debian >= wheezy:
 
+    aptitude install python3
+
+For older Debian versions, installing python 3.2 manually is required.
+
+#### Fedora
+
+For Fedora >= 15:
+
+    yum install python3
+
+#### FreeBSD
+
+For the port:
+
+    cd /usr/ports/lang/python32/ && make install clean
+
+For the package:
+
+    pkg_add -r python32
 
 #### Gentoo
 
diff --git a/build b/build
index e3a6e7f9..5cc59b6d 100755
--- a/build
+++ b/build
@@ -97,6 +97,12 @@ case "$1" in
       done
    ;;
       
+   webmain)
+      cp README ${WEBPAGE}
+      cd ${WEBDIR} && git commit -m "cdist update" ${WEBPAGE}
+      cd ${WEBDIR} && make pub
+   ;;
+
    web)
       cp README ${WEBPAGE}
       rm -rf ${WEBMAN}
diff --git a/doc/changelog b/doc/changelog
index 3e1bed97..7bea7632 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,5 +1,6 @@
 2.0.5:
 	* New Type: __package_luarocks (Christian G. Warden)
+	* New Type: __cdistmarker (Daniel Maher)
 	* Feature: __addifnosuchline supports matching on 
 		regular expressions (Daniel Maher)
 	* Documentation: (Re)write of the tutorial
diff --git a/doc/dev/logs/2012-01-06.python3-in-distros b/doc/dev/logs/2012-01-06.python3-in-distros
index 81f7b844..38a4b30d 100644
--- a/doc/dev/logs/2012-01-06.python3-in-distros
+++ b/doc/dev/logs/2012-01-06.python3-in-distros
@@ -30,7 +30,8 @@ NetBSD:
     python 3.1.4
 
 OpenBSD:
-    python 3.2? (empty ports dir)
+    2.7.1 on -current
+    2.5 & 3.2 maintained in ports
 
 OpenSuse [supported since 2011-11]
     11.4: python3-3.1.3-3.3.x86_64.rpm