Merge pull request #2819 from rpv-tomsk/snmp-fix-2291-1

[collectd.git] / README

diff --git a/README b/README
index a47b669..2210b2b 100644 (file)
--- a/README
+++ b/README
@@ -465,7 +465,11 @@ Features
 
     - amqp
       Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)
 
     - amqp
       Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)

-      server, such as RabbitMQ.
+      0.9.1 server, such as RabbitMQ.
+
+    - amqp1
+      Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)
+      1.0 server, such as Qpid Dispatch Router or Apache Artemis Broker.

 
     - csv
       Write to comma separated values (CSV) files. This needs lots of
 
     - csv
       Write to comma separated values (CSV) files. This needs lots of


@@ -908,8 +912,14 @@ Prerequisites
     are supported.
     <http://www.python.org/>
 
     are supported.
     <http://www.python.org/>
 

+  * libqpid-proton (optional)
+    Used by the `amqp1' plugin for AMQP 1.0 connections, for example to
+    Qdrouterd.
+    <http://qpid.apache.org/>
+

   * librabbitmq (optional; also called “rabbitmq-c”)
   * librabbitmq (optional; also called “rabbitmq-c”)

-    Used by the `amqp' plugin for AMQP connections, for example to RabbitMQ.
+    Used by the `amqp' plugin for AMQP 0.9.1 connections, for example to
+    RabbitMQ.

     <http://hg.rabbitmq.com/rabbitmq-c/>
 
   * librdkafka (optional; also called “rdkafka”)
     <http://hg.rabbitmq.com/rabbitmq-c/>
 
   * librdkafka (optional; also called “rdkafka”)


@@ -987,9 +997,8 @@ Configuring / Compiling / Installing
 ------------------------------------
 
   To configure, build and install collectd with the default settings, run
 ------------------------------------
 
   To configure, build and install collectd with the default settings, run

-  `./configure && make && make install'.  For detailed, generic instructions
-  see INSTALL. For a complete list of configure options and their description,
-  run `./configure --help'.
+  `./configure && make && make install'.  For a complete list of configure
+  options and their description, run `./configure --help'.

 
   By default, the configure script will check for all build dependencies and
   disable all plugins whose requirements cannot be fulfilled (any other plugin
 
   By default, the configure script will check for all build dependencies and
   disable all plugins whose requirements cannot be fulfilled (any other plugin