From 26d7eab852bae2eb43de9bcd4b615fc2ca0fa31e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Tue, 22 May 2012 15:06:04 +0200
Subject: [PATCH] document change + manpage

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 doc/changelog           |  3 +++
 doc/man/man1/cdist.text | 29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/doc/changelog b/doc/changelog
index 63fcb6b0..966e876e 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -4,6 +4,9 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+2.0.11:
+	* Add support for --remote-exec and --remote-copy parameters
+
 2.0.10: 2012-05-18
 	* Cleanup __group: No getent gshadow in old Redhat, use groupmod -g
 		(Matt Coddington)
diff --git a/doc/man/man1/cdist.text b/doc/man/man1/cdist.text
index e46e84a3..b92fba18 100644
--- a/doc/man/man1/cdist.text
+++ b/doc/man/man1/cdist.text
@@ -41,23 +41,29 @@ CONFIG
 Configure a system
 
 -h, --help::
-   Show the help screen
+    Show the help screen
 
 -c CDIST_HOME, --cdist-home CDIST_HOME::
-   Instead of using the parent of the bin directory as cdist home,
-   use the specified directory
+    Instead of using the parent of the bin directory as cdist home,
+    use the specified directory
 
 -d, --debug::
-   Enable debug output
+    Enable debug output
 
 -i MANIFEST, --initial-manifest MANIFEST::
-   Path to a cdist manifest or - to read from stdin
+    Path to a cdist manifest or - to read from stdin
 
 -p, --parallel::
-   Operate on multiple hosts in parallel
+    Operate on multiple hosts in parallel
 
 -s, --sequential::
-   Operate on multiple hosts sequentially
+    Operate on multiple hosts sequentially
+
+--remote-copy REMOTE_COPY:
+    Command to use for remote copy (should behave like scp)
+
+--remote-exec REMOTE_EXEC:
+    Command to use for remote execution (should behave like ssh)
 
 
 EXAMPLES
@@ -69,7 +75,12 @@ cdist config -d ikq05.ethz.ch
 
 # Configure hosts in parallel and use a different home directory
 cdist config -c ~/p/cdist-nutzung \
-   -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
+    -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
+
+# Use custom remote exec / copy commands
+cdist config --remote-exec /path/to/my/remote/exec \
+    --remote-copy /path/to/my/remote/copy \
+    -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
 
 # Display banner
 cdist banner
@@ -98,7 +109,7 @@ The following exit values shall be returned:
 0::
     Successful completion
 1::
-    One or more host configuration failed.
+    One or more host configurations failed
 
 
 SEE ALSO