Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2306b9f..d733a6f 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -10,6 +10,12 @@
 @BUILD_WITH_RRDTOOL_FALSE@Mode Client
 #Mode Log
 
+# Set the IP-address(es) and UDP-port(s) to send packets to. `Listen' can be
+# used as a synonym for `Server' to make the config file more readable when in
+# server mode. The port option is optional.
+#Server ff18::efc0:4a42 25826
+#Server 239.192.74.66 25826
+
 #DataDir   /opt/collectd/var/lib/collectd
 #PIDFile   /opt/collectd/var/run/collectd.pid
 #PluginDir /opt/collectd/lib/collectd

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 7914891..f3e2585 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -8,8 +8,7 @@ collectd.conf - Configuration for the system statistics collection daemon B<coll
   DataDir /path/to/data/
   PIDFile /path/to/pidfile/collectd.pid
   LogFile /path/to/logfile/collectd.log
-  Server  123.123.123.123
-  Port    12345
+  Server  123.123.123.123 12345
 
   LoadPlugin cpu
   LoadPlugin load