From 69fde0a9e39153c8ca913e95cd0cd1c2c65e86c6 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 9 Mar 2011 10:01:14 +0100
Subject: [PATCH] update pointers to cdist-reference

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 Makefile                        |  1 -
 doc/changelog                   |  2 +-
 doc/man/.gitignore              |  2 +-
 doc/man/cdist-deploy-to.text    |  8 ++++----
 doc/man/cdist-reference.text.sh | 16 ++++++++--------
 doc/man/cdist-stages.text       | 13 +++++++------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 9e3460f7..96924c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ MANSRC=$(MANDIR)/cdist.text				\
    $(MANDIR)/cdist-bin-transfer.text	\
    $(MANDIR)/cdist-deploy-to.text 		\
 	$(MANDIR)/cdist-manifest.text 		\
-	$(MANDIR)/cdist-reference.text		\
 	$(MANDIR)/cdist-stages.text			\
 	$(MANDIR)/cdist-type.text				\
 	$(MANDIR)/cdist-type-template.text	\
diff --git a/doc/changelog b/doc/changelog
index 528b7e86..b39c512d 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,5 +1,5 @@
 1.0.2: upcoming
-	* Add manpages: cdist-type, cdist-type__file
+	* Add manpages: cdist-type, cdist-type__file, cdist-reference
 	* Make doc/man/ usable as MANPATH entry
 
 1.0.1: 2011-03-08
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index 299485e8..8ed9d1e1 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1,4 +1,4 @@
 cdist.7
 *.html
 cdist-design.7
-cdist-type-listing.text
+cdist-reference.text
diff --git a/doc/man/cdist-deploy-to.text b/doc/man/cdist-deploy-to.text
index e09cba0a..acbb915a 100644
--- a/doc/man/cdist-deploy-to.text
+++ b/doc/man/cdist-deploy-to.text
@@ -30,10 +30,10 @@ variables are handled by cdist-config.
 
 SEE ALSO
 --------
-cdist(7),
-cdist-config(1),
-cdist-config-layout(7),
-cdist-stages(7)
+- cdist(7)
+- cdist-config(1)
+- cdist-reference(7)
+- cdist-stages(7)
 
 
 COPYING
diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh
index c8a49abd..2453c216 100755
--- a/doc/man/cdist-reference.text.sh
+++ b/doc/man/cdist-reference.text.sh
@@ -32,7 +32,7 @@ dest="$__cdist_abs_mydir/$filename"
 
 cd "$__cdist_abs_mydir"
 
-# exec > "$dest"
+exec > "$dest"
 cat << eof 
 cdist-reference(7)
 ==================
@@ -146,28 +146,28 @@ cat << eof
 VARIABLES
 ---------
 __explorer::
-   Directory that contains all explorers
+   Directory that contains all explorers.
    Available for: explorer
 __manifest::
-   Directory that contains the initial manifest
+   Directory that contains the initial manifest.
    Available for: initial manifest
 __global::
-   Directory that contains generic output like explorer
+   Directory that contains generic output like explorer.
    Available for: initial manifest, type manifest, type explorer, type codegen
 __object::
-   Directory that contains the current object
+   Directory that contains the current object.
    Available for: type manifest, type explorer, type codegen
 __object_id::
-   The type unique object id
+   The type unique object id.
    Available for: type manifest, type explorer, type codegen
 __target_host::
    The host we are deploying to.
    Available for: initial manifest, type manifest, type codegen
 __type::
-   Path to the current type
+   Path to the current type.
    Available for: type manifest
 __type_explorers::
-   Directory that contains the type explorers
+   Directory that contains the type explorers.
    Available for: type explorer
 
 
diff --git a/doc/man/cdist-stages.text b/doc/man/cdist-stages.text
index da6f4e02..4ab93cff 100644
--- a/doc/man/cdist-stages.text
+++ b/doc/man/cdist-stages.text
@@ -46,10 +46,9 @@ no conflicts may occur, i.e. no object of the same type with the same id may
 be created.
 
 Related manpages: 
+   - cdist-manifest(7)
    - cdist-manifest-run(1)
    - cdist-manifest-run-init(1)
-   - cdist-manifest(7)
-   - cdist-config-layout(7)
 
 
 STAGE 3: EXECUTION OF TYPES
@@ -67,9 +66,9 @@ may occur during the merge. A conflict would mean that two different objects
 try to create the same object, which indicates a broken configuration.
 
 Related manpages:
-   - cdist-type(7) 
    - cdist-manifest-run(1)
    - cdist-manifest-run-all(1)
+   - cdist-type(7) 
 
 
 STAGE 4: CODE GENERATION
@@ -81,9 +80,9 @@ on stdout. If the gencode executable fails, it must print diagnostic messages
 on stderr and exit non-zero.
 
 Related manpages:
-   - cdist-types-gencode(7)
    - cdist-gencode(1)
    - cdist-gencode-all(1)
+   - cdist-type(7) 
 
 
 STAGE 5: CODE EXECUTION
@@ -92,8 +91,8 @@ The resulting code from the previous stage is transferred to the target host
 and executed there to apply the configuration changes,
 
 Related manpages:
-   - cdist-exec-transfer(1)
    - cdist-exec-run(1)
+   - cdist-exec-transfer(1)
 
 
 SUMMARY
@@ -106,7 +105,9 @@ in correct order.
 
 SEE ALSO
 --------
-cdist(7), cdist-deploy-to(1), cdist-config-layout(7)
+- cdist(7)
+- cdist-deploy-to(1)
+- cdist-reference(7)
 
 
 COPYING