Merge branch 'master' into new-docs-format

docs/changelog

@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+next:
+	* Documentation: Migrate to reStructuredText format and sphinx (Darko Poljak)
+	* Core: Add -f option to read additional hosts from file/stdin (Darko Poljak)
+
 4.0.0: 2016-05-04
 	* Core: Fix bug with parallel hosts operation when output path is specifed (Darko Poljak)
 	* Type __package_pip: Add support for running as specified user (useful for pip in venv) (Darko Poljak)
@@ -25,7 +29,6 @@ Changelog
 	* Type __consul: Add new consul versions (Nico Schottelius)
 	* Type __apt_ppa: Do not install legacy package python-software-properties (Steven Armstrong)
 
-
 3.1.13: 2015-05-16
 	* Type __block: Fix support for non stdin blocks (Dominique Roux)
 	* Type __consul: Install package unzip (Nico Schottelius)

docs/man/man1/cdist.rst

@@ -14,7 +14,7 @@ SYNOPSIS
 
     cdist banner [-h] [-d] [-v]
 
-    cdist config [-h] [-d] [-V] [-c CONF_DIR] [-i MANIFEST] [-p] [-s] host [host ...]
+    cdist config [-h] [-d] [-V] [-c CONF_DIR] [-f HOSTFILE] [-i MANIFEST] [-p] [-s] [host [host ...]]
 
     cdist shell [-h] [-d] [-v] [-s SHELL]
 
@@ -69,6 +69,13 @@ Configure one or more hosts
     --conf-dir argument have higher precedence over those set through the
     environment variable.
 
+.. option:: -f HOSTFILE, --file HOSTFILE
+
+    Read additional hosts to operate on from specified file
+    or from stdin if '-' (each host on separate line).
+    If no host or host file is specified then, by default,
+    read hosts from stdin.
+
 .. option:: -i MANIFEST, --initial-manifest MANIFEST
 
     Path to a cdist manifest or - to read from stdin
@@ -118,6 +125,9 @@ EXAMPLES
         --remote-copy /path/to/my/remote/copy \
         -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
 
+    # Configure hosts read from file loadbalancers
+    % cdist config -f loadbalancers
+
     # Display banner
     cdist banner