From d084cf1422752db88bcc2f4e4a807335148fb0cb Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 16 Mar 2011 09:45:22 +0100
Subject: [PATCH] less todo, updates for changelog

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 doc/changelog         |  3 ++-
 doc/dev/todo/niconext |  3 +++
 doc/dev/todo/post-1.0 | 22 +---------------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/doc/changelog b/doc/changelog
index d83d3d44..696bae25 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,9 +1,10 @@
 1.1:
 	* Replace type __file with __file, __directory, __link
+	* Document cdist-env
 
 1.0.4: 2011-03-15
 	* New type __motd
-	* New type __addifnosuchline
+	* New type __addifnosuchline (Daniel Roth)
 	* Document type __issue
 	* Document type __package_pacman
 	* Document type __package_apt
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index e69de29b..a1916dcd 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -0,0 +1,3 @@
+DOC:
+   - cdist-dir
+   - cdist-config
diff --git a/doc/dev/todo/post-1.0 b/doc/dev/todo/post-1.0
index 49c6f8b0..0d32dd98 100644
--- a/doc/dev/todo/post-1.0
+++ b/doc/dev/todo/post-1.0
@@ -9,22 +9,9 @@ Types to be written/extended:
    - __service
    - __user
    - __file_edit
-      - delete_line_from_file
+      - __deleteline
       - regexp replace (can probably cover all?)
-   - __file:
-      - template == [shell script] stdout
    - cron
-   - __file: think about splitting
-      __file 
-         source
-         mode
-         owner
-      __directory
-         parents
-         mode
-         owner
-      __link 
-      type symbolic | hard
    - __issue: add --source
 
 
@@ -41,16 +28,9 @@ Documentation:
       + cdist
          + cdist-deploy-to
          + cdist-manifest
-      - cdist-type           [IMPORTANT]
-         - only do necessary work [TYPE IMPLEMENTATION HINTS]
-            - install packages only if not existent
-            - copy file only if different
-         - DOC document that $type/manifest is executed for every object/instance
    - ensure every file in bin/ has a correspondent manpage
       - cdist-code-run-all
-      - cdist-config
       - cdist-deploy-to
-      - cdist-dir
       - cdist-explorer-run-init
       - cdist-manifest-run
       - cdist-manifest-run-all