X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcollectd.conf.pod;h=a7a5816753a0bc1b3fb69fafdb447ad38ad43121;hb=dc7e14787cc4273927d5d0cdbd00fd41a0bee928;hp=4117c7626b4ad91832f8936078bc94492bf10f4b;hpb=cfe801cf0236ea2fade924e0f2b5ce3d1a51698a;p=collectd.git

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 4117c762..a7a58167 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -98,7 +98,6 @@ Options inside a B<LoadPlugin> block can override default settings and
 influence the way plugins are loaded, e.g.:
 
  <LoadPlugin perl>
-   Globals true
    Interval 60
  </LoadPlugin>
 
@@ -2480,12 +2479,6 @@ other interfaces are collected.
 
 =back
 
-=head2 Plugin C<ipc>
-
-The I<IPC plugin> allows to B<collectd> to gather information about
-process IPC mechanims, like used semaphores, size of shared memory
-segments and others.
-
 =head2 Plugin C<ipmi>
 
 =over 4
@@ -5139,6 +5132,13 @@ activating this option. The draw-back is, that data covering the specified
 amount of time will be lost, for example, if a single statement within the
 transaction fails or if the database server crashes.
 
+=item B<Instance> I<name>
+
+Specify the plugin instance name that should be used instead of the database
+name (which is the default, if this option has not been specified). This
+allows to query multiple databases of the same name on the same host (e.g.
+when running multiple database server versions in parallel).
+
 =item B<Host> I<hostname>
 
 Specify the hostname or IP of the PostgreSQL server to connect to. If the
@@ -5573,7 +5573,7 @@ that numerical port numbers must be given as a string, too.
 
 Use I<Password> to authenticate when connecting to I<Redis>.
 
-=item B<Timeout> I<Timeout in miliseconds>
+=item B<Timeout> I<Milliseconds>
 
 The B<Timeout> option set the socket timeout for node response. Since the Redis
 read function is blocking, you should keep this value as low as possible. Keep
@@ -7101,7 +7101,7 @@ Hostname or address to connect to. Defaults to C<localhost>.
 
 Service name or port number to connect to. Defaults to C<27017>.
 
-=item B<Timeout> I<Timeout>
+=item B<Timeout> I<Milliseconds>
 
 Set the timeout for each operation on I<MongoDB> to I<Timeout> milliseconds.
 Setting this option to zero means no timeout, which is the default.
@@ -7405,7 +7405,7 @@ The B<Port> option is the TCP port on which the Redis instance accepts
 connections. Either a service name of a port number may be given. Please note
 that numerical port numbers must be given as a string, too.
 
-=item B<Timeout> I<Timeout in miliseconds>
+=item B<Timeout> I<Milliseconds>
 
 The B<Timeout> option sets the socket connection timeout, in milliseconds.