From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 1 Aug 2015 07:34:28 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~626
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e460da6b5715e55c57731dcda31a228502b02b5b;p=collectd.git

Merge branch 'collectd-5.5'
---

e460da6b5715e55c57731dcda31a228502b02b5b
diff --cc src/collectd.conf.pod
index 9a8d2c1f,9bb348f7..bd39295e
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -510,12 -501,10 +510,12 @@@ are disabled by default
  
  =head2 Plugin C<amqp>
  
- The I<AMQMP plugin> can be used to communicate with other instances of
+ The I<AMQP plugin> can be used to communicate with other instances of
  I<collectd> or third party applications using an AMQP message broker. Values
  are sent to or received from the broker, which handles routing, queueing and
 -possibly filtering or messages.
 +possibly filtering out messages.
 +
 +B<Synopsis:>
  
   <Plugin "amqp">
     # Send values to an AMQP broker