update install/update instructions

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

docs/web/cdist/install.mdwn

@@ -152,15 +152,25 @@ Other branches may be available for features or bugfixes, but they
 may vanish at any point. To select a specific branch use
 
     # Generic code
-    git checkout -b <name> origin/<name>
+    git checkout -b <localbranchname> origin/<branchname>
 
-    # Stay on a specific version
+So for instance if you want to use and stay with version 2.0, you can use
-    version=2.0
-    git checkout -b $version origin/$version
 
-### Mirrors
+    git checkout -b 2.0 origin/2.0
+
+#### Git Mirrors
+
+If the main site is down, you can acquire cdist from one of the following sites:
 
  * git://github.com/telmich/cdist.git ([github](https://github.com/telmich/cdist))
  * git://git.code.sf.net/p/cdist/code ([sourceforge](https://sourceforge.net/p/cdist/code))
 
+### Python Package
+
+Cdist is available as a python package at
+[PyPi](http://pypi.python.org/pypi/cdist/). You can install it using
+
+    pip install cdist
+
+
 [[!tag cdist unix]]

docs/web/cdist/update.mdwn

@@ -1,4 +1,6 @@
-## Update
+[[!meta title="How to update cdist"]]
+
+## Update The Git Installation
 
 To upgrade cdist in the current branch use
 
@@ -12,20 +14,43 @@ If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
 The master branch on the other hand is the development branch and may not be
 working, break your setup or eat the tree in your garden.
 
-### Upgrading from 1.7 to 2.0
+## Update The Python Package
 
-* Ensure python (>= 3.2) is installed on the server
+To upgrade to the lastet version do
+
+    pip install --upgrade cdist
+
+## Update Instructions / Hints
+
+### Updating from 2.0 to 2.1
+
+ * Type __package* and __process use --state **present** or **absent**.
+   The states **removed/installed** and **stopped/running** have been removed.
+   Support for the new states is already present in 2.0.
+ * Type __directory: Parameter --parents and --recursive are now boolean
+   and the old "yes/no" values need to be removed
+ * Type **__addifnosuchline** and **__removeline** have been replaced by **__line**
+ * The **conf** directory is now located at **cdist/conf**.
+   You need to migrate your types, explorers and manifests
+   manually to the new location.
+ * Replace the variable **__self** by **__object_name**
+   Support for the variable **__object_name** is already present in 2.0.
+
+
+### Updating from 1.7 to 2.0
+
+* Ensure python (>= 3.2) is installed on the source host
 * Use "cdist config host" instead of "cdist-deploy-to host"
 * Use "cdist config -p host1 host2" instead of "cdist-mass-deploy"
 * Use "cdist banner" for fun
 * Use **\_\_object_fq** instead of **\_\_self** in manifests
 
-### Upgrading from 1.6 to 1.7
+### Updating from 1.6 to 1.7
 
 * If you used the global explorer **hardware_type**, you need to change
   your code to use **machine** instead.
 
-### Upgrading from 1.5 to 1.6
+### Updating from 1.5 to 1.6
 
 * If you used **\_\_package_apt --preseed**, you need to use the new
   type **\_\_debconf_set_selections** instead.
@@ -33,19 +58,19 @@ working, break your setup or eat the tree in your garden.
   --state uninstaaled. Starting with 1.6, it was made consistently
   to --state removed.
 
-### Upgrading from 1.3 to 1.5
+### Updating from 1.3 to 1.5
 
 No incompatiblities.
 
-### Upgrading from 1.2 to 1.3
+### Updating from 1.2 to 1.3
 
 Rename **gencode** of every type to **gencode-remote**.
 
-### Upgrading from 1.1 to 1.2
+### Updating from 1.1 to 1.2
 
 No incompatiblities.
 
-### Upgrading from 1.0 to 1.1
+### Updating from 1.0 to 1.1
 
 In 1.1 the type **\_\_file** was split into **\_\_directory**, **\_\_file** and
 **\_\_link**. The parameter **--type** was removed from **\_\_file**. Thus you