diff --git a/README b/README
index 521d70a2..3808faac 100644
--- a/README
+++ b/README
@@ -154,6 +154,11 @@ working, break your setup or eat the tree in your garden.
 
 ### Upgrading from 1.7 to 2.0
 
+* Ensure python (>= 3.2) is installed on the server
+* Use "cdist config host" instead of "cdist-deploy-to host"
+* Use "cdist config -p host1 host2" instead of "cdist-mass-deploy"
+* Use **\_\_object_fq** instead of **\_\_self** in manifests
+
 ### Upgrading from 1.6 to 1.7
 
 * If you used the global explorer **hardware_type**, you need to change
diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh
index a823891b..218b0f57 100755
--- a/doc/man/cdist-reference.text.sh
+++ b/doc/man/cdist-reference.text.sh
@@ -171,7 +171,7 @@ __object::
 __object_id::
    The type unique object id.
    Available for: type manifest, type explorer, type gencode
-__self::
+__object_fq::
    The full qualified name of the current object.
    Available for: type manifest, type explorer, type gencode
 __target_host::