From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Tue, 30 Dec 2008 16:24:06 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=66b7c4bce4e628d8c11cc6762621f155bd68536d;hp=602d70a9162bf2dc830142755836e82469230c5c;p=collectd.git

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	src/network.c
---

diff --git a/src/types.db.pod b/src/types.db.pod
index f0a49f6b..3b4f1fac 100644
--- a/src/types.db.pod
+++ b/src/types.db.pod
@@ -29,9 +29,19 @@ happen. See L<rrdcreate(1)> for more details.
 =head1 FILES
 
 The location of the types.db file is defined by the B<TypesDB> configuration
-option (see L<collectd.conf(5)>). 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.
+option (see L<collectd.conf(5)>).
+
+=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