Imported Upstream version 2.6.3

docs/website/Makefile.am

@@ -13,6 +13,7 @@ IMAGE_FILES = images/asciidoc.png \
 	images/bigbox.png \
 	images/bizarre.png \
 	images/note.png \
+	images/nut-logo.png \
 	images/warning.png
 
 FAVICON_FILES = faviconut.ico faviconut.png
@@ -52,6 +53,7 @@ ASCIIDOC_PARAMS = --unsafe --backend=xhtml11 \
     --attribute=website \
     --attribute=quirks \
     --attribute=revision=$(PACKAGE_VERSION) \
+    --attribute tree_version=@TREE_VERSION@ \
     --attribute localdate=`TZ=UTC date +%Y-%m-%d` \
     --attribute localtime=`TZ=UTC date +%H:%M:%S` \
     --attribute=date="`TZ=UTC date`"
@@ -67,7 +69,8 @@ images/:
 $(IMAGE_FILES): images/
 	cp -f ../$@ images/
 
-
+# Keep using 'HAVE_ASCIIDOC', instead of 'WITH_ASCIIDOC' since we have
+# an explicit target
 if HAVE_ASCIIDOC
 website: $(WEBSITE_FILES) $(WEBSITE_DEPS) $(IMAGE_FILES) $(SCRIPT_FILES) \
 	$(LAYOUT_FILES) scripts/ups_data.js ../stable-hcl.txt ../ups-html.txt \

docs/website/Makefile.in

@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
+	$(top_srcdir)/m4/nut_check_libltdl.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
 	$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
 	$(top_srcdir)/m4/nut_check_libpowerman.m4 \
@@ -87,6 +88,7 @@ CYGPATH_W = @CYGPATH_W@
 DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DOC_BUILD_LIST = @DOC_BUILD_LIST@
 DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
 DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
@@ -119,6 +121,8 @@ LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
 LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
 LIBIPMI_LIBS = @LIBIPMI_LIBS@
+LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
+LIBLTDL_LIBS = @LIBLTDL_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@@ -139,6 +143,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NETLIBS = @NETLIBS@
 NM = @NM@
@@ -170,12 +175,14 @@ SHELL = @SHELL@
 STATEPATH = @STATEPATH@
 STRIP = @STRIP@
 SUN_LIBUSB = @SUN_LIBUSB@
+TREE_VERSION = @TREE_VERSION@
 VERSION = @VERSION@
 WORDS_BIGENDIAN = @WORDS_BIGENDIAN@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -211,7 +218,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -251,6 +257,7 @@ IMAGE_FILES = images/asciidoc.png \
 	images/bigbox.png \
 	images/bizarre.png \
 	images/note.png \
+	images/nut-logo.png \
 	images/warning.png
 
 FAVICON_FILES = faviconut.ico faviconut.png
@@ -290,6 +297,7 @@ ASCIIDOC_PARAMS = --unsafe --backend=xhtml11 \
     --attribute=website \
     --attribute=quirks \
     --attribute=revision=$(PACKAGE_VERSION) \
+    --attribute tree_version=@TREE_VERSION@ \
     --attribute localdate=`TZ=UTC date +%Y-%m-%d` \
     --attribute localtime=`TZ=UTC date +%H:%M:%S` \
     --attribute=date="`TZ=UTC date`"
@@ -492,6 +500,8 @@ images/:
 $(IMAGE_FILES): images/
 	cp -f ../$@ images/
 
+# Keep using 'HAVE_ASCIIDOC', instead of 'WITH_ASCIIDOC' since we have
+# an explicit target
 @HAVE_ASCIIDOC_TRUE@website: $(WEBSITE_FILES) $(WEBSITE_DEPS) $(IMAGE_FILES) $(SCRIPT_FILES) \
 @HAVE_ASCIIDOC_TRUE@	$(LAYOUT_FILES) scripts/ups_data.js ../stable-hcl.txt ../ups-html.txt \
 @HAVE_ASCIIDOC_TRUE@	$(OUTDIR) $(FAVICON_FILES)

docs/website/css/web-layout.css

@@ -34,6 +34,11 @@ h1 {
   padding: 0.8em 20px;
 }
 
+#layout-logo {
+  float: left;
+  padding: 5px 20px 5px 10px;
+}
+
 #layout-title {
   font-family: monospace;
   font-size: 3.5em;

docs/website/news.txt

@@ -1,3 +1,5 @@
+- January 4, 2012: 2.6.3 released
+- October 31, 2011: link:download.html#_java_packages[jNUT and jNutWebAPI 0.2-SNAPSHOT released]
 - September 15, 2011: 2.6.2 released
 - September 2, 2011: link:download.html#_java_packages[jNUT (NUT Java support) 0.1-SNAPSHOT released]
 - July 4, 2011: link:download.html#_binary_packages[Beta NUT 2.6.1-1 package for Windows released]

docs/website/projects.txt

@@ -51,6 +51,10 @@ link:http://csociety.ecn.purdue.edu/~delpha/winnut/[WinNUT]
 
 WinNUT is a partial port of the client side of Network UPS Tools (NUT) to Windows.
 
+NOTE: WinNUT is currently being replaced by a full port to Windows, part of the
+official NUT distribution. link:download.html#_binary_packages[MSI packages]
+are available too.
+
 link:http://wmnut.mgeops.org/[WMNUT]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/website/web-layout.conf

@@ -36,7 +36,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset={encoding}" />
 <meta name="generator" content="AsciiDoc {asciidoc-version}" />
 <meta name="description" content="Power Devices support" />
-<meta name="keywords" content="Free Software, UPS, Uninterruptible Power Supplies, PDU, Power Distributions Units, Solar Controllers, power, Power Devices, Linux, Unix, Windows, Mac OS X" />
+<meta name="keywords" content="NUT, Network UPS Tools, Eaton, APC, Free Software, UPS, Uninterruptible Power Supplies, PDU, Power Distributions Units, Solar Controllers, power, power devices, control, monitor, Linux, Unix, Windows, Mac OS X" />
 <link rel="stylesheet" href="{stylesdir=css}/{theme={backend}}.css" type="text/css" />
 {doctype-manpage}<link rel="stylesheet" href="{stylesdir=.}/{theme={backend}}-manpage.css" type="text/css" />
 ifdef::quirks[]
@@ -56,7 +56,7 @@ endif::toc[]
 ifdef::hcl[]
 <script type="text/javascript" src="{scriptsdir=.}/jquery.js"></script>
 <script type="text/javascript" src="{scriptsdir=.}/ups_data.js"></script>
-<script language="javascript1.7" type="text/javascript" src="{scriptsdir=.}/nut_jquery.js"></script>
+<script type="text/javascript" src="{scriptsdir=.}/nut_jquery.js"></script>
 endif::hcl[]
 <!--[if lte IE 7]>
 <link rel="stylesheet" href="{stylesdir=css}/ie-overrides.css" type="text/css" />
@@ -68,6 +68,7 @@ endif::hcl[]
 <body>
 <div id="layout-banner-box">
 <div id="layout-banner">
+  <div id="layout-logo"><img src="images/nut-logo.png" alt="NUT logo" /></div>
   <div id="layout-title">Network UPS Tools</div>
   <div id="layout-description">Power Devices support</div>
 </div>