[collectd] [PATCH] Renamed the desktop_notification plugin in README and collectd.conf as well.

[Sebastian Harl]

Also, reordered collectd.conf to restore alphabetical sorting.

Signed-off-by: Sebastian Harl <sh at tokkee.org>
---
 README               |    4 ++--
 src/collectd.conf.in |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index aad6a70..16c1319 100644
--- a/README
+++ b/README
@@ -230,7 +230,7 @@ Features
 
   * Notifications can be handled by the following plugins:
 
-    - desktop_notification
+    - notify_desktop
       Send a desktop notification to a notification daemon, as defined in
       the Desktop Notification Specification. To actually display the
       notifications, notification-daemon is required.
@@ -340,7 +340,7 @@ Prerequisites
     For the `snmp' plugin.
 
   * libnotify (optional)
-    For the `desktop_notification' plugin.
+    For the `notify_desktop' plugin.
 
   * liboping (optional, if not found a version shipped with this distribution
     can be used)
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 476a39d..1b5696b 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -21,7 +21,6 @@ FQDNLookup   true
 @BUILD_PLUGIN_CPU_TRUE at LoadPlugin cpu
 @BUILD_PLUGIN_CPUFREQ_TRUE at LoadPlugin cpufreq
 @BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
- at BUILD_PLUGIN_DESKTOP_NOTIFICATION_TRUE@LoadPlugin desktop_notification
 @BUILD_PLUGIN_DF_TRUE at LoadPlugin df
 @BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
 @BUILD_PLUGIN_DNS_TRUE at LoadPlugin dns
@@ -46,6 +45,7 @@ FQDNLookup   true
 @BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
 @BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
 @BUILD_PLUGIN_NGINX_TRUE at LoadPlugin nginx
+ at BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop
 @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE at LoadPlugin notify_email
 @BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
 @BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
@@ -95,12 +95,6 @@ FQDNLookup   true
 #	StoreRates false
 #</Plugin>
 
-#<Plugin desktop_notification>
-#	OkayTimeout 1000
-#	WarningTimeout 5000
-#	FailureTimeout 0
-#</Plugin>
-
 #<Plugin df>
 #	Device "/dev/hda1"
 #	Device "192.168.0.2:/mnt/nfs"
@@ -212,6 +206,12 @@ FQDNLookup   true
 #	CACert "/etc/ssl/ca.crt"
 #</Plugin>
 
+#<Plugin notify_desktop>
+#	OkayTimeout 1000
+#	WarningTimeout 5000
+#	FailureTimeout 0
+#</Plugin>
+
 #<Plugin notify_email>
 #       SMTPServer "localhost"
 #	SMTPPort 25
-- 
1.5.5.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://mailman.verplant.org/pipermail/collectd/attachments/20080605/5c4b0b98/attachment.pgp