Merge branch 'collectd-4.5'

Conflicts:

	src/types.db.pod

diff --cc src/types.db.pod
index 11c7f794c248568306d97ed5b5931c834089aff4,3b4f1facbb53f6f8dfd1b304450aa3a146f82d57..4a1bfa4059d058d7726a1dfd59e10ab002ae8c3c
--- 1/src/types.db.pod
--- 2/src/types.db.pod
+++ b/src/types.db.pod
@@@ -29,10 -29,19 +29,20 @@@ happen. See L<rrdcreate(1)> for more de
  =head1 FILES
  
  The location of the types.db file is defined by the B<TypesDB> configuration
 -option (see L<collectd.conf(5)>).
 +option (see L<collectd.conf(5)>). It defaults to collectd's shared data
- directory, i.E<nbsp>e. F<I<prefix>/share/collectd/>. If you want to specify
- custom data-sets, you should do so by using a custom file specified as an
- additional argument to the B<TypesDB> option.
++directory, i.E<nbsp>e. F<I<prefix>/share/collectd/>.
+ 
+ =head1 CUSTOM TYPES
+ 
+ If you want to specify custom types, you should do so by specifying a custom
+ file in addition to the default one (see L<FILES>) above. You can do that by
+ having multiple B<TypesDB> statements in your configuration file or by
+ specifying more than one file in one line.
+ 
+ For example:
+ 
+  TypesDB "/opt/collectd/share/collectd/types.db"
+  TypesDB "/opt/collectd/etc/types.db.custom"
  
  =head1 SEE ALSO