From 4c59a0fde14312ad06734ca0ec60ef822b5892a6 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Tue, 15 Mar 2011 20:51:09 +0100
Subject: [PATCH] cleanup __link

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 conf/type/__link/man.text           | 20 +++++++++-----------
 conf/type/__link/parameter/optional |  5 -----
 conf/type/__link/parameter/required |  1 +
 3 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 conf/type/__link/parameter/optional

diff --git a/conf/type/__link/man.text b/conf/type/__link/man.text
index 5022697a..db124cb9 100644
--- a/conf/type/__link/man.text
+++ b/conf/type/__link/man.text
@@ -19,7 +19,7 @@ REQUIRED PARAMETERS
 source::
    Specifies the link source.
 
-source::
+type::
    Specifies the link type: Either hard or symoblic.
 
 
@@ -31,18 +31,16 @@ EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-# Create /etc/cdist-configured as an empty file
-__file /etc/cdist-configured --type file
+# Create hard link of /etc/shadow
+__file /root/shadow --source /etc/shadow --type hard
 
-# Same but with a different object id
-__file cdist-marker --type file --destination /etc/cdist-configured
+# Relative symbolic link
+__file /etc/apache2/sites-enabled/www.test.ch   \
+   --source ../sites-available/www.test.ch      \
+   --type symbolic
 
-# Use __file from another type
-__file /etc/issue --source "$__type/files/archlinux" --type file
-
-# Supply some more settings
-__file /etc/shadow --source "$__type/files/shadow" --type file \
-   --owner root --group shadow --mode 0640
+# Relative absolute link
+__file /opt/plone --source /home/services/plone --type symbolic
 --------------------------------------------------------------------------------
 
 
diff --git a/conf/type/__link/parameter/optional b/conf/type/__link/parameter/optional
deleted file mode 100644
index 0c30f4be..00000000
--- a/conf/type/__link/parameter/optional
+++ /dev/null
@@ -1,5 +0,0 @@
-group
-mode
-owner
-source
-destination
diff --git a/conf/type/__link/parameter/required b/conf/type/__link/parameter/required
index aa80e646..f7facfb8 100644
--- a/conf/type/__link/parameter/required
+++ b/conf/type/__link/parameter/required
@@ -1 +1,2 @@
+source
 type