Merge remote-tracking branch 'github/pr/2434'

diff --combined src/collectd.conf.in
index bbd3a15,86ea1a6..f35f328
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -814,6 -814,11 +814,11 @@@
  #             QoS 2
  #             Topic "collectd/#"
  #             CleanSession true
+ #             CACert "/etc/ssl/ca.crt"
+ #             CertificateFile "/etc/ssl/client.crt"
+ #             CertificateKeyFile "/etc/ssl/client.pem"
+ #             TLSProtocol "tlsv1.2"
+ #             CipherSuite "ciphers"
  #     </Subscribe>
  #</Plugin>
  
@@@ -1343,7 -1348,6 +1348,7 @@@
  
  #<Plugin table>
  #     <Table "/proc/slabinfo">
 +#             #Plugin "table"
  #             Instance "slabinfo"
  #             Separator " "
  #             <Result>

diff --combined src/collectd.conf.pod
index af6ed93,a98a8be..63e62ef
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -4173,18 -4173,18 +4173,18 @@@ the B<collectd> branch
  Path to the PEM-encoded CA certificate file. Setting this option enables TLS
  communication with the MQTT broker, and as such, B<Port> should be the TLS-enabled
  port of the MQTT broker.
- A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
+ This option enables the use of TLS.
  
  =item B<CertificateFile> I<file>
  
  Path to the PEM-encoded certificate file to use as client certificate when
  connecting to the MQTT broker.
- A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
+ Only valid if B<CACert> and B<CertificateKeyFile> are also set.
  
  =item B<CertificateKeyFile> I<file>
  
  Path to the unencrypted PEM-encoded key file corresponding to B<CertificateFile>.
- A valid TLS configuration requires B<CACert>, B<CertificateFile> and B<CertificateKeyFile>.
+ Only valid if B<CACert> and B<CertificateFile> are also set.
  
  =item B<TLSProtocol> I<protocol>
  
@@@ -4192,13 -4192,14 +4192,14 @@@ If configured, this specifies the strin
  C<tlsv1.2>) to use for the TLS connection to the broker. If not set a default
  version is used which depends on the version of OpenSSL the Mosquitto library
  was linked against.
+ Only valid if B<CACert> is set.
  
  =item B<CipherSuite> I<ciphersuite>
  
  A string describing the ciphers available for use. See L<ciphers(1)> and the
  C<openssl ciphers> utility for more information. If unset, the default ciphers
  will be used.
- 
+ Only valid if B<CACert> is set.
  
  =back
  
@@@ -5655,12 -5656,15 +5656,12 @@@ The OpenVPN plugin reads a status file 
  traffic statistics about connected clients.
  
  To set up OpenVPN to write to the status file periodically, use the
 -B<--status> option of OpenVPN. Since OpenVPN can write two different formats,
 -you need to set the required format, too. This is done by setting
 -B<--status-version> to B<2>.
 +B<--status> option of OpenVPN.
  
  So, in a nutshell you need:
  
    openvpn $OTHER_OPTIONS \
 -    --status "/var/run/openvpn-status" 10 \
 -    --status-version 2
 +    --status "/var/run/openvpn-status" 10
  
  Available options:
  
@@@ -7559,7 -7563,6 +7560,7 @@@ filesystem or CSV (comma separated valu
  
    <Plugin table>
      <Table "/proc/slabinfo">
 +      #Plugin "slab"
        Instance "slabinfo"
        Separator " "
        <Result>
@@@ -7586,14 -7589,10 +7587,14 @@@ The following options are available ins
  
  =over 4
  
 +=item B<Plugin> I<Plugin>
 +
 +If specified, I<Plugin> is used as the plugin name when submitting values.
 +Defaults to B<table>.
 +
  =item B<Instance> I<instance>
  
 -If specified, I<instance> is used as the plugin instance. So, in the above
 -example, the plugin name C<table-slabinfo> would be used. If omitted, the
 +If specified, I<instance> is used as the plugin instance. If omitted, the
  filename of the table is used instead, with all special characters replaced
  with an underscore (C<_>).