Nico Schottelius bfb43079e3 Merge branch 'dev' of git://git.d-roth.li/cdist ... Conflicts: conf/manifest/init Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>		2011-03-12 19:11:24 +01:00
..
to_check	Merge branch 'dev' of git://git.d-roth.li/cdist	2011-03-12 19:11:24 +01:00
.gitignore	update pointers to cdist-reference	2011-03-09 10:01:14 +01:00
cdist-bin-transfer.text	update manpages to work with asciidoc	2011-03-08 00:20:35 +01:00
cdist-deploy-to.text	update pointers to cdist-reference	2011-03-09 10:01:14 +01:00
cdist-explorer.text	hint on debug / explorer	2011-03-09 10:17:43 +01:00
cdist-manifest.text	even less todo	2011-03-09 21:54:13 +01:00
cdist-reference.text.sh	begin the manpage integration with man.text	2011-03-09 13:06:23 +01:00
cdist-stages.text	update pointers to cdist-reference	2011-03-09 10:01:14 +01:00
cdist-type-template.text	update manpages to work with asciidoc	2011-03-08 00:20:35 +01:00
cdist-type.text	[DOC] document singleton behaviour in type manpage	2011-03-11 19:09:36 +01:00
cdist.text	merge cdist-config-layout into cdist-reference	2011-03-09 09:15:34 +01:00