From dc1a5dfd6dff5fbaeb544680e511246d653a792d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Fri, 31 Jan 2014 21:50:32 +0100
Subject: [PATCH] update override documentation

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/man7/cdist-manifest.text | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index af86b7ee..7292a64f 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -140,23 +140,7 @@ ATTENTION: Only use this feature if you are 100% sure in which order
 cdist encounter the affected objects, otherwhise this results 
 into an undefined situation. 
 
---------------------------------------------------------------------------------
-# for example in the inial manifest
-
-# reate user account foobar with some hash for password
-__user foobar --password 'some_fancy_hash'
-
-# ... many statements and includes in the manifest later ...
-# somewhere in a conditionaly sourced manifest 
-# (e.g. for example only sourced if a special application is on the target host)
-
-# this leads to an error ...
-__user foobar --password 'some_other_hash' 
-
-# this tells cdist, that you know that this is an override and should be accepted
-CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
---------------------------------------------------------------------------------
-
+THIS IS A BETA FEATURE AND MAY BE REMOVED AT ANY TIME.
 
 EXAMPLES
 --------
@@ -190,6 +174,26 @@ __package lighttpd --state present
 require="__package/lighttpd" __package munin --state present
 --------------------------------------------------------------------------------
 
+How to override objects:
+
+--------------------------------------------------------------------------------
+# for example in the inital manifest
+
+# reate user account foobar with some hash for password
+__user foobar --password 'some_fancy_hash'
+
+# ... many statements and includes in the manifest later ...
+# somewhere in a conditionaly sourced manifest 
+# (e.g. for example only sourced if a special application is on the target host)
+
+# this leads to an error ...
+__user foobar --password 'some_other_hash' 
+
+# this tells cdist, that you know that this is an override and should be accepted
+CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+--------------------------------------------------------------------------------
+
+
 SEE ALSO
 --------
 - cdist-tutorial(7)