Merge branch 'collectd-4.0' into collectd-4.1

diff --combined ChangeLog
index 9e1a2d3,634ecdd..30564d5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,8 +1,35 @@@
 +2007-09-10, Version 4.1.1
 +      * Build system: The detection of `libnetlink' has been improved.
 +      * collectd: The documentation has been fixed in numerous places.
 +      * exec plugin: Setting the group under which to run a program has been
 +        fixed.
 +
 +2007-09-01, Version 4.1.0
 +      * Build system: The build system has been changed to automatically
 +        disable all plugins, which are missing dependencies. The dependency
 +        checking has been removed from the plugins themselves to remove
 +        redundancy.
 +      * Flexible interval: The interval of collected data is now sent along
 +        with the data itself over the network, so that the interval-settings
 +        of server and clients no longer needs to match.
 +      * netlink plugin: The new `netlink' plugin connects to the Linux
 +        kernel using a netlink socket and uses it to query information about
 +        interfaces, qdiscs and classes.
 +      * rrdtool plugin: The cache is now dumped to disk in an extra thread
 +        to not block data collection.
 +      * snmp plugin: The new `snmp' plugin can read values from SNMP enabled
 +        network devices, such as switches, routers, thermometers, rack
 +        monitoring servers, etc. The collectd-snmp(5) manpage documents this
 +        plugin.
 +      * unixsock plugin: Added the `LISTVAL' command.
 +      * xmms plugin: The new `xmms' plugin graphs the bitrate and frequency
 +        of music played with xmms.
 +
  2007-09-10, Version 4.0.8
        * collectd: The `sstrerror' function was improved to work correctly
          with the broken GNU version of `strerror_r'.
+       * apcups plugin: Fix the `types' used to submit the values: They still
+         has an `apcups_' prefix which doesn't work anymore.
  
  2007-08-26, Version 4.0.7
        * documentation: Some typos have been fixed and some information has

diff --combined src/apcups.c
index 62c7a3c,a4aa34d..8f315c9
--- 1/src/apcups.c
--- 2/src/apcups.c
+++ b/src/apcups.c
@@@ -1,11 -1,9 +1,11 @@@
  /*
   * collectd - src/apcups.c
 + * Copyright (C) 2007 Florian octo Forster
   * Copyright (C) 2006 Anthony Gialluca <tonyabg at charter.net>
   * Copyright (C) 2000-2004 Kern Sibbald
   * Copyright (C) 1996-99 Andre M. Hedrick <andre at suse.com>
   *
 + *
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of version 2 of the GNU General
   * Public License as published by the Free Software Foundation.
@@@ -389,14 -387,14 +389,14 @@@ static void apc_submit_generic (char *t
  
  static void apc_submit (struct apc_detail_s *apcups_detail)
  {
-       apc_submit_generic ("apcups_voltage",    "input",   apcups_detail->linev);
-       apc_submit_generic ("apcups_voltage",    "output",  apcups_detail->outputv);
-       apc_submit_generic ("apcups_voltage",    "battery", apcups_detail->battv);
-       apc_submit_generic ("apcups_charge",     "",        apcups_detail->bcharge);
-       apc_submit_generic ("apcups_charge_pct", "",        apcups_detail->loadpct);
-       apc_submit_generic ("apcups_timeleft",   "",        apcups_detail->timeleft);
-       apc_submit_generic ("apcups_temp",       "",        apcups_detail->itemp);
-       apc_submit_generic ("apcups_frequency",  "input",   apcups_detail->linefreq);
+       apc_submit_generic ("voltage",    "input",   apcups_detail->linev);
+       apc_submit_generic ("voltage",    "output",  apcups_detail->outputv);
+       apc_submit_generic ("voltage",    "battery", apcups_detail->battv);
+       apc_submit_generic ("charge",     "",        apcups_detail->bcharge);
+       apc_submit_generic ("percent",    "charge",  apcups_detail->loadpct);
+       apc_submit_generic ("timeleft",   "",        apcups_detail->timeleft);
+       apc_submit_generic ("temperature", "",       apcups_detail->itemp);
+       apc_submit_generic ("frequency",  "input",   apcups_detail->linefreq);
  }
  
  static int apcups_read (void)