diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index 64ff681b..e1c19869 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,7 +1,6 @@
 - write tutorial
     - containing many links?!
-        - quickstart
-        - cdist-environment/startup/initial-setup (setup env)
+        - cdist-manifest
         - cdist-type
         - ...
         - cdist-hacker
diff --git a/doc/man/man7/cdist-best-practice.text b/doc/man/man7/cdist-best-practice.text
index 79bad2f9..6e5a476c 100644
--- a/doc/man/man7/cdist-best-practice.text
+++ b/doc/man/man7/cdist-best-practice.text
@@ -136,7 +136,6 @@ The following **.git/config** is taken from a a real world scenario:
 --------------------------------------------------------------------------------
 
 Have a look at git-remote(1) to adjust the remote configuration, which allows
-you to push certain branches to certain remotes.
 
 
 MULTI DEVELOPERS/DIFFERENT TRUST RELATIONSHIP/CENTRAL SERVER APPROACH
diff --git a/doc/man/man7/cdist-manifest.text b/doc/man/man7/cdist-manifest.text
index e7e783a3..917ea697 100644
--- a/doc/man/man7/cdist-manifest.text
+++ b/doc/man/man7/cdist-manifest.text
@@ -5,7 +5,20 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 NAME
 ----
-cdist-manifest - Define types to be used
+cdist-manifest - Using types
+
+DESCRIPTION
+-----------
+Manifests exist to define which configurations should be applied to a specific
+host as well as to define which configurations should be applied within a
+type. Manifests are executed locally and the resulting objects are stored in
+an internal database.
+
+The same object can be redefined in multiple different manifests as long as
+the parameters are exactly the same.
+
+In general, manifests are used to define which types are used depending
+on given conditions.
 
 
 DEFINE STATE IN THE INITIAL MANIFEST
@@ -47,23 +60,15 @@ command. Use **ls conf/type** to get a list of available types. If you have
 setup the MANPATH correctly as, you can use **man cdist-reference** to access
 the reference with pointers to the manpages.
 
+INITIAL VS. TYPE MANIFEST
+-------------------------
 
-DESCRIPTION
------------
-Manifests exist to define which configurations should be applied to a specific
-host as well as to define which configurations should be applied within a
-type. Manifests are executed locally and the resulting objects are stored in
-an internal database.
-
-The same object can be redefined in multiple different manifests as long as
-the parameters are exactly the same.
-
-In general, manifests are used to define which types are used depending
-on given conditions.
+MANAGING YOUR OWN CONFIGURATION
 
 
-EXAMPLE
--------
+
+EXAMPLES
+--------
 The initial manifest may for instance contain the following code:
 
 --------------------------------------------------------------------------------
@@ -106,10 +111,14 @@ require="__file/etc/cdist-configured __link/tmp/cdist-testfile" \
 
 --------------------------------------------------------------------------------
 
+If you do not specify
+
+FIXME: autorequire
 
 SEE ALSO
 --------
 - cdist-type(7)
+- cdist-tutorial(7)
 
 
 COPYING
diff --git a/doc/man/man7/cdist-tutorial.text b/doc/man/man7/cdist-tutorial.text
index efdd1e58..e50ccc3c 100644
--- a/doc/man/man7/cdist-tutorial.text
+++ b/doc/man/man7/cdist-tutorial.text
@@ -22,11 +22,9 @@ cdist-quickstart::
 cdist-bootstrap::
     The comprehensive guide to your first cdist installation [beginner]
 
-cdist-initial-manifest::
+cdist-manifest::
     Learn how to define which hosts get which configurations [beginner]
 
-    MANAGING YOUR OWN CONFIGURATION
-
 cdist-type::
     Understand how types are working and created [intermediate]