From a8ae699c8f095a70872d877419c63881e2d61547 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 16 Mar 2011 10:02:46 +0100 Subject: [PATCH] [DOC] cleanup cdist-config Signed-off-by: Nico Schottelius --- Makefile | 4 ++-- doc/changelog | 1 + doc/man/cdist-config.text | 16 ++++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5b6b6e94..b780a983 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ WEBPAGE=software/cdist.mdwn MANDIR=doc/man # Unchecked MANSRC=$(MANDIR)/cdist-config-layout.text \ - $(MANDIR)/cdist-config.text \ $(MANDIR)/cdist-quickstart.text \ $(MANDIR)/cdist-stages.text \ $(MANDIR)/cdist-terms.text \ @@ -21,6 +20,7 @@ MANGENERATED=$(MANDIR)/cdist-reference.text MANSRC=$(MANDIR)/cdist.text \ $(MANDIR)/cdist-bin-transfer.text \ + $(MANDIR)/cdist-config.text \ $(MANDIR)/cdist-env.text \ $(MANDIR)/cdist-deploy-to.text \ $(MANDIR)/cdist-explorer.text \ @@ -40,7 +40,7 @@ all: @echo '' @echo 'Here are the possible targets:' @echo '' - @echo ' man: Build manpages' + @echo ' man: Build manpages (requires Asciidoc (a2x binary))' @echo ' clean: Remove build stuff' @echo '' @echo '' diff --git a/doc/changelog b/doc/changelog index 696bae25..a9738e06 100644 --- a/doc/changelog +++ b/doc/changelog @@ -1,6 +1,7 @@ 1.1: * Replace type __file with __file, __directory, __link * Document cdist-env + * Document cdist-config 1.0.4: 2011-03-15 * New type __motd diff --git a/doc/man/cdist-config.text b/doc/man/cdist-config.text index 969be9cc..9d147988 100644 --- a/doc/man/cdist-config.text +++ b/doc/man/cdist-config.text @@ -10,18 +10,14 @@ cdist-config - Read basic cdist configuration DESCRIPTION ----------- -Cdist-config is sourced by all helper programs and provides -hints on where to find the library. Cdist-config needs to be -in the path. - -AUTHOR ------- -Nico Schottelius +Cdist-config is sourced by cdist programs and provides hints on where to find +types, manifests, etc. Generally speaking, it's just usable from within the +core and is only of interest for cdist-developers. -RESOURCES ---------- -Main web site: http://www.nico.schottelius.org/cdist/[] +SEE ALSO +-------- +cdist(7) COPYING