Imported Upstream version 2.7.2

ChangeLog

@@ -1,3 +1,474 @@
+2014-04-17  Arnaud Quette <arnaud.quette@free.fr>
+
+	* NEWS, UPGRADING, configure.ac: Update for release 2.7.2  Complete
+	  the release information for NUT 2.7.2
+
+2014-04-07  Arnaud Quette <arnaud.quette@free.fr>
+
+	* drivers/compaq-mib.c: Fix erroneous status in HP/Compaq SNMP MIB
+	  Using the most recent HP firmware (1.76), erroneous on-battery
+	  status were reported. Also disable an erroneous low-battery
+	  definition (pointing nowhere), while waiting for actual
+	  improvements (report and patch from Philippe Andersson ; Closes
+	  networkupstools/nut#117)
+
+2014-04-06  Daniele Pezzini <hyouko@gmail.com>
+
+	* drivers/mge-xml.c: mge-xml: fix compile-time warnings, versioning
+
+2014-04-05  Charles Lepple <clepple+nut@gmail.com>
+
+	* data/driver.list.in: HCL: Numeric Digital 800 plus  USB VID:PID =
+	  0665:5161  Reference: networkupstools/nut#115 (blazer_usb @ 2.6.4;
+	  waiting for confirmation with nutdrv_qx)
+	* data/driver.list.in: HCL: Eaton Powerware 3105 supported by
+	  bcmxcp_usb  Closes networkupstools/nut#117
+	* data/driver.list.in, drivers/belkin-hid.c: usbhid-ups/belkin-hid:
+	  add support for Emerson Network Power Liebert PSI 1440  USB VID:PID
+	  = 10af:0004
+	  http://article.gmane.org/gmane.comp.monitoring.nut.user/8479
+
+2014-04-05  Arnaud Quette <arnaud.quette@free.fr>
+
+	* drivers/al175.c: Fix data format warnings on all architectures
+	  Complete commit 7daa0feb6ed4f1c29bfe14c8e491ba198a4ba643, and
+	  actually fix some of the warnings related data format. Also bump
+	  al175 driver revision
+	* clients/Makefile.am: Update libupsclient library version
+	  information  Following the recent export of libcommon functions in
+	  libupsclient, update the library version information to 4:0:0
+
+2014-04-04  Arnaud Quette <arnaud.quette@free.fr>
+
+	* drivers/al175.c: Fix data format warnings  Fix a few warnings
+	  related data format, in debug code
+	* clients/Makefile.am: Add libnutclient library version information
+	  Add the missing LDFLAGS for adding version information
+
+2014-03-21  Arnaud Quette <arnaud.quette@free.fr>
+
+	* data/driver.list.in: [HCL] CABAC UPS-1700DV2 supported by
+	  blazer_usb  Reported by jammin84  Closes #113
+	* clients/Makefile.am, common/Makefile.am: Link libupsclient with
+	  libcommon  Fix undefined references related to functions of
+	  libcommon. This issue was reported on Debian:
+	  https://bugs.debian.org/731156 (patch from Matthias Klose ; Closes
+	  Github issue #73)
+
+2014-03-18  Charles Lepple <clepple+nut@gmail.com>
+
+	* data/driver.list.in: [HCL] Digitus DN-170014 supported by
+	  richcomm_usb  Reference: http://lists.alioth.debian.org/pipermail
+	  /nut-upsdev/2014-March/006695.html -or- http://news.gmane.org/find-
+	  root.php?message_id=CADq9dvWMx0xBz9XXkVKXCre4ox%2d2kSeHtD7LW39eEDH1
+	  RCY8sQ%40mail.gmail.com
+
+2014-03-05  Charles Lepple <clepple+nut@gmail.com>
+
+	* UPGRADING: Added note about --enable-option-checking=fatal  Closes
+	  #99 (really)
+
+2014-03-03  Charles Lepple <clepple+nut@gmail.com>
+
+	* data/driver.list.in: HCL: various updates  * Closes
+	  https://github.com/networkupstools/nut/issues/107
+	  * http://lists.alioth.debian.org/pipermail/nut-
+	  upsdev/2013-November/006564.html * http://news.gmane.org/find-
+	  root.php?message_id=50D9D460.1080408%40gmail.com
+	  * http://news.gmane.org/find-root.php?message_id=CA%2b4duQ%3dppW%2
+	  bPz%2bRVPVXJyFLj0HErh1ZOtm5tk8b6n5Nd5kSk0g%40mail.gmail.com *
+	  http://news.gmane.org/find-
+	  root.php?message_id=528EC53C.9000801%40me.com
+	* docs/nut-qa.txt: NUT QA document: updated and reworded
+	* docs/nut-qa.txt: NUT QA document: CR->LF
+	* docs/FAQ.txt: FAQ: minor updates  Update the bestfortress entry,
+	  fix the mythicbeasts URL, and reword a few entries.
+
+2014-02-13  Charles Lepple <clepple+nut@gmail.com>
+
+	* docs/man/upsimage.cgi.txt: upsimage.cgi(8): update GD homepage
+
+2014-03-03  Émilien Kia <emilien.kia@gmail.com>
+
+	* drivers/nutdrv_qx.h: Detect if TRUE (and FALSE) are already defined
+	  and define bool_t accordingly.
+
+2014-02-27  Arnaud Quette <arnaud.quette@free.fr>
+
+	* UPGRADING: Add a note on Hardware Abstraction Layer removal
+	* INSTALL.nut, autogen.sh, configure.ac, docs/Makefile.am,
+	  docs/configure.txt, docs/developers.txt, docs/features.txt,
+	  docs/macros.txt, docs/new-drivers.txt, docs/nut-hal.txt, docs
+	  /packager-guide.txt, drivers/Makefile.am, drivers/dstate-hal.c,
+	  drivers/dstate-hal.h, drivers/main-hal.c, drivers/main-hal.h,
+	  m4/nut_check_libhal.m4, m4/nut_config_libhal.m4: Remove the
+	  remaining HAL files and references  Remove the remaining build
+	  rules, source code and documentation related to the FreeDesktop
+	  Hardware Abstraction Layer (HAL) support. For the record, with this
+	  HAL implementation, NUT drivers were sending data over DBus
+	  (Closes: #99)
+
+2014-02-24  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/blazer_usb.c, drivers/libusb.c, drivers/nutdrv_qx.c,
+	  drivers/riello_usb.c, drivers/usbhid-ups.c: OpenBSD ports tree
+	  patches for EPROTO  Closes networkupstools/nut#44
+
+2014-02-26  Arnaud Quette <arnaud.quette@free.fr>
+
+	* scripts/Makefile.am, scripts/README, scripts/hal/.gitignore,
+	  scripts/hal/Makefile.am, tools/nut-usbinfo.pl: Remove the
+	  generation of HAL support files  Remove the code supporting the
+	  generation of HAL FDI file. This is the first commit of a set to
+	  address Github issue #99
+	* drivers/snmp-ups.c: Fix snmp-ups segmentation fault  A basic sanity
+	  check was missing in the core code of snmp-ups, causing a driver
+	  crash under some specific circumstances, at driver initialisation
+	  time. Hence, this does not affect production systems
+	* README, UPGRADING, docs/FAQ.txt, docs/config-notes.txt,
+	  drivers/Makefile.am, scripts/Solaris/nut.in,
+	  scripts/Solaris/postinstall.in, scripts/Solaris/preremove.in,
+	  scripts/systemd/nut-driver.service.in,
+	  scripts/systemd/nutshutdown.in: Closes #96: Install upsdrvctl to
+	  $prefix/sbin  Install upsdrvctl to $prefix/sbin rather than
+	  $driverexec. upsdrvctl has been historically standing beside the
+	  drivers. It now resides in the system binaries ($prefix/sbin)
+	  directory
+
+2014-02-25  Arnaud Quette <arnaud.quette@free.fr>
+
+	* drivers/mge-hid.c: Add improved support for Eaton 5P  Add the
+	  necessary hooks to improve support for Eaton 5P range. This
+	  includes post-processing of the model name, along with handling
+	  rules for battery voltage (actual and nominal)
+
+2014-02-19  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/Makefile.am, docs/chunked.xsl, docs/common.xsl,
+	  docs/xhtml.xsl: docs: prevent smartphones from being too smart
+	  (docbook)  Add HTML <meta> tag to not auto-create telephone number
+	  links on mobile browsers also in docbook processed documents.
+	  Reference: https://github.com/networkupstools/nut/issues/78  XSL
+	  files source: - https://github.com/asciidoc/asciidoc/blob/master
+	  /docbook-xsl/common.xsl -
+	  https://github.com/asciidoc/asciidoc/blob/master/docbook-
+	  xsl/xhtml.xsl - https://github.com/asciidoc/asciidoc/blob/master
+	  /docbook-xsl/chunked.xsl
+	* docs/man/asciidoc.conf: docs: prevent smartphones from being too
+	  smart  Add HTML <meta> tag to not auto-create telephone number
+	  links on mobile browsers.  Reference:
+	  https://github.com/networkupstools/nut/issues/78
+
+2014-02-15  Arnaud Quette <arnaud.quette@free.fr>
+
+	* docs/acknowledgements.txt: Update NUT team membership for Daniele
+	  Pezzini  Daniele Pezzini is a now a NUT senior developer
+
+2014-02-14  Arnaud Quette <arnaud.quette@free.fr>
+
+	* docs/acknowledgements.txt, docs/website/news.txt: Formalizing the
+	  end of the relationship with Eaton  The situation of the
+	  relationship with Eaton has evolved, and since 2011 Eaton does not
+	  support NUT anymore. This may still evolve in the future. But for
+	  now, please do not consider anymore that buying Eaton products will
+	  provide you with official support from Eaton, or a better level of
+	  device support in NUT.
+
+2014-02-14  Charles Lepple <clepple+nut@gmail.com>
+
+	* Makefile.am: devd: use staging directory for distcheck
+	* drivers/Makefile.am, drivers/snmp-ups.c, drivers/xppc-mib.c,
+	  drivers/xppc-mib.h: snmp-ups: add XPPC-MIB for Tripp Lite
+	  SU10KRT3/1X
+	* scripts/subdriver/gen-snmp-subdriver.sh: gen-snmp-subdriver.sh:
+	  documentation updates
+
+2014-02-10  Charles Lepple <clepple+nut@gmail.com>
+
+	* scripts/subdriver/gen-snmp-subdriver.sh: gen-snmp-subdriver.sh: fix
+	  option typos  * Use '-M' for MIB directories, to match snmpwalk and
+	  the help text. * Add space before '-c' in snmpwalk (not sure how
+	  this worked before)
+	* scripts/Makefile.am: cosmetic: Indent scripts/Makefile.am
+	  EXTRA_DIST continuation lines
+	* scripts/Makefile.am: Add gen-snmp-subdriver.sh to distribution
+	  tarball
+
+2014-02-14  Arnaud Quette <arnaud.quette@free.fr>
+
+	* docs/acknowledgements.txt: Update NUT team membership for
+	  Frédéric Bohe  Frederic Bohe, NUT senior developer and Eaton
+	  contractor from 2009 to 2013, is now a retired member. Thanks for
+	  all the hard work on the Windows port, nut-scanner, Unix packaging,
+	  support, ... Also update the developers membership page, from
+	  Alioth to GitHub
+
+2013-02-24  Charles Lepple <clepple+nut@gmail.com>
+
+	* autogen.sh, configure.ac, scripts/Makefile.am,
+	  scripts/devd/.gitignore, scripts/devd/Makefile.am,
+	  scripts/devd/README, tools/nut-usbinfo.pl: FreeBSD: generate
+	  devd.conf files for USB UPSes  This adds a --with-devd-dir=PATH
+	  option to ./configure, which defaults to /usr/local/etc/devd (or
+	  /etc/devd, whichever is found first).  Unlike udev, there does not
+	  seem to be a way to re-trigger rules at runtime. This means you
+	  will likely need to unplug and replug your UPS after installing the
+	  new nut-usb.conf file.
+
+2014-02-13  Arnaud Quette <arnaud.quette@free.fr>
+
+	* .gitignore, server/.gitignore: Minor completion to gitignore files
+	  Add a few more exotic targets, related to debug or official
+	  distribution
+
+2014-02-11  Daniele Pezzini <hyouko@gmail.com>
+
+	* .gitignore, clients/.gitignore, common/.gitignore, conf/.gitignore,
+	  data/.gitignore, data/html/.gitignore, docs/.gitignore,
+	  docs/man/.gitignore, docs/website/.gitignore,
+	  docs/website/scripts/.gitignore, drivers/.gitignore,
+	  include/.gitignore, lib/.gitignore, m4/.gitignore,
+	  scripts/.gitignore, scripts/HP-UX/.gitignore,
+	  scripts/Solaris/.gitignore, scripts/augeas/.gitignore,
+	  scripts/avahi/.gitignore, scripts/hal/.gitignore,
+	  scripts/hotplug/.gitignore, scripts/python/.gitignore,
+	  scripts/systemd/.gitignore, scripts/udev/.gitignore,
+	  scripts/ufw/.gitignore, server/.gitignore, tests/.gitignore,
+	  tools/.gitignore, tools/nut-scanner/.gitignore: Simplify gitignore
+	  files  Remove redundancies and old/svn things. Limit the scope
+	  wherever it makes sense. Ignore all cscope files and test logs.
+	  Make ignoring generated files easier to maintain.
+
+2014-02-11  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/libshut.c: libshut: partially revert PnP/RTS change
+	  Reported by Baruch Even. It is unclear how this will work after
+	  running nut-scanner, but it is more important to keep the drivers
+	  working.  Reference: 65db105 /
+	  2013-09-24T08:18:00Z!fredericbohe@eaton.com  Closes:
+	  networkupstools/nut#91
+
+2014-02-09  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/man/nutdrv_qx.txt: nutdrv_qx: update manpage for the newly
+	  supported Voltronic Power P98 units
+	* drivers/nutdrv_qx.c, drivers/nutdrv_qx_mecer.c,
+	  drivers/nutdrv_qx_mecer.h: nutdrv_qx: improve support for
+	  '(ACK/(NAK' and Voltronic Power P98 UPSes  In 'mecer' subdriver's
+	  claim function try to get protocol (QPI, for Voltronic Power
+	  devices) used by the UPS: - supported devices are Voltronic Power's
+	  P98 units - if the UPS doesn't support the QPI command, use its
+	  reply to identify whether it uses '(ACK\r'/'(NAK\r' replies  This
+	  way we can catch '(ACK/(NAK' devices, while previously the 'mecer'
+	  subdriver was 'hidden' by the 'megatec' (echo back/'ACK/NAK') one.
+	  Plus Q1 units with 'ACK'/'NAK' replies or echoing back not
+	  supported and rejected commands are no longer wrongly 'claimed' by
+	  the 'mecer' subdriver.
+
+2014-02-03  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/.gitignore, docs/Makefile.am, docs/documentation.txt: docs:
+	  build PDF also for cables.txt
+
+2014-02-02  Daniele Pezzini <hyouko@gmail.com>
+
+	* Makefile.am, configure.ac, docs/.gitignore, docs/Makefile.am,
+	  docs/man/.gitignore, docs/man/Makefile.am, docs/stable-hcl.txt,
+	  docs/user-manual.txt, docs/website/.gitignore,
+	  docs/website/Makefile.am, docs/website/css/ie-overrides.css,
+	  docs/website/css/web-layout.css,
+	  docs/website/css/xhtml11-quirks.css, docs/website/css/xhtml11.css,
+	  docs/website/faviconut.ico, docs/website/faviconut.png,
+	  docs/website/news.txt, docs/website/old-news.txt,
+	  docs/website/projects.txt, docs/website/scripts/.gitignore,
+	  docs/website/scripts/filter_png.js, docs/website/scripts/jquery.js,
+	  docs/website/scripts/nut_jquery.js, docs/website/scripts/toc.js,
+	  docs/website/ups-protocols.txt, docs/website/web-layout.conf,
+	  docs/website/website.txt, tools/Makefile.am, tools/nut-hclinfo.py:
+	  website: move to a standalone website
+
+2014-01-18  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/net-protocol.txt: docs: fix a couple of asciidoc errors in
+	  net-protocols.txt
+	* server/netlist.c: net-protocol: fix closing line of LIST RANGE
+
+2014-01-16  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/nutdrv_atcl_usb.c: nutdrv_atcl_usb: fix permissions-based
+	  crash, and enable vendor variable (1.1)
+
+2014-01-13  Charles Lepple <clepple+nut@gmail.com>
+
+	* .gitignore: Ignore cscope.out
+	* docs/man/.gitignore, docs/man/nutdrv_atcl_usb.txt,
+	  drivers/nutdrv_atcl_usb.c: nutdrv_atcl_usb: documentation and
+	  logging (v1.0)
+
+2014-01-11  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/apc-mib.c: snmp-ups: APC SmartBoost and SmartTrim are OL
+	  SmartBoost and SmartTrim are voltage regulation functions that
+	  prevent the UPS from using the battery during brownouts and
+	  overvoltages, so the BOOST and TRIM states are also mapped to OL.
+	  Reference:
+	  http://article.gmane.org/gmane.comp.monitoring.nut.devel/6583
+	* data/driver.list.in: [HCL] MicroDowell B.Box LP 500: genericups
+	  type 7  Closes networkupstools/nut#83  From @lxp:  UPS shutdown
+	  only works when on-battery and has a delay of about 1min until
+	  execution (something between 50sec to 1min 30sec on mine).
+	  References: http://www.ezdirect.it/pdf/lp500.pdf
+	  https://forums.gentoo.org/viewtopic-t-730172-start-0.html
+
+2014-01-11  Daniele Pezzini <hyouko@gmail.com>
+
+	* drivers/blazer_ser.c, drivers/blazer_usb.c: blazer: fix man page
+	  references
+
+2014-01-11  Charles Lepple <clepple+nut@gmail.com>
+
+	* docs/man/nutdrv_atcl_usb.txt, drivers/nutdrv_atcl_usb.c:
+	  nutdrv_atcl: match iManufacturer (vendor) string
+	* docs/man/snmp-ups.txt: snmp-ups: update and edit documentation
+
+2014-01-11  Daniele Pezzini <hyouko@gmail.com>
+
+	* data/driver.list.in: HCL: add Atlantis Land/Voltronic Power units
+	  supported by nutdrv_qx
+	* drivers/nutdrv_qx_blazer-common.c, drivers/nutdrv_qx_blazer-
+	  common.h: nutdrv_qx: fix nutdrv_qx_blazer-common.{c,h} header
+	  comments
+	* docs/man/nutdrv_qx.txt, docs/nutdrv_qx-subdrivers.txt: nutdrv_qx:
+	  update manuals for new 'voltronic-qs' subdriver
+
+2013-12-05  Daniele Pezzini <hyouko@gmail.com>
+
+	* drivers/Makefile.am, drivers/nutdrv_qx.c, drivers
+	  /nutdrv_qx_voltronic-qs.c, drivers/nutdrv_qx_voltronic-qs.h:
+	  nutdrv_qx: add Voltronic-QS subdriver (nutdrv_qx protocol
+	  =voltronic-qs)  A subdriver using a protocol, specific to UPSes
+	  manufactured by Voltronic Power, based on the 'mustek' one (i.e.
+	  'QS').
+
+2014-01-01  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/nutdrv_atcl_usb.c: nutdrv_atcl_usb: adjusted logging and
+	  retries (v0.02)
+	* data/driver.list.in, docs/man/Makefile.am, docs/man/index.txt,
+	  docs/man/nutdrv_atcl_usb.txt: nutdrv_atcl_usb: man page and HCL
+	  entries
+
+2013-12-31  Charles Lepple <clepple+nut@gmail.com>
+
+	* drivers/.gitignore, drivers/Makefile.am, drivers/nutdrv_atcl_usb.c,
+	  tools/nut-usbinfo.pl: nutdrv_atcl_usb: 'ATCL FOR UPS' new driver
+	  Reference: http://news.gmane.org/find-
+	  root.php?message_id=%3c52B4C54E.1050106%40ariwainer.com.ar%3e
+	* drivers/libusb.c, drivers/usb-common.h: Move USB_TIMEOUT to usb-
+	  common.h
+
+2013-12-31  Laurent Bigonville <bigon@bigon.be>
+
+	* .gitignore, INSTALL, INSTALL.nut, Makefile.am, docs/FAQ.txt,
+	  docs/Makefile.am, docs/configure.txt, docs/packager-guide.txt, docs
+	  /user-manual.txt: Rename INSTALL to INSTALL.nut  Rename it to
+	  INSTALL.nut so autoreconf will not try to overwrite it.  In Debian
+	  tools like dh_autoreconf calls autoreconf with -f which overwrite
+	  the INSTALL file.
+
+2013-12-27  Charles Lepple <clepple+nut@gmail.com>
+
+	* scripts/subdriver/gen-usbhid-subdriver.sh: usbhid-ups: fix call to
+	  is_usb_device_supported()  The is_usb_device_supported() function
+	  now takes a USBDevice_t* instead of a pair of USB ID values.
+
+2013-12-22  Florian Bruhin <nut@the-compiler.org>
+
+	* data/driver.list.in, docs/man/powercom.txt, drivers/powercom.c: Add
+	  OptiUPS VS 575C support to PowerCom  Reference:
+	  http://news.gmane.org/find-
+	  root.php?message_id=%3c20131126085646.GM28832%40lupin%3e
+
+2013-12-11  Denis Yantarev <denis.yantarev@gmail.com>
+
+	* drivers/blazer_usb.c, drivers/nutdrv_qx.c: Fixed incorrectly
+	  reported Ippon response length
+
+2013-11-30  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/man/nutdrv_qx.txt, drivers/nutdrv_qx.c, drivers
+	  /nutdrv_qx_blazer-common.c, drivers/nutdrv_qx_blazer-common.h,
+	  drivers/nutdrv_qx_megatec-old.c, drivers/nutdrv_qx_mustek.c,
+	  drivers/nutdrv_qx_q1.c: nutdrv_qx: fix 'megatec/old' and 'mustek'
+	  subdrivers' claim functions  Address, for 'megatec/old' and
+	  'mustek' subdrivers, the same problem fixed in commit
+	  720975f4de910b270ba705a7f2981c2ee33ca2eb for Q1-based ones: - Make
+	  the claim function of 'megatec/old' and 'mustek' subdrivers not
+	  poll the UPS for 'vendor' informations as they are not really
+	  needed to set these protocols apart from the other ones (i.e. the
+	  'status' poll is specific enough, at the time of writing). - Move
+	  common 'light' claim function to nutdrv_qx_blazer-common.{c,h}. -
+	  Update manual. - Versioning.
+
+2013-11-24  Daniele Pezzini <hyouko@gmail.com>
+
+	* docs/nutdrv_qx-subdrivers.txt: nutdrv_qx: improve developer manual
+	  Get rid of useless tables. Fix minor errors/typos.
+	* drivers/nutdrv_qx.c: nutdrv_qx: versioning
+	* docs/man/nutdrv_qx.txt, docs/nutdrv_qx-subdrivers.txt: nutdrv_qx:
+	  update manuals for new Q1 subdriver and improve readability
+
+2013-11-23  Daniele Pezzini <hyouko@gmail.com>
+
+	* drivers/Makefile.am, drivers/nutdrv_qx.c, drivers/nutdrv_qx_q1.c,
+	  drivers/nutdrv_qx_q1.h: nutdrv_qx: add new 'fallback' Q1 subdriver
+	  Add new 'Q1' subdriver. This subdriver implements the same protocol
+	  as the one used by the 'megatec' subdriver minus the vendor (I) and
+	  ratings (F) queries. In the claim function: - it doesn't even try
+	  to get 'vendor' informations (I) - it checks only status (Q1),
+	  through 'input.voltage' variable Therefore it should be able to
+	  work even if the UPS doesn't support vendor/ratings *and* the user
+	  doesn't use the 'novendor'/'norating' flags, as long as: - the UPS
+	  replies a Q1-compliant answer (i.e. not necessary filled with all
+	  of the Q1-required data, but at least of the right length and with
+	  not available data filled with some replacement character) - the
+	  UPS reports a valid input.voltage (used in the claim function) -
+	  the UPS reports valid status bits (1st, 2nd, 3rd, 6th, 7th are the
+	  mandatory ones)  This commit reintroduces a functionality of the
+	  blazer subdrivers that was lost because now, in order to tell
+	  whether a device is supported by a subdriver or not, if the user
+	  doesn't call the driver with the 'novendor' flag, both the status
+	  (Q1) and the vendor (I/FW?) queries are needed (that's to better
+	  discern the subdrivers).  Reference:
+	  http://lists.alioth.debian.org/pipermail/nut-
+	  upsuser/2013-November/008692.html
+
+2013-11-23  Charles Lepple <clepple+nut@gmail.com>
+
+	* configure.ac, configure.in: Rename configure.in to configure.ac
+	  autoconf has been warning about this for a while - let's fix it
+	  before too many branches get created with the old name.
+	* configure.in: configure.in: bump version to 2.7.1.5  Some packaging
+	  systems don't like the -pre# system.
+
+2013-11-21  Laurent Bigonville <bigon@bigon.be>
+
+	* docs/man/ups.conf.txt, docs/man/upsdrvctl.txt, drivers/upsdrvctl.c:
+	  Provide retry options for upsdrvctl and driver(s)  As recently seen
+	  in Debian (bugs #694717 and #677143), it may be required to have
+	  upsdrvctl retrying to start the driver in case of failure.  More
+	  specifically, a mix of init system (V and systemd), udev and USB
+	  device(s) can result in the /dev entry not being available at
+	  driver startup, thus resulting in a general failure to start NUT.
+	  This commit provides at least a way to overcome this issue. A more
+	  suitable  solution will require more work on NUT design.  This
+	  patch if based on Arnaud Quette proposal
+
+2013-11-20  Arnaud Quette <arnaud.quette@free.fr>
+
+	* Makefile.am: Maintainers targets: distribution signature / hashes
+	  Create some handy targets to ease and automate release publication
+
 2013-11-19  Charles Lepple <clepple+nut@gmail.com>
 
 	* configure.in: configure: update version to 2.7.1

INSTALL

@@ -1,320 +1,370 @@
-Installation instructions
+Installation Instructions
-=========================
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
 
-This chapter describe the various methods for installing Network UPS Tools.
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
 
-Whenever it is possible, prefer <<Installing_packages, installing from packages>>.
+Sharing Defaults
-Packagers have done an excellent and hard work at improving NUT integration into
+================
-their system.
 
-[[Installing_source]]
+   If you want to set default values for `configure' scripts to share,
-Installing from source
+you can create a site shell script called `config.site' that gives
-----------------------
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
 
-These are the essential steps for compiling and installing this software.
+Defining Variables
+==================
 
-The NUT linkdoc:packager-guide[Packager Guide], which presents the best
+   Variables not defined in a site shell script can be set in the
-practices for installing and integrating NUT, is also a good reading.
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
 
-[NOTE]
+     ./configure CC=/usr/local2/bin/gcc
-.Keep in mind that...
-================================================================================
 
-- the paths shown below are the default values you get by just calling
+causes the specified `gcc' to be used as the C compiler (unless it is
-configure by itself.  If you have used --prefix or similar, things will be
+overridden in the site shell script).
-different.  Also, if you didn't install this program from source yourself, the
-paths will probably have a number of differences.
 
-- by default, your system probably won't find the man pages, since they
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-install to /usr/local/ups/man.  You can fix this by editing your MANPATH, or
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
-just do this:
 
-	man -M /usr/local/ups/man <man page>
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-- if your favorite system offers up to date binary packages, you should always
+`configure' Invocation
-prefer these over a source installation. Along with the known advantages of such
+======================
-systems for installation, upgrade and removal, there are many integration issues
-that have been addressed.
 
-================================================================================
+   `configure' recognizes the following options to control how it
+operates.
 
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
 
-Prepare your system
+`--help=short'
-~~~~~~~~~~~~~~~~~~~~
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
-System User creation
+`--version'
-^^^^^^^^^^^^^^^^^^^^
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
 
-Create at least one system user and a group for running this software. You
+`--cache-file=FILE'
-might call them "ups" and "nut".  The exact names aren't important as
+     Enable the cache: use and save the results of the tests in FILE,
-long as you are consistent.
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
 
-The process for doing this varies from one system to the next, and
+`--config-cache'
-explaining how to add users is beyond the scope of this document.
+`-C'
+     Alias for `--cache-file=config.cache'.
 
-For the purposes of this document, the user name and group name 
+`--quiet'
-will be 'ups' and 'nut' respectively.
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
 
-Be sure the new user is a member of the new group!  If you forget to
+`--srcdir=DIR'
-do this, you will have problems later on when you try to start upsd.
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
 
-Build and install
+`--no-create'
-~~~~~~~~~~~~~~~~~
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
 
-[[Configuration]]
+`configure' also accepts some other, not widely useful, options.  Run
-Configuration
+`configure --help' for more details.
-^^^^^^^^^^^^^
 
-Configure the source tree for your system.  Add the '--with-user' and
-'--with-group' switch to set the user name and group that you created
-above.
-
-	./configure --with-user=ups --with-group=nut
-
-If you need any other switches for configure, add them here.  For example:
-
-* to build and install USB drivers, add '--with-usb' (note that you
-  need to install libusb development package or files).
-
-* to build and install SNMP drivers, add '--with-snmp' (note that
-  you need to install libsnmp development package or files).
-
-* to build and install CGI scripts, add '--with-cgi'.
-
-See <<Configure_options,Configure options>> from the User Manual,
-docs/configure.txt or './configure --help' for all the available
-options.
-
-If you alter paths with additional switches, be sure to use those
-new paths while reading the rest of the steps.    
-
-Reference: <<Configure_options,Configure options>> from the
-User Manual.
-
-
-Build the programs
-^^^^^^^^^^^^^^^^^^
-
-	make
-
-This will build the NUT client and server programs and the
-selected drivers. It will also build any other features that were
-selected during <<Configuration,configuration>> step above. 
-
-
-Installation
-^^^^^^^^^^^^
-
-[NOTE]
-=====================================================================
-
-you should now gain privileges for installing software if necessary:
-
-	su
-
-=====================================================================
-
-Install the files to a system level directory:
-
-	make install
-
-This will install the compiled programs and man pages, as well as
-some data files required by NUT. Any optional features selected
-during configuration will also be installed.
-
-This will also install sample versions of the NUT configuration
-files. Sample files are installed with names like ups.conf.sample
-so they will not overwrite any existing real config files you may
-have created.
-
-If you are packaging this software, then you will probably want to
-use the DESTDIR variable to redirect the build into another place,
-i.e.:
-
-	make DESTDIR=/tmp/package install
-	make DESTDIR=/tmp/package install-conf
-
-[[StatePath]]
-State path creation
-^^^^^^^^^^^^^^^^^^^
-
-Create the state path directory for the driver(s) and server to use
-for storing UPS status data and other auxiliary files, and make it
-owned by the user you created.
-
-	mkdir -p /var/state/ups
-	chmod 0770 /var/state/ups
-	chown root:nut /var/state/ups
-
-[[Ownership]]
-Ownership and permissions
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Set ownership data and permissions on your serial or USB ports
-that go to your UPS hardware.  Be sure to limit access to just
-the user you created earlier.
-
-These examples assume the second serial port (ttyS1) on a typical
-Slackware system.  On FreeBSD, that would be cuaa1.  Serial ports
-vary greatly, so yours may be called something else.
-
-	chmod 0660 /dev/ttyS1
-	chown root:nut /dev/ttyS1
-
-////////////////////////////////////////////////////////////////////////////////
-FIXME: TBR
-////////////////////////////////////////////////////////////////////////////////
-
-The setup for USB ports is slightly more complicated. Device files
-for USB devices, such as /proc/bus/usb/002/001, are usually
-created "on the fly" when a device is plugged in, and disappear
-when the device is disconnected.  Moreover, the names of these
-device files can change randomly. To set up the correct
-permissions for the USB device, you may need to set up (operating
-system dependent) hotplugging scripts.  Sample scripts and
-information are provided in the scripts/hotplug and
-scripts/udev directories. For most users, the hotplugging scripts
-will be installed automatically by "make install". 
-
-(If you want to try if a driver works without setting up
-hotplugging, you can add the "-u root" option to upsd, upsmon, and
-drivers; this should allow you to follow the below
-instructions. However, don't forget to set up the correct
-permissions later!).
-
-NOTE: if you are using something like devfs or udev, make sure
-these permissions stay set across a reboot.  If they revert to the
-old values, your drivers may fail to start.
-
-
-You are now ready to configure NUT, and start testing and using it.
-
-You can jump directly to the <<Configuration_notes,NUT configuration>>.
-
-
-[[Installing_packages]]
-Installing from packages
-------------------------
-
-This chapter describes the specific installation steps when using
-binary packages that exist on various major systems.
-
-[[Debian]]
-Debian, Ubuntu and other derivatives
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NOTE: NUT is packaged and well maintained in these systems.
-The official Debian packager is part of the NUT Team.
-
-Using your prefered method (apt-get, aptitude, Synaptic, ...), install
-the 'nut' package, and optionaly the following:
-
-- 'nut-cgi', if you need the CGI (HTML) option,
-- 'nut-snmp', if you need the snmp-ups driver,
-- 'nut-xml', for the netxml-ups driver,
-- 'nut-powerman-pdu', to control the PowerMan daemon (PDU management)
-- 'nut-dev', if you need the development files.
-
-////////////////////////////////////////////////////////////////////////////////
-- nut-client
-- nut-hal-drivers
-////////////////////////////////////////////////////////////////////////////////
-
-Configuration files are located in /etc/nut.
-linkman:nut.conf[5] must be edited to be able to invoke /etc/init.d/nut
-
-NOTE: Ubuntu users can access the APT URL installation by clicking on link:apt://nut[this link].
-
-
-[[Mandriva]]
-Mandriva
-~~~~~~~~
-
-NOTE: NUT is packaged and well maintained in these systems.
-The official Mandriva packager is part of the NUT Team.
-
-Using your prefered method (urpmi, RPMdrake, ...), install one of the two below
-packages:
-
-- 'nut-server' if you have a 'standalone' or 'netserver' installation,
-- 'nut' if you have a 'netclient' installation.
-
-Optionaly, you can also install the following:
-
-- 'nut-cgi', if you need the CGI (HTML) option,
-- 'nut-devel', if you need the development files.
-
-
-[[Suse]]
-Suse / Opensuse
-~~~~~~~~~~~~~~~
-
-NOTE: NUT is packaged and well maintained in these systems.
-The official Suse packager is part of the NUT Team.
-
-Install the 'nut-classic' package, and optionaly the following:
-
-- 'nut-drivers-net', if you need the snmp-ups or the netxml-ups drivers,
-- 'nut-cgi', if you need the CGI (HTML) option,
-- 'nut-devel', if you need the development files,
-
-NOTE: Suse and Opensuse users can use the
-link:http://software.opensuse.org/search?baseproject=ALL&p=1&q=nut[one-click install method]
-to install NUT.
-
-
-[[RedHat]]
-Red Hat, Fedora and CentOS
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NOTE: NUT is packaged and well maintained in these systems.
-The official Red Hat packager is part of the NUT Team.
-
-Using your prefered method (yum, Add/Remove Software, ...), install one of the
-two below packages:
-
-- 'nut' if you have a 'standalone' or 'netserver' installation,
-- 'nut-client' if you have a 'netclient' installation.
-
-Optionaly, you can also install the following:
-
-- 'nut-cgi', if you need the CGI (HTML) option,
-- 'nut-xml', if you need the netxml-ups driver,
-- 'nut-devel', if you need the development files.
-
-
-[[FreeBSD]]
-FreeBSD
-~~~~~~~
-
-You can either install NUT as a binary package or as a port.
-
-Binary package
-^^^^^^^^^^^^^^
-
-To install the main component, use the following command:
-
-	# pkg_add -r nut
-
-Port
-^^^^
-
-The port is located under /usr/ports/sysutils/nut. 
-To install it, use the following command:
-
-	# cd /usr/ports/sysutils/nut/ && make install clean
-
-You have to define WITH_NUT_CGI to build the optional CGI scripts.
-
-Optionaly, you can also install the following ports:
-
-- sysutils/nut-snmp, for the SNMP driver,
-- sysutils/nut-usb, for the USB drivers,
-- sysutils/nut-libupsclient, for the upsclient library.
-
-
-You are now ready to configure NUT, and start testing and using it.
-
-You can jump directly to the
-<<Configuration_notes,NUT configuration>>.

INSTALL.nut

@@ -0,0 +1,319 @@
+Installation instructions
+=========================
+
+This chapter describe the various methods for installing Network UPS Tools.
+
+Whenever it is possible, prefer <<Installing_packages, installing from packages>>.
+Packagers have done an excellent and hard work at improving NUT integration into
+their system.
+
+[[Installing_source]]
+Installing from source
+----------------------
+
+These are the essential steps for compiling and installing this software.
+
+The NUT linkdoc:packager-guide[Packager Guide], which presents the best
+practices for installing and integrating NUT, is also a good reading.
+
+[NOTE]
+.Keep in mind that...
+================================================================================
+
+- the paths shown below are the default values you get by just calling
+configure by itself.  If you have used --prefix or similar, things will be
+different.  Also, if you didn't install this program from source yourself, the
+paths will probably have a number of differences.
+
+- by default, your system probably won't find the man pages, since they
+install to /usr/local/ups/man.  You can fix this by editing your MANPATH, or
+just do this:
+
+	man -M /usr/local/ups/man <man page>
+
+- if your favorite system offers up to date binary packages, you should always
+prefer these over a source installation. Along with the known advantages of such
+systems for installation, upgrade and removal, there are many integration issues
+that have been addressed.
+
+================================================================================
+
+
+Prepare your system
+~~~~~~~~~~~~~~~~~~~~
+
+System User creation
+^^^^^^^^^^^^^^^^^^^^
+
+Create at least one system user and a group for running this software. You
+might call them "ups" and "nut".  The exact names aren't important as
+long as you are consistent.
+
+The process for doing this varies from one system to the next, and
+explaining how to add users is beyond the scope of this document.
+
+For the purposes of this document, the user name and group name 
+will be 'ups' and 'nut' respectively.
+
+Be sure the new user is a member of the new group!  If you forget to
+do this, you will have problems later on when you try to start upsd.
+
+
+Build and install
+~~~~~~~~~~~~~~~~~
+
+[[Configuration]]
+Configuration
+^^^^^^^^^^^^^
+
+Configure the source tree for your system.  Add the '--with-user' and
+'--with-group' switch to set the user name and group that you created
+above.
+
+	./configure --with-user=ups --with-group=nut
+
+If you need any other switches for configure, add them here.  For example:
+
+* to build and install USB drivers, add '--with-usb' (note that you
+  need to install libusb development package or files).
+
+* to build and install SNMP drivers, add '--with-snmp' (note that
+  you need to install libsnmp development package or files).
+
+* to build and install CGI scripts, add '--with-cgi'.
+
+See <<Configure_options,Configure options>> from the User Manual,
+docs/configure.txt or './configure --help' for all the available
+options.
+
+If you alter paths with additional switches, be sure to use those
+new paths while reading the rest of the steps.    
+
+Reference: <<Configure_options,Configure options>> from the
+User Manual.
+
+
+Build the programs
+^^^^^^^^^^^^^^^^^^
+
+	make
+
+This will build the NUT client and server programs and the
+selected drivers. It will also build any other features that were
+selected during <<Configuration,configuration>> step above. 
+
+
+Installation
+^^^^^^^^^^^^
+
+[NOTE]
+=====================================================================
+
+you should now gain privileges for installing software if necessary:
+
+	su
+
+=====================================================================
+
+Install the files to a system level directory:
+
+	make install
+
+This will install the compiled programs and man pages, as well as
+some data files required by NUT. Any optional features selected
+during configuration will also be installed.
+
+This will also install sample versions of the NUT configuration
+files. Sample files are installed with names like ups.conf.sample
+so they will not overwrite any existing real config files you may
+have created.
+
+If you are packaging this software, then you will probably want to
+use the DESTDIR variable to redirect the build into another place,
+i.e.:
+
+	make DESTDIR=/tmp/package install
+	make DESTDIR=/tmp/package install-conf
+
+[[StatePath]]
+State path creation
+^^^^^^^^^^^^^^^^^^^
+
+Create the state path directory for the driver(s) and server to use
+for storing UPS status data and other auxiliary files, and make it
+owned by the user you created.
+
+	mkdir -p /var/state/ups
+	chmod 0770 /var/state/ups
+	chown root:nut /var/state/ups
+
+[[Ownership]]
+Ownership and permissions
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Set ownership data and permissions on your serial or USB ports
+that go to your UPS hardware.  Be sure to limit access to just
+the user you created earlier.
+
+These examples assume the second serial port (ttyS1) on a typical
+Slackware system.  On FreeBSD, that would be cuaa1.  Serial ports
+vary greatly, so yours may be called something else.
+
+	chmod 0660 /dev/ttyS1
+	chown root:nut /dev/ttyS1
+
+////////////////////////////////////////////////////////////////////////////////
+FIXME: TBR
+////////////////////////////////////////////////////////////////////////////////
+
+The setup for USB ports is slightly more complicated. Device files
+for USB devices, such as /proc/bus/usb/002/001, are usually
+created "on the fly" when a device is plugged in, and disappear
+when the device is disconnected.  Moreover, the names of these
+device files can change randomly. To set up the correct
+permissions for the USB device, you may need to set up (operating
+system dependent) hotplugging scripts.  Sample scripts and
+information are provided in the scripts/hotplug and
+scripts/udev directories. For most users, the hotplugging scripts
+will be installed automatically by "make install". 
+
+(If you want to try if a driver works without setting up
+hotplugging, you can add the "-u root" option to upsd, upsmon, and
+drivers; this should allow you to follow the below
+instructions. However, don't forget to set up the correct
+permissions later!).
+
+NOTE: if you are using something like devfs or udev, make sure
+these permissions stay set across a reboot.  If they revert to the
+old values, your drivers may fail to start.
+
+
+You are now ready to configure NUT, and start testing and using it.
+
+You can jump directly to the <<Configuration_notes,NUT configuration>>.
+
+
+[[Installing_packages]]
+Installing from packages
+------------------------
+
+This chapter describes the specific installation steps when using
+binary packages that exist on various major systems.
+
+[[Debian]]
+Debian, Ubuntu and other derivatives
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NOTE: NUT is packaged and well maintained in these systems.
+The official Debian packager is part of the NUT Team.
+
+Using your prefered method (apt-get, aptitude, Synaptic, ...), install
+the 'nut' package, and optionaly the following:
+
+- 'nut-cgi', if you need the CGI (HTML) option,
+- 'nut-snmp', if you need the snmp-ups driver,
+- 'nut-xml', for the netxml-ups driver,
+- 'nut-powerman-pdu', to control the PowerMan daemon (PDU management)
+- 'nut-dev', if you need the development files.
+
+////////////////////////////////////////////////////////////////////////////////
+- nut-client
+////////////////////////////////////////////////////////////////////////////////
+
+Configuration files are located in /etc/nut.
+linkman:nut.conf[5] must be edited to be able to invoke /etc/init.d/nut
+
+NOTE: Ubuntu users can access the APT URL installation by clicking on link:apt://nut[this link].
+
+
+[[Mandriva]]
+Mandriva
+~~~~~~~~
+
+NOTE: NUT is packaged and well maintained in these systems.
+The official Mandriva packager is part of the NUT Team.
+
+Using your prefered method (urpmi, RPMdrake, ...), install one of the two below
+packages:
+
+- 'nut-server' if you have a 'standalone' or 'netserver' installation,
+- 'nut' if you have a 'netclient' installation.
+
+Optionaly, you can also install the following:
+
+- 'nut-cgi', if you need the CGI (HTML) option,
+- 'nut-devel', if you need the development files.
+
+
+[[Suse]]
+Suse / Opensuse
+~~~~~~~~~~~~~~~
+
+NOTE: NUT is packaged and well maintained in these systems.
+The official Suse packager is part of the NUT Team.
+
+Install the 'nut-classic' package, and optionaly the following:
+
+- 'nut-drivers-net', if you need the snmp-ups or the netxml-ups drivers,
+- 'nut-cgi', if you need the CGI (HTML) option,
+- 'nut-devel', if you need the development files,
+
+NOTE: Suse and Opensuse users can use the
+link:http://software.opensuse.org/search?baseproject=ALL&p=1&q=nut[one-click install method]
+to install NUT.
+
+
+[[RedHat]]
+Red Hat, Fedora and CentOS
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NOTE: NUT is packaged and well maintained in these systems.
+The official Red Hat packager is part of the NUT Team.
+
+Using your prefered method (yum, Add/Remove Software, ...), install one of the
+two below packages:
+
+- 'nut' if you have a 'standalone' or 'netserver' installation,
+- 'nut-client' if you have a 'netclient' installation.
+
+Optionaly, you can also install the following:
+
+- 'nut-cgi', if you need the CGI (HTML) option,
+- 'nut-xml', if you need the netxml-ups driver,
+- 'nut-devel', if you need the development files.
+
+
+[[FreeBSD]]
+FreeBSD
+~~~~~~~
+
+You can either install NUT as a binary package or as a port.
+
+Binary package
+^^^^^^^^^^^^^^
+
+To install the main component, use the following command:
+
+	# pkg_add -r nut
+
+Port
+^^^^
+
+The port is located under /usr/ports/sysutils/nut. 
+To install it, use the following command:
+
+	# cd /usr/ports/sysutils/nut/ && make install clean
+
+You have to define WITH_NUT_CGI to build the optional CGI scripts.
+
+Optionaly, you can also install the following ports:
+
+- sysutils/nut-snmp, for the SNMP driver,
+- sysutils/nut-usb, for the USB drivers,
+- sysutils/nut-libupsclient, for the upsclient library.
+
+
+You are now ready to configure NUT, and start testing and using it.
+
+You can jump directly to the
+<<Configuration_notes,NUT configuration>>.

Makefile.am

@@ -9,7 +9,7 @@ SUBDIRS = include common clients conf data tools docs drivers \
   lib scripts server tests
 
 # COPYING is included automatically.
-EXTRA_DIST = LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING
+EXTRA_DIST = INSTALL.nut LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING
 
 # ----------------------------------------------------------------------
 # flags to pass to ./configure when calling "make distcheck" and "make
@@ -22,7 +22,8 @@ DISTCHECK_LIGHT_FLAGS = --with-all=auto --with-ssl=auto --with-doc=auto
 
 DISTCHECK_CONFIGURE_FLAGS = ${DISTCHECK_FLAGS}		\
  --with-hotplug-dir='$${prefix}/etc/hotplug'		\
- --with-udev-dir='$${prefix}/etc/udev'
+ --with-udev-dir='$${prefix}/etc/udev'			\
+ --with-devd-dir='$${prefix}/etc/devd'
 
 distcheck-light:
 	$(MAKE) $(AM_MAKEFLAGS) DISTCHECK_FLAGS="$(DISTCHECK_LIGHT_FLAGS)" distcheck
@@ -44,16 +45,13 @@ ChangeLog: tools/gitlog2changelog.py dummy-stamp
 	$(top_srcdir)/tools/gitlog2changelog.py v2.6.0 || \
 		echo "gitlog2changelog.py failed to generate the ChangeLog. See https://github.com/networkupstools/nut/commits/master" > $@
 
-if HAVE_ASCIIDOC
+# Maintainers targets: distribution signature and hashes
-website:
+dist-sig:
-	cd docs;  $(MAKE) $(AM_MAKEFLAGS) website
+	gpg --detach-sign nut-@PACKAGE_VERSION@.tar.gz
-	cd docs/man;  $(MAKE) $(AM_MAKEFLAGS) html-man
+
-	cd tools;  $(MAKE) $(AM_MAKEFLAGS) website
+dist-hash:
-	cd docs/website;  $(MAKE) $(AM_MAKEFLAGS) website
+	md5sum nut-@PACKAGE_VERSION@.tar.gz > nut-@PACKAGE_VERSION@.tar.gz.md5
-else !HAVE_ASCIIDOC
+	sha256sum nut-@PACKAGE_VERSION@.tar.gz > nut-@PACKAGE_VERSION@.tar.gz.sha256
-website:
-	@echo "Not building website since 'asciidoc' was not found."
-endif !HAVE_ASCIIDOC
 
 # ----------------------------------------------------------------------
 # targets from old build system (pre-automake).

Makefile.in

@@ -72,7 +72,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -82,10 +81,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -199,10 +197,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -214,8 +208,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -301,6 +293,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@
@@ -353,7 +346,7 @@ SUBDIRS = include common clients conf data tools docs drivers \
 
 
 # COPYING is included automatically.
-EXTRA_DIST = LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING
+EXTRA_DIST = INSTALL.nut LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING
 
 # ----------------------------------------------------------------------
 # flags to pass to ./configure when calling "make distcheck" and "make
@@ -364,7 +357,8 @@ DISTCHECK_FLAGS = --with-all --with-ssl --with-doc=auto
 DISTCHECK_LIGHT_FLAGS = --with-all=auto --with-ssl=auto --with-doc=auto
 DISTCHECK_CONFIGURE_FLAGS = ${DISTCHECK_FLAGS}		\
  --with-hotplug-dir='$${prefix}/etc/hotplug'		\
- --with-udev-dir='$${prefix}/etc/udev'
+ --with-udev-dir='$${prefix}/etc/udev'			\
+ --with-devd-dir='$${prefix}/etc/devd'
 
 
 # Automatically generate the ChangeLog from Git logs:
@@ -882,13 +876,13 @@ ChangeLog: tools/gitlog2changelog.py dummy-stamp
 	$(top_srcdir)/tools/gitlog2changelog.py v2.6.0 || \
 		echo "gitlog2changelog.py failed to generate the ChangeLog. See https://github.com/networkupstools/nut/commits/master" > $@
 
-@HAVE_ASCIIDOC_TRUE@website:
+# Maintainers targets: distribution signature and hashes
-@HAVE_ASCIIDOC_TRUE@	cd docs;  $(MAKE) $(AM_MAKEFLAGS) website
+dist-sig:
-@HAVE_ASCIIDOC_TRUE@	cd docs/man;  $(MAKE) $(AM_MAKEFLAGS) html-man
+	gpg --detach-sign nut-@PACKAGE_VERSION@.tar.gz
-@HAVE_ASCIIDOC_TRUE@	cd tools;  $(MAKE) $(AM_MAKEFLAGS) website
+
-@HAVE_ASCIIDOC_TRUE@	cd docs/website;  $(MAKE) $(AM_MAKEFLAGS) website
+dist-hash:
-@HAVE_ASCIIDOC_FALSE@website:
+	md5sum nut-@PACKAGE_VERSION@.tar.gz > nut-@PACKAGE_VERSION@.tar.gz.md5
-@HAVE_ASCIIDOC_FALSE@	@echo "Not building website since 'asciidoc' was not found."
+	sha256sum nut-@PACKAGE_VERSION@.tar.gz > nut-@PACKAGE_VERSION@.tar.gz.sha256
 
 build:
 	@echo $(WARN)

NEWS

@@ -3,6 +3,51 @@ If you're upgrading from an earlier version, see the UPGRADING file.
 For a complete and more detailed list of changes, please refer to the
 ChangeLog file.
 
+---------------------------------------------------------------------------
+Release notes for NUT 2.7.2 - what's new since 2.7.1:
+
+ - This release is the second interim release of the 2.7 testing series.
+
+ - libupsclient had undefined references related to functions of libcommon.
+   This issue was reported on Debian (bug #731156) and is now fixed
+
+ - support for new devices:
+   CABAC UPS-1700DV2
+   Eaton Powerware 3105
+   Emerson Network Power Liebert PSI 1440
+   MicroDowell B.Box LP 500
+   Numeric Digital 800 plus
+   OptiUPS VS 575C
+   Tripp Lite SU10KRT3/1X
+
+ - FreeDesktop Hardware Abstraction Layer (HAL) support was removed.
+
+ - nutdrv_atcl_usb: new driver for 'ATCL FOR UPS'
+
+ - al175: re-introduced this driver (actually, it was in 2.7.1)
+
+ - upsdrvctl now provides retry options for upsdrvctl and driver(s)
+
+ - snmp-ups: add support for XPPC-MIB and Tripp Lite SU10KRT3/1X.
+   Also fix erroneous status in HP/Compaq SNMP MIB (with the most recent HP
+   firmware (1.76) ; improved various MIBs (APC, HP/Compaq, ...) 
+
+ - nutdrv_qx: add new 'fallback' Q1 subdriver, with minimal 'Q1' support.
+   General improvements on all subdrivers.
+
+ - mge-shut: partially revert PnP/RTS change, for initializing the
+   communication with the UPS. Note that nut-scanner similar function was
+   not modified however.
+
+ - FreeBSD DEVD support: generate devd.conf files for USB UPSes
+   This adds a --with-devd-dir=PATH option to ./configure
+
+ - The NUT website was moved to a standalone website. A separate code
+   repository and source archive are now available.
+
+ - As usual, more bugfixes, cleanup and improvements, on both source code
+   and documentation.
+
 ---------------------------------------------------------------------------
 Release notes for NUT 2.7.1 - what's new since 2.6.5:
 

README

@@ -123,13 +123,13 @@ The entry in `ups.conf` looks like this:
 To start and stop drivers, use upsdrvctl.  By default, it will start or
 stop every UPS in the config file:
 
-	/usr/local/ups/bin/upsdrvctl start
+	/usr/local/ups/sbin/upsdrvctl start
-	/usr/local/ups/bin/upsdrvctl stop
+	/usr/local/ups/sbin/upsdrvctl stop
 
 However, you can also just start or stop one by adding its name:
 
-	/usr/local/ups/bin/upsdrvctl start sparky
+	/usr/local/ups/sbin/upsdrvctl start sparky
-	/usr/local/ups/bin/upsdrvctl stop sparky
+	/usr/local/ups/sbin/upsdrvctl stop sparky
 
 To find the driver name for your device, refer to the section below
 called "HARDWARE SUPPORT TABLE".
@@ -223,8 +223,8 @@ upsdrvctl can also shut down (power down) all of your UPS hardware.
 WARNING: if you play around with this command, expect your filesystems
 to die.  Don't power off your computers unless they're ready for it:
 
-	/usr/local/ups/bin/upsdrvctl shutdown
+	/usr/local/ups/sbin/upsdrvctl shutdown
-	/usr/local/ups/bin/upsdrvctl shutdown sparky
+	/usr/local/ups/sbin/upsdrvctl shutdown sparky
 
 You should read the <<UPS_shutdown,Configuring automatic UPS shutdowns>>
 chapter to learn more about when to use this feature.  If called at the wrong

UPGRADING

@@ -7,6 +7,21 @@ 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.7.1 to 2.7.2
+---------------------------
+
+- upsdrvctl is now installed to $prefix/sbin rather than $driverexec.
+  This usually means moving from /bin to /sbin, apart from few exceptions.
+  In all cases, please adapt your scripts.
+
+- FreeDesktop Hardware Abstraction Layer (HAL) support was removed.
+  Please adapt your packaging files, if you used to distribute the
+  nut-hal-drivers package.
+
+- This is a good time to point out that for stricter packaging systems, it may
+  be beneficial to add "--enable-option-checking=fatal" to the ./configure
+  command line, in order to quickly pick up any other removed option flags.
+
 Changes from 2.6.5 to 2.7.1
 ---------------------------
 

aclocal.m4

@@ -1322,7 +1322,6 @@ m4_include([m4/nut_check_asciidoc.m4])
 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])
@@ -1332,6 +1331,5 @@ m4_include([m4/nut_check_libpowerman.m4])
 m4_include([m4/nut_check_libusb.m4])
 m4_include([m4/nut_check_libwrap.m4])
 m4_include([m4/nut_check_os.m4])
-m4_include([m4/nut_config_libhal.m4])
 m4_include([m4/nut_report_feature.m4])
 m4_include([m4/nut_type_socklen_t.m4])

clients/Makefile.am

@@ -46,14 +46,15 @@ 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
+libupsclient_la_LIBADD = ../common/libcommonclient.la
 if WITH_SSL
   libupsclient_la_LIBADD += $(LIBSSL_LIBS)
 endif
 
 # libupsclient version information
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libupsclient_la_LDFLAGS = -version-info 3:1:0
+libupsclient_la_LDFLAGS = -version-info 4:0:0
 
 libnutclient_la_SOURCES = nutclient.h nutclient.cpp
+libnutclient_la_LDFLAGS = -version-info 0:0:0
 

clients/Makefile.in

@@ -79,7 +79,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -89,10 +88,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -133,9 +131,12 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libnutclient_la_LIBADD =
 am_libnutclient_la_OBJECTS = nutclient.lo
 libnutclient_la_OBJECTS = $(am_libnutclient_la_OBJECTS)
+libnutclient_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libnutclient_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 @WITH_SSL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-libupsclient_la_DEPENDENCIES = ../common/libparseconf.la \
+libupsclient_la_DEPENDENCIES = ../common/libcommonclient.la \
 	$(am__DEPENDENCIES_2)
 am_libupsclient_la_OBJECTS = upsclient.lo
 libupsclient_la_OBJECTS = $(am_libupsclient_la_OBJECTS)
@@ -274,10 +275,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -289,8 +286,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -376,6 +371,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@
@@ -445,12 +441,13 @@ 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_LIBADD = ../common/libcommonclient.la $(am__append_4)
 
 # libupsclient version information
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libupsclient_la_LDFLAGS = -version-info 3:1:0
+libupsclient_la_LDFLAGS = -version-info 4:0:0
 libnutclient_la_SOURCES = nutclient.h nutclient.cpp
+libnutclient_la_LDFLAGS = -version-info 0:0:0
 all: all-am
 
 .SUFFIXES:
@@ -518,7 +515,7 @@ clean-libLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 libnutclient.la: $(libnutclient_la_OBJECTS) $(libnutclient_la_DEPENDENCIES) $(EXTRA_libnutclient_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(libdir) $(libnutclient_la_OBJECTS) $(libnutclient_la_LIBADD) $(LIBS)
+	$(libnutclient_la_LINK) -rpath $(libdir) $(libnutclient_la_OBJECTS) $(libnutclient_la_LIBADD) $(LIBS)
 libupsclient.la: $(libupsclient_la_OBJECTS) $(libupsclient_la_DEPENDENCIES) $(EXTRA_libupsclient_la_DEPENDENCIES) 
 	$(libupsclient_la_LINK) -rpath $(libdir) $(libupsclient_la_OBJECTS) $(libupsclient_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)

common/Makefile.am

@@ -2,7 +2,7 @@
 
 AM_CFLAGS = -I$(top_srcdir)/include
 
-noinst_LTLIBRARIES = libparseconf.la libcommon.la
+noinst_LTLIBRARIES = libparseconf.la libcommon.la libcommonclient.la
 libparseconf_la_SOURCES = parseconf.c
 
 # do not hard depend on '../include/nut_version.h', since it blocks
@@ -10,6 +10,8 @@ libparseconf_la_SOURCES = parseconf.c
 # BUILT_SOURCES (in ../include) will ensure nut_version.h will
 # be built before anything else
 libcommon_la_SOURCES = common.c state.c upsconf.c
+libcommonclient_la_SOURCES = common.c state.c
 # ensure inclusion of local implementation of missing systems functions
 # using LTLIBOBJS. Refer to configure.in -> AC_REPLACE_FUNCS
 libcommon_la_LIBADD = libparseconf.la @LTLIBOBJS@
+libcommonclient_la_LIBADD = libparseconf.la @LTLIBOBJS@

common/Makefile.in

@@ -67,7 +67,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -77,10 +76,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -91,6 +89,9 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
 libcommon_la_DEPENDENCIES = libparseconf.la @LTLIBOBJS@
 am_libcommon_la_OBJECTS = common.lo state.lo upsconf.lo
 libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS)
+libcommonclient_la_DEPENDENCIES = libparseconf.la @LTLIBOBJS@
+am_libcommonclient_la_OBJECTS = common.lo state.lo
+libcommonclient_la_OBJECTS = $(am_libcommonclient_la_OBJECTS)
 libparseconf_la_LIBADD =
 am_libparseconf_la_OBJECTS = parseconf.lo
 libparseconf_la_OBJECTS = $(am_libparseconf_la_OBJECTS)
@@ -107,8 +108,10 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libcommon_la_SOURCES) $(libparseconf_la_SOURCES)
+SOURCES = $(libcommon_la_SOURCES) $(libcommonclient_la_SOURCES) \
-DIST_SOURCES = $(libcommon_la_SOURCES) $(libparseconf_la_SOURCES)
+	$(libparseconf_la_SOURCES)
+DIST_SOURCES = $(libcommon_la_SOURCES) $(libcommonclient_la_SOURCES) \
+	$(libparseconf_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -159,10 +162,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -174,8 +173,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -261,6 +258,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@
@@ -303,7 +301,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udevdir = @udevdir@
 AM_CFLAGS = -I$(top_srcdir)/include
-noinst_LTLIBRARIES = libparseconf.la libcommon.la
+noinst_LTLIBRARIES = libparseconf.la libcommon.la libcommonclient.la
 libparseconf_la_SOURCES = parseconf.c
 
 # do not hard depend on '../include/nut_version.h', since it blocks
@@ -311,9 +309,11 @@ libparseconf_la_SOURCES = parseconf.c
 # BUILT_SOURCES (in ../include) will ensure nut_version.h will
 # be built before anything else
 libcommon_la_SOURCES = common.c state.c upsconf.c
+libcommonclient_la_SOURCES = common.c state.c
 # ensure inclusion of local implementation of missing systems functions
 # using LTLIBOBJS. Refer to configure.in -> AC_REPLACE_FUNCS
 libcommon_la_LIBADD = libparseconf.la @LTLIBOBJS@
+libcommonclient_la_LIBADD = libparseconf.la @LTLIBOBJS@
 all: all-am
 
 .SUFFIXES:
@@ -359,6 +359,8 @@ clean-noinstLTLIBRARIES:
 	done
 libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) 
 	$(LINK)  $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS)
+libcommonclient.la: $(libcommonclient_la_OBJECTS) $(libcommonclient_la_DEPENDENCIES) $(EXTRA_libcommonclient_la_DEPENDENCIES) 
+	$(LINK)  $(libcommonclient_la_OBJECTS) $(libcommonclient_la_LIBADD) $(LIBS)
 libparseconf.la: $(libparseconf_la_OBJECTS) $(libparseconf_la_DEPENDENCIES) $(EXTRA_libparseconf_la_DEPENDENCIES) 
 	$(LINK)  $(libparseconf_la_OBJECTS) $(libparseconf_la_LIBADD) $(LIBS)
 

conf/Makefile.in

@@ -68,7 +68,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -78,10 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -171,10 +169,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -186,8 +180,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -273,6 +265,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@

conf/upsmon.conf.sample

@@ -27,7 +27,7 @@
 #
 # This user should not have write access to upsmon.conf.
 #
-# RUN_AS_USER nobody
+# RUN_AS_USER nut
 
 # --------------------------------------------------------------------------
 # MONITOR <system> <powervalue> <username> <password> ("master"|"slave")
@@ -196,7 +196,7 @@ DEADTIME 15
 #
 # See the shutdown.txt file in the docs subdirectory for more information.
 
-POWERDOWNFLAG /usr/local/ups/etc/killpower
+POWERDOWNFLAG /etc/nut/killpower
 
 # --------------------------------------------------------------------------
 # NOTIFYMSG - change messages sent by upsmon when certain events occur
@@ -307,7 +307,7 @@ FINALDELAY 5
 # Certificates are stored in a dedicated database (splitted in 3 files).
 # Specify the path of the database directory.
 # 
-# CERTPATH /usr/local/ups/etc/cert/upsmon
+# CERTPATH /etc/nut/cert/upsmon
 #
 # With OpenSSL:
 # Directory containing CA certificates in PEM format, used to verify

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nut 2.7.1.
+# Generated by GNU Autoconf 2.69 for nut 2.7.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nut'
 PACKAGE_TARNAME='nut'
-PACKAGE_VERSION='2.7.1'
+PACKAGE_VERSION='2.7.2'
-PACKAGE_STRING='nut 2.7.1'
+PACKAGE_STRING='nut 2.7.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -640,6 +640,7 @@ systemdsystemshutdowndir
 systemdsystemunitdir
 pkgconfigdir
 driverexecdir
+devddir
 cgiexecdir
 WORDS_BIGENDIAN
 SUN_LIBUSB
@@ -657,12 +658,6 @@ NETLIBS
 DRIVER_INSTALL_TARGET
 DRIVER_MAN_LIST
 DRIVER_BUILD_LIST
-LIBHAL_LIBS
-LIBHAL_CFLAGS
-HAL_CALLOUTS_PATH
-HAL_FDI_PATH
-HAL_DEVICE_MATCH_KEY
-HAL_USER
 LIBLTDL_LIBS
 LIBLTDL_CFLAGS
 LIBWRAP_LIBS
@@ -692,6 +687,8 @@ HAVE_ASPELL_TRUE
 ASPELL
 MANUALUPDATE_FALSE
 MANUALUPDATE_TRUE
+WITH_DEVD_FALSE
+WITH_DEVD_TRUE
 WITH_UDEV_FALSE
 WITH_UDEV_TRUE
 WITH_HOTPLUG_FALSE
@@ -729,8 +726,6 @@ WITH_ASCIIDOC_TRUE
 DBLATEX
 A2X
 ASCIIDOC
-WITH_HAL_FALSE
-WITH_HAL_TRUE
 WITH_CGI_FALSE
 WITH_CGI_TRUE
 WITH_LIBLTDL_FALSE
@@ -888,13 +883,6 @@ with_snmp_includes
 with_snmp_libs
 with_usb_includes
 with_usb_libs
-with_hal
-with_hal_includes
-with_hal_libs
-with_hal_user
-with_hal_device_match_key
-with_hal_callouts_path
-with_hal_fdi_path
 with_snmp
 with_neon
 with_neon_includes
@@ -946,6 +934,7 @@ with_pkgconfig_dir
 with_systemdsystemunitdir
 with_hotplug_dir
 with_udev_dir
+with_devd_dir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1505,7 +1494,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nut 2.7.1 to adapt to many kinds of systems.
+\`configure' configures nut 2.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1565,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nut 2.7.1:";;
+     short | recursive ) echo "Configuration of nut 2.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1611,17 +1600,6 @@ Optional Packages:
   [--with-usb-includes=CFLAGS]
                           include flags for the libusb library
   [--with-usb-libs=LIBS]  linker flags for the libusb library
-  --with-hal              build and install HAL support (no)
-  [--with-hal-includes=CFLAGS]
-                          include flags for the HAL library
-  [--with-hal-libs=LIBS]  linker flags for the HAL library
-  [--with-hal-user=USER]  addons run as user
-  [--with-hal-device-match-key=KEY]
-                          device match key
-  [--with-hal-callouts-path=PATH]
-                          installation path for callouts
-  [--with-hal-fdi-path=PATH]
-                          installation path for device information files
   --with-snmp             build and install SNMP drivers (auto)
   --with-neon             build and install neon based XML/HTTP driver (auto)
   [--with-neon-includes=CFLAGS]
@@ -1692,6 +1670,8 @@ Optional Packages:
                           Directory for systemd service files (auto)
   --with-hotplug-dir=PATH where to install hotplug rules (/etc/hotplug)
   --with-udev-dir=PATH    where to install udev rules (/lib/udev or /etc/udev)
+  --with-devd-dir=PATH    where to install devd.conf file (/usr/local/etc/devd
+                          or /etc/devd)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1781,7 +1761,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nut configure 2.7.1
+nut configure 2.7.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2367,7 +2347,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nut $as_me 2.7.1, which was
+It was created by nut $as_me 2.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3438,7 +3418,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nut'
- VERSION='2.7.1'
+ VERSION='2.7.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4992,6 +4972,14 @@ if test ! -d "${udevdir}"; then
    fi
 fi
 
+devddir='/usr/local/etc/devd'
+if test ! -d "${devddir}"; then
+   devddir='/etc/devd'
+   if test ! -d "${devddir}"; then
+      devddir=''
+   fi
+fi
+
 RUN_AS_USER="nobody"
 RUN_AS_GROUP="nobody"
 PIDPATH="/var/run"
@@ -8076,277 +8064,6 @@ done
 fi
 
 
-# Check whether --with-hal was given.
-if test "${with_hal+set}" = set; then :
-  withval=$with_hal; nut_with_hal="${withval}"
-else
-  nut_with_hal="no"
-
-fi
-
-
-
-if test -z "${nut_have_libhal_seen}"; then
-	nut_have_libhal_seen=yes
-
-	CFLAGS_ORIG="${CFLAGS}"
-	LIBS_ORIG="${LIBS}"
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal version via pkg-config (0.5.8 minimum required)" >&5
-$as_echo_n "checking for libhal version via pkg-config (0.5.8 minimum required)... " >&6; }
-	HAL_VERSION="`pkg-config --silence-errors --modversion hal 2>/dev/null`"
-	if test "$?" != "0" -o -z "${HAL_VERSION}"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none found" >&5
-$as_echo "none found" >&6; }
-	elif pkg-config --silence-errors --atleast-version=0.5.8 hal 2>/dev/null; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAL_VERSION} found" >&5
-$as_echo "${HAL_VERSION} found" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ${HAL_VERSION} is too old" >&5
-$as_echo "$as_me: WARNING: ${HAL_VERSION} is too old" >&2;}
-	fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal cflags" >&5
-$as_echo_n "checking for libhal cflags... " >&6; }
-
-# Check whether --with-hal-includes was given.
-if test "${with_hal_includes+set}" = set; then :
-  withval=$with_hal_includes;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-includes - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			CFLAGS="${withval}"
-			;;
-		esac
-
-else
-
-				CFLAGS="`pkg-config --silence-errors --cflags hal dbus-glib-1 2>/dev/null`"
-		if test "$?" != "0"; then
-			CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CFLAGS}" >&5
-$as_echo "${CFLAGS}" >&6; }
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal ldflags" >&5
-$as_echo_n "checking for libhal ldflags... " >&6; }
-
-# Check whether --with-hal-libs was given.
-if test "${with_hal_libs+set}" = set; then :
-  withval=$with_hal_libs;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-libs - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			LIBS="${withval}"
-			;;
-		esac
-
-else
-
-				LIBS="`pkg-config --silence-errors --libs hal dbus-glib-1 2>/dev/null`"
-		if test "$?" != "0"; then
-			LIBS="-lhal -ldbus-1 -lpthread"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LIBS}" >&5
-$as_echo "${LIBS}" >&6; }
-
-		for ac_header in libhal.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "libhal.h" "ac_cv_header_libhal_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_libhal_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBHAL_H 1
-_ACEOF
- nut_have_libhal=yes
-else
-  nut_have_libhal=no
-fi
-
-done
-
-	for ac_header in glib.h dbus/dbus-glib.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  nut_have_libhal=no
-fi
-
-done
-
-	for ac_func in libhal_device_new_changeset
-do :
-  ac_fn_c_check_func "$LINENO" "libhal_device_new_changeset" "ac_cv_func_libhal_device_new_changeset"
-if test "x$ac_cv_func_libhal_device_new_changeset" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBHAL_DEVICE_NEW_CHANGESET 1
-_ACEOF
-
-else
-  nut_have_libhal=no
-fi
-done
-
-
-	if test "${nut_have_libhal}" = "yes"; then
-		for ac_func in g_timeout_add_seconds
-do :
-  ac_fn_c_check_func "$LINENO" "g_timeout_add_seconds" "ac_cv_func_g_timeout_add_seconds"
-if test "x$ac_cv_func_g_timeout_add_seconds" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_G_TIMEOUT_ADD_SECONDS 1
-_ACEOF
-
-fi
-done
-
-		LIBHAL_CFLAGS="${CFLAGS}"
-		LIBHAL_LIBS="${LIBS}"
-	fi
-
-	CFLAGS="${CFLAGS_ORIG}"
-	LIBS="${LIBS_ORIG}"
-fi
-
-
-if test -z "${nut_have_config_libhal_seen}" -a "${nut_have_libhal}" = "yes"; then
-	nut_have_config_libhal_seen=yes
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal user" >&5
-$as_echo_n "checking for libhal user... " >&6; }
-
-# Check whether --with-hal-user was given.
-if test "${with_hal_user+set}" = set; then :
-  withval=$with_hal_user;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-user - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			HAL_USER="${withval}"
-			;;
-		esac
-
-else
-
-				HAL_USER="`pkg-config --silence-errors --variable=haluser hal 2>/dev/null`"
-		if test "$?" != "0" -o -z "${HAL_USER}"; then
-			HAL_USER="haldaemon"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAL_USER}" >&5
-$as_echo "${HAL_USER}" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define HAL_USER "${HAL_USER}"
-_ACEOF
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal device match key" >&5
-$as_echo_n "checking for libhal device match key... " >&6; }
-
-# Check whether --with-hal-device-match-key was given.
-if test "${with_hal_device_match_key+set}" = set; then :
-  withval=$with_hal_device_match_key;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-device-match-key - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			HAL_DEVICE_MATCH_KEY="${withval}"
-			;;
-		esac
-
-else
-
-				if pkg-config --silence-errors --atleast-version=0.5.11 hal 2>/dev/null; then
-			HAL_DEVICE_MATCH_KEY="info.bus"
-		else
-			HAL_DEVICE_MATCH_KEY="info.subsystem"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAL_DEVICE_MATCH_KEY}" >&5
-$as_echo "${HAL_DEVICE_MATCH_KEY}" >&6; }
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal Callouts path" >&5
-$as_echo_n "checking for libhal Callouts path... " >&6; }
-
-# Check whether --with-hal-callouts-path was given.
-if test "${with_hal_callouts_path+set}" = set; then :
-  withval=$with_hal_callouts_path;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-callouts-path - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			HAL_CALLOUTS_PATH="${withval}"
-			;;
-		esac
-
-else
-
-						HAL_CALLOUTS_PATH="`pkg-config --silence-errors --variable=libexecdir hal 2>/dev/null`"
-		if test "$?" != "0" -o -z "${HAL_CALLOUTS_PATH}"; then
-			HAL_CALLOUTS_PATH="${libdir}/hal"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAL_CALLOUTS_PATH}" >&5
-$as_echo "${HAL_CALLOUTS_PATH}" >&6; }
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libhal Device Information path" >&5
-$as_echo_n "checking for libhal Device Information path... " >&6; }
-
-# Check whether --with-hal-fdi-path was given.
-if test "${with_hal_fdi_path+set}" = set; then :
-  withval=$with_hal_fdi_path;
-		case "${withval}" in
-		yes|no)
-			as_fn_error $? "invalid option --with(out)-hal-fdi-path - see docs/configure.txt" "$LINENO" 5
-			;;
-		*)
-			HAL_FDI_PATH="${withval}"
-			;;
-		esac
-
-else
-
-								HAL_FDI_PATH="`pkg-config --silence-errors --variable=hal_fdidir hal 2>/dev/null`"
-		if test "$?" != "0" -o -z "${HAL_FDI_PATH}"; then
-			HAL_FDI_PATH="${datarootdir}/hal/fdi/information/20thirdparty"
-		fi
-
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${HAL_FDI_PATH}" >&5
-$as_echo "${HAL_FDI_PATH}" >&6; }
-fi
-
-
 # Check whether --with-snmp was given.
 if test "${with_snmp+set}" = set; then :
   withval=$with_snmp; nut_with_snmp="${withval}"
@@ -11363,62 +11080,6 @@ _ACEOF
 
 
 
-if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then
-   as_fn_error $? "\"libhal not found, required for HAL support\"" "$LINENO" 5
-fi
-
-if test "${nut_with_hal}" = "yes" -a "${nut_have_libusb}" != "yes"; then
-   as_fn_error $? "\"libusb not found, required for HAL support\"" "$LINENO" 5
-fi
-
-if test "${nut_with_hal}" != "no"; then
-   if test "${nut_have_libhal}" = "yes" -a "${nut_have_libusb}" = "yes"; then
-      nut_with_hal="yes"
-   else
-      nut_with_hal="no"
-   fi
-fi
-
- if test "${nut_with_hal}" = "yes"; then
-  WITH_HAL_TRUE=
-  WITH_HAL_FALSE='#'
-else
-  WITH_HAL_TRUE='#'
-  WITH_HAL_FALSE=
-fi
-
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable HAL support" >&5
-$as_echo_n "checking whether to enable HAL support... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${nut_with_hal} " >&5
-$as_echo "${nut_with_hal} " >&6; }
-     if test -z "${nut_report_feature_flag}"; then
-      nut_report_feature_flag="1"
-      ac_clean_files="${ac_clean_files} conf_nut_report_feature"
-      echo > conf_nut_report_feature
-      echo "Configuration summary:" >> conf_nut_report_feature
-      echo "======================" >> conf_nut_report_feature
-   fi
-   echo "enable HAL support: ${nut_with_hal} " >> conf_nut_report_feature
-
-
-    if test "${nut_with_hal}" = "yes"; then
-  WITH_HAL_TRUE=
-  WITH_HAL_FALSE='#'
-else
-  WITH_HAL_TRUE='#'
-  WITH_HAL_FALSE=
-fi
-
-   if test "${nut_with_hal}" = "yes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define WITH_HAL 1
-_ACEOF
-
-   fi
-
-
 
 
 
@@ -11772,8 +11433,8 @@ no)
 	;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if asciidoc version can build website (minimum required 8.6.3)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if asciidoc version can build manpages (minimum required 8.6.3)" >&5
-$as_echo_n "checking if asciidoc version can build website (minimum required 8.6.3)... " >&6; }
+$as_echo_n "checking if asciidoc version can build manpages (minimum required 8.6.3)... " >&6; }
 
 
 
@@ -11819,8 +11480,8 @@ $as_echo "no" >&6; }
   fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if a2x version can build website (minimum required 8.6.3)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if a2x version can build manpages (minimum required 8.6.3)" >&5
-$as_echo_n "checking if a2x version can build website (minimum required 8.6.3)... " >&6; }
+$as_echo_n "checking if a2x version can build manpages (minimum required 8.6.3)... " >&6; }
 
 
 
@@ -22969,6 +22630,50 @@ else
 fi
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install FreeBSD devd.conf file" >&5
+$as_echo_n "checking whether to install FreeBSD devd.conf file... " >&6; }
+
+# Check whether --with-devd-dir was given.
+if test "${with_devd_dir+set}" = set; then :
+  withval=$with_devd_dir;
+	case "${withval}" in
+	yes)
+		if test -z "${devddir}"; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			as_fn_error $? "\"devd directory requested but not found\"" "$LINENO" 5
+		fi
+		;;
+	auto)
+		;;
+	no)
+		devddir=""
+		;;
+	*)
+		devddir="${withval}"
+		;;
+	esac
+
+fi
+
+if test -n "${devddir}"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using ${devddir}" >&5
+$as_echo "using ${devddir}" >&6; }
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+ if test -n "${devddir}"; then
+  WITH_DEVD_TRUE=
+  WITH_DEVD_FALSE='#'
+else
+  WITH_DEVD_TRUE='#'
+  WITH_DEVD_FALSE=
+fi
+
+
+
 for ac_prog in asciidoc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -23215,12 +22920,7 @@ _ACEOF
 
 
 
-
+ac_config_files="$ac_config_files clients/Makefile common/Makefile conf/Makefile conf/upsmon.conf.sample conf/upssched.conf.sample data/html/header.html data/html/Makefile data/Makefile data/driver.list docs/Makefile docs/man/Makefile drivers/Makefile include/Makefile lib/libupsclient-config lib/libupsclient.pc lib/libnutclient.pc lib/libnutscan.pc lib/Makefile scripts/augeas/Makefile scripts/augeas/nutnutconf.aug scripts/augeas/nutupsconf.aug scripts/augeas/nutupsdconf.aug scripts/augeas/nutupsdusers.aug scripts/augeas/nutupsmonconf.aug scripts/augeas/nutupsschedconf.aug scripts/augeas/nuthostsconf.aug scripts/augeas/nutupssetconf.aug scripts/avahi/nut.service scripts/devd/Makefile scripts/devd/nut-usb.conf scripts/hotplug/Makefile scripts/hotplug/libhidups scripts/HP-UX/nut.psf scripts/HP-UX/postinstall scripts/python/Makefile scripts/systemd/Makefile scripts/systemd/nut-driver.service scripts/systemd/nut-monitor.service scripts/systemd/nut-server.service scripts/systemd/nutshutdown scripts/Solaris/Makefile scripts/Solaris/pkginfo scripts/Solaris/postinstall scripts/Solaris/preremove scripts/Solaris/nut scripts/udev/Makefile scripts/udev/nut-ipmipsu.rules scripts/udev/nut-usbups.rules scripts/ufw/nut.ufw.profile scripts/Makefile server/Makefile tools/Makefile tools/nut-scanner/Makefile tests/Makefile Makefile"
-
-
-
-
-ac_config_files="$ac_config_files clients/Makefile common/Makefile conf/Makefile conf/upsmon.conf.sample conf/upssched.conf.sample data/html/header.html data/html/Makefile data/Makefile data/driver.list docs/Makefile docs/man/Makefile docs/website/Makefile drivers/Makefile include/Makefile lib/libupsclient-config lib/libupsclient.pc lib/libnutclient.pc lib/libnutscan.pc lib/Makefile scripts/augeas/Makefile scripts/augeas/nutnutconf.aug scripts/augeas/nutupsconf.aug scripts/augeas/nutupsdconf.aug scripts/augeas/nutupsdusers.aug scripts/augeas/nutupsmonconf.aug scripts/augeas/nutupsschedconf.aug scripts/augeas/nuthostsconf.aug scripts/augeas/nutupssetconf.aug scripts/avahi/nut.service scripts/hal/Makefile scripts/hal/ups-nut-device.fdi scripts/hotplug/Makefile scripts/hotplug/libhidups scripts/HP-UX/nut.psf scripts/HP-UX/postinstall scripts/python/Makefile scripts/systemd/Makefile scripts/systemd/nut-driver.service scripts/systemd/nut-monitor.service scripts/systemd/nut-server.service scripts/systemd/nutshutdown scripts/Solaris/Makefile scripts/Solaris/pkginfo scripts/Solaris/postinstall scripts/Solaris/preremove scripts/Solaris/nut scripts/udev/Makefile scripts/udev/nut-ipmipsu.rules scripts/udev/nut-usbups.rules scripts/ufw/nut.ufw.profile scripts/Makefile server/Makefile tools/Makefile tools/nut-scanner/Makefile tests/Makefile Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23424,14 +23124,6 @@ if test -z "${WITH_CGI_TRUE}" && test -z "${WITH_CGI_FALSE}"; then
   as_fn_error $? "conditional \"WITH_CGI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_HAL_TRUE}" && test -z "${WITH_HAL_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${WITH_HAL_TRUE}" && test -z "${WITH_HAL_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_HAL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${WITH_ASCIIDOC_TRUE}" && test -z "${WITH_ASCIIDOC_FALSE}"; then
   as_fn_error $? "conditional \"WITH_ASCIIDOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23468,6 +23160,10 @@ if test -z "${WITH_UDEV_TRUE}" && test -z "${WITH_UDEV_FALSE}"; then
   as_fn_error $? "conditional \"WITH_UDEV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_DEVD_TRUE}" && test -z "${WITH_DEVD_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_DEVD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MANUALUPDATE_TRUE}" && test -z "${MANUALUPDATE_FALSE}"; then
   as_fn_error $? "conditional \"MANUALUPDATE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23873,7 +23569,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nut $as_me 2.7.1, which was
+This file was extended by nut $as_me 2.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23939,7 +23635,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nut config.status 2.7.1
+nut config.status 2.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -24457,7 +24153,6 @@ do
     "data/driver.list") CONFIG_FILES="$CONFIG_FILES data/driver.list" ;;
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/man/Makefile") CONFIG_FILES="$CONFIG_FILES docs/man/Makefile" ;;
-    "docs/website/Makefile") CONFIG_FILES="$CONFIG_FILES docs/website/Makefile" ;;
     "drivers/Makefile") CONFIG_FILES="$CONFIG_FILES drivers/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "lib/libupsclient-config") CONFIG_FILES="$CONFIG_FILES lib/libupsclient-config" ;;
@@ -24475,8 +24170,8 @@ do
     "scripts/augeas/nuthostsconf.aug") CONFIG_FILES="$CONFIG_FILES scripts/augeas/nuthostsconf.aug" ;;
     "scripts/augeas/nutupssetconf.aug") CONFIG_FILES="$CONFIG_FILES scripts/augeas/nutupssetconf.aug" ;;
     "scripts/avahi/nut.service") CONFIG_FILES="$CONFIG_FILES scripts/avahi/nut.service" ;;
-    "scripts/hal/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/hal/Makefile" ;;
+    "scripts/devd/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/devd/Makefile" ;;
-    "scripts/hal/ups-nut-device.fdi") CONFIG_FILES="$CONFIG_FILES scripts/hal/ups-nut-device.fdi" ;;
+    "scripts/devd/nut-usb.conf") CONFIG_FILES="$CONFIG_FILES scripts/devd/nut-usb.conf" ;;
     "scripts/hotplug/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/hotplug/Makefile" ;;
     "scripts/hotplug/libhidups") CONFIG_FILES="$CONFIG_FILES scripts/hotplug/libhidups" ;;
     "scripts/HP-UX/nut.psf") CONFIG_FILES="$CONFIG_FILES scripts/HP-UX/nut.psf" ;;

configure.ac

@@ -3,7 +3,7 @@ dnl | Network UPS Tools: configure.in                                  |
 dnl +------------------------------------------------------------------+
 
 dnl NUT version number is defined here, with a Git suffix in include/nut_version.h
-AC_INIT(nut, 2.7.1)
+AC_INIT(nut, 2.7.2)
 AC_CONFIG_SRCDIR(server/upsd.c)
 AC_CONFIG_MACRO_DIR([m4])
 echo "Network UPS Tools version ${PACKAGE_VERSION}"
@@ -76,6 +76,14 @@ if test ! -d "${udevdir}"; then
    fi
 fi
 
+devddir='/usr/local/etc/devd'
+if test ! -d "${devddir}"; then
+   devddir='/etc/devd'
+   if test ! -d "${devddir}"; then
+      devddir=''
+   fi
+fi
+
 RUN_AS_USER="nobody"
 RUN_AS_GROUP="nobody"
 PIDPATH="/var/run"
@@ -254,9 +262,6 @@ dnl what will be in the --with-drivers argument.
 
 NUT_CHECK_LIBNETSNMP
 NUT_CHECK_LIBUSB
-NUT_ARG_WITH([hal], [build and install HAL support], [no])
-NUT_CHECK_LIBHAL
-NUT_CONFIG_LIBHAL
 NUT_ARG_WITH([snmp], [build and install SNMP drivers], [auto])
 NUT_CHECK_LIBNETSNMP
 NUT_ARG_WITH([neon], [build and install neon based XML/HTTP driver], [auto])
@@ -582,37 +587,13 @@ fi
 NUT_REPORT_FEATURE([build CGI programs], [${nut_with_cgi}], [],
 					[WITH_CGI], [Define to enable CGI (HTTP) support])
 
-dnl ----------------------------------------------------------------------
-dnl checks related to --with-hal
-
-dnl ${nut_with_hal}: any value except "yes" or "no" is treated as "auto".
-if test "${nut_with_hal}" = "yes" -a "${nut_have_libhal}" != "yes"; then
-   AC_MSG_ERROR(["libhal not found, required for HAL support"])
-fi
-
-if test "${nut_with_hal}" = "yes" -a "${nut_have_libusb}" != "yes"; then
-   AC_MSG_ERROR(["libusb not found, required for HAL support"])
-fi
-
-if test "${nut_with_hal}" != "no"; then
-   if test "${nut_have_libhal}" = "yes" -a "${nut_have_libusb}" = "yes"; then
-      nut_with_hal="yes"
-   else
-      nut_with_hal="no"
-   fi
-fi
-
-AM_CONDITIONAL(WITH_HAL, test "${nut_with_hal}" = "yes")
-NUT_REPORT_FEATURE([enable HAL support], [${nut_with_hal}], [],
-					[WITH_HAL], [Define to enable HAL support])
 
 dnl ----------------------------------------------------------------------
 
 dnl checks related to --with-doc
 
 dnl Always check for AsciiDoc prerequisites, since even if --with-doc
-dnl is set to 'no', we may still want to build the website, or some
+dnl is set to 'no', we may still want to build some doc targets manually
-dnl doc targets manually
 NUT_CHECK_ASCIIDOC
 
 case "${nut_with_doc}" in
@@ -683,7 +664,7 @@ no)
 	;;
 esac
 
-AC_MSG_CHECKING([if asciidoc version can build website (minimum required 8.6.3)])
+AC_MSG_CHECKING([if asciidoc version can build manpages (minimum required 8.6.3)])
 AX_COMPARE_VERSION([${ASCIIDOC_VERSION}], [ge], [8.6.3], [
 	AC_MSG_RESULT(yes)
 	nut_have_asciidoc="yes"
@@ -692,7 +673,7 @@ AX_COMPARE_VERSION([${ASCIIDOC_VERSION}], [ge], [8.6.3], [
 	nut_have_asciidoc="no"
 ])
 
-AC_MSG_CHECKING([if a2x version can build website (minimum required 8.6.3)])
+AC_MSG_CHECKING([if a2x version can build manpages (minimum required 8.6.3)])
 AX_COMPARE_VERSION([${A2X_VERSION}], [ge], [8.6.3], [
 	AC_MSG_RESULT(yes)
 ], [
@@ -1091,6 +1072,38 @@ else
 fi
 AM_CONDITIONAL(WITH_UDEV, test -n "${udevdir}")
 
+dnl FreeBSD devd support:
+
+AC_MSG_CHECKING(whether to install FreeBSD devd.conf file)
+AC_ARG_WITH(devd-dir,
+	AS_HELP_STRING([--with-devd-dir=PATH], [where to install devd.conf file (/usr/local/etc/devd or /etc/devd)]),
+[
+	case "${withval}" in
+	yes)
+		if test -z "${devddir}"; then
+			AC_MSG_RESULT(no)
+			AC_MSG_ERROR(["devd directory requested but not found"])
+		fi
+		;;
+	auto)
+		;;
+	no)
+		devddir=""
+		;;
+	*)
+		devddir="${withval}"
+		;;
+	esac
+], [])
+if test -n "${devddir}"; then
+	AC_MSG_RESULT(using ${devddir})
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(WITH_DEVD, test -n "${devddir}")
+
+dnl
+
 AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
 AM_CONDITIONAL([MANUALUPDATE], [test "x$ASCIIDOC" != "xnone"])
 AC_PATH_PROGS([A2X], [a2x], [none])
@@ -1151,12 +1164,6 @@ 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)
-AC_SUBST(HAL_CALLOUTS_PATH)
-AC_SUBST(LIBHAL_CFLAGS)
-AC_SUBST(LIBHAL_LIBS)
 AC_SUBST(DRIVER_BUILD_LIST)
 AC_SUBST(DRIVER_MAN_LIST)
 AC_SUBST(DRIVER_INSTALL_TARGET)
@@ -1174,6 +1181,7 @@ AC_SUBST(RUN_AS_GROUP)
 AC_SUBST(SUN_LIBUSB)
 AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(cgiexecdir)
+AC_SUBST(devddir)
 AC_SUBST(driverexecdir)
 AC_SUBST(htmldir)
 AC_SUBST(pkgconfigdir)
@@ -1194,7 +1202,6 @@ AC_OUTPUT([
  data/driver.list
  docs/Makefile
  docs/man/Makefile
- docs/website/Makefile
  drivers/Makefile
  include/Makefile
  lib/libupsclient-config
@@ -1212,8 +1219,8 @@ AC_OUTPUT([
  scripts/augeas/nuthostsconf.aug
  scripts/augeas/nutupssetconf.aug
  scripts/avahi/nut.service
- scripts/hal/Makefile
+ scripts/devd/Makefile
- scripts/hal/ups-nut-device.fdi
+ scripts/devd/nut-usb.conf
  scripts/hotplug/Makefile
  scripts/hotplug/libhidups
  scripts/HP-UX/nut.psf

data/Makefile.in

@@ -67,7 +67,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -77,10 +76,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -206,10 +204,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -221,8 +215,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -308,6 +300,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@

data/driver.list.in

@@ -27,8 +27,8 @@
 #   *****   vendor provided protocol and hardware
 #
 # - driver [parameters]: mention the driver(s) (separated by "or" if there are
-#   several possibilities. Any mandatory parameter(s) must be referenced, as
+#   several possibilities). Any mandatory parameter(s) must be referenced, as
-#   they will be parsed by configuration helper softwares.
+#   they will be parsed by configuration helper software.
 #   For example, genericups entries must mention the "upstype=nn" format.
 #
 # Duplicate text in the last field will be cooked out during the conversion
@@ -99,8 +99,10 @@
 
 "Atlantis Land"	"ups"	"2"	"A03-P826"	""	"blazer_ser"
 "Atlantis Land"	"ups"	"2"	"A03-P551"	"USB"	"blazer_usb langid_fix=0x0409"	# http://www.atlantisland.it/pub/prodotti.php?famiglia=1&l1=7&l2=24&articolo=QTAzLVA1NTE=
+"Atlantis Land"	"ups"	"2"	"HostPower 851 (A03-HP851)"	"USB"	"nutdrv_qx"
 "Atlantis Land"	"ups"	"2"	"LinePower 1151 (A03-OP1151)"	"Serial"	"nutdrv_qx"
 "Atlantis Land"	"ups"	"2"	"LinePower 1151 (A03-OP1151)"	"USB"	"nutdrv_qx"
+"Atlantis Land"	"ups"	"2"	"OnePower 841+ (A03-P841)"	"USB"	"nutdrv_qx"
 "Atlantis Land"	"ups"	"2"	"(various)"	"Serial"	"nutdrv_qx"
 "Atlantis Land"	"ups"	"2"	"(various)"	"USB"	"nutdrv_qx"
 
@@ -154,6 +156,8 @@
 "Borri"	"ups"	"2"	"B500-R060-B/B500-R100-B"	""	"blazer_usb"
 "Borri"	"ups"	"2"	"B500EVO-100-B/B500EVO-200-B"	""	"blazer_usb"
 
+"CABAC"	"ups"	"2"	"UPS-1700DV2"	""	"blazer_usb"
+
 "Chloride"	"ups"	"2"	"Desk Power 650"	"serial port"	"blazer_ser"
 
 "Cito Power"	"ups"	"2"	"CPG-SR1000"	""	"blazer_ser"
@@ -192,6 +196,7 @@
 "Cyber Power Systems"	"ups"	"2"	"CPS800AVR"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"2"	"AE550"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"3"	"CP 1500C"	"USB"	"usbhid-ups"
+"Cyber Power Systems"	"ups"	"3"	"CP825AVR-G / LE825G"	"USB"	"usbhid-ups"	# http://www.cyberpowersystems.com/products/ups-systems/retail-products/LE825G.html
 "Cyber Power Systems"	"ups"	"3"	"OR2200LCDRM2U"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"3"	"OR700LCDRM1U"	"USB"	"usbhid-ups"
 "Cyber Power Systems"	"ups"	"3"	"PR6000LCDRTXL5U"	"USB"	"usbhid-ups"
@@ -241,6 +246,7 @@
 
 "Digital Loggers"	"pdu"	"1"	"LPC, EPCR2, DIN"	"8 outlets"	"powerman-pdu (experimental)"
 
+"Digitus"	"ups"	"1"	"DN-170014"	"USB"	"richcomm_usb"	# http://www.digitus.info/en/products/professional-network/security-and-surveillance/power-supply/uninterrruptable-power-supplies/ups-uninterruptible-power-systems-dn-170014/section/prof/
 "Digitus"	"ups"	"2"	"DN-170020"	""	"blazer_ser"
 
 "Dynamix"	"ups"	"2"	"UPS1700D"	""	"blazer_ser"
@@ -295,6 +301,7 @@
 "Eaton"	"pdu"	"5"	"ePDU Managed"	""	"snmp-ups"
 "Eaton"	"pdu"	"5"	"ePDU Switched"	""	"snmp-ups"
 "Eaton"	"pdu"	"5"	"ePDU Monitored"	""	"snmp-ups or netxml-ups"
+"Eaton"	"ups"	"5"	"Powerware 3105"	"USB"	"bcmxcp_usb"	# http://powerquality.eaton.com/Products-services/Backup-Power-UPS/3105-eol.aspx
 "Eaton"	"ups"	"5"	"Powerware 9130"	""	"bcmxcp or usbhid-ups"
 "Eaton"	"ups"	"5"	"Powerware 9140"	""	"bcmxcp or usbhid-ups"
 "Eaton"	"ups"	"5"	"Powerware 5130"	""	"usbhid-ups"
@@ -414,6 +421,7 @@
 "Infosec"	"ups"	"2"	"iPEL 750"	""	"blazer_ser"
 "Infosec"	"ups"	"2"	"iPEL 1000"	""	"blazer_ser"
 "Infosec"	"ups"	"2"	"500XP"	""	"blazer_ser"
+"Infosec"	"ups"	"2"	"X2, X3, X4, E2, E3, E4"	"USB"	"blazer_usb"
 "Infosec"	"ups"	"2"	"XP 500"	"USB"	"blazer_usb"
 "Infosec"	"ups"	"2"	"XP 1000"	""	"blazer_ser"
 
@@ -437,6 +445,8 @@
 
 "Jageson Technology"	"ups"	"1"	"Jasuny USPS"	""	"genericups upstype=4"
 
+"Kanji"	"ups"	"1"	"800 VA"	"USB"	"nutdrv_atcl_usb"
+
 "Kebo"	"ups"	"2"	"1200D/D Series"	""	"blazer_ser"
 
 "KOLFF"	"ups"	"2"	"BLACK NOVA 1K/2K/3K/6K/10K/20K TOWER"	""	"blazer_usb"
@@ -458,6 +468,7 @@
 "Liebert"	"ups"	"1"	"GXT2-3000RT230"	""	"liebert-esp2 (experimental)"
 "Liebert"	"ups"	"2"	"PowerSure Personal XT"	"USB"	"usbhid-ups"
 "Liebert"	"ups"	"2"	"PowerSure PSA"	"USB"	"usbhid-ups"
+"Liebert"	"ups"	"2"	"PowerSure PSI 1440"	"USB"	"usbhid-ups"	# http://www.emersonnetworkpower.com/en-US/Products/ACPower/Pages/LiebertPowerSurePSILineInteractiveUPS10003000VA.aspx
 
 "LNXI"	"pdu"	"1"	"Icebox"	"10 outlets"	"powerman-pdu (experimental)"
 
@@ -641,6 +652,7 @@
 "MicroDowell"	"ups"	"1"	"B.Box BP  750"	""	"powerpanel"
 "MicroDowell"	"ups"	"1"	"B.Box BP 1000"	""	"powerpanel"
 "MicroDowell"	"ups"	"1"	"B.Box BP 1500"	""	"powerpanel"
+"MicroDowell"	"ups"	"1"	"B.Box LP  500"	""	"genericups upstype=7"
 "MicroDowell"	"ups"	"5"	"Enterprise B8"	""	"microdowell"
 "MicroDowell"	"ups"	"5"	"Enterprise B10"	""	"microdowell"
 "MicroDowell"	"ups"	"5"	"Enterprise N8"	""	"microdowell"
@@ -674,6 +686,7 @@
 "Mustek"	"ups"	"2"	"Powermust"	"600VA Plus"	"blazer_ser"
 "Mustek"	"ups"	"2"	"Powermust"	"800VA Pro"	"blazer_ser"
 "Mustek"	"ups"	"2"	"Powermust"	"1000VA Plus"	"blazer_ser"
+"Mustek"	"ups"	"2"	"Powermust"	"1000VA USB"	"blazer_usb"
 "Mustek"	"ups"	"2"	"Powermust"	"1400VA Plus"	"blazer_ser"
 "Mustek"	"ups"	"2"	"Powermust"	"2000VA USB"	"blazer_ser"
 "Mustek"	"ups"	"2"	"Powermust Office 650"	"USB"	"blazer_usb"
@@ -687,7 +700,10 @@
 "Nitram"	"ups"	"1"	"Elite 2002"	""	"genericups upstype=16"
 "Nitram"	"ups"	"1"	"Elite 2005"	""	"powerpanel"
 
-"NUMERIC"	"ups"	"2"	"3000 SW"	""	"blazer_ser"
+"Novex"	"ups"	"1"	"NUPS-650"	"USB"	"blazer_usb protocol=megatec"	# http://komp.1k.by/periphery-ups/novex/Novex_NUPS_650-130052.html
+
+"Numeric"	"ups"	"2"	"3000 SW"	""	"blazer_ser"
+"Numeric"	"ups"	"2"	"Digital 800 plus"	"USB"	"blazer_usb"
 
 "Oneac"	"ups"	"1"	"ON400"	"advanced interface"	"oneac"
 "Oneac"	"ups"	"1"	"ON600"	"advanced interface"	"oneac"
@@ -715,6 +731,7 @@
 "OnLite"	"ups"	"2"	"AQUA"	"50"	"blazer_ser"
 
 "Opti-UPS"	"ups"	"1"	"PowerES"	"420E"	"optiups"
+"Opti-UPS"	"ups"	"1"	"VS 575C"	"type=OPTI"	"powercom"
 
 "Orvaldi Power Protection"	"ups"	"2"	"various"	"not 400 or 600"	"blazer_ser"
 "Orvaldi Power Protection"	"ups"	"2"	"750 / 900SP"	""	"blazer_usb"
@@ -723,6 +740,7 @@
 
 "Plexus"	"ups"	"2"	"500VA"	"USB"	"blazer_usb"
 "Plexus"	"ups"	"2"	"1000VA Pro"	"USB"	"blazer_usb"
+"Plexus"	"ups"	"1"	"800 VA"	"USB"	"nutdrv_atcl_usb"
 
 "Powercom"	"ups"	"4"	"SMK"	""	"blazer_ser"
 "Powercom"	"ups"	"4"	"SXL"	""	"blazer_ser"
@@ -888,6 +906,8 @@
 "Sweex"	"ups"	"1"	"1000"	"USB"	"richcomm_usb"
 "Sweex"	"ups"	"2"	"(various)"	""	"blazer_ser"
 
+"Syndome"	"ups"	"2"	"Era 500VA"	"USB"	"blazer_usb"
+
 "Sysgration"	"ups"	"2"	"UPGUARDS Pro650"	""	"blazer_ser"
 
 "Tecnoware"	"ups"	"2"	"Easy Power 1200"	""	"blazer_ser"
@@ -1068,6 +1088,9 @@
 "Voltronic Power"	"ups"	"2"	"Frigate TX 1KVA"	"USB"	"nutdrv_qx"
 "Voltronic Power"	"ups"	"2"	"Galleon 1KVA"	"Serial"	"nutdrv_qx"
 "Voltronic Power"	"ups"	"2"	"Galleon 1KVA"	"USB"	"nutdrv_qx"
+"Voltronic Power"	"ups"	"2"	"Prosine 800"	"Serial"	"nutdrv_qx"
+"Voltronic Power"	"ups"	"2"	"Prosine 800"	"USB"	"nutdrv_qx"
+"Voltronic Power"	"ups"	"2"	"Vesta LED 850VA"	"USB"	"nutdrv_qx"
 "Voltronic Power"	"ups"	"2"	"(various)"	"Serial"	"nutdrv_qx"
 "Voltronic Power"	"ups"	"2"	"(various)"	"USB"	"nutdrv_qx"
 

data/html/Makefile.in

@@ -65,7 +65,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -75,10 +74,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -165,10 +163,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -180,8 +174,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -267,6 +259,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@

docs/FAQ.txt

@@ -185,7 +185,7 @@ UPS.
 This is also a good option to consider if you can't use networked
 monitoring code for security or safety reasons.
 
-See ideas.txt for more on this and other related topics.
+See the TODO file for more on this and other related topics.
 
 == Why isn't upssched part of upsmon?
 
@@ -219,12 +219,13 @@ a shell script and make upsmon call it.  Everyone wins.
 
 There are at least two different protocols being used for hardware
 with very similar names.  The bestups driver tends to support the
-units built around the newer "PhoenixTec" protocol.  
+units built around the newer "PhoenixTec" protocol, and the bestfortress
+driver supports the older Best hardware.
 
-Previous releases of this software included a driver called
+There is a similar problem with the tripplite_usb driver: it only supports the
-bestfortress which supported the older Best hardware.  See the
+older, proprietary protocol. Newer standards-compliant Tripp Lite UPS models
-earlier entries about updating old drivers which have been removed
+are supported by usbhid-ups. We name drivers based on the information
-from the tree.
+available at that time, which often is incomplete.
 
 == What's this about 'data stale'?
 
@@ -262,7 +263,7 @@ running.  Maybe your state path is not configured properly.
 Check your syslog.  upsd will complain regularly if it can't
 connect to a driver, and it should say why it can't connect.
 
-Note: if you jumped in with both feet and didn't follow the INSTALL
+Note: if you jumped in with both feet and didn't follow the INSTALL.nut
 document, you probably started upsd by itself.  You have to run
 'upsdrvctl start' to start the drivers after configuring ups.conf.
 
@@ -285,7 +286,7 @@ might look like this:
 
 	if (test -f /etc/killpower)
 	then
-		/usr/local/ups/bin/upsdrvctl shutdown
+		/usr/local/ups/sbin/upsdrvctl shutdown
 
 		sleep 600	# this should never return
 
@@ -342,7 +343,7 @@ same effect with the following command:
 The following pages have some slightly more kludgy answers which involve the
 use of `setpci`, and are highly model-specific:
 
- - http://mythic-beasts.com/support/macminicolo_howto.html
+ - https://www.mythic-beasts.com/support/servers/colo/macminicolo_howto
  - http://superuser.com/questions/212434/reboot-after-power-failure-for-mac-running-ubuntu
  - http://ubuntuforums.org/showthread.php?t=1209576
 
@@ -359,7 +360,7 @@ solution.
 == My Mac won't power back up by itself into Mac OS X after the UPS shuts down.  What can I do about this?
 
 This is relatively simple to fix.  If you have console or VNC access, log in as
-an administrator, go to System Preferences, click on energy saver, click on the
+an administrator, go to System Preferences, click on Energy Saver, click on the
 options tab, check "Restart automatically after a power failure".
 
 Alternatively, you can connect via SSH and run "sudo pmset autorestart 1" to
@@ -387,7 +388,7 @@ For my development system this yields the following /dev entries:
 
 - Switch to root, then start the drivers:
 
-	# /usr/local/ups/bin/upsdrvctl -u nutdev start
+	# /usr/local/ups/sbin/upsdrvctl -u nutdev start
 
 - The listing for /var/state/ups then looks like this:
 
@@ -492,11 +493,12 @@ any of the user accounts which run inside the jail.
 
 == upsd is running, so why can't I connect to it?
 
-Assuming you haven't changed the TCP port number on the command line
+Assuming you haven't changed the TCP port number on the command line or at
-or at compile-time, then you probably have some sort of firewall
+compile-time, then you may have some sort of firewall blocking the connection.
-blocking the connection.
 
-upsd listens on TCP port 3493 by default.
+upsd listens on TCP port 3493 by default. If you do not specify a LISTEN
+directive in upsd.conf, upsd only listens on the loopback interface. See the
+upsd.conf man page for details.
 
 == How do you make upsmon reload the config file?
 
@@ -759,7 +761,7 @@ Implement this by modifying your shutdown script like this:
 
 	if (test -f /etc/killpower)
 	then
-		/usr/local/ups/bin/upsdrvctl shutdown
+		/usr/local/ups/sbin/upsdrvctl shutdown
 
 		sleep 120
 

docs/Makefile.am

@@ -16,8 +16,7 @@ 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 \
+ outlets.txt scheduling.txt security.txt support.txt user-manual.txt
- stable-hcl.txt
 
 DEVELOPER_GUIDE_DEPS = contact-closure.txt design.txt developers.txt	\
  developer-guide.txt hid-subdrivers.txt macros.txt new-clients.txt	\
@@ -36,11 +35,12 @@ CABLES_IMAGES = images/cables/73-0724.png images/cables/940-0024C.jpg \
  images/cables/SOLA-330.png
 
 ALL_TXT_SRC = nut-names.txt $(USER_MANUAL_DEPS) $(DEVELOPER_GUIDE_DEPS) \
- $(CABLES_DEPS) FAQ.txt nut-hal.txt nut-qa.txt packager-guide.txt snmp.txt
+ $(CABLES_DEPS) FAQ.txt nut-qa.txt packager-guide.txt snmp.txt
 
 NUT_SPELL_DICT = nut.dict
 EXTRA_DIST = $(ALL_TXT_SRC) $(SHARED_DEPS) $(IMAGE_FILES) \
- $(CABLES_IMAGES) docinfo.xml $(NUT_SPELL_DICT)
+ $(CABLES_IMAGES) docinfo.xml $(NUT_SPELL_DICT) \
+ common.xsl xhtml.xsl chunked.xsl
 
 ASCIIDOC_HTML_SINGLE = user-manual.html \
 	developer-guide.html \
@@ -55,10 +55,10 @@ ASCIIDOC_HTML_CHUNKED = user-manual.chunked \
 ASCIIDOC_PDF = user-manual.pdf \
 	developer-guide.pdf \
 	packager-guide.pdf \
+	cables.pdf	\
 	FAQ.pdf
 
-# Force build in ./ and man/ before website 
+SUBDIRS = man
-SUBDIRS = . man website
 SUFFIXES = .txt .html .pdf
 
 all: doc
@@ -70,27 +70,13 @@ pdf: $(ASCIIDOC_PDF)
 html-single: $(ASCIIDOC_HTML_SINGLE)
 html-chunked: $(ASCIIDOC_HTML_CHUNKED)
 
-if HAVE_ASCIIDOC
-website: html-chunked pdf
-else !HAVE_ASCIIDOC
-website:
-	@echo "Not building website documentation since 'asciidoc' was not found."
-endif !HAVE_ASCIIDOC
-
 clean-local:
 	rm -rf *.pdf *.html *.chunked docbook-xsl.css *.bak
 
-# 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: ../data/driver.list.in
-	cd ../data && $(MAKE) $(AM_MAKEFLAGS) driver.list
-	cd ../tools && $(MAKE) $(AM_MAKEFLAGS) website
-
 ### TODO: automatic dependency generation
 # 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 ../scripts/ufw/README
+	../INSTALL.nut ../UPGRADING ../TODO ../scripts/ufw/README
 FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS) $(SHARED_DEPS) \
 	../scripts/augeas/README ../TODO ../lib/README \
 	../tools/nut-scanner/README
@@ -112,11 +98,11 @@ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
     --attribute tree_version=@TREE_VERSION@ \
     -a toc -a numbered --destination-dir=.
 
-.txt.html:
+.txt.html: common.xsl xhtml.xsl
-	$(A2X) $(A2X_COMMON_OPTS) --attribute=xhtml11_format --format=xhtml $<
+	$(A2X) $(A2X_COMMON_OPTS) --attribute=xhtml11_format --format=xhtml --xsl-file=$(srcdir)/xhtml.xsl $<
 
-.txt.chunked:
+.txt.chunked: common.xsl chunked.xsl
-	$(A2X) $(A2X_COMMON_OPTS) --attribute=chunked_format --format=chunked $<
+	$(A2X) $(A2X_COMMON_OPTS) --attribute=chunked_format --format=chunked --xsl-file=$(srcdir)/chunked.xsl $<
 
 .txt.pdf: docinfo.xml
 	$(A2X) $(A2X_COMMON_OPTS) --attribute=pdf_format --format=pdf -a docinfo1 $<
@@ -144,4 +130,4 @@ spellcheck-interactive:
 	@echo "Documentation spell check not available since 'aspell' was not found."
 endif !HAVE_ASPELL
 
-.PHONY: html html-single pdf website
+.PHONY: html html-single pdf

docs/Makefile.in

@@ -63,7 +63,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -73,10 +72,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -173,10 +171,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -188,8 +182,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -275,6 +267,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@
@@ -334,8 +327,7 @@ IMAGE_FILES = images/asciidoc.png \
 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 \
+ outlets.txt scheduling.txt security.txt support.txt user-manual.txt
- stable-hcl.txt
 
 DEVELOPER_GUIDE_DEPS = contact-closure.txt design.txt developers.txt	\
  developer-guide.txt hid-subdrivers.txt macros.txt new-clients.txt	\
@@ -354,11 +346,12 @@ CABLES_IMAGES = images/cables/73-0724.png images/cables/940-0024C.jpg \
  images/cables/SOLA-330.png
 
 ALL_TXT_SRC = nut-names.txt $(USER_MANUAL_DEPS) $(DEVELOPER_GUIDE_DEPS) \
- $(CABLES_DEPS) FAQ.txt nut-hal.txt nut-qa.txt packager-guide.txt snmp.txt
+ $(CABLES_DEPS) FAQ.txt nut-qa.txt packager-guide.txt snmp.txt
 
 NUT_SPELL_DICT = nut.dict
 EXTRA_DIST = $(ALL_TXT_SRC) $(SHARED_DEPS) $(IMAGE_FILES) \
- $(CABLES_IMAGES) docinfo.xml $(NUT_SPELL_DICT)
+ $(CABLES_IMAGES) docinfo.xml $(NUT_SPELL_DICT) \
+ common.xsl xhtml.xsl chunked.xsl
 
 ASCIIDOC_HTML_SINGLE = user-manual.html \
 	developer-guide.html \
@@ -373,17 +366,16 @@ ASCIIDOC_HTML_CHUNKED = user-manual.chunked \
 ASCIIDOC_PDF = user-manual.pdf \
 	developer-guide.pdf \
 	packager-guide.pdf \
+	cables.pdf	\
 	FAQ.pdf
 
-
+SUBDIRS = man
-# Force build in ./ and man/ before website 
-SUBDIRS = . man website
 SUFFIXES = .txt .html .pdf
 
 ### TODO: automatic dependency generation
 # 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 ../scripts/ufw/README
+	../INSTALL.nut ../UPGRADING ../TODO ../scripts/ufw/README
 
 FULL_DEVELOPER_GUIDE_DEPS = $(DEVELOPER_GUIDE_DEPS) $(SHARED_DEPS) \
 	../scripts/augeas/README ../TODO ../lib/README \
@@ -760,29 +752,18 @@ pdf: $(ASCIIDOC_PDF)
 html-single: $(ASCIIDOC_HTML_SINGLE)
 html-chunked: $(ASCIIDOC_HTML_CHUNKED)
 
-@HAVE_ASCIIDOC_TRUE@website: html-chunked pdf
-@HAVE_ASCIIDOC_FALSE@website:
-@HAVE_ASCIIDOC_FALSE@	@echo "Not building website documentation since 'asciidoc' was not found."
-
 clean-local:
 	rm -rf *.pdf *.html *.chunked docbook-xsl.css *.bak
 
-# 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: ../data/driver.list.in
-	cd ../data && $(MAKE) $(AM_MAKEFLAGS) driver.list
-	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
 
-.txt.html:
+.txt.html: common.xsl xhtml.xsl
-	$(A2X) $(A2X_COMMON_OPTS) --attribute=xhtml11_format --format=xhtml $<
+	$(A2X) $(A2X_COMMON_OPTS) --attribute=xhtml11_format --format=xhtml --xsl-file=$(srcdir)/xhtml.xsl $<
 
-.txt.chunked:
+.txt.chunked: common.xsl chunked.xsl
-	$(A2X) $(A2X_COMMON_OPTS) --attribute=chunked_format --format=chunked $<
+	$(A2X) $(A2X_COMMON_OPTS) --attribute=chunked_format --format=chunked --xsl-file=$(srcdir)/chunked.xsl $<
 
 .txt.pdf: docinfo.xml
 	$(A2X) $(A2X_COMMON_OPTS) --attribute=pdf_format --format=pdf -a docinfo1 $<
@@ -807,7 +788,7 @@ packager-guide.html packager-guide.chunked packager-guide.pdf: packager-guide.tx
 @HAVE_ASPELL_FALSE@spellcheck-interactive:
 @HAVE_ASPELL_FALSE@	@echo "Documentation spell check not available since 'aspell' was not found."
 
-.PHONY: html html-single pdf website
+.PHONY: html html-single pdf
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

docs/acknowledgements.txt

@@ -21,8 +21,8 @@ Active members
 
 - Arnaud Quette: project leader (since 2005), Debian packager and jack of all trades
 - Charles Lepple: senior lieutenant
-- Frederic Bohe: senior developer
 - Emilien Kia: senior developer
+- Daniele Pezzini: senior developer
 - Václav Krpec: junior developer
 - Kjell Claesson: senior developer
 - Alexander Gordeev: junior developer
@@ -36,7 +36,7 @@ Active members
 - Antoine Colombier: trainee
 
 For an up to date list of NUT developers, refer to
-link:https://alioth.debian.org/project/memberlist.php?group_id=30602[Alioth].
+link:https://github.com/orgs/networkupstools/members[GitHub].
 
 Retired members
 ~~~~~~~~~~~~~~~
@@ -56,26 +56,8 @@ blazer_ser and blazer_usb
 - Dominique Lallement: Consultant (chairman of the USB/HID PDC Forum)
 - Julius Malkiewicz: junior developer
 - Tomas Smetana: former Redhat packager (2007-2008)
+- Frederic Bohe: senior developer, Eaton contractor (2009-2013)
 
-[[Eaton]]
-Our main supporter: Eaton
--------------------------
-
-Through the acquisition of MGE Office Protection Systems (a carve out of
-the MGE UPS SYSTEMS small systems, up to 10 KVA), Eaton has been supporting
-NUT, and more generally the Free/Libre Opensource Software Community
-since around 2002.
-
-This support includes the following actions:
-
-- providing extensive technical documents (Eaton protocols library),
-- providing units to developers of NUT and related projects,
-- hosting the networkupstools.org webserver (from 2005 to August 2012),
-- providing artwork,
-- promoting NUT in general.
-
-For more detailed information on Eaton's Opensource commitment, please refer to
-link:http://opensource.eaton.com[Eaton Opensource website].
 
 Supporting manufacturers
 ------------------------
@@ -83,27 +65,46 @@ Supporting manufacturers
 UPS manufacturers
 ~~~~~~~~~~~~~~~~~
 
-- link:http://powerquality.eaton.com[Eaton], our main supporter, as presented in
+[[Eaton]]
-the <<Eaton,above section>>.
+* link:http://powerquality.eaton.com[Eaton], has been the main NUT supporter in
+the past, between 2007 and 2011, continuing MGE UPS SYSTEMS efforts.
+As such, Eaton has been:
+  - providing extensive technical documents (Eaton protocols library),
+  - providing units to developers of NUT and related projects,
+  - hosting the networkupstools.org webserver (from 2007 to August 2012),
+  - providing artwork,
+  - promoting NUT in general,
+  - supporting its customers using NUT.
++
+[WARNING]
+================================================================================
+*The situation has evolved, and since 2011 Eaton does not support NUT anymore.*
 
-- link:http://www.gamatronic.com[Gamatronic], through Nadav Moskovitch, has
+*This may still evolve in the future.*
+
+*But for now, please do not consider anymore that buying Eaton products will
+provide you with official support from Eaton, or a better level of device
+support in NUT.*
+================================================================================
+
+* link:http://www.gamatronic.com[Gamatronic], through Nadav Moskovitch, has
 revived the 'sec' driver (as gamatronic), and expanded a bit genericups for its
 UPSs with alarm interface.
 
-- link:http://www.microdowell.com[Microdowell], through Elio Corbolante, has
+* link:http://www.microdowell.com[Microdowell], through Elio Corbolante, has
 created the 'microdowell' driver to support the Enterprise Nxx/Bxx serial devices.
 They also proposes NUT as an alternative to its software for
 link:http://www.microdowell.com/fra/download.html[Linux / Unix].
 
-- link:http://pcmups.com.tw[Powercom], through Alexey Morozov, has provided
+* link:http://pcmups.com.tw[Powercom], through Alexey Morozov, has provided
 link:ups-protocols.html[extensive information] on its USB/HID devices, along
 with development units.
 
-- link:http://www.riello-ups.com[Riello UPS], through Massimo Zampieri, has
+* link:http://www.riello-ups.com[Riello UPS], through Massimo Zampieri, has
 provided link:ups-protocols.html[all protocols information]. Elio Parisi has
 also created riello_ser and riello_usb to support these protocols.
 
-- link:http://www.tripplite.com[Tripp Lite], through Eric Cobb, has provided
+* link:http://www.tripplite.com[Tripp Lite], through Eric Cobb, has provided
 test results from connecting their HID-compliant UPS hardware to NUT. Some of
 this information has been incorporated into the NUT hardware compatibility
 list, and the rest of the information is available via the
@@ -133,13 +134,14 @@ safenet driver.
 Older entries (before 2005)
 ---------------------------
 
-- MGE UPS SYSTEMS was the previous NUT sponsor. They provided protocols
+- MGE UPS SYSTEMS was the previous NUT sponsor, from 2002 until its partial
-information, many units for development of NUT-related projects.
+acquisition by Eaton. They provided protocols information, many units for
+development of NUT-related projects.
 Several drivers such as mge-utalk, mge-shut, snmp-ups, hidups, and usbhid-ups
 are the result of this collaboration, in addition to the WMNut, MGE HID Parser
-the libhid projects, ... through Arnaud.
+the libhid projects, ... through Arnaud Quette (who was also an MGE employee).
-All the MGE supporters have now gone with Eaton (through MGE Office
+All the MGE supporters have gone with Eaton (through MGE Office Protection
-Protection Systems), which is the new NUT sponsor.
+Systems), which was temporarily the new NUT sponsor.
 
 - Fenton Technologies contributed a PowerPal 660 to the project.  Their open 
 stance and quick responses to technical inquiries were appreciated for 

docs/chunked.xsl

@@ -0,0 +1,22 @@
+<!--
+  Generates chunked XHTML documents from DocBook XML source using DocBook XSL
+  stylesheets.
+
+  NOTE: The URL reference to the current DocBook XSL stylesheets is
+  rewritten to point to the copy on the local disk drive by the XML catalog
+  rewrite directives so it doesn't need to go out to the Internet for the
+  stylesheets. This means you don't need to edit the <xsl:import> elements on
+  a machine by machine basis.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
+	<xsl:import href="common.xsl"/>
+	<xsl:param name="navig.graphics.path">images/icons/</xsl:param>
+	<xsl:param name="admon.graphics.path">images/icons/</xsl:param>
+	<xsl:param name="callout.graphics.path" select="'images/icons/callouts/'"/>
+
+	<!-- Format-detection to prevent smartphones from being too smart -->
+	<xsl:template name="user.head.content">
+		<meta name="format-detection" content="telephone=no" />
+	</xsl:template>
+</xsl:stylesheet>

docs/common.xsl

@@ -0,0 +1,106 @@
+<!--
+  Inlcuded in xhtml.xsl, xhtml.chunked.xsl, htmlhelp.xsl.
+  Contains common XSL stylesheets parameters.
+  Output documents styled by docbook.css.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="html.stylesheet" select="'docbook-xsl.css'"/>
+
+<xsl:param name="htmlhelp.chm" select="'htmlhelp.chm'"/>
+<xsl:param name="htmlhelp.hhc.section.depth" select="5"/>
+
+<xsl:param name="section.autolabel">
+  <xsl:choose>
+    <xsl:when test="/processing-instruction('asciidoc-numbered')">1</xsl:when>
+    <xsl:otherwise>0</xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+<xsl:param name="suppress.navigation" select="0"/>
+<xsl:param name="navig.graphics.extension" select="'.png'"/>
+<xsl:param name="navig.graphics" select="0"/>
+<xsl:param name="navig.graphics.path">images/icons/</xsl:param>
+<xsl:param name="navig.showtitles">0</xsl:param>
+
+<xsl:param name="shade.verbatim" select="0"/>
+<xsl:attribute-set name="shade.verbatim.style">
+  <xsl:attribute name="border">0</xsl:attribute>
+  <xsl:attribute name="background-color">#E0E0E0</xsl:attribute>
+</xsl:attribute-set>
+
+<xsl:param name="admon.graphics" select="1"/>
+<xsl:param name="admon.graphics.path">images/icons/</xsl:param>
+<xsl:param name="admon.graphics.extension" select="'.png'"/>
+<xsl:param name="admon.style">
+  <xsl:text>margin-left: 0; margin-right: 10%;</xsl:text>
+</xsl:param>
+<xsl:param name="admon.textlabel" select="1"/>
+
+<xsl:param name="callout.defaultcolumn" select="'60'"/>
+<xsl:param name="callout.graphics.extension" select="'.png'"/>
+<xsl:param name="callout.graphics" select="'1'"/>
+<xsl:param name="callout.graphics.number.limit" select="'10'"/>
+<xsl:param name="callout.graphics.path" select="'images/icons/callouts/'"/>
+<xsl:param name="callout.list.table" select="'1'"/>
+
+<!-- This does not seem to work. -->
+<xsl:param name="section.autolabel.max.depth" select="2"/>
+
+<xsl:param name="chunk.first.sections" select="1"/>
+<xsl:param name="chunk.section.depth" select="1"/>
+<xsl:param name="chunk.quietly" select="0"/>
+<xsl:param name="chunk.toc" select="''"/>
+<xsl:param name="chunk.tocs.and.lots" select="0"/>
+
+<xsl:param name="html.cellpadding" select="'4px'"/>
+<xsl:param name="html.cellspacing" select="''"/>
+
+<xsl:param name="table.borders.with.css" select="1"/>
+<xsl:param name="table.cell.border.color" select="'#527bbd'"/>
+
+<xsl:param name="table.cell.border.style" select="'solid'"/>
+<xsl:param name="table.cell.border.thickness" select="'1px'"/>
+<xsl:param name="table.footnote.number.format" select="'a'"/>
+<xsl:param name="table.footnote.number.symbols" select="''"/>
+<xsl:param name="table.frame.border.color" select="'#527bbd'"/>
+<xsl:param name="table.frame.border.style" select="'solid'"/>
+<xsl:param name="table.frame.border.thickness" select="'3px'"/>
+<xsl:param name="tablecolumns.extension" select="'1'"/>
+
+<xsl:param name="highlight.source" select="1"/>
+
+<xsl:param name="section.label.includes.component.label" select="1"/>
+
+<!--
+  Table of contents inserted by <?asciidoc-toc?> processing instruction.
+-->
+<xsl:param name="generate.toc">
+  <xsl:choose>
+    <xsl:when test="/processing-instruction('asciidoc-toc')">
+article toc,title
+book    toc,title,figure,table,example,equation
+      <!-- The only way I could find that suppressed book chapter TOCs -->
+      <xsl:if test="$generate.section.toc.level != 0">
+chapter   toc,title
+part      toc,title
+preface   toc,title
+qandadiv  toc
+qandaset  toc
+reference toc,title
+sect1     toc
+sect2     toc
+sect3     toc
+sect4     toc
+sect5     toc
+section   toc
+set       toc,title
+      </xsl:if>
+    </xsl:when>
+    <xsl:otherwise>
+article nop
+book    nop
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:param>
+
+</xsl:stylesheet>

docs/config-notes.txt

@@ -158,14 +158,14 @@ Starting the driver(s)
 
 Start the driver(s) for your hardware:
 
-	/usr/local/ups/bin/upsdrvctl start
+	/usr/local/ups/sbin/upsdrvctl start
 
 Make sure the driver doesn't report any errors.  It should show a
 few details about the hardware and then enter the background.  You
 should get back to the command prompt a few seconds later.  For
 reference, a successful start of the `usbhid-ups` driver looks like this:
 
-	# /usr/local/ups/bin/upsdrvctl start
+	# /usr/local/ups/sbin/upsdrvctl start
 	Network UPS Tools - Generic HID driver 0.34 (2.4.1)
 	USB communication driver 0.31
 	Using subdriver: MGE HID 1.12

docs/configure.txt

@@ -112,14 +112,6 @@ more information.
 
 Enable IPv6 support.
 
-	--with-hal (default: no)
-
-Build and install Hardware Abstraction Layer support.
-If you own a USB unit, only protect your local system and run the
-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
@@ -173,7 +165,7 @@ for this software.
 If you use one of the --with-user and --with-group options, then
 you have to use the other one too. 
 
-See the INSTALL document and the FAQ for more on this topic.
+See the INSTALL.nut document and the FAQ for more on this topic.
 
 	--with-logfacility=FACILITY
 
@@ -349,21 +341,6 @@ compiler flags that are needed.
 	--with-neon-libs, --with-libltdl-libs
 	--with-powerman-libs="-L/foo/bar -labcd -lxyz"
 
-If your system doesn't have pkg-config and support for any of the above
-libraries isn't found (but you know it is installed), you must specify the
-linker flags that are needed.
-
-HAL addons (deprecated)
------------------------
-
-	--with-hal-includes="-DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal \
-		-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
-	--with-hal-libs="-lhal -ldbus-1 -lpthread"
-	--with-hal-user="haldaemon"
-	--with-hal-device-match-key="info.bus"
-	--with-hal-callouts-path="${libdir}/hal"
-	--with-hal-fdi-path="${datarootdir}/hal/fdi/information/20thirdparty"
-
 If system doesn't have pkg-config or it fails to provides hints for some of the
 settings that are needed to set it up properly and the build in defaults are
 not right, you can specify the right variables here.

docs/developers.txt

@@ -84,9 +84,7 @@ will get the right headers on every system.
 Device drivers - main.c
 -----------------------
 
-The device drivers use main.c as their core.  The only exceptions are the
+The device drivers use main.c as their core.
-HAL-based drivers, which use the same dstate function calls while integrating
-with the DBUS event loop.
 
 To write a new driver, you create a file with a series of support
 functions that will be called by main.  These all have names that start

docs/documentation.txt

@@ -9,7 +9,7 @@ User Documentation
 ifdef::website[]
 - FAQ - Frequently Asked Questions (link:docs/FAQ.html[online]) (link:docs/FAQ.pdf[PDF])
 - NUT User Manual (link:docs/user-manual.chunked/index.html[online]) (link:docs/user-manual.pdf[PDF])
-- Cables information (link:cables.html[online]) (link:cables.pdf[PDF])
+- Cables information (link:cables.html[online]) (link:docs/cables.pdf[PDF])
 - link:docs/man/index.html#User_man[User manual pages]
 endif::website[]
 ifndef::website[]

docs/features.txt

@@ -58,19 +58,6 @@ WARNING: Be sure to plug your network's physical hardware (switches, hubs,
 routers, bridges, ...) into the UPS!
 
 
-////////////////////////////////////////////////////////////////////////////////
-*FIXME* to be removed?
-
-- This has also allowed us to create easily the Power Management integration.
-
-=== Power Management integration ===
-
-- Thanks to its modular design, NUT can feed data to the FreeDesktop Hardware Abstraction Layer (HAL).[[BR]]
- This allow a seemless integration of USB UPSs, at a small cost (around 200 Kb), reusing the standard Power Management GUIs and providing to users a full Plug & Play system.
-
-- The added bonus is that this is the best Power Management existing, surpassing the one that exist on Windows and Mac OS, both in terms of devices supported and of features.
-////////////////////////////////////////////////////////////////////////////////
-
 Redundancy support - Hot swap/high availability power supplies
 --------------------------------------------------------------
 

docs/macros.txt

@@ -12,7 +12,6 @@ directory.
 	#define a replacement if necessary.
 
 - NUT_CHECK_LIBGD
-- NUT_CHECK_LIBHAL
 - NUT_CHECK_LIBNEON
 - NUT_CHECK_LIBNETSNMP
 - NUT_CHECK_LIBPOWERMAN

docs/man/Makefile.am

@@ -446,6 +446,7 @@ SRC_USB_LIBUSB_PAGES = \
 	bcmxcp_usb.txt \
 	blazer-common.txt	\
 	blazer_usb.txt	\
+	nutdrv_atcl_usb.txt \
 	nutdrv_qx.txt	\
 	richcomm_usb.txt \
 	riello_usb.txt	\
@@ -455,6 +456,7 @@ SRC_USB_LIBUSB_PAGES = \
 MAN_USB_LIBUSB_PAGES = \
 	bcmxcp_usb.8 \
 	blazer_usb.8 \
+	nutdrv_atcl_usb.8 \
 	nutdrv_qx.8	\
 	richcomm_usb.8 \
 	riello_usb.8	\
@@ -469,6 +471,7 @@ HTML_USB_LIBUSB_MANS = \
 	bcmxcp_usb.html \
 	blazer_usb.html	\
 	nutdrv_qx.html	\
+	nutdrv_atcl_usb.html \
 	richcomm_usb.html \
 	riello_usb.html	\
 	tripplite_usb.html \
@@ -566,10 +569,7 @@ HTML_MANS = \
 
 all:
 
-man-index.html: index.html
+html-man: $(HTML_MANS) index.html
-	cp -f $< $@
-
-html-man: $(HTML_MANS) man-index.html
 
 CLEANFILES = *.xml *.html
 

docs/man/Makefile.in

@@ -91,7 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libavahi.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 \
@@ -101,10 +100,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libusb.m4 \
 	$(top_srcdir)/m4/nut_check_libwrap.m4 \
 	$(top_srcdir)/m4/nut_check_os.m4 \
-	$(top_srcdir)/m4/nut_config_libhal.m4 \
 	$(top_srcdir)/m4/nut_report_feature.m4 \
 	$(top_srcdir)/m4/nut_type_socklen_t.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -196,10 +194,6 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
-HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
-HAL_FDI_PATH = @HAL_FDI_PATH@
-HAL_USER = @HAL_USER@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -211,8 +205,6 @@ LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
 LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
-LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
-LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
@@ -298,6 +290,7 @@ builddir = @builddir@
 cgiexecdir = @cgiexecdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+devddir = @devddir@
 docdir = @docdir@
 driverexecdir = @driverexecdir@
 dvidir = @dvidir@
@@ -744,6 +737,7 @@ HTML_DEV_MANS = \
 @SOME_DRIVERS_FALSE@	bcmxcp_usb.txt \
 @SOME_DRIVERS_FALSE@	blazer-common.txt	\
 @SOME_DRIVERS_FALSE@	blazer_usb.txt	\
+@SOME_DRIVERS_FALSE@	nutdrv_atcl_usb.txt \
 @SOME_DRIVERS_FALSE@	nutdrv_qx.txt	\
 @SOME_DRIVERS_FALSE@	richcomm_usb.txt \
 @SOME_DRIVERS_FALSE@	riello_usb.txt	\
@@ -753,6 +747,7 @@ HTML_DEV_MANS = \
 @SOME_DRIVERS_FALSE@MAN_USB_LIBUSB_PAGES = \
 @SOME_DRIVERS_FALSE@	bcmxcp_usb.8 \
 @SOME_DRIVERS_FALSE@	blazer_usb.8 \
+@SOME_DRIVERS_FALSE@	nutdrv_atcl_usb.8 \
 @SOME_DRIVERS_FALSE@	nutdrv_qx.8	\
 @SOME_DRIVERS_FALSE@	richcomm_usb.8 \
 @SOME_DRIVERS_FALSE@	riello_usb.8	\
@@ -763,6 +758,7 @@ HTML_DEV_MANS = \
 @SOME_DRIVERS_FALSE@	bcmxcp_usb.html \
 @SOME_DRIVERS_FALSE@	blazer_usb.html	\
 @SOME_DRIVERS_FALSE@	nutdrv_qx.html	\
+@SOME_DRIVERS_FALSE@	nutdrv_atcl_usb.html \
 @SOME_DRIVERS_FALSE@	richcomm_usb.html \
 @SOME_DRIVERS_FALSE@	riello_usb.html	\
 @SOME_DRIVERS_FALSE@	tripplite_usb.html \
@@ -1227,10 +1223,7 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \
 
 all:
 
-man-index.html: index.html
+html-man: $(HTML_MANS) index.html
-	cp -f $< $@
-
-html-man: $(HTML_MANS) man-index.html
 
 @HAVE_ASCIIDOC_TRUE@.txt.html:
 @HAVE_ASCIIDOC_TRUE@	$(ASCIIDOC) --backend=xhtml11 \

docs/man/al175.8

@@ -2,12 +2,12 @@
 .\"     Title: al175
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/20/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "AL175" "8" "11/20/2013" "Network UPS Tools 2\&.7\&.1" "NUT Manual"
+.TH "AL175" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/apcsmart-old.8

@@ -2,12 +2,12 @@
 .\"     Title: apcsmart-old
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "APCSMART\-OLD" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "APCSMART\-OLD" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/apcsmart.8

@@ -2,12 +2,12 @@
 .\"     Title: apcsmart
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/30/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "APCSMART" "8" "10/30/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "APCSMART" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/apcupsd-ups.8

@@ -2,12 +2,12 @@
 .\"     Title: apcupsd-ups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "APCUPSD\-UPS" "8" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "APCUPSD\-UPS" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/asciidoc.conf

@@ -22,4 +22,8 @@ endif::backend-docbook[]
 ifdef::backend-xhtml11[]
 [linkman-inlinemacro]
 <a href="{target}.html">{target}{0?({0})}</a>
+
+# Format-detection to prevent smartphones from being too smart
+[+docinfo]
+<meta name="format-detection" content="telephone=no" />
 endif::backend-xhtml11[]

docs/man/bcmxcp.8

@@ -2,12 +2,12 @@
 .\"     Title: bcmxcp
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BCMXCP" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BCMXCP" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/bcmxcp_usb.8

@@ -2,12 +2,12 @@
 .\"     Title: bcmxcp_usb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BCMXCP_USB" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BCMXCP_USB" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BELKIN" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BELKIN" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/belkinunv.8

@@ -2,12 +2,12 @@
 .\"     Title: belkinunv
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BELKINUNV" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BELKINUNV" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/bestfcom.8

@@ -2,12 +2,12 @@
 .\"     Title: bestfcom
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BESTFCOM" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BESTFCOM" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/bestfortress.8

@@ -2,12 +2,12 @@
 .\"     Title: bestfortress
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BESTFORTRESS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BESTFORTRESS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/bestuferrups.8

@@ -2,12 +2,12 @@
 .\"     Title: bestuferrups
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BESTUFERRUPS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BESTUFERRUPS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/bestups.8

@@ -2,12 +2,12 @@
 .\"     Title: bestups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BESTUPS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "BESTUPS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/blazer_ser.8

@@ -2,12 +2,12 @@
 .\"     Title: blazer_ser
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/17/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BLAZER_SER" "8" "11/17/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "BLAZER_SER" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/blazer_usb.8

@@ -2,12 +2,12 @@
 .\"     Title: blazer_usb
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "BLAZER_USB" "8" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "BLAZER_USB" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/clone.8

@@ -2,12 +2,12 @@
 .\"     Title: clone
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "CLONE" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "CLONE" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/dummy-ups.8

@@ -2,12 +2,12 @@
 .\"     Title: dummy-ups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "DUMMY\-UPS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "DUMMY\-UPS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/etapro.8

@@ -2,12 +2,12 @@
 .\"     Title: etapro
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "ETAPRO" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "ETAPRO" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/everups.8

@@ -2,12 +2,12 @@
 .\"     Title: everups
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "EVERUPS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "EVERUPS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/gamatronic.8

@@ -2,12 +2,12 @@
 .\"     Title: gamatronic
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "GAMATRONIC" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "GAMATRONIC" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "GENERICUPS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "GENERICUPS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "HOSTS\&.CONF" "5" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "HOSTS\&.CONF" "5" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/isbmex.8

@@ -2,12 +2,12 @@
 .\"     Title: isbmex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "ISBMEX" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "ISBMEX" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/ivtscd.8

@@ -2,12 +2,12 @@
 .\"     Title: ivtscd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "IVTSCD" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "IVTSCD" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT" "3" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT" "3" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_commands.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_commands
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_COMMAND" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_COMMAND" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_devices.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_devices
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_DEVICES" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_DEVICES" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_general.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_general
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_GENERAL" "3" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_GENERAL" "3" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_misc.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_misc
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_MISC" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_MISC" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_tcp.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_tcp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_TCP" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_TCP" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libnutclient_variables.3

@@ -2,12 +2,12 @@
 .\"     Title: libnutclient_variables
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBNUTCLIENT_VARIABL" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBNUTCLIENT_VARIABL" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/libupsclient-config.1

@@ -2,12 +2,12 @@
 .\"     Title: libupsclient-config
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIBUPSCLIENT\-CONFIG" "1" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "LIBUPSCLIENT\-CONFIG" "1" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/liebert-esp2.8

@@ -2,12 +2,12 @@
 .\"     Title: liebert-esp2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIEBERT\-ESP2" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "LIEBERT\-ESP2" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "LIEBERT" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "LIEBERT" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/macosx-ups.8

@@ -2,12 +2,12 @@
 .\"     Title: macosx-ups
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "MACOSX\-UPS" "8" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "MACOSX\-UPS" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/masterguard.8

@@ -2,12 +2,12 @@
 .\"     Title: masterguard
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "MASTERGUARD" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "MASTERGUARD" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/metasys.8

@@ -2,12 +2,12 @@
 .\"     Title: metasys
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "METASYS" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "METASYS" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/mge-shut.8

@@ -2,12 +2,12 @@
 .\"     Title: mge-shut
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "MGE\-SHUT" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "MGE\-SHUT" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/mge-utalk.8

@@ -2,12 +2,12 @@
 .\"     Title: mge-utalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "MGE\-UTALK" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "MGE\-UTALK" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/microdowell.8

@@ -2,12 +2,12 @@
 .\"     Title: microdowell
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "MICRODOWELL" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "MICRODOWELL" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/netxml-ups.8

@@ -2,12 +2,12 @@
 .\"     Title: netxml-ups
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 10/30/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NETXML\-UPS" "8" "10/30/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NETXML\-UPS" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nut-ipmipsu.8

@@ -2,12 +2,12 @@
 .\"     Title: nut-ipmipsu
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUT\-IPMIPSU" "8" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUT\-IPMIPSU" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nut-recorder.8

@@ -2,12 +2,12 @@
 .\"     Title: nut-recorder
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUT\-RECORDER" "8" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUT\-RECORDER" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUT\-SCANNER" "8" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "NUT\-SCANNER" "8" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/26/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.6.5
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUT\&.CONF" "5" "07/26/2013" "Network UPS Tools 2\&.6\&.5" "NUT Manual"
+.TH "NUT\&.CONF" "5" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nutdrv_atcl_usb.8

@@ -0,0 +1,72 @@
+'\" t
+.\"     Title: nutdrv_atcl_usb
+.\"    Author: [see the "AUTHORS" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 02/25/2014
+.\"    Manual: NUT Manual
+.\"    Source: Network UPS Tools 2.7.1.5
+.\"  Language: English
+.\"
+.TH "NUTDRV_ATCL_USB" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "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"
+nutdrv_atcl_usb \- Driver for \*(AqATCL FOR UPS\*(Aq equipment
+.SH "NOTE"
+.sp
+This man page only documents the specific features of the nutdrv_atcl_usb driver\&. For information about the core driver, see \fBnutupsdrv\fR(8)\&.
+.SH "SUPPORTED HARDWARE"
+.sp
+This driver is for UPS hardware which identifies itself as USB idVendor 0001 and idProduct 0000, and iManufacturer ATCL FOR UPS\&. Known manufacturers include Kanji and Plexus\&. The UPS interface seems to be a USB frontend to a traditional contact\-closure interface, which translates into only three states in ups\&.status: \fBOL\fR, \fBOB\fR and \fBOB LB\fR\&. See also \fBgenericups\fR(8)\&.
+.SH "EXTRA ARGUMENTS"
+.sp
+This driver supports the following optional setting:
+.PP
+\fBvendor\fR=\fIname\fR
+.RS 4
+In case your iManufacturer (Vendor) string does not exactly match
+ATCL FOR UPS, you may provide an alternate string here\&. Note that a more likely case is that your device is handled by another driver for
+0001:0000
+devices, such as
+\fBnutdrv_qx\fR(8)\&.
+.RE
+.SH "BUGS"
+.sp
+The UPS returns the same code for "load power is off" as for "on line power"\&. This condition will not be observed if the NUT master is powered by the UPS, but may be an issue if the UPS is monitored by a remote system\&.
+.sp
+The time between the shutdown command and removal of power seems to be fixed at 30 seconds\&. Ensure that the NUT shutdown script is invoked as late as possible in the shutdown procedure (in case some services take longer than others to clean up)\&.
+.sp
+Most contact\-closure UPSes will not power down the load if the line power is present\&. This can create a race when using slave \fBupsmon\fR(8) systems\&. See the \fBupsmon\fR(8) man page for more information\&. The solution to this problem is to upgrade to a smart protocol UPS of some kind that allows detection and proper load cycling on command\&.
+.SH "AUTHORS"
+.sp
+Charles Lepple
+.SH "SEE ALSO"
+.SS "The core driver:"
+.sp
+\fBnutupsdrv\fR(8)
+.SS "The generic serial driver:"
+.sp
+\fBgenericups\fR(8)
+.SS "The Qx driver:"
+.sp
+\fBnutdrv_qx\fR(8)
+.SS "Internet resources:"
+.sp
+The NUT (Network UPS Tools) home page: http://www\&.networkupstools\&.org/

docs/man/nutdrv_atcl_usb.txt

@@ -0,0 +1,70 @@
+NUTDRV_ATCL_USB(8)
+==================
+
+NAME
+----
+nutdrv_atcl_usb - Driver for 'ATCL FOR UPS' equipment
+
+NOTE
+----
+This man page only documents the specific features of the nutdrv_atcl_usb 
+driver.  For information about the core driver, see linkman:nutupsdrv[8].
+
+SUPPORTED HARDWARE
+------------------
+This driver is for UPS hardware which identifies itself as USB idVendor 0001
+and idProduct 0000, and iManufacturer +ATCL FOR UPS+.  Known manufacturers
+include Kanji and Plexus. The UPS interface seems to be a USB frontend to a
+traditional contact-closure interface, which translates into only three states
+in ups.status: *OL*, *OB* and *OB LB*.  See also linkman:genericups[8].
+
+EXTRA ARGUMENTS
+---------------
+
+This driver supports the following optional setting:
+
+*vendor*='name'::
+In case your iManufacturer (Vendor) string does not exactly match
++ATCL FOR UPS+, you may provide an alternate string here. Note that a more
+likely case is that your device is handled by another driver for +0001:0000+
+devices, such as linkman:nutdrv_qx[8].
+
+BUGS
+----
+The UPS returns the same code for "load power is off" as for "on line power".
+This condition will not be observed if the NUT master is powered by the UPS,
+but may be an issue if the UPS is monitored by a remote system.
+
+The time between the shutdown command and removal of power seems to be fixed at
+30 seconds. Ensure that the NUT shutdown script is invoked as late as possible
+in the shutdown procedure (in case some services take longer than others to
+clean up).
+
+Most contact-closure UPSes will not power down the load if the line power 
+is present. This can create a race when using slave linkman:upsmon[8] systems.
+See the linkman:upsmon[8] man page for more information. The solution to this
+problem is to upgrade to a smart protocol UPS of some kind that allows
+detection and proper load cycling on command.
+
+AUTHORS
+-------
+Charles Lepple
+
+SEE ALSO
+--------
+
+The core driver:
+~~~~~~~~~~~~~~~~
+linkman:nutupsdrv[8]
+
+The generic serial driver:
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+linkman:genericups[8]
+
+The Qx driver:
+~~~~~~~~~~~~~~
+linkman:nutdrv_qx[8]
+
+Internet resources:
+~~~~~~~~~~~~~~~~~~~
+The NUT (Network UPS Tools) home page: http://www.networkupstools.org/

docs/man/nutdrv_qx.8

@@ -2,12 +2,12 @@
 .\"     Title: nutdrv_qx
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 11/18/2013
+.\"      Date: 02/25/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre2
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTDRV_QX" "8" "11/18/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTDRV_QX" "8" "02/25/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,7 +34,7 @@ nutdrv_qx \- Driver for Q* protocol serial and USB based UPS equipment
 This man page only documents the hardware\-specific features of the \fBnutdrv_qx\fR driver\&. For information about the core driver, see \fBnutupsdrv\fR(8)\&.
 .SH "SUPPORTED HARDWARE"
 .sp
-The \fBnutdrv_qx\fR driver is known to work with various UPSes from \fIBlazer\fR, \fIEnergy Sistem\fR, \fIFenton Technologies\fR, \fIGeneral Electric\fR, \fIMustek\fR, \fIVoltronic Power\fR (rebranded by many, many \- have I said many? \- others\&.\&. Long story short: if your UPS came with a software called \fIViewpower\fR, chances are high that it works with this driver with the \fIvoltronic\fR protocol) and many others\&.
+The \fBnutdrv_qx\fR driver is known to work with various UPSes from \fIBlazer\fR, \fIEnergy Sistem\fR, \fIFenton Technologies\fR, \fIGeneral Electric\fR, \fIMustek\fR, \fIVoltronic Power\fR (rebranded by many, many \- have I said many? \- others\&.\&. Long story short: if your UPS came with a software called \fIViewpower\fR, chances are high that it works with this driver with one of the \fIvoltronic*\fR protocols or with the \fImecer\fR one) and many others\&.
 .sp
 The NUT compatibility table lists all the known supported models\&. Keep in mind, however, that other models not listed there may also be supported, but haven\(cqt been tested\&.
 .sp
@@ -47,9 +47,11 @@ The following are the ones that most likely will need changing (see \fBups.conf\
 .PP
 \fBondelay =\fR \fIvalue\fR
 .RS 4
-Time to wait before switching on the UPS (seconds)\&. This value is truncated to units of 60 seconds\&. The acceptable range is
+Time to wait before switching on the UPS (seconds)\&. This value is truncated to units of 60 seconds\&.
-0\&.\&.599940
+.sp
-seconds\&. Note that a value below 3 minutes, may cause earlier firmware versions to not switch on automatically, so it defaults to 3 minutes (i\&.e\&. 180 seconds)\&. This option provides a default value for
+Note that a value below 3 minutes, may cause earlier firmware versions to not switch on automatically, so it defaults to 3 minutes (i\&.e\&. 180 seconds)\&.
+.sp
+This option provides a default value for
 \fBups\&.delay\&.start\fR
 that will then be used by the driver in the automatic shutdown sequence (i\&.e\&. calling the driver with the
 \fB\-k\fR
@@ -69,7 +71,9 @@ with
 .PP
 \fBoffdelay =\fR \fIvalue\fR
 .RS 4
-Time to wait before shutting down the UPS (seconds)\&. This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds)\&. Defaults to 30 seconds\&. This option provides a default value for
+Time to wait before shutting down the UPS (seconds)\&. This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds)\&. Defaults to 30 seconds\&.
+.sp
+This option provides a default value for
 \fBups\&.delay\&.shutdown\fR
 that will then be used by the driver in the automatic shutdown sequence (i\&.e\&. calling the driver with the
 \fB\-k\fR
@@ -95,7 +99,8 @@ when FSD arises the UPS will call a
 \fBshutdown\&.stayoff\fR
 shutting down after
 \fBups\&.delay\&.shutdown\fR
-seconds and won\(cqt return, otherwise (standard behaviour) the UPS will call
+seconds and won\(cqt return (see
+KNOWN PROBLEMS), otherwise (standard behaviour) the UPS will call
 \fBshutdown\&.return\fR
 shutting down after
 \fBups\&.delay\&.shutdown\fR
@@ -106,14 +111,27 @@ seconds (if mains meanwhile returned)\&.
 .PP
 \fBprotocol =\fR \fIstring\fR
 .RS 4
-Skip autodetection of the protocol to use and only use the one specified\&. Supported values
+Skip autodetection of the protocol to use and only use the one specified\&. Supported values:
 \fImecer\fR,
 \fImegatec\fR,
 \fImegatec/old\fR,
 \fImustek\fR,
-\fIvoltronic\fR
+\fIq1\fR,
+\fIvoltronic\fR,
+\fIvoltronic\-qs\fR
 and
 \fIzinto\fR\&.
+.sp
+Note that if you end up using the
+\fIq1\fR
+protocol, you may want to give a try to the
+\fImecer\fR,
+\fImegatec\fR
+and
+\fIzinto\fR
+ones setting the
+\fBnovendor\fR/\fBnorating\fR flags
+(only one, or both)\&.
 .RE
 .PP
 \fBpollfreq =\fR \fIvalue\fR
@@ -185,6 +203,13 @@ is also specified\&.
 .RE
 .SS "MECER, MEGATAEC, MEGATEC/OLD, MUSTEK, ZINTO PROTOCOLS"
 .PP
+\fBondelay\fR
+.RS 4
+The acceptable range is
+0\&.\&.599940
+seconds\&.
+.RE
+.PP
 \fBoffdelay\fR
 .RS 4
 The acceptable range is
@@ -201,10 +226,47 @@ Some UPSes will lock up if you attempt to read rating information from them\&. S
 .RS 4
 Some UPSes will lock up if you attempt to read vendor information from them\&. Setting this flag will make the driver skip this step\&.
 .RE
+.SS "Q1 PROTOCOL"
+.PP
+\fBondelay\fR
+.RS 4
+The acceptable range is
+0\&.\&.599940
+seconds\&.
+.RE
+.PP
+\fBoffdelay\fR
+.RS 4
+The acceptable range is
+12\&.\&.600
+seconds\&.
+.RE
+.SS "VOLTRONIC\-QS PROTOCOL"
+.PP
+\fBondelay\fR
+.RS 4
+The acceptable range is
+60\&.\&.599940
+seconds\&.
+.RE
+.PP
+\fBoffdelay\fR
+.RS 4
+The acceptable range is
+12\&.\&.540
+seconds\&.
+.RE
 .SS "VOLTRONIC PROTOCOL"
 .sp
 The following options are supported only by the \fIvoltronic\fR protocol\&. Not all of them are available on all the UPSes supported by this protocol\&.
 .PP
+\fBondelay\fR
+.RS 4
+The acceptable range is
+0\&.\&.599940
+seconds\&.
+.RE
+.PP
 \fBoffdelay\fR
 .RS 4
 The acceptable range is
@@ -535,7 +597,7 @@ Perform a quick (10 second) battery test\&.
 .RS 4
 Stop a running battery test\&. (Not available on some hardware)
 .RE
-.SS "MECER, MEGATEC, MEGATEC/OLD, MUSTEK, ZINTO PROTOCOLS"
+.SS "MECER, MEGATEC, MEGATEC/OLD, MUSTEK, Q1, ZINTO PROTOCOLS"
 .PP
 \fBtest\&.battery\&.start\fR \fIvalue\fR
 .RS 4
@@ -543,6 +605,22 @@ Perform a battery test for the duration of
 \fIvalue\fR
 seconds (truncated to 60 seconds) [60\&.\&.5940]\&.
 .RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBVOLTRONIC POWER P98 UNITS (WITH MECER PROTOCOL)\fR
+.RS 4
+.PP
+\fBtest\&.battery\&.start\fR \fIvalue\fR
+.RS 4
+Perform a battery test for the duration of
+\fIvalue\fR
+seconds (truncated to 60 seconds) [12\&.\&.5940]\&. This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds)\&.
+.RE
+.RE
 .SS "VOLTRONIC PROTOCOL"
 .sp
 The following instant commands are available for the \fIvoltronic\fR protocol\&. Not all of them are available on all the UPSes supported by this protocol\&.
@@ -878,6 +956,56 @@ Both the \fBload\&.off\fR and \fBshutdown\&.stayoff\fR instant commands are mean
 Some models report a bogus value for the beeper status (will always be \fIenabled\fR or \fIdisabled\fR)\&. So, the \fBbeeper\&.toggle\fR command may appear to have no effect in the status reported by the driver when, in fact, it is working fine\&.
 .sp
 The temperature and load value is known to be bogus in some models\&.
+.SS "VOLTRONIC\-QS UNITS"
+.sp
+Both \fBload\&.off\fR and \fBshutdown\&.stayoff\fR instant commands are known to work as expected (i\&.e\&. turn the load off indefinitely) only if mains is present, otherwise, as soon as mains returns the load will be powered\&.
+.sp
+After issuing a \fBshutdown\&.return\fR instant command, the UPS won\(cqt wait \fBondelay\fR before powering on the load, provided the following conditions are met:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+if the load has been previously (no matter how long before) powered off through
+\fBload\&.off\fR/\fBshutdown\&.stayoff\fR
+\fIand\fR
+powered on through
+\fBload\&.on\fR/\fBshutdown\&.stop\fR
+\fIand\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+if AC wasn\(cqt cut after issuing the
+\fBload\&.off\fR/\fBshutdown\&.stayoff\fR
+(i\&.e\&. the UPS didn\(cqt turn itself off)
+\fIand\fR
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+if there\(cqs a power outage after issuing the
+\fBshutdown\&.return\fR
+command
+.RE
+.sp
+In this case, as soon as mains returns the load will be powered\&.
 .SH "UPS WARNINGS (VOLTRONIC PROTOCOL)"
 .sp
 The UPSes supported by \fIvoltronic\fR protocol report warnings through a 64bit flag (bit1bit2\&...bit63bit64) where 1 means that a warning arose, while 0 means no warning\&. Since more than one warning at a time can be signaled, and because of the limited space in the ups\&.alarm variable, if the length of the warnings exceeds that of ups\&.alarms variable, they will be reported as bits\&. If you want to know the explanation of that bit you can either watch the log or see the next table (unlisted bits equal to unknown warnings)\&.

docs/man/nutdrv_qx.txt

@@ -17,7 +17,7 @@ For information about the core driver, see linkman:nutupsdrv[8].
 SUPPORTED HARDWARE
 ------------------
 
-The *nutdrv_qx* driver is known to work with various UPSes from 'Blazer', 'Energy Sistem', 'Fenton Technologies', 'General Electric', 'Mustek', 'Voltronic Power' (rebranded by many, many - have I said many? - others.. Long story short: if your UPS came with a software called 'Viewpower', chances are high that it works with this driver with the 'voltronic' <<_extra_arguments,protocol>>) and many others.
+The *nutdrv_qx* driver is known to work with various UPSes from 'Blazer', 'Energy Sistem', 'Fenton Technologies', 'General Electric', 'Mustek', 'Voltronic Power' (rebranded by many, many - have I said many? - others.. Long story short: if your UPS came with a software called 'Viewpower', chances are high that it works with this driver with one of the <<_extra_arguments,'voltronic*' protocols or with the 'mecer' one>>) and many others.
 
 The <<_internet_resources,NUT compatibility table>> lists all the known supported models.
 Keep in mind, however, that other models not listed there may also be supported, but haven't been tested.
@@ -35,22 +35,26 @@ The following are the ones that most likely will need changing (see linkman:ups.
 *ondelay =* 'value'::
 Time to wait before switching on the UPS (seconds).
 This value is truncated to units of 60 seconds.
-The acceptable range is +0..599940+ seconds.
++
 Note that a value below 3 minutes, may cause earlier firmware versions to not switch on automatically, so it defaults to 3 minutes (i.e. 180 seconds).
++
 This option provides a default value for *ups.delay.start* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[8] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[8] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.start* with linkman:upsrw[8].
 
 *offdelay =* 'value'::
 Time to wait before shutting down the UPS (seconds).
 This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds).
 Defaults to 30 seconds.
++
 This option provides a default value for *ups.delay.shutdown* that will then be used by the driver in the automatic shutdown sequence (i.e. calling the driver with the *-k* option, calling linkman:upsdrvctl[8] with the *shutdown* option or when the +FSD+ flag is set and linkman:upsmon[8] enters its shutdown sequence): however you can change this value `on the fly' for the actual session, only for the use with instant commands, setting *ups.delay.shutdown* with linkman:upsrw[8].
 
 *stayoff*::
-If you set stayoff in linkman:ups.conf[5] when FSD arises the UPS will call a *shutdown.stayoff* shutting down after *ups.delay.shutdown* seconds and won't return, otherwise (standard behaviour) the UPS will call *shutdown.return* shutting down after *ups.delay.shutdown* seconds and then turn on after *ups.delay.start* seconds (if mains meanwhile returned).
+If you set stayoff in linkman:ups.conf[5] when FSD arises the UPS will call a *shutdown.stayoff* shutting down after *ups.delay.shutdown* seconds and won't return (see <<_known_problems,KNOWN PROBLEMS>>), otherwise (standard behaviour) the UPS will call *shutdown.return* shutting down after *ups.delay.shutdown* seconds and then turn on after *ups.delay.start* seconds (if mains meanwhile returned).
 
 *protocol =* 'string'::
 Skip autodetection of the protocol to use and only use the one specified.
-Supported values 'mecer', 'megatec', 'megatec/old', 'mustek', 'voltronic' and 'zinto'.
+Supported values: 'mecer', 'megatec', 'megatec/old', 'mustek', 'q1', 'voltronic', 'voltronic-qs' and 'zinto'.
++
+Note that if you end up using the 'q1' protocol, you may want to give a try to the 'mecer', 'megatec' and 'zinto' ones setting the <<old-blazer-protocols-options,*novendor*/*norating* flags>> (only one, or both).
 
 *pollfreq =* 'value'::
 Set polling frequency, in seconds, to reduce the data flow.
@@ -99,9 +103,13 @@ If not specified, the driver defaults to 10%.
 Only used if *runtimecal* is also specified.
 
 
+[[old-blazer-protocols-options]]
 MECER, MEGATAEC, MEGATEC/OLD, MUSTEK, ZINTO PROTOCOLS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+*ondelay*::
+The acceptable range is +0..599940+ seconds.
+
 *offdelay*::
 The acceptable range is +12..600+ seconds.
 
@@ -114,12 +122,35 @@ Some UPSes will lock up if you attempt to read vendor information from them.
 Setting this flag will make the driver skip this step.
 
 
+Q1 PROTOCOL
+~~~~~~~~~~~
+
+*ondelay*::
+The acceptable range is +0..599940+ seconds.
+
+*offdelay*::
+The acceptable range is +12..600+ seconds.
+
+
+VOLTRONIC-QS PROTOCOL
+~~~~~~~~~~~~~~~~~~~~~
+
+*ondelay*::
+The acceptable range is +60..599940+ seconds.
+
+*offdelay*::
+The acceptable range is +12..540+ seconds.
+
+
 VOLTRONIC PROTOCOL
 ~~~~~~~~~~~~~~~~~~
 
 The following options are supported only by the 'voltronic' protocol.
 Not all of them are available on all the UPSes supported by this protocol.
 
+*ondelay*::
+The acceptable range is +0..599940+ seconds.
+
 *offdelay*::
 The acceptable range is +12..5940+ seconds.
 
@@ -317,13 +348,21 @@ Stop a running battery test.
 (Not available on some hardware)
 
 
-MECER, MEGATEC, MEGATEC/OLD, MUSTEK, ZINTO PROTOCOLS
+MECER, MEGATEC, MEGATEC/OLD, MUSTEK, Q1, ZINTO PROTOCOLS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 *test.battery.start* 'value'::
 Perform a battery test for the duration of 'value' seconds (truncated to 60 seconds) [+60..5940+].
 
 
+VOLTRONIC POWER P98 UNITS (WITH MECER PROTOCOL)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*test.battery.start* 'value'::
+Perform a battery test for the duration of 'value' seconds (truncated to 60 seconds) [+12..5940+].
+This value is truncated to units of 6 seconds (less than 60 seconds) or 60 seconds (more than 60 seconds).
+
+
 VOLTRONIC PROTOCOL
 ~~~~~~~~~~~~~~~~~~
 
@@ -540,6 +579,20 @@ So, the *beeper.toggle* command may appear to have no effect in the status repor
 The temperature and load value is known to be bogus in some models.
 
 
+VOLTRONIC-QS UNITS
+~~~~~~~~~~~~~~~~~~
+
+Both *load.off* and *shutdown.stayoff* instant commands are known to work as expected (i.e. turn the load off indefinitely) only if mains is present, otherwise, as soon as mains returns the load will be powered.
+
+After issuing a *shutdown.return* instant command, the UPS won't wait *ondelay* before powering on the load, provided the following conditions are met:
+
+- if the load has been previously (no matter how long before) powered off through *load.off*/*shutdown.stayoff* _and_ powered on through *load.on*/*shutdown.stop* _and_
+- if AC wasn't cut after issuing the *load.off*/*shutdown.stayoff* (i.e. the UPS didn't turn itself off) _and_
+- if there's a power outage after issuing the *shutdown.return* command
+
+In this case, as soon as mains returns the load will be powered.
+
+
 UPS WARNINGS (VOLTRONIC PROTOCOL)
 ---------------------------------
 
@@ -548,7 +601,7 @@ Since more than one warning at a time can be signaled, and because of the limite
 If you want to know the explanation of that bit you can either watch the log or see the next table (unlisted bits equal to unknown warnings).
 
 .UPS Warnings for 'voltronic' UPSes
-[cols="5>,95",options="autowidth,header",frame="topbot",align="center",caption=""]
+[cols="5>,95",options="autowidth,header",frame="topbot",grid="rows",align="center",caption=""]
 |====
 |#	|Corresponding Warning
 |1	|Battery disconnected
@@ -637,6 +690,7 @@ linkman:upsdrvctl[8],
 linkman:upsmon[8],
 linkman:upsrw[8]
 
+
 Internet Resources:
 ~~~~~~~~~~~~~~~~~~~
 

docs/man/nutscan.3

@@ -2,12 +2,12 @@
 .\"     Title: nutscan
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_ADD_DEVICE_T" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_ADD_DEVICE_T" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_ADD_OPTION_T" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_ADD_OPTION_T" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_CIDR_TO_IP" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_CIDR_TO_IP" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_DISPLAY_PARS" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_DISPLAY_PARS" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_DISPLAY_UPS_" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_DISPLAY_UPS_" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_FREE_DEVICE" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_FREE_DEVICE" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nutscan_get_serial_ports_list.3

@@ -2,12 +2,12 @@
 .\"     Title: nutscan_get_serial_ports_list
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_GET_SERIAL_P" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_GET_SERIAL_P" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nutscan_init.3

@@ -2,12 +2,12 @@
 .\"     Title: nutscan_init
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_INIT" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_INIT" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_NEW_DEVICE" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_NEW_DEVICE" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_AVAHI" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_AVAHI" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

docs/man/nutscan_scan_eaton_serial.3

@@ -2,12 +2,12 @@
 .\"     Title: nutscan_scan_eaton_serial
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_EATON_S" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_EATON_S" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_IPMI" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_IPMI" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_NUT" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_NUT" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_SNMP" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_SNMP" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_USB" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_USB" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

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.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/13/2013
+.\"      Date: 02/15/2014
 .\"    Manual: NUT Manual
-.\"    Source: Network UPS Tools 2.7.1-pre1
+.\"    Source: Network UPS Tools 2.7.1.5
 .\"  Language: English
 .\"
-.TH "NUTSCAN_SCAN_XML_HTT" "3" "09/13/2013" "Network UPS Tools 2\&.7\&.1\-p" "NUT Manual"
+.TH "NUTSCAN_SCAN_XML_HTT" "3" "02/15/2014" "Network UPS Tools 2\&.7\&.1\&." "NUT Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------