Merge commit 'upstream/2.6.3' into debian

2012-01-24 11:22:35 +01:00 · 2012-01-24 11:22:35 +01:00 · 40fd3ef098
commit 40fd3ef098
parent 0d4527e4ff fad6ced6f6
255 changed files with 11081 additions and 4629 deletions
--- a/453
+++ b/453
@ -1,5 +1,458 @@
+2012-01-04  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3371] docs/website/news.txt: Update 2.6.3 release date
+
+2012-01-03  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3370] NEWS, UPGRADING, configure.in, docs/website/news.txt:
+	  Final update for 2.6.3 release
+
+2012-01-03  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3369] docs/config-notes.txt: Add a note about file names with
+	  space characters in the documentation.
+
+2012-01-03  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3368] drivers/dummy-ups.c: Add a comment for further processing
+
+2012-01-03  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3367] tools/nut-scanner/nut-scanner.c: Fix nut scanner SNMP v3
+	  help message.
+	* [r3366] docs/man/nut-scanner.txt: Fix nut scanner SNMP v3
+	  documentation.
+
+2011-12-17  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3364] drivers/blazer_usb.c: Actually apply the langid_fix
+	  value, when calling usb_get_string (reported by Charles Lepple)
+	* [r3363] data/driver.list.in, docs/man/blazer.txt,
+	  drivers/blazer_usb.c: Try to fix language ID support for USB
+	  units from LDLC, Dynamix and no names in blazer_usb (reworked
+	  patch, from Brian R. Smith and Aurélien Grenotton)
+
+2011-12-16  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3362] scripts/HP-UX: Add the generated HP-UX packaging script
+	  (.psf) to the list of Subversion ignored files
+	* [r3361] drivers/eaton-mib.c, drivers/snmp-ups.c: Fix newer Eaton
+	  ePDU OIDs declaration ordering, so that it better supports the
+	  various models (switched or advanced monitored)
+
+2011-12-15  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3360] clients/upsclient.c, drivers/belkinunv.c,
+	  drivers/etapro.c, drivers/gamatronic.c, drivers/isbmex.c,
+	  drivers/libshut.c, drivers/metasys.c, drivers/mge-shut.c,
+	  drivers/microdowell.c, drivers/nut-libfreeipmi.c,
+	  drivers/rhino.c, drivers/solis.c: Fix set but not used variables
+	  [-Wunused-but-set-variable] (including patch from Regid Ichira)
+
+2011-12-13  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3359] Makefile.am, configure.in, docs/man,
+	  docs/man/Makefile.am, docs/man/nutscan_init.txt,
+	  docs/man/nutscan_scan_avahi.txt, docs/man/nutscan_scan_ipmi.txt,
+	  docs/man/nutscan_scan_nut.txt, docs/man/nutscan_scan_snmp.txt,
+	  docs/man/nutscan_scan_usb.txt,
+	  docs/man/nutscan_scan_xml_http.txt, drivers/nut-libfreeipmi.c,
+	  m4/nut_check_libfreeipmi.m4, m4/nut_check_libltdl.m4,
+	  tools/nut-scanner/Makefile.am, tools/nut-scanner/nut-scan.h,
+	  tools/nut-scanner/nut-scanner.c,
+	  tools/nut-scanner/nutscan-init.c,
+	  tools/nut-scanner/nutscan-init.h, tools/nut-scanner/scan_avahi.c,
+	  tools/nut-scanner/scan_ipmi.c, tools/nut-scanner/scan_nut.c,
+	  tools/nut-scanner/scan_snmp.c, tools/nut-scanner/scan_usb.c,
+	  tools/nut-scanner/scan_xml_http.c: Merge nut-scanner_dlopen
+	  branch, at revision 3358. This brings weak runtime dependencies
+	  to nut-scanner, allowing to compile with all options and to run
+	  according to the available dependencies. It also adds IPMI scan
+	* [r3358] compile: Update compile script, as per the latest version
+	  available in Automake (1.11)
+
+2011-12-05  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3341] data/driver.list.in, docs/man/snmp-ups.txt,
+	  drivers/Makefile.am, drivers/cyberpower-mib.c,
+	  drivers/cyberpower-mib.h, drivers/snmp-ups.c: Add Cyber Power
+	  Systems with SNMP RMCARD (100, 201, 202 and 301) to the list of
+	  snmp-ups supported models (patch from Eric Schultz)
+	* [r3340] drivers/snmp-ups.c: Remove the Eaton Marlin hook, for
+	  base outlet index, since it has been fixed by a new firmware
+	  revision
+
+2011-11-29  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3338] tools/nut-snmpinfo.py: Fix indentation and use open()
+	  instead of file(), to better support Python 3 (Alioth bug
+	  #313446, patch from Bohdan Popovych)
+
+2011-11-25  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3335] drivers/nut-ipmi.h: Fix wrong prototype declaration, that
+	  was causing a compilation warning (implicit declaration of
+	  function ‘nut_ipmi_get_sensors_status’)
+
+2011-11-24  Prachi Gandhi <prachi-guest@alioth.debian.org>
+
+	* [r3328] Makefile.am, configure.in, scripts/Makefile.am,
+	  scripts/Solaris: Reverted changes made for Solaris packaging
+	  files(revision 3326), added files in NUT_packaging branch
+	* [r3326] Makefile.am, configure.in, scripts/Makefile.am,
+	  scripts/Solaris, scripts/Solaris/Makefile.am,
+	  scripts/Solaris/makelocal.sh, scripts/Solaris/pkginfo.in,
+	  scripts/Solaris/prototype: Solaris NUT package files added
+
+2011-11-15  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3321] drivers/blazer_usb.c, drivers/usb-common.h: Revert commit
+	  r2993 and r2994. This enables again inclusion of buggy USB Device
+	  and Vendor IDs, supported by blazer_usb, in udev rules file
+	  (Reported by Stanislav Brabec, from Suse)
+	* [r3320] tools/Makefile.am: Add missing comment
+
+2011-11-12  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3318] drivers/mge-mib.c: Add upsmgBatteryLowCondition OID to
+	  the status mapping (reported by Kiss Gabor (Bitman))
+
+2011-11-11  Praveen Kumar <praveenkumar-guest@alioth.debian.org>
+
+	* [r3317] scripts/HP-UX/makedepot.sh: script file to create package
+	  (depot) for HP-UX
+
+2011-11-08  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3316] docs/website/web-layout.conf: Complete search keywords
+	* [r3315] docs/website/web-layout.conf: Final fix for the
+	  displaying of the legend, to work on all browsers, while still
+	  being conforming to W3C validation
+
+2011-11-07  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3314] docs/website/web-layout.conf: Fix displaying of the
+	  legend
+
+2011-11-05  Michal Soltys <msoltyspl-guest@alioth.debian.org>
+
+	* [r3313] docs/cables.txt, docs/man/apcsmart.txt: apcsmart.txt:
+	  minor documentation update
+	  
+	  Broken diagram link and 940-0024E cable mention (reported by
+	  Jonathan
+	  Laventhol).
+
+2011-11-05  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3312] conf/upsd.conf.sample, server/upsd.c: Don't fail to start
+	  if at least one of the listening interface is available. This is
+	  needed on systems where either IPv4 or IPv6 is disabled, and no
+	  explicit LISTEN directive has been specified (Reported by Pavel
+	  Zubkou, Debian bug #598741)
+
+2011-11-02  Praveen Kumar <praveenkumar-guest@alioth.debian.org>
+
+	* [r3310] configure.in, scripts/HP-UX/nut.psf.in: Adding packaging
+	  script for HPUX
+
+2011-10-31  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3308] docs/download.txt, docs/website/news.txt: Publish update
+	  jNut 0.2, along with the new jNutWebAPI (contributed by Emilien
+	  Kia, from Eaton)
+
+2011-10-28  Emilien Kia <emilienkia-guest@alioth.debian.org>
+
+	* [r3306] scripts/java/README, scripts/java/jNutWebAPI,
+	  scripts/java/jNutWebAPI/README, scripts/java/jNutWebAPI/pom.xml,
+	  scripts/java/jNutWebAPI/src, scripts/java/jNutWebAPI/src/main,
+	  scripts/java/jNutWebAPI/src/main/java,
+	  scripts/java/jNutWebAPI/src/main/java/org,
+	  scripts/java/jNutWebAPI/src/main/java/org/networkupstools,
+	  scripts/java/jNutWebAPI/src/main/java/org/networkupstools/jnutwebapi,
+	  scripts/java/jNutWebAPI/src/main/java/org/networkupstools/jnutwebapi/NutRestProvider.java,
+	  scripts/java/jNutWebAPI/src/main/java/org/networkupstools/jnutwebapi/RestWSApplication.java,
+	  scripts/java/jNutWebAPI/src/main/java/org/networkupstools/jnutwebapi/ScannerProvider.java,
+	  scripts/java/jNutWebAPI/src/main/resources,
+	  scripts/java/jNutWebAPI/src/main/webapp,
+	  scripts/java/jNutWebAPI/src/main/webapp/WEB-INF,
+	  scripts/java/jNutWebAPI/src/main/webapp/WEB-INF/web.xml,
+	  scripts/java/jNutWebAPI/src/test,
+	  scripts/java/jNutWebAPI/src/test/java,
+	  scripts/java/jNutWebAPI/src/test/java/org,
+	  scripts/java/jNutWebAPI/src/test/java/org/networkupstools,
+	  scripts/java/jNutWebAPI/src/test/java/org/networkupstools/jnutwebapi:
+	  Initial commit of jNutWebAPI.
+	* [r3305] scripts/java/jNut,
+	  scripts/java/jNut/src/main/java/org/networkupstools/jnut/Scanner.java:
+	  Fix a little bug with function namming (get instead of set).
+
+2011-10-27  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3304] docs/maintainer-guide.txt: Create a basic NUT maintainer
+	  guide, to start tracking and improving maintenance workflow
+	* [r3303] drivers/bcmxcp_usb.c: Handle disconnection issues and
+	  reconnection mechanism (bug reported by Rich Wrenn)
+
+2011-10-25  Emilien Kia <emilienkia-guest@alioth.debian.org>
+
+	* [r3302]
+	  scripts/java/jNut/src/test/java/org/networkupstools/jnut/ClientTest.java:
+	  Add licence information.
+	* [r3301] scripts/java/jNut/README, scripts/java/jNut/pom.xml,
+	  scripts/java/jNut/src/main/java/org/networkupstools/jnut/Scanner.java,
+	  scripts/java/jNut/src/test/java/org/networkupstools/jnut/ScannerTest.java:
+	  Add nut-scanner.
+
+2011-10-25  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3300] tools/nut-scanner/scan_snmp.c: Add sanity checks
+	* [r3299] tools/nut-scanner/scan_avahi.c: Remove unused variable
+
+2011-10-25  Michal Soltys <msoltyspl-guest@alioth.debian.org>
+
+	* [r3298] drivers/apcsmart.c: drivers/apcsmart.c: minor correction
+	  
+	  Assigning 0 directly was wrong (actually, a leftover from earlier
+	  version of the code that was removed) - ser_set_speed() prepares
+	  the
+	  port initially, we only adjust certain options.
+
+2011-10-24  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3297] docs/man/nut-scanner.txt,
+	  tools/nut-scanner/nut-scanner.c: Forgot to document "-q" option
+	  (thanks to Emilien Kia for reporting this)
+
+2011-10-21  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3296] tools/nut-scanner/nut-scanner.c: Trivial layout
+	  consistency
+	* [r3295] docs/man/nut-scanner.txt: Update man page with -V and -a
+	  option
+	* [r3294] tools/nut-scanner/nut-scanner.c: Add an option to display
+	  available bus (usefull for wrapper).
+	* [r3293] tools/nut-scanner/nut-scanner.c: return -1 on bad command
+	  line option
+
+2011-10-19  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3292] tools/nut-scanner/nutscan-ip.c: Fix crash on 32bits
+	  systems
+	* [r3291] tools/nut-scanner/nut-scanner.c: Add a switch to display
+	  NUT version.
+
+2011-10-19  Charles Lepple <clepple+nut@gmail.com>
+
+	* [r3290] docs/FAQ.txt: Add FAQ entry for LISTEN directive
+
+2011-10-18  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3289] drivers/eaton-mib.c: Fix outlets reported current, which
+	  were off by 100 in aphel_genesisII MIB, and bump MIB version to
+	  0.46 (patch from Sven Nilsson)
+
+2011-10-14  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3288] docs/Makefile.am, docs/images/nut-logo.png,
+	  docs/images/nut.svg, docs/website/Makefile.am,
+	  docs/website/css/web-layout.css, docs/website/faviconut.ico,
+	  docs/website/faviconut.png, docs/website/web-layout.conf: Add the
+	  new NUT logo (contributed by Luc Descotils, from Eaton)
+	* [r3287] docs/website/web-layout.conf: Fix another W3C validator
+	  error (there is no attribute "language" anymore for <script> in
+	  XHTML 1.1)
+	* [r3286] data/driver.list.in: Remove redundant entry, that
+	  probably causes a W3C validator error (end tag for "tr" which is
+	  not finished)
+	* [r3285] tools/Makefile.am: Only generate static and JSON HCL if
+	  we can import json, simplejson and lxml Python modules
+	* [r3284] docs/Makefile.am: Remove the user manual dependency on
+	  static HCL, which broke Buildbot
+	* [r3283] configure.in, docs/Makefile.am, docs/download.txt,
+	  docs/website/Makefile.am: Automate generation of the version
+	  release information, in the Download section. This is a rewritten
+	  version of commit 3272, this time using Asciidoc mechanism
+	  instead of Autoconf
+	* [r3282] Makefile.am, docs/Makefile.am, tools/Makefile.am,
+	  tools/nut-hclinfo.py: Add static HCL as a user manual dependency,
+	  along with the needed build rules
+
+2011-10-14  Charles Lepple <clepple+nut@gmail.com>
+
+	* [r3281] include/Makefile.am: nut_version.h: grab Git revision, if
+	  any
+
+2011-10-13  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3280] docs/configure.txt: Add missing --with-avahi
+	  documentation
+	* [r3279] docs/Makefile.am, docs/developer-guide.txt,
+	  tools/nut-scanner, tools/nut-scanner/README,
+	  tools/nut-scanner/nut-scan.h: Add a 'NUT device discovery'
+	  chapter to the developer guide, to document libnutscan
+	* [r3278] configure.in: Enable Avahi automatic support, upon
+	  detection
+	* [r3277] docs/man, docs/man/Makefile.am, docs/man/index.txt,
+	  docs/man/nutscan.txt: Add an overview manpage for libnutscan
+	* [r3276] configure.in, docs/Makefile.am, docs/download.txt,
+	  docs/download.txt.in: Revert commit 3272, which breaks
+	  distribution check, while waiting for a suitable solution
+
+2011-10-13  Charles Lepple <clepple+nut@gmail.com>
+
+	* [r3275] docs/man/nut-scanner.txt: nut-scanner.txt: spelling and
+	  style edits
+
+2011-10-13  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3274] docs/man/nut-scanner.txt: Add examples to nut-scanner man
+	  page
+
+2011-10-12  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3273] docs: Mark download.txt as Subversion ignored, since it
+	  is now generated automatically (no functional changes)
+
+2011-10-11  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3272] configure.in, docs/Makefile.am, docs/download.txt,
+	  docs/download.txt.in: Automate generation of the stable release
+	  information, in the Download section
+
+2011-10-10  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3271] drivers/nut-libfreeipmi.c,
+	  tools/nut-scanner/scan_avahi.c: Replace <time.h> inclusion by
+	  "timehead.h", as per NUT coding standard (Reported by Prachi
+	  Gandhi, from Eaton)
+
+2011-10-10  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3270] docs/man/nut-scanner.txt,
+	  tools/nut-scanner/nut-scanner.c: Add CIDR option manual
+
+2011-10-10  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3269] scripts/upower/95-upower-hid.rules: Update upower script
+	  with Powercom entry
+	* [r3268] docs/website/projects.txt: Advertise more the official
+	  Windows port, with regard to WinNUT
+	* [r3267] Makefile.am: Force ChangeLog regeneration upon make dist,
+	  in case it has already been generated previously
+
+2011-10-06  Charles Lepple <clepple+nut@gmail.com>
+
+	* [r3266] docs/support.txt: Reduce recommended debug level from 5
+	  to 2 in Support page.
+
+2011-10-05  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3265] data/driver.list.in, drivers/powercom-hid.c: Add Powercom
+	  BNT-xxxAP (productID 0004) to the list of usbhid-ups supported
+	  models (reported by Virus, on Ubuntu Launchpad)
+
+2011-09-30  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3264] data/driver.list.in: Add Belkin F6S600auUSB to the list
+	  of blazer_usb supported models (reported by Simon Dwyer)
+
+2011-09-26  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3260] conf/upsd.conf.sample: Complete LISTEN information, with
+	  regard to IP v4 or v6 disabled kernel (reported by Pavel Zubkou,
+	  Debian bug #598741)
+	* [r3259] clients/Makefile.am: Fix forgotten update of libupsclient
+	  version information (bump from 1:0:0 to 2:0:1)
+	* [r3258] docs/man/bcmxcp.txt, docs/man/blazer.txt,
+	  docs/man/dummy-ups.txt: Fix spelling and typo errors (patch from
+	  Laurent Bigonville, Debian)
+	* [r3257] tools/nut-scanner/scan_xml_http.c: Fix remaining
+	  compilation errors on FreeBSD, due to missing <netinet/in.h>
+	  header inclusion
+
+2011-09-26  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3256] tools/nut-scanner/nutscan-ip.c: Remove AI_NUMERICSERV
+	  since it's useless and produces compile error on some systems.
+	* [r3255] tools/nut-scanner/nutscan-ip.h: Try to fix FreeBSD build
+
+2011-09-23  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3254] docs/config-notes.txt: Add a note on nut-scanner
+	  availability
+	* [r3253] docs: Mark some forgotten generated HTML files as
+	  Subversion ignored files (no functional changes)
+	* [r3252] docs/Makefile.am, docs/developer-guide.txt,
+	  docs/new-clients.txt, lib/README: Complete lib/README and convert
+	  it to Asciidoc, as 'Appendix B: NUT libraries complementary
+	  information'
+	* [r3251] configure.in, docs/macros.txt, docs/man/Makefile.am,
+	  docs/website/Makefile.am, drivers/Makefile.am,
+	  m4/nut_check_libfreeipmi.m4, m4/nut_check_libwrap.m4,
+	  m4/nut_report_feature.m4, tools/nut-scanner/Makefile.am,
+	  tools/nut-scanner/nut-scan.h, tools/nut-scanner/nut-scanner.c,
+	  tools/nut-scanner/scan_avahi.c, tools/nut-scanner/scan_ipmi.c,
+	  tools/nut-scanner/scan_snmp.c, tools/nut-scanner/scan_usb.c:
+	  Rework the whole HAVE_<FEATURE> versus WITH_<FEATURE> logic,
+	  which is not suitable anymore since nut-scanner. Previously, we
+	  only defined an automake variable (AM_CONDITIONAL) that allowed
+	  to compile coherent set of features (a specific driver, for
+	  example). With nut-scanner, we also need a pre-processor macro
+	  (AC_DEFINE) to manage code activation inside of a feature. The
+	  NUT_REPORT_FEATURE macro has been modified to handle all this
+	  logic
+
+2011-09-23  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3250] tools/nut-scanner/nutscan-ip.c,
+	  tools/nut-scanner/nutscan-ip.h, tools/nut-scanner/scan_snmp.c,
+	  tools/nut-scanner/scan_xml_http.c: Replace calls to inet_*
+	  functions by equivalent getaddrinfo and getnameinfo for
+	  portability
+
+2011-09-22  Frederic Bohe <fbohe-guest@alioth.debian.org>
+
+	* [r3249] tools/nut-scanner/nut-scanner.c: Move a pthread variable
+	  to a #ifdef HAVE_PTHREAD section.
+
+2011-09-20  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3248] server/Makefile.am, server/ctype.h, server/netcmds.h,
+	  server/netget.c, server/netget.h, server/netinstcmd.c,
+	  server/netinstcmd.h, server/netlist.c, server/netlist.h,
+	  server/netmisc.c, server/netmisc.h, server/netset.c,
+	  server/netset.h, server/netuser.c, server/netuser.h,
+	  server/nut_ctype.h, server/ssl.c, server/ssl.h, server/upsd.c,
+	  server/upsd.h: Rename upsd internal client structure and header
+	  from ctype_t to nut_ctype_t. This avoids namespace conflict on
+	  Aix, and is more suitable in general
+
+2011-09-18  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3247] docs/man/nutupsdrv.txt: Add the missing '-q' option
+	  (closes Alioth patch #301145)
+	* [r3246] tools/nut-scanner/Makefile.am: Distribute the needed
+	  headers for libnutscan
+	* [r3245] configure.in, lib, lib/Makefile.am, lib/libnutscan.pc.in:
+	  Add pkg-config support for libnutscan
+	* [r3244] common/Makefile.am: Remove extraneous space
+
+2011-09-17  Arnaud Quette <arnaud.quette@free.fr>
+
+	* [r3243] docs/developer-guide.txt, docs/man/dummy-ups.txt:
+	  Complete device simulation and recording information
+	* [r3242] docs/man/index.txt: Add nut-scanner and libnutscan
+	  entries to the manual pages index
+	* [r3241] docs/man: Mark some more generated HTML files as a
+	  Subversion ignored files (no functional changes)
+
 2011-09-15  Arnaud Quette <arnaud.quette@free.fr>

+	* [r3239] docs/download.txt: Add the missing SHA-256 sum on the
+	  Download page / section (need to be generated after the
+	  distribution package)
 	* [r3238] drivers/nut-ipmipsu.c, drivers/nut-libfreeipmi.c: Don't
 	  override PSU absence with the power failure flag
 	* [r3237] NEWS, UPGRADING, configure.in, docs/download.txt,
--- a/Makefile.am
+++ b/Makefile.am
@ -4,9 +4,9 @@
 ACLOCAL_AMFLAGS = -I m4

 # subdirectories to build and distribute. The order matters, as
-# several subdirectories depend on stuff in "common" being built first
-SUBDIRS = include common clients conf data docs drivers lib	\
-  tools scripts server
+# several subdirectories depend on stuff in "common" or tools being built first
+SUBDIRS = include common clients conf data tools docs drivers \
+  lib scripts server

 # COPYING is included automatically.
 EXTRA_DIST = LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING
@ -37,7 +37,10 @@ distcleancheck:

 # Automatically generate the ChangeLog from SVN logs:
 MAINTAINERCLEAN_FILES = ChangeLog
-ChangeLog: tools/svn2cl.authors
+# Force ChangeLog regeneration upon make dist (due to inexistant 'dummy-stamp'),
+# in case it has already been generated previously
+dummy-stamp:
+ChangeLog: tools/svn2cl.authors dummy-stamp
 	svn2cl --group-by-day --include-rev --authors=$< --revision 'HEAD:2332' --output=$@ || \
 		echo "svn2cl failed to generate the ChangeLog. See http://trac.networkupstools.org/projects/nut/timeline" > $@

--- a/Makefile.in
+++ b/Makefile.in
@ -39,6 +39,7 @@ target_triplet = @target@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	$(top_srcdir)/scripts/HP-UX/nut.psf.in \
 	$(top_srcdir)/scripts/avahi/nut.service.in AUTHORS COPYING \
 	ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
 	depcomp install-sh ltmain.sh missing
@ -53,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -70,7 +72,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES = scripts/avahi/nut.service
+CONFIG_CLEAN_FILES = scripts/avahi/nut.service scripts/HP-UX/nut.psf
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@ -145,6 +147,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -177,6 +180,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -197,6 +202,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -228,12 +234,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -269,7 +277,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@ -298,9 +305,9 @@ udevdir = @udevdir@
 ACLOCAL_AMFLAGS = -I m4

 # subdirectories to build and distribute. The order matters, as
-# several subdirectories depend on stuff in "common" being built first
-SUBDIRS = include common clients conf data docs drivers lib	\
-  tools scripts server
+# several subdirectories depend on stuff in "common" or tools being built first
+SUBDIRS = include common clients conf data tools docs drivers \
+  lib scripts server


 # COPYING is included automatically.
@ -364,6 +371,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 scripts/avahi/nut.service: $(top_builddir)/config.status $(top_srcdir)/scripts/avahi/nut.service.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+scripts/HP-UX/nut.psf: $(top_builddir)/config.status $(top_srcdir)/scripts/HP-UX/nut.psf.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@

 mostlyclean-libtool:
 	-rm -f *.lo
@ -803,7 +812,10 @@ distcheck-light:
 #	find . -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
 distcleancheck:
 	@:
-ChangeLog: tools/svn2cl.authors
+# Force ChangeLog regeneration upon make dist (due to inexistant 'dummy-stamp'),
+# in case it has already been generated previously
+dummy-stamp:
+ChangeLog: tools/svn2cl.authors dummy-stamp
 	svn2cl --group-by-day --include-rev --authors=$< --revision 'HEAD:2332' --output=$@ || \
 		echo "svn2cl failed to generate the ChangeLog. See http://trac.networkupstools.org/projects/nut/timeline" > $@

--- a/51
+++ b/51
@ -2,6 +2,57 @@ If you're upgrading from an earlier version, see the UPGRADING file.

 For a complete list of changes, please refer to the ChangeLog file.

+---------------------------------------------------------------------------
+Release notes for NUT 2.6.3 - what's new since 2.6.2:
+
+ - nut-scanner is now more portable, and provides more coherent option names.
+   IPMI support has also been added, to discover local power supplies.
+   This version brings weak runtime dependencies in libnutscan, which allows to
+   compile nut-scanner with all options and to run according to the available
+   dependencies (USB, SNMP, IPMI, ...).
+
+ - libnutscan now provides pkg-config support and the needed header files are
+   distributed. Some documentation is also available in the developer guide and
+   manual pages have been updated and completed.
+
+ - support for new devices: Cyber Power Systems with SNMP RMCARD (100, 201,
+   202 and 301) ; Dynamix 650VA USB ; LDLC UPS-1200D ; Tecnoware UPS ERA LCD
+   0.65 ; Powercom BNT-xxxAP (USB ID 0d9f:0004) ; Various USB devices using
+   UPSilon 2000 software.
+
+ - apcsmart has received minor correction.
+
+ - bcmxcp_usb now handles disconnection issues and reconnection mechanism.
+
+ - blazer_usb enables again inclusion of buggy USB Device and Vendor IDs in
+   udev rules file ; language ID support has been added for USB units from
+   LDLC, Dynamix and other no names.
+
+ - nut-ipmipsu has also received some improvements.
+
+ - snmp-ups has fixed outlets reported current in aphel_genesisII MIB ;
+   MGE 3 phases handles better low battery condition ; support for Cyber Power
+   Systems with SNMP RMCARD has been added ; support of the newer Eaton ePDUs
+   has been improved.
+
+ - upsd doesn't anymore fail to start if at least one of the listening
+   interface is available. This is needed on systems where either IPv4 or IPv6
+   is disabled, and no explicit LISTEN directive has been specified.
+
+ - Avahi support is now automatically enabled, upon detection
+
+ - jNut (NUT Java interface) adds device discovery support, through a
+   nut-scanner wrapper ; jNutWebAPI, a HTTP/JSON web service interface, has
+   also been added to interact with upsd and nut-scanner.
+
+ - Base files for HPUX packaging have been added. This is still a work in
+   progress.
+
+ - Compilation on IBM Aix has been fixed (namespace conflict with ctypes).
+ 
+ - more bugfixes, cleanup and improvements, on both source code and
+   documentation.
+ 
 ---------------------------------------------------------------------------
 Release notes for NUT 2.6.2 - what's new since 2.6.1:

--- a/5
+++ b/5
@ -7,6 +7,11 @@ This file lists changes that affect users who installed older versions
 of this software.  When upgrading from an older version, be sure to
 check this file to see if you need to make changes to your system.

+Changes from 2.6.2 to 2.6.3
+---------------------------
+
+- nothing that affects upgraded systems.
+
 Changes from 2.6.1 to 2.6.2
 ---------------------------

--- a/aclocal.m4
+++ b/aclocal.m4
@ -13,8 +13,8 @@

 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -154,7 +154,8 @@ AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@ -200,7 +201,8 @@ m4_define([_PKG_CONFIG],
    pkg_cv_[]$1="$$1"
 elif test -n "$PKG_CONFIG"; then
    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
 else
    pkg_failed=untried
@ -248,9 +250,9 @@ if test $pkg_failed = yes; then
   	AC_MSG_RESULT([no])
        _PKG_SHORT_ERRORS_SUPPORTED
        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@ -1301,6 +1303,7 @@ m4_include([m4/nut_check_libavahi.m4])
 m4_include([m4/nut_check_libfreeipmi.m4])
 m4_include([m4/nut_check_libgd.m4])
 m4_include([m4/nut_check_libhal.m4])
+m4_include([m4/nut_check_libltdl.m4])
 m4_include([m4/nut_check_libneon.m4])
 m4_include([m4/nut_check_libnetsnmp.m4])
 m4_include([m4/nut_check_libpowerman.m4])
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@ -50,4 +50,4 @@ libupsclient_la_LIBADD = ../common/libparseconf.la
 if WITH_SSL
  libupsclient_la_LIBADD += $(LIBSSL_LIBS)
 endif
-libupsclient_la_LDFLAGS = -version-info 1:0:0
+libupsclient_la_LDFLAGS = -version-info 2:0:1
--- a/clients/Makefile.in
+++ b/clients/Makefile.in
@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -207,6 +208,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -239,6 +241,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -259,6 +263,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -290,12 +295,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -331,7 +338,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@ -384,7 +390,7 @@ upsstats_cgi_SOURCES = upsstats.c upsclient.h status.h upsstats.h	\
 # not LDADD.
 libupsclient_la_SOURCES = upsclient.c upsclient.h
 libupsclient_la_LIBADD = ../common/libparseconf.la $(am__append_4)
-libupsclient_la_LDFLAGS = -version-info 1:0:0
+libupsclient_la_LDFLAGS = -version-info 2:0:1
 all: all-am

 .SUFFIXES:
--- a/clients/upsclient.c
+++ b/clients/upsclient.c
@ -401,7 +401,6 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 	char			sport[NI_MAXSERV];
 	int			v;
 	fd_set 			wfds;
-	int			ret;
 	int			error;
 	socklen_t		error_size;
 	long			fd_flags;
@ -483,7 +482,7 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
 			if(errno == EINPROGRESS) {
 				FD_ZERO(&wfds);
 				FD_SET(sock_fd, &wfds);
-				ret = select(sock_fd+1,NULL,&wfds,NULL,
+				select(sock_fd+1,NULL,&wfds,NULL,
 						timeout);
 				if (FD_ISSET(sock_fd, &wfds)) {
 					error_size = sizeof(error);
--- a/common/Makefile.am
+++ b/common/Makefile.am
@ -8,7 +8,7 @@ AM_CFLAGS = -I$(top_srcdir)/include
 FORCE:

 noinst_LTLIBRARIES = libparseconf.la libcommon.la
-libparseconf_la_SOURCES =  parseconf.c
+libparseconf_la_SOURCES = parseconf.c

 libcommon_la_SOURCES = common.c state.c upsconf.c ../include/nut_version.h
 # ensure inclusion of local implementation of missing systems functions
--- a/common/Makefile.in
+++ b/common/Makefile.in
@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -113,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -145,6 +147,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -165,6 +169,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -196,12 +201,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -237,7 +244,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- a/21
+++ b/21
@ -1,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.

-scriptversion=2005-05-14.22
+scriptversion=2009-10-06.20; # UTC

-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
 fi

 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`

 # Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
 ret=$?

 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi

 rmdir "$lockdir"
@ -138,5 +138,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
--- a/conf/Makefile.in
+++ b/conf/Makefile.in
@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -118,6 +119,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -150,6 +152,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -170,6 +174,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -201,12 +206,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -242,7 +249,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- a/conf/upsd.conf.sample
+++ b/conf/upsd.conf.sample
@ -3,6 +3,8 @@
 # This file contains access control data, you should keep it secure.
 #
 # It should only be readable by the user that upsd becomes.  See the FAQ.
+#
+# Each entry below provides usage and default value.

 # =======================================================================
 # MAXAGE <seconds>
@ -27,9 +29,12 @@
 # =======================================================================
 # LISTEN <address> [<port>]
 # LISTEN 127.0.0.1 3493
+# LISTEN ::1 3493
 #
-# This defaults to the localhost listening address and port 3493.  You
-# may specify each interface you want upsd to listen on for connections,
+# This defaults to the localhost listening addresses and port 3493.
+# In case of IP v4 or v6 disabled kernel, only the available one will be used.
+#
+# You may specify each interface you want upsd to listen on for connections,
 # optionally with a port number.
 #
 # You may need this if you have multiple interfaces on your machine and
--- a/config.guess
+++ b/config.guess
@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.

-timestamp='2009-12-30'
+timestamp='2011-05-11'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -57,7 +57,7 @@ GNU config.guess ($timestamp)

 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
    *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    # MiNT.  But MiNT is downward compatible to TOS, so this should
    # be no problem.
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@ -481,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@ -495,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@ -552,7 +555,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@ -595,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c

-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>

-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);

-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@ -731,22 +734,22 @@ EOF
 	exit ;;
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
    CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@ -770,14 +773,14 @@ EOF
 	exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@ -805,14 +808,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
    *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@ -867,7 +870,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@ -879,7 +882,13 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
@ -892,7 +901,7 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	LIBC=gnu
@ -960,7 +969,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -968,6 +977,9 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@ -975,7 +987,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -984,11 +996,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
    i*86:OS/2:*:*)
@ -1020,7 +1032,7 @@ EOF
 	fi
 	exit ;;
    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@ -1048,13 +1060,13 @@ EOF
 	exit ;;
    pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@ -1089,8 +1101,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@ -1133,10 +1145,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
    *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@ -1162,11 +1174,11 @@ EOF
 	exit ;;
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@ -1231,6 +1243,9 @@ EOF
    *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
    NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@ -1276,13 +1291,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@ -1322,11 +1337,11 @@ main ()
 #include <sys/param.h>
  printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif

--- a/config.sub
+++ b/config.sub
@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.

-timestamp='2010-01-22'
+timestamp='2011-03-23'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -76,7 +76,7 @@ version="\
 GNU config.sub ($timestamp)

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@ -124,8 +124,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
@ -157,8 +158,8 @@ case $os in
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@ -174,10 +175,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@ -282,11 +283,13 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
 	| rx \
 	| score \
@ -294,15 +297,24 @@ case $basic_machine in
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@ -314,6 +326,18 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;

+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@ -334,7 +358,7 @@ case $basic_machine in
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@ -368,26 +392,28 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
 	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@ -412,7 +438,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@ -482,11 +508,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@ -518,7 +553,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@ -734,7 +769,7 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@ -841,6 +876,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@ -923,9 +964,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@ -1019,6 +1061,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@ -1075,20 +1120,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-        # This must be matched before tile*.
-        tilegx*)
+	# This must be matched before tile*.
+	tilegx*)
 		basic_machine=tilegx-unknown
 		os=-linux-gnu
 		;;
@ -1163,6 +1196,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@ -1260,11 +1296,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@ -1301,7 +1337,8 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@ -1348,7 +1385,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@ -1397,7 +1434,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@ -1442,8 +1479,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@ -1466,10 +1503,10 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@ -1481,8 +1518,17 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@ -1509,7 +1555,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@ -1536,7 +1582,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
--- a/3643
+++ b/3643
--- a/configure.in
+++ b/configure.in
@ -3,7 +3,7 @@ dnl | Network UPS Tools: configure.in                                  |
 dnl +------------------------------------------------------------------+

 dnl NUT version number is defined here and *only* here (no more include/version)
-AC_INIT(nut, 2.6.2)
+AC_INIT(nut, 2.6.3)
 AC_CONFIG_SRCDIR(server/upsd.c)
 AC_CONFIG_MACRO_DIR([m4])
 echo "Network UPS Tools version ${PACKAGE_VERSION}"
@ -35,6 +35,11 @@ dnl # reason is that the SVN revision should be computed at compile time,
 dnl # not configure time.
 dnl AC_DEFINE_UNQUOTED(UPS_VERSION, "${PACKAGE_VERSION}", [NUT version])

+dnl However, automatically define the tree version (mostly for AC_SUBST)
+TREE_VERSION="`echo ${PACKAGE_VERSION} | awk '{ print substr($0,1,3) }'`"
+AC_DEFINE_UNQUOTED(TREE_VERSION, "${TREE_VERSION}", [NUT tree version])
+
+
 dnl Fix this early so we can expand with eval later
 test "${prefix}" = "NONE" && prefix="${ac_default_prefix}"
 test "${exec_prefix}" = "NONE" && exec_prefix='${prefix}'
@ -210,6 +215,7 @@ NUT_ARG_WITH([dev], [build and install the development files], [no])
 NUT_ARG_WITH([serial], [build and install serial drivers], [yes])
 NUT_ARG_WITH([usb], [build and install USB drivers], [auto])
 NUT_ARG_WITH([doc], [build and install documentation], [no])
+NUT_ARG_WITH([avahi], [build and install Avahi support], [auto])

 dnl ----------------------------------------------------------------------
 dnl Check for presence and compiler flags of various libraries
@ -255,8 +261,9 @@ dnl ${nut_with_serial}: any value except "yes" or "no" is treated as "auto".
 if test "${nut_with_serial}" != "no"; then
  nut_with_serial="yes"
 fi
-AM_CONDITIONAL(WITH_SERIAL, test "${nut_with_serial}" = "yes")
-NUT_REPORT_FEATURE([build serial drivers], [${nut_with_serial}])
+
+NUT_REPORT_FEATURE([build serial drivers], [${nut_with_serial}], [],
+					[WITH_SERIAL], [Define to enable serial support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-usb
@ -270,8 +277,8 @@ if test "${nut_with_usb}" != "no"; then
   nut_with_usb="${nut_have_libusb}"
 fi

-AM_CONDITIONAL(WITH_USB, test "${nut_with_usb}" = "yes")
-NUT_REPORT_FEATURE([build USB drivers], [${nut_with_usb}])
+NUT_REPORT_FEATURE([build USB drivers], [${nut_with_usb}], [],
+					[WITH_USB], [Define to enable USB support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-snmp
@ -285,8 +292,8 @@ if test "${nut_with_snmp}" != "no"; then
   nut_with_snmp="${nut_have_libnetsnmp}"
 fi

-AM_CONDITIONAL(WITH_SNMP, test "${nut_with_snmp}" = "yes")
-NUT_REPORT_FEATURE([build SNMP drivers], [${nut_with_snmp}])
+NUT_REPORT_FEATURE([build SNMP drivers], [${nut_with_snmp}], [],
+					[WITH_SNMP], [Define to enable SNMP support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-neon
@ -300,11 +307,8 @@ if test "${nut_with_neon}" != "no"; then
   nut_with_neon="${nut_have_neon}"
 fi

-AM_CONDITIONAL(WITH_NEONXML, test "${nut_with_neon}" = "yes")
-NUT_REPORT_FEATURE([build neon based XML driver], [${nut_with_neon}])
-if test "${nut_with_neon}" = "yes"; then
-   AC_DEFINE_UNQUOTED(WITH_NEON, 1, [Define to enable Neon XML/HTTP support])
-fi
+NUT_REPORT_FEATURE([build neon based XML driver], [${nut_with_neon}], [],
+					[WITH_NEON], [Define to enable Neon HTTP support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-avahi
@ -318,10 +322,8 @@ if test "${nut_with_avahi}" != "no"; then
   nut_with_avahi="${nut_have_avahi}"
 fi

-AM_CONDITIONAL(WITH_AVAHI, test "${nut_with_avahi}" = "yes")
-if test "${nut_with_avahi}" = "yes"; then
-   AC_DEFINE_UNQUOTED(WITH_AVAHI, 1, [Define to enable avahi support])
-fi
+NUT_REPORT_FEATURE([enable Avahi support], [${nut_with_avahi}], [],
+					[WITH_AVAHI], [Define to enable Avahi support])

 dnl ----------------------------------------------------------------------

@ -336,8 +338,8 @@ if test "${nut_with_powerman}" != "no"; then
   nut_with_powerman="${nut_have_libpowerman}"
 fi

-AM_CONDITIONAL(WITH_LIBPOWERMAN, test "${nut_with_powerman}" = "yes")
-NUT_REPORT_FEATURE([build Powerman PDU client driver], [${nut_with_powerman}])
+NUT_REPORT_FEATURE([build Powerman PDU client driver], [${nut_with_powerman}], [],
+					[WITH_LIBPOWERMAN], [Define to enable Powerman PDU support])

 dnl ----------------------------------------------------------------------
 dnl Check for with-ipmi, and --with-freeipmi (or --with-openipmi)
@ -368,6 +370,7 @@ if test "${nut_with_ipmi}" != "no"; then
      dnl fi
      dnl    Implies --with-ipmi
      dnl    nut_with_ipmi="yes"
+      dnl    AC_DEFINE(WITH_OPENIPMI, 1, [Define to enable IPMI support using OpenIPMI])
   else
      dnl Prefer FreeIPMI over OpenIPMI otherwise
      NUT_CHECK_LIBFREEIPMI
@ -391,15 +394,20 @@ if test "${nut_with_ipmi}" != "no"; then
         dnl Implies --with-ipmi
         nut_with_ipmi="yes"
         nut_with_freeipmi="yes"
+         AC_DEFINE(WITH_FREEIPMI, 1, [Define to enable IPMI support using FreeIPMI])
      fi
   fi
 fi

-AM_CONDITIONAL(WITH_IPMI, test "${nut_with_ipmi}" = "yes")
+
+NUT_REPORT_FEATURE([build IPMI driver], [${nut_with_ipmi}], [${nut_ipmi_lib}],
+					[WITH_IPMI], [Define to enable IPMI support])
+
+dnl Note: we still have to manually enable complementary AC_DEFINEs (see above)
+dnl and AM_CONDITIONALs (see below)...
 AM_CONDITIONAL(WITH_FREEIPMI, test "${nut_with_freeipmi}" = "yes")
 dnl AM_CONDITIONAL(WITH_OPENIPMI, test "${nut_with_openipmi}" = "yes")

-NUT_REPORT_FEATURE([build IPMI driver], [${nut_with_ipmi} ${nut_ipmi_lib}])

 dnl ----------------------------------------------------------------------
 dnl Check for --with-ssl
@ -420,8 +428,8 @@ if test "${nut_with_ssl}" != "no"; then
   nut_with_ssl="${nut_have_libssl}"
 fi

-AM_CONDITIONAL(WITH_SSL, test "${nut_with_ssl}" = "yes")
-NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}])
+NUT_REPORT_FEATURE([enable SSL development code], [${nut_with_ssl}], [],
+					[WITH_SSL], [Define to enable SSL development code])

 dnl ----------------------------------------------------------------------
 dnl Check for --with-wrap
@ -442,8 +450,31 @@ if test "${nut_with_wrap}" != "no"; then
   nut_with_wrap="${nut_have_libwrap}"
 fi

-AM_CONDITIONAL(WITH_WRAP, test "${nut_with_wrap}" = "yes")
-NUT_REPORT_FEATURE([enable libwrap (tcp-wrappers) support], [${nut_with_wrap}])
+NUT_REPORT_FEATURE([enable libwrap (tcp-wrappers) support], [${nut_with_wrap}], [],
+					[WITH_WRAP], [Define to enable libwrap (tcp-wrappers) support])
+
+
+dnl ----------------------------------------------------------------------
+dnl Check for --with-libltdl
+
+NUT_ARG_WITH([libltdl], [enable libltdl (Libtool dlopen abstraction) support], [auto])
+
+dnl ${nut_with_libltdl}: any value except "yes" or "no" is treated as "auto".
+if test "${nut_with_libltdl}" != "no"; then
+   dnl check for libltdl compiler flags
+   NUT_CHECK_LIBLTDL
+fi
+
+if test "${nut_with_libltdl}" = "yes" -a "${nut_have_libltdl}" != "yes"; then
+   AC_MSG_ERROR(["libltdl not found"])
+fi
+
+if test "${nut_with_libltdl}" != "no"; then
+   nut_with_libltdl="${nut_have_libltdl}"
+fi
+
+NUT_REPORT_FEATURE([enable libltdl (Libtool dlopen abstraction) support], [${nut_with_libltdl}], [],
+					[WITH_LIBLTDL], [Define to enable libltdl (Libtool dlopen abstraction) support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-cgi
@ -464,8 +495,8 @@ if test "${nut_with_cgi}" != "no"; then
   nut_with_cgi="${nut_have_libgd}"
 fi

-AM_CONDITIONAL(WITH_CGI, test "${nut_with_cgi}" = "yes")
-NUT_REPORT_FEATURE([build CGI programs], [${nut_with_cgi}])
+NUT_REPORT_FEATURE([build CGI programs], [${nut_with_cgi}], [],
+					[WITH_CGI], [Define to enable CGI (HTTP) support])

 dnl ----------------------------------------------------------------------
 dnl checks related to --with-hal
@ -488,7 +519,8 @@ if test "${nut_with_hal}" != "no"; then
 fi

 AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")
-NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}])
+NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}], [],
+					[WITH_HAL], [Define to enable HAL support])

 dnl ----------------------------------------------------------------------

@ -584,8 +616,12 @@ AX_COMPARE_VERSION([${A2X_VERSION}], [ge], [8.6.3], [
 	nut_have_asciidoc="no"
 ])

+NUT_REPORT_FEATURE([build and install documentation], [${nut_with_doc}], [],
+					[WITH_ASCIIDOC], [Define to enable Asciidoc support])
+
+dnl Notes: we also keep HAVE_ASCIIDOC for implicit targets, such as manpage
+dnl building
 AM_CONDITIONAL([HAVE_ASCIIDOC], [test "${nut_have_asciidoc}" = "yes"])
-NUT_REPORT_FEATURE([build and install documentation], [${nut_with_doc}])

 if test "${nut_with_doc}" = "yes"; then
 	NUT_REPORT([only build specific documentation format], [${DOC_BUILD_LIST}])
@ -604,7 +640,8 @@ else
  AC_DISABLE_STATIC
 fi
 AM_CONDITIONAL(WITH_DEV, test "${nut_with_dev}" = "yes")
-NUT_REPORT_FEATURE([build and install the development files], [${nut_with_dev}])
+NUT_REPORT_FEATURE([build and install the development files], [${nut_with_dev}], [],
+					[WITH_DEV], [Define to enable development files support])

 dnl ----------------------------------------------------------------------

@ -992,6 +1029,7 @@ BINDIR=${conftemp}
 AC_DEFINE_UNQUOTED(BINDIR, "${conftemp}", [Default path for user executables])

 AC_SUBST(OS_NAME)
+AC_SUBST(TREE_VERSION)
 AC_SUBST(LIBSSL_CFLAGS)
 AC_SUBST(LIBSSL_LIBS)
 AC_SUBST(LIBGD_CFLAGS)
@ -1011,6 +1049,8 @@ AC_SUBST(LIBIPMI_LIBS)
 AC_SUBST(DOC_BUILD_LIST)
 AC_SUBST(LIBWRAP_CFLAGS)
 AC_SUBST(LIBWRAP_LIBS)
+AC_SUBST(LIBLTDL_CFLAGS)
+AC_SUBST(LIBLTDL_LIBS)
 AC_SUBST(HAL_USER)
 AC_SUBST(HAL_DEVICE_MATCH_KEY)
 AC_SUBST(HAL_FDI_PATH)
@ -1055,6 +1095,7 @@ AC_OUTPUT([
 include/Makefile
 lib/libupsclient-config
 lib/libupsclient.pc
+ lib/libnutscan.pc
 lib/Makefile
 scripts/augeas/Makefile
 scripts/augeas/nutnutconf.aug
@ -1070,6 +1111,7 @@ AC_OUTPUT([
 scripts/hal/ups-nut-device.fdi
 scripts/hotplug/Makefile
 scripts/hotplug/libhidups
+ scripts/HP-UX/nut.psf
 scripts/java/Makefile
 scripts/python/Makefile
 scripts/systemd/Makefile
--- a/data/Makefile.in
+++ b/data/Makefile.in
@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -154,6 +155,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -186,6 +188,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -206,6 +210,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -237,12 +242,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -278,7 +285,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- a/data/driver.list.in
+++ b/data/driver.list.in
@ -108,6 +108,7 @@
 "Belkin"	"ups"	"2"	"Universal UPS F6H350ukUNV"	"serial port"	"blazer_ser"
 "Belkin"	"ups"	"2"	"Universal UPS F6H500ukUNV"	"serial port"	"blazer_ser"
 "Belkin"	"ups"	"2"	"Universal UPS F6H650ukUNV"	"serial port"	"blazer_ser"
+"Belkin"	"ups"	"2"	"F6S600auUSB"	"USB"	"blazer_usb"

 "Best Power"	"ups"	"1"	"Fortress (older)"	""	"bestfortress"
 "Best Power"	"ups"	"1"	"Fortress (newer)"	""	"bestups"
@ -159,6 +160,10 @@
 "Cyber Power Systems"	"ups"	"2"	"CP1000AVRLCD"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"2"	"CP1350AVRLCD"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"2"	"CP1500AVRLCD"	"USB"	"usbhid-ups"
+"Cyber Power Systems"	"ups"	"3"	"RMCARD100"	""	"snmp-ups"
+"Cyber Power Systems"	"ups"	"3"	"RMCARD201"	""	"snmp-ups"
+"Cyber Power Systems"	"ups"	"3"	"RMCARD202"	""	"snmp-ups"
+"Cyber Power Systems"	"ups"	"3"	"RMCARD301"	""	"snmp-ups"

 "Cyclades"	"pdu"	"1"	"PM8"	"8 outlets"	"powerman-pdu (experimental)"
 "Cyclades"	"pdu"	"1"	"PM10"	"10 outlets"	"powerman-pdu (experimental)"
@ -195,6 +200,7 @@

 "Dynamix"	"ups"	"2"	"UPS1700D"	""	"blazer_ser"
 "Dynamix"	"ups"	"2"	"UPS-650VA"	""	"blazer_ser"
+"Dynamix"	"ups"	"2"	"650VA"	"USB"	"blazer_usb langid_fix=0x0409"

 "Dynex"	"ups"	"1"	"975AVR"	""	"genericups upstype=7"
 "Dynex"	"ups"	"2"	"DX-800U"	"USB"	"usbhid-ups"
@ -351,6 +357,8 @@
 "Krauler"	"ups"	"2"	"UP-D1200VA"	"USB"	"blazer_usb"
 "Krauler"	"ups"	"2"	"UP-M500VA"	"USB"	"blazer_usb"

+"LDLC"	"ups"	"2"	"UPS-1200D"	""	"blazer_usb langid_fix=0x4095"
+
 "Lestar"	"ups"	"2"	"MD-800E"	""	"blazer_ser"

 "Liebert"	"ups"	"2"	"ITON 600VA"	""	"blazer_ser"
@ -530,7 +538,6 @@
 "MGE UPS SYSTEMS"	"ups"	"5"	"various models (XML/HTTP mode)"	"NMC Minislot (Ref 66102)"	"netxml-ups (experimental)"
 "MGE UPS SYSTEMS"	"ups"	"5"	"various models (SNMP mode)"	"NMC Minislot (Ref 66102)"	"snmp-ups (experimental)"
 "MGE UPS SYSTEMS"	"ups"	"5"	"Pulsar (XML/HTTP mode)"	"SNMP/Web Minislot card (ref 66244)"	"netxml-ups (experimental)"
-"MGE UPS SYSTEMS"	"ups"	"5"	"Pulsar (XML/HTTP mode)"	"SNMP/Web Minislot card (ref 66244)"	"netxml-ups (experimental)"
 "MGE UPS SYSTEMS"	"ups"	"5"	"Pulsar (SNMP mode)"	"SNMP/Web Minislot card (ref 66244)"	"snmp-ups (experimental)"
 "MGE UPS SYSTEMS"	"ups"	"5"	"Pulsar / Comet / Galaxy (SNMP)"	"SNMP card (ref 66062)"	"snmp-ups (experimental)"
 "MGE UPS SYSTEMS"	"ups"	"5"	"Pulsar (SNMP)"	"SNMP card (ref 66045)"	"snmp-ups (experimental)"
@ -631,6 +638,7 @@
 "Powercom"	"ups"	"5"	"WOW"	"USB (2009 models, product id: 00a4)"	"usbhid-ups (experimental)"
 "Powercom"	"ups"	"4"	"(various)"	"USB (<= 2009 models, product id: 0002)"	"powercom (requires 'usbserial' kernel module)"
 "Powercom"	"ups"	"5"	"(various)"	"USB (2009 models, product id: 00a?)"	"usbhid-ups (experimental)"
+"Powercom"	"ups"	"5"	"BNT-xxxAP"	"USB (product id: 0004)"	"usbhid-ups (experimental)"

 "POWEREX"	"ups"	"2"	"VI 1000 LED"	""	"blazer_usb"

@ -728,6 +736,7 @@
 "Sysgration"	"ups"	"2"	"UPGUARDS Pro650"	""	"blazer_ser"

 "Tecnoware"	"ups"	"2"	"Easy Power 1200"	""	"blazer_ser"
+"Tecnoware"	"ups"	"2"	"UPS ERA LCD 0.65"	""	"blazer_usb langid_fix=0x409"

 "Tripp-Lite"	"ups"	"1"	"INTERNETOFFICE700"	"USB"	"tripplite_usb"
 "Tripp-Lite"	"ups"	"2"	"OMNIVS1000"	"USB"	"tripplite_usb"
@ -772,10 +781,12 @@
 "Various"	"ups"	"4"	"(various)"	"SEC protocol"	"gamatronic"
 "Various"	"ups"	"1"	"(various)"	"Generic RUPS model"	"genericups upstype=4"
 "Various"	"ups"	"1"	"(various)"	"Generic RUPS 2000 (Megatec M2501 cable)"	"genericups upstype=21"
-"Various"	"ups"	"2"	"(various)"	"Q1 / Megatec protocol"	"blazer_ser"
+"Various"	"ups"	"2"	"(various serial)"	"Q1 / Megatec protocol"	"blazer_ser"
+"Various"	"ups"	"2"	"(various USB)"	"Q1 / Megatec protocol"	"blazer_usb"
 "Various"	"ups"	"2"	"(various)"	"PhoenixTec protocol"	"bestups"
 "Various"	"ups"	"3"	"(various)"	"SNMP - RFC 1628"	"snmp-ups (experimental)"
 "Various"	"ups"	"1"	"(various)"	"Safenet software"	"safenet"
+"Various"	"ups"	"2"	"(Various USB)"	"UPSilon 2000 software"	"blazer_usb langid_fix=0x409"

 "Victron/IMV"	"ups"	"1"	"(various)"	""	"victronups"
 "Victron/IMV"	"ups"	"1"	"Lite"	"crack cable"	"genericups upstype=10"
--- a/data/html/Makefile.in
+++ b/data/html/Makefile.in
@ -49,6 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -113,6 +114,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -145,6 +147,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -165,6 +169,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -196,12 +201,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -237,7 +244,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@ -95,6 +95,19 @@ access method,

 Refer to the upsd(8) and upsd.conf(5) manpages for more information.

+== I get a 'not listening on...' error from upsd.
+
+Verify your LISTEN directive. It should be one of the valid IP addresses for
+the computer running upsd (or 0.0.0.0, which is INADDR_ANY), not an address for
+a client.
+
+The LISTEN directive lets you pick which interface upsd listens on. If you are
+trying to limit the clients which can connect to upsd, you either need to use
+tcp-wrappers or kernel firewall rules.
+
+This isn't a NUT-specific limitation - it applies equally to your web server or
+mailer daemon.
+
 == I have an APC Smart-UPS connected with a grey APC serial cable and it won't work. 

 The Back-UPS type in the genericups driver works but then I don't get to use
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@ -1,8 +1,7 @@
-SHARED_DEPS = nut-names.txt asciidoc.conf
-
 IMAGE_FILES = images/asciidoc.png \
 	images/eaton-logo.png \
 	images/nut_layering.png \
+	images/nut-logo.png \
 	images/note.png \
 	images/warning.png \
 	images/blue-arrow.png \
@ -12,6 +11,9 @@ IMAGE_FILES = images/asciidoc.png \
 	images/bizarre.png \
 	images/old-cgi.png

+# Only track here the local deps
+SHARED_DEPS = nut-names.txt asciidoc.conf
+
 USER_MANUAL_DEPS = acknowledgements.txt cables.txt config-notes.txt	\
 configure.txt download.txt documentation.txt features.txt history.txt	\
 outlets.txt scheduling.txt security.txt support.txt user-manual.txt \
@ -74,11 +76,19 @@ endif !HAVE_ASCIIDOC
 clean-local:
 	rm -rf *.pdf *.html *.chunked docbook-xsl.css

+# Static HCL is generated automatically
+# This is more of a harness, since this file should have already been
+# generated, due to the top level Makefile SUBDIRS ordering (tools before docs)
+ups-html.txt:
+	cd ../tools; $(MAKE) $(AM_MAKEFLAGS) website
+
 ### TODO: automatic dependency generation
-FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS)  $(SHARED_DEPS) ../README \
-	../INSTALL cables.txt ../UPGRADING ../TODO
-FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS)  $(SHARED_DEPS) \
-	../scripts/augeas/README
+# Add other directory deps (not for local EXTRA_DIST) and generated contents
+FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS) $(SHARED_DEPS) ../README \
+	../INSTALL ../UPGRADING ../TODO
+FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS) $(SHARED_DEPS) \
+	../scripts/augeas/README ../TODO ../lib/README \
+	../tools/nut-scanner/README

 user-manual.html user-manual.chunked user-manual.pdf: $(FULL_USER_MANUAL_DEPS)
 developer-guide.html developer-guide.chunked developer-guide.pdf: $(FULL_DEVELOPER_GUIDE_DEPS)
@ -94,6 +104,7 @@ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
    --attribute iconsdir=$(srcdir)/images \
    --attribute=badges \
    --attribute=external_title \
+    --attribute tree_version=@TREE_VERSION@ \
    -a toc -a numbered --destination-dir=.

 .txt.html:
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -127,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -159,6 +161,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -179,6 +183,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -210,12 +215,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -251,7 +258,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@ -275,10 +281,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevdir = @udevdir@
-SHARED_DEPS = nut-names.txt asciidoc.conf
 IMAGE_FILES = images/asciidoc.png \
 	images/eaton-logo.png \
 	images/nut_layering.png \
+	images/nut-logo.png \
 	images/note.png \
 	images/warning.png \
 	images/blue-arrow.png \
@ -288,6 +294,9 @@ IMAGE_FILES = images/asciidoc.png \
 	images/bizarre.png \
 	images/old-cgi.png

+
+# Only track here the local deps
+SHARED_DEPS = nut-names.txt asciidoc.conf
 USER_MANUAL_DEPS = acknowledgements.txt cables.txt config-notes.txt	\
 configure.txt download.txt documentation.txt features.txt history.txt	\
 outlets.txt scheduling.txt security.txt support.txt user-manual.txt \
@ -333,11 +342,13 @@ SUBDIRS = . man website
 SUFFIXES = .txt .html .pdf

 ### TODO: automatic dependency generation
-FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS)  $(SHARED_DEPS) ../README \
-	../INSTALL cables.txt ../UPGRADING ../TODO
+# Add other directory deps (not for local EXTRA_DIST) and generated contents
+FULL_USER_MANUAL_DEPS = $(USER_MANUAL_DEPS) $(SHARED_DEPS) ../README \
+	../INSTALL ../UPGRADING ../TODO

-FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS)  $(SHARED_DEPS) \
-	../scripts/augeas/README
+FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS) $(SHARED_DEPS) \
+	../scripts/augeas/README ../TODO ../lib/README \
+	../tools/nut-scanner/README


 # Note: without the "-v", asciidoc (circa 8.6.2) sometimes hangs when
@ -350,6 +361,7 @@ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
    --attribute iconsdir=$(srcdir)/images \
    --attribute=badges \
    --attribute=external_title \
+    --attribute tree_version=@TREE_VERSION@ \
    -a toc -a numbered --destination-dir=.

 all: all-recursive
@ -714,6 +726,12 @@ html-chunked: $(ASCIIDOC_HTML_CHUNKED)
 clean-local:
 	rm -rf *.pdf *.html *.chunked docbook-xsl.css

+# Static HCL is generated automatically
+# This is more of a harness, since this file should have already been
+# generated, due to the top level Makefile SUBDIRS ordering (tools before docs)
+ups-html.txt:
+	cd ../tools; $(MAKE) $(AM_MAKEFLAGS) website
+
 user-manual.html user-manual.chunked user-manual.pdf: $(FULL_USER_MANUAL_DEPS)
 developer-guide.html developer-guide.chunked developer-guide.pdf: $(FULL_DEVELOPER_GUIDE_DEPS)
 packager-guide.html packager-guide.chunked packager-guide.pdf: packager-guide.txt asciidoc.conf
--- a/docs/cables.txt
+++ b/docs/cables.txt
@ -15,6 +15,13 @@ image::images/cables/940-0024C.jpg[APCC 940-0024C clone diagram]

 NOTE: The original 940-0024C diagram was contributed by Steve Draper.

+940-0024E clone
+~~~~~~~~~~~~~~~
+
+*Reported by Jonathan Laventhol*
+
+This cable is said to use the same wiring as 940-0024C clone.
+
 940-0024C clone for Macs
 ~~~~~~~~~~~~~~~~~~~~~~~~

--- a/docs/config-notes.txt
+++ b/docs/config-notes.txt
@ -10,7 +10,11 @@ package.  You should check out the <<Overview,NUT Overview>>
 and other accompanying documentation to see how it all works.

 NOTE: NUT does not currently provide proper graphical configuration tools.
-However, there is now support for linkdoc:developer-guide[Augeas,augeas_user].
+However, there is now support for linkdoc:developer-guide[Augeas,augeas_user],
+which will enable the easier creation of configuration tools.
+Moreover, linkman:nut-scanner[8] is available to discover supported devices
+(USB, SNMP, Eaton XML/HTTP and IPMI) and NUT servers (using Avahi or the classic
+connection method).

 Details about the configuration files
 -------------------------------------
@ -51,6 +55,11 @@ string, you just escape it.
 The \ can actually be used to escape any character, but you only really
 need it for \, ", and # as they have special meanings to the parser.

+When using file names with space characters, you may end up having tricky
+things since you need to write them inside "" which must be escaped:
+
+	NOTIFYCMD "\"c:\\path with space\\notifyme\" \"c:\\path with space\\name\""
+
 # is the comment character.  Anything after an unescaped # is ignored.

 Something like this...
--- a/docs/configure.txt
+++ b/docs/configure.txt
@ -117,6 +117,11 @@ Gnome or KDE desktop, this will enable a full Plug & Play usage.
 See docs/nut-hal.txt for additional information on how to set up
 and use HAL support.

+	--with-avahi (default: auto-detect)
+
+Build and install Avahi support, to publish NUT server availability
+using mDNS protocol.
+

 Other configuration options
 ---------------------------
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@ -40,6 +40,12 @@ include::sock-protocol.txt[]

 include::../scripts/augeas/README[]

+
+[[devscan]]
+
+include::../tools/nut-scanner/README[]
+
+
 [[new-clients]]

 include::new-clients.txt[]
@ -57,6 +63,8 @@ NUT developers tools

 NUT provides several tools for clients and core developers, and QA people.

+[[dev-simu]]
+
 Device simulation
 -----------------

@ -65,10 +73,44 @@ This mode allows to simulate any kind of devices, even non existing ones.

 Using this method, you can either replay a real life sequence,
 <<dev-recording,recorded from an actual device>>, or directly interact
-through upsrw or by editing the device file.
+through upsrw or by editing the device file, to modify the variables values.

-For more information, refer to linkman:dummy-ups[8]
-manual page. 
+Here is an example to setup a device simulation:
+
+- install NUT as usual, if not already done
+- get a simulation file (.dev) or sequence (.seq), or generate one using the
+<<dev-recording,device recorder>>. Sample files are provided in the 'data'
+directory of the NUT source. You can also download these from the development
+repository, such as the
+link:http://anonscm.debian.org/viewvc/nut/trunk/data/evolution500.seq?revision=2778&view=co[evolution500.seq].
+- copy the simulation file to your sysconfig directory, like /etc/nut or
+/etc/ups
+- configure NUT for simulation (linkman:ups.conf[5]):
+
+	[dummy]
+		driver = dummy-ups
+		port = evolution500.dev
+		desc = "dummy-ups in dummy mode"
+
+- now start NUT, at least dummy-ups and upsd:
+
+	$ upsdrvctl start dummy
+	$ upsd
+
+- and check the data:
+
+	$ upsc dummy
+	...
+
+- you can also use upsrw to modify the data:
+
+	$ upsrw -s ups.status="OB LB" -u user -p password dummy
+
+- or directly edit /etc/nut/evolution500.seq. In this case, modification will
+only apply according to the TIMER events and the current position in the
+sequence.
+
+For more information, refer to linkman:dummy-ups[8] manual page. 


 [[dev-recording]]
@ -91,6 +133,9 @@ For example, to record information from the device 'myups' every 10 seconds:

 	tools/device-recorder.sh myups@localhost myups.seq 10

+During the recording, you will want to generate power events, such as power
+failure and restoration. These will be tracked in the simulation files, and be
+eventually be replayed by the <<dev-simu,dummy-ups>> driver.


 NUT core development and maintenance
@ -113,3 +158,9 @@ Appendix A: NUT command and variable naming scheme
 ==================================================

 include::nut-names.txt[]
+
+[[lib-info]]
+Appendix B: NUT libraries complementary information
+===================================================
+
+include::../lib/README[]
--- a/docs/download.txt
+++ b/docs/download.txt
@ -20,26 +20,26 @@ endif::website[]
 to do so.
 ================================================================================

-Stable tree: 2.6
-~~~~~~~~~~~~~~~~
+Stable tree: {tree_version}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~

- link:http://www.networkupstools.org/source/2.6/nut-2.6.2.tar.gz[nut-2.6.2.tar.gz]
- link:http://www.networkupstools.org/source/2.6/nut-2.6.2.tar.gz.sig[PGP/GPG signature]
- SHA-256 sum: 4ba1d297a98190db0ae86eb31136c780f35e6d3f47ae845316b44eaa9245a86e
- link:http://www.networkupstools.org/source/2.6/new-2.6.2.txt[Release notes]
- link:http://www.networkupstools.org/source/2.6/ChangeLog[ChangeLog]
+- link:http://www.networkupstools.org/source/{tree_version}/nut-{revision}.tar.gz[nut-{revision}.tar.gz]
+- link:http://www.networkupstools.org/source/{tree_version}/nut-{revision}.tar.gz.sig[PGP/GPG signature]
+- SHA-256 sum: 343554add0713348f8b09bca8d83eee2eb2ae8bad9cdad9a39e0f0e2d0f5d375
+- link:http://www.networkupstools.org/source/{tree_version}/new-{revision}.txt[Release notes]
+- link:http://www.networkupstools.org/source/{tree_version}/ChangeLog[ChangeLog]

-You can also browse the link:http://www.networkupstools.org/source/2.6/[stable source directory].
+You can also browse the link:http://www.networkupstools.org/source/{tree_version}/[stable source directory].


-Testing tree: 2.6.x-pre
-~~~~~~~~~~~~~~~~~~~~~~~
+Testing tree: {tree_version}.x-pre
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 There is currently no testing release.


-Development tree: 2.7
-~~~~~~~~~~~~~~~~~~~~~
+Development tree:
+~~~~~~~~~~~~~~~~~

 Code repository
 ^^^^^^^^^^^^^^^
@ -121,4 +121,7 @@ Java packages
 -------------

 - NUT Java support (client side, Beta)
-link:http://www.networkupstools.org/package/java/jNut-0.1-SNAPSHOT.tar.gz[jNUT 0.1-SNAPSHOT]
+link:http://www.networkupstools.org/package/java/jNut-0.2-SNAPSHOT.tar.gz[jNUT 0.2-SNAPSHOT]
+
+- NUT Java Web support (client side using REST, Beta)
+link:http://www.networkupstools.org/package/java/jNutWebAPI-0.2-SNAPSHOT-src.tar.gz[jNutWebAPI 0.2-SNAPSHOT (sources)]
--- a/docs/images/nut-logo.png
+++ b/docs/images/nut-logo.png
--- a/docs/macros.txt
+++ b/docs/macros.txt
@ -48,7 +48,7 @@ directory.
 	through the OS_NAME variable, but may be useful for other purposes in the
 	future.

- NUT_REPORT_FEATURE(FEATURE, VALUE) 
+- NUT_REPORT_FEATURE(FEATURE, VALUE, VARIABLE, DESCRIPTION) 

 	Schedule a line for the end-of-configuration feature summary.  The
 	FEATURE is a descriptive string such that the sentence "Checking
@ -56,6 +56,9 @@ directory.
 	taken (typically yes or no). The feature is also reported to the
 	terminal.

+	Also use VARIABLE and DESCRIPTION for defining AM_CONDITIONAL and
+	AC_DEFINE (only if VALUE = "yes"). VARIABLE is of the form 'WITH_<NAME>'.
+
 - NUT_REPORT(FEATURE, VALUE)

 	Schedule a line for the end-of-configuration feature summary, without
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@ -132,6 +132,7 @@ SRC_DEV_PAGES = \
 	upscli_ssl.txt \
 	upscli_strerror.txt \
 	upscli_upserror.txt \
+	nutscan.txt \
 	nutscan_scan_snmp.txt \
 	nutscan_scan_usb.txt \
 	nutscan_scan_xml_http.txt \
@ -145,6 +146,7 @@ SRC_DEV_PAGES = \
 	nutscan_free_device.txt \
 	nutscan_add_option_to_device.txt \
 	nutscan_add_device_to_device.txt \
+	nutscan_init.txt \
 	libupsclient-config.txt \
 	skel.txt

@ -163,6 +165,7 @@ MAN3_DEV_PAGES = \
 	upscli_ssl.3 \
 	upscli_strerror.3 \
 	upscli_upserror.3 \
+	nutscan.3 \
 	nutscan_scan_snmp.3 \
 	nutscan_scan_usb.3 \
 	nutscan_scan_xml_http.3 \
@ -175,7 +178,8 @@ MAN3_DEV_PAGES = \
 	nutscan_new_device.3 \
 	nutscan_free_device.3 \
 	nutscan_add_option_to_device.3 \
-	nutscan_add_device_to_device.3
+	nutscan_add_device_to_device.3 \
+	nutscan_init.3

 MAN1_DEV_PAGES = \
 	libupsclient-config.1
@ -204,6 +208,7 @@ HTML_DEV_MANS = \
 	upscli_ssl.html \
 	upscli_strerror.html \
 	upscli_upserror.html \
+	nutscan.html \
 	nutscan_scan_snmp.html \
 	nutscan_scan_usb.html \
 	nutscan_scan_xml_http.html \
@ -217,6 +222,7 @@ HTML_DEV_MANS = \
 	nutscan_free_device.html \
 	nutscan_add_option_to_device.html \
 	nutscan_add_device_to_device.html \
+	nutscan_init.html \
 	libupsclient-config.html \
 	skel.html

@ -385,7 +391,7 @@ HTML_USB_LIBUSB_MANS = \
 SRC_NETXML_PAGES = netxml-ups.txt
 MAN_NETXML_PAGES = netxml-ups.8

-if WITH_NEONXML
+if WITH_NEON
   man8_MANS += $(MAN_NETXML_PAGES)
 endif

--- a/docs/man/Makefile.in
+++ b/docs/man/Makefile.in
@ -58,7 +58,7 @@ target_triplet = @target@
@SOME_DRIVERS_FALSE@@WITH_SERIAL_TRUE@am__append_4 = $(MAN_SERIAL_PAGES)
@SOME_DRIVERS_FALSE@@WITH_SNMP_TRUE@am__append_5 = $(MAN_SNMP_PAGES)
@SOME_DRIVERS_FALSE@@WITH_USB_TRUE@am__append_6 = $(MAN_USB_LIBUSB_PAGES)
-@SOME_DRIVERS_FALSE@@WITH_NEONXML_TRUE@am__append_7 = $(MAN_NETXML_PAGES)
+@SOME_DRIVERS_FALSE@@WITH_NEON_TRUE@am__append_7 = $(MAN_NETXML_PAGES)
@SOME_DRIVERS_FALSE@@WITH_LIBPOWERMAN_TRUE@am__append_8 = $(MAN_POWERMAN_PAGES)
@SOME_DRIVERS_FALSE@@WITH_IPMI_TRUE@am__append_9 = $(MAN_IPMIPSU_PAGES)
 subdir = docs/man
@ -74,6 +74,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@ -143,6 +144,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@ -175,6 +177,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -195,6 +199,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@ -226,12 +231,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@ -267,7 +274,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@ -403,6 +409,7 @@ SRC_DEV_PAGES = \
 	upscli_ssl.txt \
 	upscli_strerror.txt \
 	upscli_upserror.txt \
+	nutscan.txt \
 	nutscan_scan_snmp.txt \
 	nutscan_scan_usb.txt \
 	nutscan_scan_xml_http.txt \
@ -416,6 +423,7 @@ SRC_DEV_PAGES = \
 	nutscan_free_device.txt \
 	nutscan_add_option_to_device.txt \
 	nutscan_add_device_to_device.txt \
+	nutscan_init.txt \
 	libupsclient-config.txt \
 	skel.txt

@ -434,6 +442,7 @@ MAN3_DEV_PAGES = \
 	upscli_ssl.3 \
 	upscli_strerror.3 \
 	upscli_upserror.3 \
+	nutscan.3 \
 	nutscan_scan_snmp.3 \
 	nutscan_scan_usb.3 \
 	nutscan_scan_xml_http.3 \
@ -446,7 +455,8 @@ MAN3_DEV_PAGES = \
 	nutscan_new_device.3 \
 	nutscan_free_device.3 \
 	nutscan_add_option_to_device.3 \
-	nutscan_add_device_to_device.3
+	nutscan_add_device_to_device.3 \
+	nutscan_init.3

 MAN1_DEV_PAGES = \
 	libupsclient-config.1
@ -469,6 +479,7 @@ HTML_DEV_MANS = \
 	upscli_ssl.html \
 	upscli_strerror.html \
 	upscli_upserror.html \
+	nutscan.html \
 	nutscan_scan_snmp.html \
 	nutscan_scan_usb.html \
 	nutscan_scan_xml_http.html \
@ -482,6 +493,7 @@ HTML_DEV_MANS = \
 	nutscan_free_device.html \
 	nutscan_add_option_to_device.html \
 	nutscan_add_device_to_device.html \
+	nutscan_init.html \
 	libupsclient-config.html \
 	skel.html

--- a/docs/man/apcsmart-old.8
+++ b/docs/man/apcsmart-old.8
@ -2,12 +2,12 @@
 .\"     Title: apcsmart-old
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "APCSMART\-OLD" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "APCSMART\-OLD" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/apcsmart.8
+++ b/docs/man/apcsmart.8
@ -2,12 +2,12 @@
 .\"     Title: apcsmart
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 11/17/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "APCSMART" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "APCSMART" "8" "11/17/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -108,7 +108,23 @@ This driver expects to see a 940\-0024C cable or a clone by default\&. You can s
 .sp
 If your 940\-0024C cable is broken or missing, use this diagram to build a clone:
 .sp
-http://www\&.networkupstools\&.org/cables/940\-0024C\&.jpg
+http://www\&.networkupstools\&.org/cables\&.html#_940_0024c_clone
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.sp
+It was reported, that the 940\-0024E cable uses the same wiring as the 940\-0024C one\&.
+.sp .5v
+.RE
 .sp
 You can specify alternate cable in \fBups.conf\fR(5):
 .sp
--- a/docs/man/apcsmart.txt
+++ b/docs/man/apcsmart.txt
@ -73,7 +73,10 @@ definition described below.
 If your 940-0024C cable is broken or missing, use this diagram to build
 a clone:

-http://www.networkupstools.org/cables/940-0024C.jpg
+http://www.networkupstools.org/cables.html#_940_0024c_clone
+
+NOTE: It was reported, that the 940-0024E cable uses the same wiring as the
+940-0024C one.

 You can specify alternate cable in linkman:ups.conf[5]:

--- a/docs/man/bcmxcp.8
+++ b/docs/man/bcmxcp.8
@ -2,12 +2,12 @@
 .\"     Title: bcmxcp
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BCMXCP" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BCMXCP" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -103,7 +103,7 @@ is the outlet number reported by the upsc command)
 .RE
 .SH "TODO LIST"
 .PP
-Report UPS statistics informations
+Report UPS statistics information
 .RS 4
 BCM/XCP supports reporting of UPS statistics data\&.
 .RE
--- a/docs/man/bcmxcp.txt
+++ b/docs/man/bcmxcp.txt
@ -59,7 +59,7 @@ Turn off the load on outlet 'n' and return when power is back.
 TODO LIST
 ---------

-Report UPS statistics informations::
+Report UPS statistics information::
 BCM/XCP supports reporting of UPS statistics data.

 Change settings::
--- a/docs/man/bcmxcp_usb.8
+++ b/docs/man/bcmxcp_usb.8
@ -2,12 +2,12 @@
 .\"     Title: bcmxcp_usb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BCMXCP_USB" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BCMXCP_USB" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/belkin.8
+++ b/docs/man/belkin.8
@ -2,12 +2,12 @@
 .\"     Title: belkin
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BELKIN" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BELKIN" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/belkinunv.8
+++ b/docs/man/belkinunv.8
@ -2,12 +2,12 @@
 .\"     Title: belkinunv
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BELKINUNV" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BELKINUNV" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/bestfcom.8
+++ b/docs/man/bestfcom.8
@ -2,12 +2,12 @@
 .\"     Title: bestfcom
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BESTFCOM" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BESTFCOM" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/bestfortress.8
+++ b/docs/man/bestfortress.8
@ -2,12 +2,12 @@
 .\"     Title: bestfortress
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BESTFORTRESS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BESTFORTRESS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/bestuferrups.8
+++ b/docs/man/bestuferrups.8
@ -2,12 +2,12 @@
 .\"     Title: bestuferrups
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BESTUFERRUPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BESTUFERRUPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/bestups.8
+++ b/docs/man/bestups.8
@ -2,12 +2,12 @@
 .\"     Title: bestups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BESTUPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BESTUPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/blazer.8
+++ b/docs/man/blazer.8
@ -2,12 +2,12 @@
 .\"     Title: blazer
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/17/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "BLAZER" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "BLAZER" "8" "12/17/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -195,6 +195,13 @@ Select a serial\-over\-USB subdriver to use\&. You have a choice between
 and
 \fBproductid\fR\&.
 .RE
+.PP
+\fBlangid_fix =\fR \fIvalue\fR
+.RS 4
+Apply the language ID workaround to the krauler subdriver\&. This is mandatory for some devices to work (LDLC, Dynamix and others)\&. You must to provide
+\fBvalue\fR
+(0x409 or 0x4095), according to your device entry in NUT hardware compatibility list (HCL)\&.
+.RE
 .SH "UPS COMMANDS"
 .sp
 This driver supports some instant commands (see \fBupscmd\fR(8)):
@ -274,7 +281,7 @@ battery\&.charge =  \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 .RE
 .\}
 .sp
-There is a way to get better readings without disconnecting the load but this requires to keep track on how much (and how fast) current is going in\- and out of the battery\&. If you specified the \fBruntimecal\fR, the driver will attempt to do this\&. Note however, that this heavily relies on the values you enter and that the UPS must be able to report the load as well\&. There are quite a couple of devices that report 0 % (or any other fixed value) at all times, in which case this obviously doesn\(cqt work\&.
+There is a way to get better readings without disconnecting the load but this requires one to keep track on how much (and how fast) current is going in\- and out of the battery\&. If you specified the \fBruntimecal\fR, the driver will attempt to do this\&. Note however, that this heavily relies on the values you enter and that the UPS must be able to report the load as well\&. There are quite a couple of devices that report 0 % (or any other fixed value) at all times, in which case this obviously doesn\(cqt work\&.
 .sp
 The driver also has no way of determining the degradation of the battery capacity over time, so you\(cqll have to deal with this yourself (by adjusting the values in \fBruntimecal\fR)\&. Also note that the driver guesses the initial state of charge based on the battery voltage, so this may be less than 100 %, even when you are certain that they are full\&. There is just no way to reliably measure this between 0 and 100 % full charge\&.
 .sp
@ -320,4 +327,4 @@ Arjen de Korte <adkorte\-guest at alioth\&.debian\&.org>, Alexander Gordeev <las
 \fBnutupsdrv\fR(8), \fBupsc\fR(8), \fBupscmd\fR(8), \fBupsrw\fR(8)
 .SS "Internet Resources:"
 .sp
-The NUT (Network UPS Tools) home page: http://www\&.networkupstools\&.org/
+The NUT (Network UPS Tools) home page: http://www\&.networkupstools\&.org/ The NUT HCL: http://www\&.networkupstools\&.org/stable\-hcl\&.html
--- a/docs/man/blazer.txt
+++ b/docs/man/blazer.txt
@ -156,6 +156,14 @@ Select a serial-over-USB subdriver to use. You have a choice between *phoenix*,
 *ippon*, *cypress*, and *krauler*. When using this option, it is mandatory to also
 specify the *vendorid* and *productid*.

+*langid_fix =* 'value'::
+
+Apply the language ID workaround to the krauler subdriver. This is mandatory
+for some devices to work (LDLC, Dynamix and others). You must to provide
+*value* (0x409 or 0x4095), according to your device entry in NUT hardware
+compatibility list (HCL).
+
+
 UPS COMMANDS
 ------------

@ -224,12 +232,12 @@ battery.charge =  ------------------------------------------ x 100 %
                  battery.voltage.high - battery.voltage.low

 There is a way to get better readings without disconnecting the load but this
-requires to keep track on how much (and how fast) current is going in- and out of
-the battery. If you specified the *runtimecal*, the driver will attempt to do
-this. Note however, that this heavily relies on the values you enter and that the
-UPS must be able to report the load as well. There are quite a couple of devices
-that report 0 % (or any other fixed value) at all times, in which case this
-obviously doesn't work.
+requires one to keep track on how much (and how fast) current is going in- and
+out of the battery. If you specified the *runtimecal*, the driver will attempt
+to do this. Note however, that this heavily relies on the values you enter and
+that the UPS must be able to report the load as well. There are quite a couple
+of devices that report 0 % (or any other fixed value) at all times, in which
+case this obviously doesn't work.

 The driver also has no way of determining the degradation of the battery capacity
 over time, so you'll have to deal with this yourself (by adjusting the values
@ -298,3 +306,4 @@ Internet Resources:
 ~~~~~~~~~~~~~~~~~~~

 The NUT (Network UPS Tools) home page: http://www.networkupstools.org/
+The NUT HCL: http://www.networkupstools.org/stable-hcl.html
--- a/docs/man/clone.8
+++ b/docs/man/clone.8
@ -2,12 +2,12 @@
 .\"     Title: clone
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "CLONE" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "CLONE" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/dummy-ups.8
+++ b/docs/man/dummy-ups.8
@ -2,12 +2,12 @@
 .\"     Title: dummy-ups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "DUMMY\-UPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "DUMMY\-UPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -37,7 +37,7 @@ This man page only documents the specific features of the dummy\-ups driver\&. F
 This program is a multi\-purpose UPS emulation tool\&. Its behavior depends on the running mode:
 .SS "Dummy Mode"
 .sp
-\fBdummy\-ups\fR looks like a standard device driver to \fBupsd\fR(8) and allows to change any value for testing purposes\&. It is both interactive, controllable through the \fBupsrw\fR(1) and \fBupscmd\fR(1) commands (or equivalent graphical tool), and batchable through script files\&. It can be configured, launched and used as any other real driver\&. This mode is mostly useful for development and testing purposes\&.
+\fBdummy\-ups\fR looks like a standard device driver to \fBupsd\fR(8) and allows one to change any value for testing purposes\&. It is both interactive, controllable through the \fBupsrw\fR(1) and \fBupscmd\fR(1) commands (or equivalent graphical tool), and batchable through script files\&. It can be configured, launched and used as any other real driver\&. This mode is mostly useful for development and testing purposes\&.
 .SS "Repeater Mode"
 .sp
 \fBdummy\-ups\fR acts as a NUT client, simply forwarding data\&. This can be useful for supervision purposes\&. This can also allow some load sharing between several UPS instances, using a point\-to\-point communication with the UPS\&.
@ -55,9 +55,9 @@ For instance:
 .\}
 .nf
 [dummy]
-            driver = dummy\-ups
-            port = evolution500\&.dev
-            desc = "dummy\-ups in dummy mode"
+        driver = dummy\-ups
+        port = evolution500\&.dev
+        desc = "dummy\-ups in dummy mode"
 .fi
 .if n \{\
 .RE
@ -130,7 +130,7 @@ This driver was written in one evening to replace the previous dummycons testing
 .sp
 It also helps the NUT Quality Assurance effort, by automating some tests on the NUT framework\&.
 .sp
-It now offers a repeater mode\&. This will help in building the Meta UPS approach, which allows to build a virtual device, composed of several other devices (either UPS, PDUs)\&.
+It now offers a repeater mode\&. This will help in building the Meta UPS approach, which allows one to build a virtual device, composed of several other devices (either UPS, PDUs)\&.
 .SH "BUGS"
 .sp
 Instant commands are not yet supported in Dummy Mode, and data need name/value checking enforcement, as well as boundaries or enumeration definition\&.
--- a/docs/man/dummy-ups.txt
+++ b/docs/man/dummy-ups.txt
@ -20,7 +20,7 @@ Dummy Mode
 ~~~~~~~~~~

 *dummy-ups* looks like a standard device driver to linkman:upsd[8] and 
-allows to change any value for testing purposes.  It is both interactive,
+allows one to change any value for testing purposes.  It is both interactive,
 controllable through the linkman:upsrw[1] and linkman:upscmd[1] commands (or
 equivalent graphical tool), and batchable through script files. It can be
 configured, launched and used as any other real driver.  This mode is mostly
@ -48,7 +48,7 @@ sysconfig directory (ie /etc/nut, /usr/local/ups/etc, ...) is prepended.

 For instance:

-    [dummy]
+	[dummy]
 		driver = dummy-ups
 		port = evolution500.dev
 		desc = "dummy-ups in dummy mode"
@ -124,7 +124,7 @@ It also helps the NUT Quality Assurance effort, by automating some tests on the
 NUT framework.

 It now offers a repeater mode. This will help in building the Meta UPS approach,
-which allows to build a virtual device, composed of several other devices
+which allows one to build a virtual device, composed of several other devices
 (either UPS, PDUs).

 BUGS
--- a/docs/man/etapro.8
+++ b/docs/man/etapro.8
@ -2,12 +2,12 @@
 .\"     Title: etapro
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "ETAPRO" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "ETAPRO" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/everups.8
+++ b/docs/man/everups.8
@ -2,12 +2,12 @@
 .\"     Title: everups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "EVERUPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "EVERUPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/gamatronic.8
+++ b/docs/man/gamatronic.8
@ -2,12 +2,12 @@
 .\"     Title: gamatronic
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "GAMATRONIC" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "GAMATRONIC" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/genericups.8
+++ b/docs/man/genericups.8
@ -2,12 +2,12 @@
 .\"     Title: genericups
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "GENERICUPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "GENERICUPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/hosts.conf.5
+++ b/docs/man/hosts.conf.5
@ -2,12 +2,12 @@
 .\"     Title: hosts.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "HOSTS\&.CONF" "5" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "HOSTS\&.CONF" "5" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/isbmex.8
+++ b/docs/man/isbmex.8
@ -2,12 +2,12 @@
 .\"     Title: isbmex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "ISBMEX" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "ISBMEX" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/ivtscd.8
+++ b/docs/man/ivtscd.8
@ -2,12 +2,12 @@
 .\"     Title: ivtscd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "IVTSCD" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "IVTSCD" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/libupsclient-config.1
+++ b/docs/man/libupsclient-config.1
@ -2,12 +2,12 @@
 .\"     Title: libupsclient-config
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "LIBUPSCLIENT\-CONFIG" "1" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "LIBUPSCLIENT\-CONFIG" "1" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/liebert-esp2.8
+++ b/docs/man/liebert-esp2.8
@ -2,12 +2,12 @@
 .\"     Title: liebert-esp2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "LIEBERT\-ESP2" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "LIEBERT\-ESP2" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/liebert.8
+++ b/docs/man/liebert.8
@ -2,12 +2,12 @@
 .\"     Title: liebert
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "LIEBERT" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "LIEBERT" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/masterguard.8
+++ b/docs/man/masterguard.8
@ -2,12 +2,12 @@
 .\"     Title: masterguard
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "MASTERGUARD" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "MASTERGUARD" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/metasys.8
+++ b/docs/man/metasys.8
@ -2,12 +2,12 @@
 .\"     Title: metasys
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "METASYS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "METASYS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/mge-shut.8
+++ b/docs/man/mge-shut.8
@ -2,12 +2,12 @@
 .\"     Title: mge-shut
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "MGE\-SHUT" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "MGE\-SHUT" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/mge-utalk.8
+++ b/docs/man/mge-utalk.8
@ -2,12 +2,12 @@
 .\"     Title: mge-utalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "MGE\-UTALK" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "MGE\-UTALK" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/microdowell.8
+++ b/docs/man/microdowell.8
@ -2,12 +2,12 @@
 .\"     Title: microdowell
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "MICRODOWELL" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "MICRODOWELL" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/netxml-ups.8
+++ b/docs/man/netxml-ups.8
@ -2,12 +2,12 @@
 .\"     Title: netxml-ups
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NETXML\-UPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NETXML\-UPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nut-ipmipsu.8
+++ b/docs/man/nut-ipmipsu.8
@ -2,12 +2,12 @@
 .\"     Title: nut-ipmipsu
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUT\-IPMIPSU" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUT\-IPMIPSU" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nut-scanner.8
+++ b/docs/man/nut-scanner.8
@ -2,12 +2,12 @@
 .\"     Title: nut-scanner
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 01/03/2012
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUT\-SCANNER" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUT\-SCANNER" "8" "01/03/2012" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -36,7 +36,7 @@ nut-scanner \- scan communication buses for NUT devices
 \fBnut\-scanner\fR [\fIOPTIONS\fR]
 .SH "DESCRIPTION"
 .sp
-\fBnut\-scanner\fR scans available communication buses and display any NUT compatible device it has found\&.
+\fBnut\-scanner\fR scans available communication buses and displays any NUT\-compatible devices it has found\&.
 .SH "OPTIONS"
 .PP
 \fB\-h\fR
@ -65,13 +65,13 @@ Scan all available communication buses (default behavior)
 .PP
 \fB\-U\fR | \fB\-\-usb_scan\fR
 .RS 4
-List all NUT compatible USB devices currently plugged in\&.
+List all NUT\-compatible USB devices currently plugged in\&.
 .RE
 .PP
 \fB\-S\fR | \fB\-\-snmp_scan\fR
 .RS 4
-Scan SNMP devices\&. Require at least a
-\fIstart IP\fR, and optionnaly an
+Scan SNMP devices\&. Requires at least a
+\fIstart IP\fR, and optionally, an
 \fIend IP\fR\&. See specific SNMP OPTIONS for community and security settings\&.
 .RE
 .PP
@ -90,7 +90,7 @@ to
 .PP
 \fB\-A\fR | \fB\-\-avahi_scan\fR
 .RS 4
-Scan NUT servers using avahi request on the current network interfaces\&. No IP required\&.
+Scan NUT servers using Avahi request on the current network interfaces\&. No IP required\&.
 .RE
 .PP
 \fB\-I\fR | \fB\-\-ipmi_scan\fR
@ -115,12 +115,17 @@ Set the last IP (IPv4 or IPv6) when a range of IP is required (SNMP, old_nut)\&.
 \fIstart IP\fR
 is scanned\&. If
 \fIend IP\fR
-is lesser than
-\fIstart IP\fR, both parameter are internally permuted\&.
+is less than
+\fIstart IP\fR, both parameters are internally permuted\&.
+.RE
+.PP
+\fB\-m\fR | \fB\-\-mask_cidr\fR \fIIP address/mask\fR
+.RS 4
+Set a range of IP using CIDR notation\&.
 .RE
 .SH "NUT DEVICE OPTION"
 .PP
-\fB\-p\fR | \fB\-\-port <port number\fR \fIport number\fR
+\fB\-p\fR | \fB\-\-port\fR \fIport number\fR
 .RS 4
 Set the port number of scanned NUT devices (default 3493)\&.
 .RE
@ -147,14 +152,14 @@ used for authenticated SNMPv3 messages\&. This parameter is mandatory if you set
 \fIsecurity level\fR\&.
 .RE
 .PP
-\fB\-a\fR | \fB\-\-authProtocol\fR \fIauthentication protocol\fR
+\fB\-w\fR | \fB\-\-authProtocol\fR \fIauthentication protocol\fR
 .RS 4
 Set the
 \fIauthentication protocol\fR
 used for authenticated SNMPv3 messages\&. Allowed values are MD5 or SHA\&. Default value is MD5\&.
 .RE
 .PP
-\fB\-A\fR | \fB\-\-authPassword\fR \fIauthentication pass phrase\fR
+\fB\-W\fR | \fB\-\-authPassword\fR \fIauthentication pass phrase\fR
 .RS 4
 Set the
 \fIauthentication pass phrase\fR
@ -178,6 +183,39 @@ used for encrypted SNMPv3 messages\&. This parameter is mandatory if you set
 \fIsecurity level\fR
 to authPriv\&.
 .RE
+.SH "MISCELLANEOUS OPTIONS"
+.PP
+\fB\-V\fR | \fB\-\-version\fR
+.RS 4
+Display NUT version\&.
+.RE
+.PP
+\fB\-a\fR | \fB\-\-available\fR
+.RS 4
+Display available bus that can be scanned , depending on how the binary has been compiled\&. (OLDNUT, USB, SNMP, XML, AVAHI, IPMI)\&.
+.RE
+.PP
+\fB\-q\fR | \fB\-\-quiet\fR
+.RS 4
+Display only scan result\&. No information on currently scanned bus is displayed\&.
+.RE
+.SH "EXAMPLES"
+.sp
+To scan USB devices only:
+.sp
+\fBnut\-scanner \-U\fR
+.sp
+To scan SNMP v1 device with public community on address range 192\&.168\&.0\&.0 to 192\&.168\&.0\&.255:
+.sp
+\fBnut\-scanner \-S \-s 192\&.168\&.0\&.0 \-e 192\&.168\&.0\&.255\fR
+.sp
+The same using CIDR notation:
+.sp
+\fBnut\-scanner \-S \-m 192\&.168\&.0\&.0/24\fR
+.sp
+To scan NUT servers with a timeout of 10 seconds on IP range 192\&.168\&.0\&.0 to 192\&.168\&.0\&.128 using CIDR notation:
+.sp
+\fBnut\-scanner \-O \-t 10 \-m 192\&.168\&.0\&.0/25\fR
 .SH "SEE ALSO"
 .sp
 \fBups.conf\fR(5)
--- a/docs/man/nut-scanner.txt
+++ b/docs/man/nut-scanner.txt
@ -15,7 +15,8 @@ SYNOPSIS
 DESCRIPTION
 -----------

-*nut-scanner* scans available communication buses and display any NUT compatible device it has found.
+*nut-scanner* scans available communication buses and displays any
+NUT-compatible devices it has found.

 OPTIONS
 -------
@ -42,11 +43,11 @@ BUS OPTIONS

 *-U* | *--usb_scan*::

-  List all NUT compatible USB devices currently plugged in.
+  List all NUT-compatible USB devices currently plugged in.

 *-S* | *--snmp_scan*::

-  Scan SNMP devices. Require at least a 'start IP', and optionnaly an 'end IP'. See specific SNMP OPTIONS for community and security settings.
+  Scan SNMP devices. Requires at least a 'start IP', and optionally, an 'end IP'. See specific SNMP OPTIONS for community and security settings.

 *-M* | *--xml_scan*::

@ -58,7 +59,7 @@ BUS OPTIONS

 *-A* | *--avahi_scan*::

-  Scan NUT servers using avahi request on the current network interfaces. No IP required.
+  Scan NUT servers using Avahi request on the current network interfaces. No IP required.

 *-I* | *--ipmi_scan*::

@ -77,12 +78,16 @@ NETWORK OPTIONS

 *-e* | *--end_ip* 'end IP'::

-  Set the last IP (IPv4 or IPv6) when a range of IP is required (SNMP, old_nut). If this parameter is omitted, only the 'start IP' is scanned. If 'end IP' is lesser than 'start IP', both parameter are internally permuted.
+  Set the last IP (IPv4 or IPv6) when a range of IP is required (SNMP, old_nut). If this parameter is omitted, only the 'start IP' is scanned. If 'end IP' is less than 'start IP', both parameters are internally permuted.
+
+*-m* | *--mask_cidr* 'IP address/mask'::
+
+  Set a range of IP using CIDR notation.

 NUT DEVICE OPTION
 -----------------

-*-p* | *--port <port number* 'port number'::
+*-p* | *--port* 'port number'::

  Set the port number of scanned NUT devices (default 3493).

@ -104,11 +109,11 @@ SNMP V3 OPTIONS

  Set the 'security name' used for authenticated SNMPv3 messages. This parameter is mandatory if you set 'security level'.

-*-a* | *--authProtocol* 'authentication protocol'::
+*-w* | *--authProtocol* 'authentication protocol'::

  Set the 'authentication protocol' used for authenticated SNMPv3 messages. Allowed values are MD5 or SHA. Default value is MD5.

-*-A* | *--authPassword* 'authentication pass phrase'::
+*-W* | *--authPassword* 'authentication pass phrase'::

  Set the 'authentication pass phrase' used for authenticated SNMPv3 messages. This parameter is mandatory if you set 'security level' to authNoPriv or authPriv.

@ -120,6 +125,41 @@ SNMP V3 OPTIONS

  Set the 'privacy pass phrase' used for encrypted SNMPv3 messages. This parameter is mandatory if you set 'security level' to authPriv.

+MISCELLANEOUS OPTIONS
+---------------------
+
+*-V* | *--version*::
+
+  Display NUT version.
+
+*-a* | *--available*::
+
+  Display available bus that can be scanned , depending on how the binary has been compiled. (OLDNUT, USB, SNMP, XML, AVAHI, IPMI).
+
+*-q* | *--quiet*::
+
+  Display only scan result. No information on currently scanned bus is displayed.
+
+EXAMPLES
+--------
+
+To scan USB devices only:
+
+*nut-scanner -U*
+
+To scan SNMP v1 device with public community on address range 192.168.0.0 to 192.168.0.255:
+
+*nut-scanner -S -s 192.168.0.0 -e 192.168.0.255*
+
+The same using CIDR notation:
+
+*nut-scanner -S -m 192.168.0.0/24*
+
+To scan NUT servers with a timeout of 10 seconds on IP range 192.168.0.0 to 192.168.0.128 using CIDR notation:
+
+*nut-scanner -O -t 10 -m 192.168.0.0/25*
+
+
 SEE ALSO
 --------

--- a/docs/man/nut.conf.5
+++ b/docs/man/nut.conf.5
@ -2,12 +2,12 @@
 .\"     Title: nut.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUT\&.CONF" "5" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUT\&.CONF" "5" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan.3
+++ b/docs/man/nutscan.3
@ -0,0 +1,165 @@
+'\" t
+.\"     Title: nutscan
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 11/03/2011
+.\"    Manual: NUT Manual
+.\"    Source: Network UPS Tools
+.\"  Language: English
+.\"
+.TH "NUTSCAN" "3" "11/03/2011" "Network UPS Tools" "NUT Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nutscan \- Network UPS Tools (NUT) device discovery library
+.SH "DESCRIPTION"
+.sp
+The Network UPS Tools (NUT) \fBnutscan\fR library provides the same discovery related features that are also offered by \fBnut-scanner\fR(8)\&.
+.sp
+It allows to discover supported NUT devices (USB, SNMP, Eaton XML/HTTP and IPMI) and NUT servers (using Avahi or the classic connection method)\&.
+.SH "DISCOVERY FUNCTIONS"
+.sp
+First, include the needed header file:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+#include <nut\-scan\&.h>
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Then, to discover new devices, use the appropriate function:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_usb\fR(3)
+for supported USB devices,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_snmp\fR(3)
+for supported SNMP agents,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_xml_http\fR(3)
+for Eaton Network Management Card,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_nut\fR(3)
+for NUT servers (upsd), using the classic method,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_avahi\fR(3)
+for NUT servers (upsd), using the mDNS (Avahi) method,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_scan_ipmi\fR(3)
+for supported IPMI PSU\&.
+.RE
+.sp
+All these functions return a list of devices found, using the nutscan_device_t structure\&. This one is described in \fBnutscan_add_device_to_device\fR(3)\&.
+.sp
+Helper functions are also provided to output data using standard format:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_display_parsable\fR(3)
+for parsable output,
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+\fBnutscan_display_ups_conf\fR(3)
+for ups\&.conf style\&.
+.RE
+.SH "ERROR HANDLING"
+.sp
+There is currently no specific mechanism around error handling\&.
+.SH "SEE ALSO"
+.sp
+\fBnut-scanner\fR(8), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3) \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3) \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3) \fBnutscan_display_parsable\fR(3), \fBnutscan_display_ups_conf\fR(3) \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3) \fBnutscan_add_device_to_device\fR(3), \fBnutscan_add_option_to_device\fR(3) \fBnutscan_cidr_to_ip\fR(3)
--- a/docs/man/nutscan.txt
+++ b/docs/man/nutscan.txt
@ -0,0 +1,59 @@
+NUTSCAN(3)
+==========
+
+NAME
+----
+
+nutscan - Network UPS Tools (NUT) device discovery library
+
+DESCRIPTION
+-----------
+
+The Network UPS Tools (NUT) *nutscan* library provides the same discovery
+related features that are also offered by linkman:nut-scanner[8].
+
+It allows to discover supported NUT devices (USB, SNMP, Eaton XML/HTTP and IPMI)
+and NUT servers (using Avahi or the classic connection method).
+
+
+DISCOVERY FUNCTIONS
+-------------------
+
+First, include the needed header file:
+
+ #include <nut-scan.h>
+
+Then, to discover new devices, use the appropriate function:
+
+- linkman:nutscan_scan_usb[3] for supported USB devices,
+- linkman:nutscan_scan_snmp[3] for supported SNMP agents,
+- linkman:nutscan_scan_xml_http[3] for Eaton Network Management Card,
+- linkman:nutscan_scan_nut[3] for NUT servers (upsd), using the classic method,
+- linkman:nutscan_scan_avahi[3] for NUT servers (upsd), using the mDNS (Avahi) method,
+- linkman:nutscan_scan_ipmi[3] for supported IPMI PSU.
+
+
+All these functions return a list of devices found, using the nutscan_device_t
+structure. This one is described in linkman:nutscan_add_device_to_device[3].
+
+Helper functions are also provided to output data using standard format:
+
+- linkman:nutscan_display_parsable[3] for parsable output,
+- linkman:nutscan_display_ups_conf[3] for ups.conf style.
+
+
+ERROR HANDLING
+--------------
+There is currently no specific mechanism around error handling.
+
+
+SEE ALSO
+--------
+linkman:nut-scanner[8],
+linkman:nutscan_scan_usb[3], linkman:nutscan_scan_snmp[3]
+linkman:nutscan_scan_xml_http[3], linkman:nutscan_scan_nut[3]
+linkman:nutscan_scan_avahi[3], linkman:nutscan_scan_ipmi[3]
+linkman:nutscan_display_parsable[3], linkman:nutscan_display_ups_conf[3]
+linkman:nutscan_new_device[3], linkman:nutscan_free_device[3]
+linkman:nutscan_add_device_to_device[3], linkman:nutscan_add_option_to_device[3]
+linkman:nutscan_cidr_to_ip[3]
--- a/docs/man/nutscan_add_device_to_device.3
+++ b/docs/man/nutscan_add_device_to_device.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_add_device_to_device
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_ADD_DEVICE_T" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_ADD_DEVICE_T" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_add_option_to_device.3
+++ b/docs/man/nutscan_add_option_to_device.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_add_option_to_device
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_ADD_OPTION_T" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_ADD_OPTION_T" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_cidr_to_ip.3
+++ b/docs/man/nutscan_cidr_to_ip.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_cidr_to_ip
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_CIDR_TO_IP" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_CIDR_TO_IP" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_display_parsable.3
+++ b/docs/man/nutscan_display_parsable.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_display_parsable
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_DISPLAY_PARS" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_DISPLAY_PARS" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_display_ups_conf.3
+++ b/docs/man/nutscan_display_ups_conf.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_display_ups_conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_DISPLAY_UPS_" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_DISPLAY_UPS_" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_free_device.3
+++ b/docs/man/nutscan_free_device.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_free_device
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_FREE_DEVICE" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_FREE_DEVICE" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_init.3
+++ b/docs/man/nutscan_init.3
@ -0,0 +1,65 @@
+'\" t
+.\"     Title: nutscan_init
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 12/15/2011
+.\"    Manual: NUT Manual
+.\"    Source: Network UPS Tools
+.\"  Language: English
+.\"
+.TH "NUTSCAN_INIT" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nutscan_init \- Initialize the nutscan library\&.
+.SH "SYNOPSIS"
+.sp
+.nf
+#include <nut\-scan\&.h>
+.fi
+.sp
+.nf
+void nutscan_init();
+.fi
+.SH "DESCRIPTION"
+.sp
+The \fBnutscan_init()\fR function must be called at least once before using any other function of the nutscan library\&.
+.sp
+It updates the following global variables which can be used by nutscan library user to know which scan methods are available at run\-time\&. This depends on the libraries installed on the system:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+nutscan_avail_avahi = 1 : AVAHI scan is available
+nutscan_avail_ipmi = 1 : IPMI scan is available
+nutscan_avail_nut = 1 : Old NUT method is available
+nutscan_avail_snmp = 1 : SNMP method is available
+nutscan_avail_usb = 1 : USB method is available
+nutscan_avail_xml_http = 1 : XML HTTP method is available
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Note that if a method is reported as unavailable by those variables, the call to the corresponding nutscan_scan_* function will always return NULL\&.
+.SH "SEE ALSO"
+.sp
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3)
--- a/docs/man/nutscan_init.txt
+++ b/docs/man/nutscan_init.txt
@ -0,0 +1,40 @@
+NUTSCAN_INIT(3)
+===============
+
+NAME
+----
+
+nutscan_init - Initialize the nutscan library.
+
+SYNOPSIS
+--------
+
+ #include <nut-scan.h>
+
+ void nutscan_init();
+
+DESCRIPTION
+-----------
+
+The *nutscan_init()* function must be called at least once before using any other function of the nutscan library.
+
+It updates the following global variables which can be used by nutscan library user to know which scan methods are available at run-time. This depends on the libraries installed on the system:
+
+	nutscan_avail_avahi = 1 : AVAHI scan is available
+	nutscan_avail_ipmi = 1 : IPMI scan is available
+	nutscan_avail_nut = 1 : Old NUT method is available
+	nutscan_avail_snmp = 1 : SNMP method is available
+	nutscan_avail_usb = 1 : USB method is available
+	nutscan_avail_xml_http = 1 : XML HTTP method is available
+
+Note that if a method is reported as unavailable by those variables, the call to the corresponding nutscan_scan_* function will always return NULL.
+
+SEE ALSO
+--------
+linkman:nutscan_init[3], linkman:nutscan_scan_usb[3],
+linkman:nutscan_scan_snmp[3], linkman:nutscan_scan_xml_http[3], 
+linkman:nutscan_scan_nut[3], linkman:nutscan_scan_avahi[3], 
+linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
+linkman:nutscan_display_parsable[3], linkman:nutscan_new_device[3],
+linkman:nutscan_free_device[3], linkman:nutscan_add_option_to_device[3],
+linkman:nutscan_add_device_to_device[3]
--- a/docs/man/nutscan_new_device.3
+++ b/docs/man/nutscan_new_device.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_new_device
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_NEW_DEVICE" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_NEW_DEVICE" "3" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/nutscan_scan_avahi.3
+++ b/docs/man/nutscan_scan_avahi.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_avahi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_AVAHI" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_AVAHI" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -42,10 +42,12 @@ nutscan_device_t * nutscan_scan_avahi(long usec_timeout);
 .sp
 The \fBnutscan_scan_avahi()\fR function try to detect NUT service and its associated devcies\&. It uses the AVAHI library to do so\&.
 .sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
+.sp
 This function waits up to \fIusec_timeout\fR microseconds before considering an IP address does not respond\&.
 .SH "RETURN VALUE"
 .sp
 The \fBnutscan_scan_avahi()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
--- a/docs/man/nutscan_scan_avahi.txt
+++ b/docs/man/nutscan_scan_avahi.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_avahi()* function try to detect NUT service and its associated devcies. It uses the AVAHI library to do so.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 This function waits up to 'usec_timeout' microseconds before considering an IP address does not respond.

 RETURN VALUE
@ -27,6 +29,7 @@ The *nutscan_scan_avahi()* function returns a pointer to a `nutscan_device_t` st

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_xml_http[3], 
 linkman:nutscan_scan_nut[3], linkman:nutscan_scan_snmp[3], 
 linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutscan_scan_ipmi.3
+++ b/docs/man/nutscan_scan_ipmi.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_ipmi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_IPMI" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_IPMI" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -41,9 +41,11 @@ nutscan_device_t * nutscan_scan_ipmi(void);
 .SH "DESCRIPTION"
 .sp
 The \fBnutscan_scan_ipmi()\fR function is not implemented yet\&.
+.sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
 .SH "RETURN VALUE"
 .sp
 The \fBnutscan_scan_ipmi()\fR function is not implemented yet\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
--- a/docs/man/nutscan_scan_ipmi.txt
+++ b/docs/man/nutscan_scan_ipmi.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_ipmi()* function is not implemented yet.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 RETURN VALUE
 ------------

@ -25,6 +27,7 @@ The *nutscan_scan_ipmi()* function is not implemented yet.

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_xml_http[3], 
 linkman:nutscan_scan_nut[3], linkman:nutscan_scan_avahi[3], 
 linkman:nutscan_scan_snmp[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutscan_scan_nut.3
+++ b/docs/man/nutscan_scan_nut.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_nut
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_NUT" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_NUT" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -42,6 +42,8 @@ nutscan_device_t * nutscan_scan_nut(const char * startIP, const char * stopIP, c
 .sp
 The \fBnutscan_scan_nut()\fR function try to detect available NUT services and their associated devices\&. It issues a NUT request on every IP ranging from \fIstartIP\fR to \fIstopIP\fR\&. \fIstartIP\fR is mandatory, \fIstopIP\fR is optional\&. Those IP may be either IPv4 or IPv6 addresses or host names\&.
 .sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
+.sp
 A specific \fIport\fR number may be passed, or NULL to use the default NUT port\&.
 .sp
 This function waits up to \fIusec_timeout\fR microseconds before considering an IP address does not respond to NUT queries\&.
@ -50,4 +52,4 @@ This function waits up to \fIusec_timeout\fR microseconds before considering an
 The \fBnutscan_scan_nut()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
--- a/docs/man/nutscan_scan_nut.txt
+++ b/docs/man/nutscan_scan_nut.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_nut()* function try to detect available NUT services and their associated devices. It issues a NUT request on every IP ranging from 'startIP' to 'stopIP'. 'startIP' is mandatory, 'stopIP' is optional. Those IP may be either IPv4 or IPv6 addresses or host names.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 A specific 'port' number may be passed, or NULL to use the default NUT port.

 This function waits up to 'usec_timeout' microseconds before considering an IP address does not respond to NUT queries.
@ -29,6 +31,7 @@ The *nutscan_scan_nut()* function returns a pointer to a `nutscan_device_t` stru

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_xml_http[3], 
 linkman:nutscan_scan_snmp[3], linkman:nutscan_scan_avahi[3], 
 linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutscan_scan_snmp.3
+++ b/docs/man/nutscan_scan_snmp.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_snmp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_SNMP" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_SNMP" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -42,6 +42,8 @@ nutscan_device_t * nutscan_scan_snmp(const char * start_ip,const char * stop_ip,
 .sp
 The \fBnutscan_scan_snmp()\fR function try to detect NUT compatible SNMP devices\&. It tries SNMP queries on every IP ranging from \fIstart_ip\fR to \fIstop_ip\fR\&. Those IP may be either IPv4 or IPv6 addresses or host names\&.
 .sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
+.sp
 This function waits up to \fItimeout\fR microseconds before considering an IP address does not respond to SNMP queries\&.
 .sp
 A valid nutscan_snmp_t structure must be passed to this function\&.
@ -84,4 +86,4 @@ If \fIprivProtocol\fR is NULL, DES protocol is used\&. Else you can set \fIprivP
 The \fBnutscan_scan_snmp()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
--- a/docs/man/nutscan_scan_snmp.txt
+++ b/docs/man/nutscan_scan_snmp.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_snmp()* function try to detect NUT compatible SNMP devices. It tries SNMP queries on every IP ranging from 'start_ip' to 'stop_ip'. Those IP may be either IPv4 or IPv6 addresses or host names.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 This function waits up to 'timeout' microseconds before considering an IP address does not respond to SNMP queries.

 A valid `nutscan_snmp_t` structure must be passed to this function.
@ -55,6 +57,7 @@ The *nutscan_scan_snmp()* function returns a pointer to a `nutscan_device_t` str

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_xml_http[3], 
 linkman:nutscan_scan_nut[3], linkman:nutscan_scan_avahi[3], 
 linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutscan_scan_usb.3
+++ b/docs/man/nutscan_scan_usb.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_usb
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_USB" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_USB" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -41,9 +41,11 @@ nutscan_device_t * nutscan_scan_usb();
 .SH "DESCRIPTION"
 .sp
 The \fBnutscan_scan_usb()\fR function try to detect NUT compatible USB devices\&.
+.sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
 .SH "RETURN VALUE"
 .sp
 The \fBnutscan_scan_usb()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3)
--- a/docs/man/nutscan_scan_usb.txt
+++ b/docs/man/nutscan_scan_usb.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_usb()* function try to detect NUT compatible USB devices.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 RETURN VALUE
 ------------

@ -25,6 +27,7 @@ The *nutscan_scan_usb()* function returns a pointer to a `nutscan_device_t` stru

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_snmp[3], linkman:nutscan_scan_xml_http[3], 
 linkman:nutscan_scan_nut[3], linkman:nutscan_scan_avahi[3], 
 linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutscan_scan_xml_http.3
+++ b/docs/man/nutscan_scan_xml_http.3
@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_xml_http
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 12/15/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_XML_HTT" "3" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTSCAN_SCAN_XML_HTT" "3" "12/15/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -41,9 +41,11 @@ nutscan_device_t * nutscan_scan_xml_http(long usec_timeout);
 .SH "DESCRIPTION"
 .sp
 The \fBnutscan_scan_xml_http()\fR function try to detect NUT compatible XML/HTTP devices\&. It does this by issuing a broadcast message on currently configured network interfaces\&. It waits up to \fIusec_timeout\fR microseconds for a response from potential devices\&.
+.sp
+You MUST call \fBnutscan_init\fR(3) before using this function\&.
 .SH "RETURN VALUE"
 .sp
 The \fBnutscan_scan_xml_http()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
 .SH "SEE ALSO"
 .sp
-\fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3)
+\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3)
--- a/docs/man/nutscan_scan_xml_http.txt
+++ b/docs/man/nutscan_scan_xml_http.txt
@ -18,6 +18,8 @@ DESCRIPTION

 The *nutscan_scan_xml_http()* function try to detect NUT compatible XML/HTTP devices. It does this by issuing a broadcast message on currently configured network interfaces. It waits up to 'usec_timeout' microseconds for a response from potential devices.

+You MUST call linkman:nutscan_init[3] before using this function.
+
 RETURN VALUE
 ------------

@ -25,6 +27,7 @@ The *nutscan_scan_xml_http()* function returns a pointer to a `nutscan_device_t`

 SEE ALSO
 --------
+linkman:nutscan_init[3],
 linkman:nutscan_scan_usb[3], linkman:nutscan_scan_snmp[3], 
 linkman:nutscan_scan_nut[3], linkman:nutscan_scan_avahi[3], 
 linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3], 
--- a/docs/man/nutupsdrv.8
+++ b/docs/man/nutupsdrv.8
@ -2,12 +2,12 @@
 .\"     Title: nutupsdrv
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "NUTUPSDRV" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "NUTUPSDRV" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@ -86,6 +86,13 @@ Raise the debugging level\&. Use this multiple times to see more details\&. Runn
 The level of debugging needed depends both on the driver and the problem you\(cqre trying to diagnose\&. Therefore, first explain the problem you have with a driver to a developer/maintainer, before sending them debugging output\&. More often than not, if you just pick a level, the output may be either too limited or too verbose to be of any use\&.
 .RE
 .PP
+\fB\-q\fR
+.RS 4
+Raise log level threshold\&. Use this multiple times to log more details\&.
+.sp
+The debugging comment above also applies here\&.
+.RE
+.PP
 \fB\-i\fR \fIinterval\fR
 .RS 4
 Set the poll interval for the device\&.
--- a/docs/man/nutupsdrv.txt
+++ b/docs/man/nutupsdrv.txt
@ -66,6 +66,11 @@ have with a driver to a developer/maintainer, before sending them debugging
 output.  More often than not, if you just pick a level, the output may be
 either too limited or too verbose to be of any use.

+*-q*::
+Raise log level threshold.  Use this multiple times to log more details.
+
+The debugging comment above also applies here.
+ 
 *-i* 'interval'::
 Set the poll interval for the device.

--- a/docs/man/oneac.8
+++ b/docs/man/oneac.8
@ -2,12 +2,12 @@
 .\"     Title: oneac
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "ONEAC" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "ONEAC" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/optiups.8
+++ b/docs/man/optiups.8
@ -2,12 +2,12 @@
 .\"     Title: optiups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "OPTIUPS" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "OPTIUPS" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/powercom.8
+++ b/docs/man/powercom.8
@ -2,12 +2,12 @@
 .\"     Title: powercom
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "POWERCOM" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "POWERCOM" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/powerman-pdu.8
+++ b/docs/man/powerman-pdu.8
@ -2,12 +2,12 @@
 .\"     Title: powerman-pdu
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "POWERMAN\-PDU" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "POWERMAN\-PDU" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/docs/man/powerpanel.8
+++ b/docs/man/powerpanel.8
@ -2,12 +2,12 @@
 .\"     Title: powerpanel
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/15/2011
+.\"      Date: 10/09/2011
 .\"    Manual: NUT Manual
 .\"    Source: Network UPS Tools
 .\"  Language: English
 .\"
-.TH "POWERPANEL" "8" "09/15/2011" "Network UPS Tools" "NUT Manual"
+.TH "POWERPANEL" "8" "10/09/2011" "Network UPS Tools" "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
--- a/Show more
+++ b/Show more