From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 10 Oct 2016 18:58:19 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.2~18
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=9c962b99a3acd77f1d6e2499052b47356819511a

Merge branch 'collectd-5.5' into collectd-5.6
---

9c962b99a3acd77f1d6e2499052b47356819511a
diff --cc src/collectd.conf.pod
index 090f18ee,e476c48f..9c97137c
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -5785,10 -5209,8 +5785,10 @@@ transaction fails or if the database se
  
  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.
+ allows one to query multiple databases of the same name on the same host (e.g.
  when running multiple database server versions in parallel).
 +The plugin instance name can also be set from the query result using
 +the B<PluginInstanceFrom> option in B<Query> block.
  
  =item B<Host> I<hostname>
  
@@@ -6052,13 -5474,9 +6052,13 @@@ Similar to the B<Process> option this a
  statistics of processes matching the specified I<regex> (see L<regex(7)> for
  details). The statistics of all matching processes are summed up and
  dispatched to the daemon using the specified I<name> as an identifier. This
- allows to "group" several processes together. I<name> must not contain
+ allows one to "group" several processes together. I<name> must not contain
  slashes.
  
 +=item B<CollectContextSwitch> I<Boolean>
 +
 +Collect context switch of the process.
 +
  =back
  
  =head2 Plugin C<protocols>
diff --cc src/tail_csv.c
index 1bdf8b29,919f9482..206f1037
--- a/src/tail_csv.c
+++ b/src/tail_csv.c
@@@ -536,8 -544,8 +536,8 @@@ static int tcsv_init(void) { /* {{{ *
          }
          else if (ds->ds_num != 1)
          {
 -            ERROR ("tail_csv plugin: The type \"%s\" has %i data sources. "
 +            ERROR ("tail_csv plugin: The type \"%s\" has %zu data sources. "
-                     "Only types with a single data soure are supported.",
+                     "Only types with a single data source are supported.",
                      ds->type, ds->ds_num);
              continue;
          }