New upstream version 1.8.19upstream/1.8.19upstream

3 files changed, 304 insertions, 789 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
deleted file mode 100644
index fb184ec..0000000
--- a/doc/Makefile.in
+++ /dev/null
@@ -1,611 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 
-# Redistribution of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistribution in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 
-# Neither the name of Sun Microsystems, Inc. or the names of
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# 
-# This software is provided "AS IS," without a warranty of any kind.
-# ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-# PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
-# SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
-# FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
-# OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
-# SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
-# OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
-# PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
-# LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
-# EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(man_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-ARCH = @ARCH@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASEDIR = @BASEDIR@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRO = @DISTRO@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTF_BMC = @INTF_BMC@
-INTF_BMC_LIB = @INTF_BMC_LIB@
-INTF_DUMMY = @INTF_DUMMY@
-INTF_DUMMY_LIB = @INTF_DUMMY_LIB@
-INTF_FREE = @INTF_FREE@
-INTF_FREE_LIB = @INTF_FREE_LIB@
-INTF_IMB = @INTF_IMB@
-INTF_IMB_LIB = @INTF_IMB_LIB@
-INTF_LAN = @INTF_LAN@
-INTF_LANPLUS = @INTF_LANPLUS@
-INTF_LANPLUS_LIB = @INTF_LANPLUS_LIB@
-INTF_LAN_LIB = @INTF_LAN_LIB@
-INTF_LIPMI = @INTF_LIPMI@
-INTF_LIPMI_LIB = @INTF_LIPMI_LIB@
-INTF_OPEN = @INTF_OPEN@
-INTF_OPEN_LIB = @INTF_OPEN_LIB@
-INTF_SERIAL = @INTF_SERIAL@
-INTF_SERIAL_LIB = @INTF_SERIAL_LIB@
-INTF_USB = @INTF_USB@
-INTF_USB_LIB = @INTF_USB_LIB@
-IPMITOOL_INTF_LIB = @IPMITOOL_INTF_LIB@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OS = @OS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POW_LIB = @POW_LIB@
-PSTAMP = @PSTAMP@
-RANLIB = @RANLIB@
-RPMBUILD = @RPMBUILD@
-RPM_RELEASE = @RPM_RELEASE@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_configure_args = @ac_configure_args@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-MAINTAINERCLEANFILES = Makefile.in
-man_MANS = ipmitool.1 ipmievd.8
-EXTRA_DIST = $(man_MANS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man1dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.1[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(man_MANS)'; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man8dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.8[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1 install-man8
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1 uninstall-man8
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-man uninstall-man1 uninstall-man8
-
-
-# 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.
-.NOEXPORT:
diff --git a/doc/ipmievd.8 b/doc/ipmievd.8.in
index a39dce0..6792a0d 100644
--- a/doc/ipmievd.8
+++ b/doc/ipmievd.8.in
@@ -145,7 +145,7 @@ placed at the end of commands to get option usage help.
 > ipmievd help
 .br 
 Commands:
-    open    Use OpenIPMI for asyncronous notification of events
+    open    Use OpenIPMI for asynchronous notification of events
     sel     Poll SEL for notification of events
 
 .TP 
@@ -174,7 +174,7 @@ Do NOT become a daemon, instead log all messages to stderr.
 .TP
 \fIpidfile\fP=<\fBfilename\fR>
 Save process ID to this file when in daemon mode.  Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
 number -- defaults to 0).
 .RE
 
@@ -197,7 +197,7 @@ Do NOT become a daemon, instead log all messages to stderr.
 .TP
 \fIpidfile\fP=<\fBfilename\fR>
 Save process ID to this file when in daemon mode.  Defaults to
-/var/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
+/run/ipmievd.pid\fIN\fP (where \fIN\fP is the ipmi device
 number -- defaults to 0).
 .TP 
 \fItimeout\fP=<\fBseconds\fR>
@@ -217,6 +217,16 @@ Reading Sensors...
 .br 
 Waiting for Events...
 .br 
+
+.SH FILES
+.TP
+.B @IANADIR@/enterprise-numbers
+system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers
+.TP
+.B ~/@IANAUSERDIR@/enterprise-numbers
+user's override for the system IANA PEN registry, this file if it exists is loaded instead
+of the system registry (see above).
+
 .SH "AUTHOR"
 Duncan Laurie <duncan@iceblink.org>
 .SH "SEE ALSO"
diff --git a/doc/ipmitool.1 b/doc/ipmitool.1.in
index 2e39fad..13ab35e 100644
--- a/doc/ipmitool.1
+++ b/doc/ipmitool.1.in
@@ -3,12 +3,13 @@
 ipmitool \- utility for controlling IPMI\-enabled devices
 .SH "SYNOPSIS"
 
-ipmitool [ <options> ] <command> [ <sub-commands and sub-options> ]
+.BR ipmitool
+[ <options> ] <command> [ <sub-commands and sub-options> ]
 
 <options>           := [ <general-options> | <conditional-opts> ]
-.br
-Any recognized option is accepted. Conditional options may be ignored or it's usage postponed until shell or exec processes relevant command.
-.br
+
+Any recognized option is accepted. Conditional options may be ignored or it's
+usage postponed until shell or exec processes relevant command.
 
 <general\-options>   := [ \-h | \-V | \-v | \-I <interface> | \-H <address> |
                          \-d <N> | \-p <port> | \-c | \-U <username> |
@@ -66,8 +67,9 @@ called \fIOpenIPMI\fP and it is included in standard distributions.
 On Solaris this driver is called \fIBMC\fP and is included in Solaris 10.
 Management of a remote station requires the IPMI\-over\-LAN interface to be
 enabled and configured.  Depending on the particular requirements of each
-system it may be possible to enable the LAN interface using ipmitool over
-the system interface.
+system it may be possible to enable the LAN interface using
+.BR ipmitool
+over the system interface.
 .SH "OPTIONS"
 .TP 
 \fB\-a\fR
@@ -95,9 +97,14 @@ This is not available with all commands.
 .TP 
 \fB\-C\fR <\fIciphersuite\fP>
 The remote server authentication, integrity, and encryption algorithms
-to use for IPMIv2.0 \fIlanplus\fP connections.  See table 22\-19 in the
-IPMIv2.0 specification.  The default is 3 which specifies RAKP\-HMAC\-SHA1 
-authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorithms.
+to use for IPMIv2.0 \fIlanplus\fP connections.  See table 22\-20 in the
+IPMI v2.0 specification. The default is 17 which specifies RAKP\-HMAC\-SHA256
+authentication, HMAC\-SHA256\-128 integrity, and AES\-CBC\-128 encryption algorithms.
+
+NOTE: In
+.BR ipmitool
+1.8.18 and earlier the default was 3, which was insecure and was not supported
+by some more recent BMC implementations.
 .TP 
 \fB\-d \fIN\fP\fR
 Use device number N to specify the /dev/ipmiN (or 
@@ -212,7 +219,7 @@ Increase verbose output level.  This option may be specified
 multiple times to increase the level of debug output.  If given
 three times you will get hexdumps of all incoming and
 outgoing packets. Using it five times provides details
-on request and expected reply procesing. The \fIhpm\fP commands
+on request and expected reply processing. The \fIhpm\fP commands
 \fItargetcap\fP \fIcompprop\fP \fIabort\fP \fIupgstatus\fP
 \fIrollback\fP \fIrollbackstatus\fP \fIselftestresult\fP increases
 the verbosity level
@@ -234,8 +241,9 @@ Prompt for the Kg key for IPMIv2.0 authentication.
 Change Size of Communication Channel. (OEM)
 
 .LP 
-If no password method is specified then ipmitool will prompt the
-user for a password. If no password is entered at the prompt,
+If no password method is specified then
+.BR ipmitool
+will prompt the user for a password. If no password is entered at the prompt,
 the remote server password will default to NULL.
 .SH "SECURITY"
 There are several security issues be be considered before enabling the
@@ -256,19 +264,23 @@ system.  It is thus recommended that IPMI password management only be done
 over IPMIv2.0 \fIlanplus\fP interface or the system interface on the
 local station.
 
-For IPMI v1.5, the maximum password length is 16 characters.
-Passwords longer than 16 characters will be truncated.
+For IPMI v1.5, the maximum password length is 16 characters; longer
+passwords might be truncated or rejected by the server, or rejected
+by
+.BR ipmitool .
+
+For IPMI v2.0, the maximum password length is 20 characters; longer
+passwords will be rejected by
+.BR ipmitool .
 
-For IPMI v2.0, the maximum password length is 20 characters;
-longer passwords are truncated.
 .SH "COMMANDS"
 .TP 
 \fIhelp\fP
-This can be used to get command\-line help  on  ipmitool
-commands.  It may also be placed at the end of commands
-to get option usage help.
+This can be used to get command\-line help on 
+.BR ipmitool
+commands. It may also be placed at the end of commands to get option usage help.
 
-ipmitool help
+> ipmitool help
 .br 
 Commands:
         bmc          Deprecated. Use mc
@@ -381,39 +393,23 @@ application (ipmi or sol) on the given channel.
 \fIstatus\fP
 
 Status information related to power, buttons, cooling, drives and faults.
-.RS
-.RE
 .TP 
 \fIpower\fP
 .RS
 .TP 
 \fIstatus\fP
-.RS
-.RE
 .TP
 \fIon\fP
-.RS
-.RE
 .TP
 \fIoff\fP
-.RS
-.RE
 .TP
 \fIcycle\fP
-.RS
-.RE
 .TP
 \fIreset\fP
-.RS
-.RE
 .TP
 \fIdiag\fP
-.RS
-.RE
 .TP
 \fIsoft\fP
-.RS
-.RE
 .RE
 .TP 
 \fIidentify\fP [<seconds>|force]
@@ -425,8 +421,6 @@ Default is 15 seconds.
 0 - Off
 .br
 force - To turn on indefinitely
-.RS
-.RE
 .TP 
 \fIpolicy\fP
 
@@ -436,34 +430,22 @@ What to do when power is restored.
 \fIlist\fP
 
 Show available options.
-.RS
-.RE
 .TP 
 \fIalways-on\fP
-.RS
-.RE
 .TP 
 \fIprevious\fP
-.RS
-.RE
 .TP 
 \fIalways-off\fP
-.RS
-.RE
 .RE
 
 .TP 
 \fIrestart_cause\fP
 
 Last restart cause.
-.RS
-.RE
 .TP 
 \fIpoh\fP
 
 Get power on hours.
-.RS
-.RE
 .TP 
 \fIbootdev\fP
 .RS
@@ -471,95 +453,123 @@ Get power on hours.
 \fInone\fP
 
 Do not change boot device order.
-.RS
-.RE
 .TP 
 \fIpxe\fP
 
 Force PXE boot.
-.RS
-.RE
 .TP 
 \fIdisk\fP
 
 Force boot from default Hard-drive.
-.RS
-.RE
 .TP 
 \fIsafe\fP
 
 Force boot from default Hard-drive, request Safe Mode.
-.RS
-.RE
 .TP 
 \fIdiag\fP
 
 Force boot from Diagnostic Partition.
-.RS
-.RE
 .TP 
 \fIcdrom\fP
 
 Force boot from CD/DVD.
-.RS
-.RE
 .TP 
 \fIbios\fP
 
 Force boot into BIOS Setup.
-.RS
-.RE
 .TP 
 \fIfloppy\fP
 
 Force boot from Floppy/primary removable media.
-.RS
-.RE
 .RE
+
+.TP
+\fIbootmbox\fP \fIget\fP [text] [block <\fBblock#\fP>]
+
+Read the Boot Initiator Mailbox in hex dump or in text mode.
+
+By default the whole mailbox is read. If block number is specified,
+that particular block is read. For block 0 or when the whole
+mailbox is read, the Boot Initiator IANA Enterprise Number and
+the corresponding enterprise name are printed.
+
+.TP
+\fIbootmbox\fP \fIset\fP text [block <\fBblock#\fP>] <\fBIANA_PEN\fP> "<\fBdata_string\fP>"
+
+Write the specified <block> or the entire Boot Initiator Mailbox in text mode.
+It is required to specify a decimal IANA Enterprise Number recognized
+by the boot initiator on the target system. Refer to your target system
+manufacturer for details. The rest of the arguments are a text string.
+
+When single block write is requested, the total length of <data> may not
+exceed 13 bytes for block 0, or 16 bytes otherwise.
+
+.TP
+\fIbootmbox\fP \fIset\fP [block <\fBblock#\fP>] <\fBIANA_PEN\fP> <\fBdata_byte\fP> [<\fBdata_byte\fP> ...]
+
+Same as above, but the arguments after IANA PEN are separate
+data byte values separated by spaces.
+
 .TP 
-\fIbootparam\fP
-.RS
+\fIbootparam\fP \fIget\fP <\fBopt_id\fR> [<\fBopt_param\fR>]
+
+Get value of system boot option number <\fBopt_id\fR>. Some boot
+options (e.g. option 7) can also take an optional numeric parameter.
+
 .TP 
-\fIforce_pxe\fP
+\fIbootparam\fP \fIset\fP bootflag <\fBdevice\fR> [options=...]
+
+Set a boot flag. Valid devices are:
 
-Force PXE boot
 .RS
-.RE
-.TP 
-\fIforce_disk\fP
+.IP \fIforce_pxe\fP
+
+Force PXE boot
+.IP \fIforce_disk\fP
 
 Force boot from default Hard-drive
-.RS
-.RE
-.TP 
-\fIforce_safe\fP
+.IP \fIforce_safe\fP
 
 Force boot from default Hard-drive, request Safe Mode
-.RS
-.RE
-.TP 
-\fIforce_diag\fP
+.IP \fIforce_diag\fP
 
 Force boot from Diagnostic Partition
-.RS
-.RE
-.TP 
-\fIforce_cdrom\fP
+.IP \fIforce_cdrom\fP
 
 Force boot from CD/DVD
-.RS
-.RE
-.TP 
-\fIforce_bios\fP
+.IP \fIforce_bios\fP
 
 Force boot into BIOS Setup
-.RS
-.RE
+
+.PP
+Valid options are:
+
+.IP \fIPEF\fP
+
+Clear valid bit on reset/power cycle cause by PEF
+
+.IP \fItimeout\fP
+
+Automatically clear boot flag valid bit on timeout
+
+.IP \fIwatchdog\fP
+
+Clear valid bit on reset/power cycle cause by watchdog
+
+.IP \fIreset\fP
+
+Clear valid bit on push button reset/soft reset
+
+.IP \fIpower\fP
+
+Clear valid bit on power up via power push button or wake event
 .RE
+
 .TP 
 \fIselftest\fP
-.RS
-.RE
+
+Get the chassis self-test results
+
 .RE
 .TP 
 \fIdcmi\fP
@@ -954,8 +964,6 @@ Shows Extended SD Card information.
 \fIecho\fP
 
 For echoing lines to stdout in scripts.
-.RS
-.RE
 .TP
 \fIekanalyzer\fP <\fBcommand\fR> <\fBxx=filename1\fR> <\fBxx=filename2\fR> [<\fBrc=filename3\fR>] \fB...\fR
 .RS
@@ -1215,12 +1223,13 @@ Get a list of all the possible Sensor States and pre-defined Sensor State
 Shortcuts available for a particular sensor.   \fBsensorid\fR is the character 
 string representation of the sensor and must be enclosed in double quotes
 if it includes white space.  Several different commands including 
-\fIipmitool sensor list\fP may be used to obtain a list that includes 
+.BR ipmitool
+\fIsensor list\fP may be used to obtain a list that includes 
 the \fBsensorid\fR strings representing the sensors on a given system. 
 .RS
 .PP 
 > ipmitool \-I open event "PS 2T Fan Fault" list
-.br 
+.br
 Finding sensor PS 2T Fan Fault... ok
 .br 
 Sensor States:
@@ -1277,7 +1286,9 @@ Finding sensor PS 2T Fan Fault... ok
 \fIexec\fP <\fBfilename\fR>
 
 .RS
-Execute ipmitool commands from \fIfilename\fR.  Each line is a
+Execute
+.BR ipmitool
+commands from \fIfilename\fR.  Each line is a
 complete command.  The syntax of the commands are defined by the
 COMMANDS section in this manpage.  Each line may have an optional
 comment at the end of the line, delimited with a `#' symbol.
@@ -1504,20 +1515,14 @@ Show firmware upgrade log.
 \fIlist\fP
 
 List All Generic Device Locators.
-.RS
-.RE
 .TP 
 \fIread\fP <\fBsdr name\fR> <\fBfile\fR>
 
 Read to file eeprom specify by Generic Device Locators.
-.RS
-.RE
 .TP
 \fIwrite\fP <\fBsdr name\fR> <\fBfile\fR>
 
 Write from file eeprom specify by Generic Device Locators
-.RS
-.RE
 .RE
 .TP
 \fIhpm\fP
@@ -1692,7 +1697,9 @@ user, operator, admin, oem.
 \fIactivate\fP
 .br
 
-Causes ipmitool to enter Intel IPMI v1.5 Serial Over LAN mode. An RMCP+
+Causes
+.BR ipmitool
+to enter Intel IPMI v1.5 Serial Over LAN mode. An RMCP+
 connection is made to the BMC, the terminal is set to raw mode, and user
 input is sent to the serial console on the remote server. On exit, 
 the SOL payload mode is deactivated and the terminal is reset to its
@@ -1704,9 +1711,9 @@ Special escape sequences are provided to control the SOL session:
 .TP
 \fI~.\fP        Terminate connection
 .TP
-\fI~^Z\fP       Suspend ipmitool
+\fI~^Z\fP       Suspend \fBipmitool\fR
 .TP
-\fI~^X\fP       Suspend ipmitool, but don't restore tty on restart
+\fI~^X\fP       Suspend \fBipmitool\fR, but don't restore tty on restart
 .TP
 \fI~B\fP        Send break
 .TP
@@ -1744,7 +1751,8 @@ Select the next boot order on the Kontron CP6012.
 .RS
 
 These commands will allow you to configure IPMI LAN channels
-with network information so they can be used with the ipmitool
+with network information so they can be used with the
+..BR ipmitool
 \fIlan\fP and \fIlanplus\fP interfaces.  \fINOTE\fR: To
 determine on which channel the LAN interface is located, issue
 the `channel info \fInumber\fR' command until you come across
@@ -2017,9 +2025,74 @@ The default will clear statistics on the first found LAN channel.
 
 Instructs the BMC to perform a warm or cold reset.
 .TP 
-\fIguid\fP
+\fIguid\fP [\fBsmbios\fR|\fBrfc4122\fR|\fBipmi\fR|\fBdump\fR]
 
 Display the Management Controller Globally Unique IDentifier.
+
+.RS
+.TP
+\fIauto\fP
+.br
+
+This is the default behavior for
+.BR ipmitool (1).
+
+Try to automatically detect the encoding based on the value of the
+version field and (for version 1) the timestamp. The version is
+considered valid if it is 1 through 5, and the timestamp is valid
+if the year is past or equal to UNIX Epoch (1970) and is before or
+equal to the current year.
+
+If multiple encodings happen to have valid version fields, then
+precedence takes the one with version 1 and a valid timestamp. If
+neither one has that, then the precedence order is as follows:
+\fIsmbios\fP, \fIipmi\fP, \fIrfc4122\fP.
+
+If neither encoding yields a valid version field, then
+.BR ipmitool (1)
+defaults to \fIdump\fP mode.
+
+If this option is in use, then
+.BR ipmitool (1)
+will also print out the detected encoding and warn
+regarding IPMI specification violation if the encoding isn't \fIipmi\fP.
+
+.TP
+\fIsmbios\fP
+.br
+
+Decode GUID as if it was sent by BMC as prescribed by SMBIOS specification.
+
+\fBNOTE:\fR This is a violation of IPMI specification, but many BMC implementations do
+it this way. If your BMC's GUID is shown correctly using this option, you
+may want to inform your BMC manufacturer that they have a bug.
+
+.TP
+\fIipmi\fP
+.br
+
+Decode GUID according to IPMI specification. It MUST show the correct GUID.
+If it doesn't, try other options and inform your BMC manufacturer of the bug.
+
+.TP
+\fIrfc4122\fP or \fIrfc\fP
+.br
+
+Decode GUID as if it was sent by BMC as prescribed by RFC4122 specification.
+
+\fBNOTE:\fR This is a violation of IPMI specification.
+If your BMC's GUID is shown correctly using this option, you
+may want to inform your BMC manufacturer that they have a bug.
+
+.TP
+\fIdump\fP
+.br
+
+Dump as hex the data received from BMC in response to Get Device GUID command.
+No decoding or interpretation is performed. First received byte is dumped first.
+
+.RE
+
 .TP 
 \fIinfo\fP
 .br
@@ -2886,7 +2959,9 @@ A list of all entity ids can be found in the IPMI specifications.
 
 Dumps raw SDR data to a file.  This data file can then be used as
 a local SDR cache of the remote managed system with the \fI\-S <file>\fP
-option on the ipmitool command line.  This can greatly improve performance
+option on the
+.BR ipmitool
+command line.  This can greatly improve performance
 over system interface or remote LAN.
 .TP 
 \fIfill\fP \fIsensors\fP
@@ -2969,7 +3044,9 @@ Print information on the specified SEL Record entry.
 \fIsave\fP <\fBfile\fR>
 
 Save SEL records to a text file that can be fed back into the
-\fIevent file\fP ipmitool command.  This can be useful for
+\fIevent file\fP
+.BR ipmitool
+command. This can be useful for
 testing Event generation by building an appropriate Platform
 Event Message file based on existing events.  Please see the
 available help for the 'event file ...' command for a description of
@@ -2978,12 +3055,16 @@ the format of this file.
 \fIwriteraw\fP <\fBfile\fR>
 
 Save SEL records to a file in raw, binary format.  This file can
-be fed back to the \fIsel readraw\fP ipmitool command for viewing.
+be fed back to the \fIsel readraw\fP
+.BR ipmitool
+command for viewing.
 .TP 
 \fIreadraw\fP <\fBfile\fR>
 
 Read and display SEL records from a binary file.  Such a file can
-be created using the \fIsel writeraw\fP ipmitool command.
+be created using the \fIsel writeraw\fP
+.BR ipmitool
+command.
 .TP          
 \fItime\fP
 .RS
@@ -3068,50 +3149,34 @@ or by using the keyword `all' to specify all sessions.
 \fIhostname\fP <\fBhost\fR>
 
 Session hostname.
-.RS
-.RE
 .TP
 \fIusername\fP <\fBuser\fR>
 
 Session username.
-.RS
-.RE
 .TP
 \fIpassword\fP <\fBpass\fR>
 
 Session password.
-.RS
-.RE
 .TP
 \fIprivlvl\fP <\fBlevel\fR>
 
 Session privilege level force.
-.RS
-.RE
 .TP
 \fIauthtype\fP <\fBtype\fR>
 
 Authentication type force.
-.RS
-.RE
 .TP
 \fIlocaladdr\fP <\fBaddr\fR>
 
 Local IPMB address.
-.RS
-.RE
 .TP
 \fItargetaddr\fP <\fBaddr\fR>
 
 Remote target IPMB address.
-.RS
-.RE
 .TP
 \fIport\fP <\fBport\fR>
 
 Remote RMCP port.
-.RS
-.RE
 .TP
 \fIcsv\fP [\fBlevel\fR]
 
@@ -3119,22 +3184,21 @@ Enable output in comma separated format.
 Affects following commands:
 \fIuser\fP, \fIchannel\fP, \fIisol\fP, \fIsunoem\fP,
 \fIsol\fP, \fIsensor\fP, \fIsdr\fP, \fIsel\fP, \fIsession\fP.
-.RS
-.RE
 .TP
 \fIverbose\fP [\fBverbose\fR]
 
 Verbosity level.
-.RS
-.RE
 .RE
 .TP 
 \fIshell\fP
 .RS
 This command will launch an interactive shell which you can use
-to send multiple ipmitool commands to a BMC and see the responses.
-This can be useful instead of running the full ipmitool command each
-time.  Some commands will make use of a Sensor Data Record cache
+to send multiple 
+.BR ipmitool
+commands to a BMC and see the responses. This can be useful instead of
+running the full
+.BR ipmitool
+command each time. Some commands will make use of a Sensor Data Record cache
 and you will see marked improvement in speed if these commands
 are able to reuse the same cache in a shell session.  LAN sessions
 will send a periodic keepalive command to keep the IPMI session
@@ -3210,7 +3274,9 @@ by the IPMI over serial channel.
 \fIactivate\fP [\fIusesolkeepalive\fP | \fInokeepalive\fP] [\fIinstance=<number>\fP]
 .br 
 
-Causes ipmitool to enter Serial Over LAN
+Causes
+.BR ipmitool
+to enter Serial Over LAN
 mode, and is only available when using the lanplus
 interface.  An RMCP+ connection is made to the BMC,
 the terminal is set to raw mode, and user input is
@@ -3469,12 +3535,13 @@ Displays a list of user information for all defined userids.
 
 Sets the username associated with the given userid.
 .TP 
-\fIpassword\fP <\fBuserid\fR> [<\fBpassword\fR>]
+\fIpassword\fP <\fBuserid\fR> [<\fBpassword\fR> [<\fB16|20\fR>]]
 .br 
 
 Sets the password for the given userid.  If no password is given,
 the password is cleared (set to the NULL password).  Be careful when
-removing passwords from administrator\-level accounts.
+removing passwords from administrator\-level accounts.  If specified,
+16 or 20 determines the maximum password length.
 .RE
 .TP 
 \fIdisable\fP <\fBuserid\fR>
@@ -3500,7 +3567,9 @@ Determine whether a password has been stored as 16 or 20 bytes.
 .RE
 
 .SH "OPEN INTERFACE"
-The ipmitool \fIopen\fP interface utilizes the OpenIPMI
+The
+.BR ipmitool
+\fIopen\fP interface utilizes the OpenIPMI
 kernel device driver.  This driver is present in all modern
 2.4 and all 2.6 kernels and it should be present in recent
 Linux distribution kernels.  There are also IPMI driver
@@ -3509,7 +3578,9 @@ the OpenIPMI homepage.
 
 The required kernel modules is different for 2.4 and 2.6
 kernels.  The following kernel modules must be loaded on
-a 2.4\-based kernel in order for ipmitool to work:
+a 2.4\-based kernel in order for
+.BR ipmitool
+to work:
 .TP 
 .B ipmi_msghandler
 Incoming and outgoing message handler for IPMI interfaces.
@@ -3521,7 +3592,9 @@ An IPMI Keyboard Controller Style (KCS) interface driver for the message handler
 Linux character device interface for the message handler.
 .LP 
 The following kernel modules must be loaded on
-a 2.6\-based kernel in order for ipmitool to work:
+a 2.6\-based kernel in order for
+.BR ipmitool
+to work:
 .TP 
 .B ipmi_msghandler
 Incoming and outgoing message handler for IPMI interfaces.
@@ -3549,19 +3622,22 @@ entry with:
 
 .I mknod /dev/ipmi0 c 254 0
 
-ipmitool includes some sample initialization scripts that
+.BR ipmitool
+includes some sample initialization scripts that
 can perform this task automatically at start\-up.
 
-In order to have ipmitool use the OpenIPMI device interface
+In order to have
+.BR ipmitool
+use the OpenIPMI device interface
 you can specify it on the command line:
 .PP 
-ipmitool \fB\-I\fR \fIopen\fP <\fIcommand\fP>
+> ipmitool \fB\-I\fR \fIopen\fP <\fIcommand\fP>
 .SH "BMC INTERFACE"
 The ipmitool bmc interface utilizes the \fIbmc\fP device driver as
 provided by Solaris 10 and higher.  In order to force ipmitool to make
 use of this interface you can specify it on the command line:
 .PP 
-ipmitool \fB\-I\fR \fIbmc\fP <\fIcommand\fP>
+> ipmitool \fB\-I\fR \fIbmc\fP <\fIcommand\fP>
 
 The following files are associated with the bmc driver:
 
@@ -3575,13 +3651,18 @@ The following files are associated with the bmc driver:
 .B /dev/bmc
 Character device node used to communicate with the bmc driver.
 .SH "LIPMI INTERFACE"
-The ipmitool \fIlipmi\fP interface uses the Solaris 9 IPMI kernel device driver.
+The
+.BR ipmitool
+\fIlipmi\fP interface uses the Solaris 9 IPMI kernel device driver.
 It has been superceeded by the \fIbmc\fP interface on Solaris 10.  You can tell
-ipmitool to use this interface by specifying it on the command line.
+.BR ipmitool
+to use this interface by specifying it on the command line.
 
-ipmitool \fB\-I\fR \fIlipmi\fP <\fIexpression\fP>
+> ipmitool \fB\-I\fR \fIlipmi\fP <\fIexpression\fP>
 .SH "LAN INTERFACE"
-The ipmitool \fIlan\fP interface communicates with the BMC
+The
+.BR ipmitool
+\fIlan\fP interface communicates with the BMC
 over an Ethernet LAN connection using UDP under IPv4.  UDP
 datagrams are formatted to contain IPMI request/response 
 messages with a IPMI session headers and RMCP headers.
@@ -3594,20 +3675,24 @@ datagrams to port 623.
 The LAN interface is an authentication multi\-session connection;
 messages delivered to the BMC can (and should) be authenticated
 with a challenge/response protocol with either straight
-password/key or MD5 message\-digest algorithm.  ipmitool will
-attempt to connect with administrator privilege level as this
+password/key or MD5 message\-digest algorithm.
+.BR ipmitool
+will attempt to connect with administrator privilege level as this
 is required to perform chassis power functions.
 
-You can tell ipmitool to use the lan interface with the
+You can tell
+.BR ipmitool
+to use the lan interface with the
 \fB\-I\fR \fIlan\fP option:
 
 .PP 
-ipmitool \fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
+> ipmitool \fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
 [\fB\-U\fR <\fIusername\fP>] [\fB\-P\fR <\fIpassword\fP>] <\fIcommand\fP>
 
 A hostname must be given on the command line in order to use the 
-lan interface with ipmitool.  The password field is optional;
-if you do not provide a password on the command line, ipmitool
+lan interface with \fBipmitool\fR. The password field is optional;
+if you do not provide a password on the command line,
+.BR ipmitool
 will attempt to connect without authentication.  If you specify a 
 password it will use MD5 authentication if supported by the BMC
 and straight password/key otherwise, unless overridden with a
@@ -3620,63 +3705,78 @@ interface uses the RMCP+ protocol as described in the IPMI v2.0
 specification.  RMCP+ allows for improved authentication and data 
 integrity checks, as well as encryption and the ability to carry
 multiple types of payloads.  Generic Serial Over LAN support 
-requires RMCP+, so the ipmitool \fIsol activate\fP command
+requires RMCP+, so the
+.BR ipmitool
+\fIsol activate\fP command
 requires the use of the \fIlanplus\fP interface.
 
 RMCP+ session establishment uses a symmetric challenge\-response
 protocol called RAKP (\fBRemote Authenticated Key\-Exchange Protocol\fR)
-which allows the negotiation of many options.  ipmitool does not
+which allows the negotiation of many options.
+.BR ipmitool
+does not
 yet allow the user to specify the value of every option, defaulting
 to the most obvious settings marked as required in the v2.0 
 specification.  Authentication and integrity HMACS are produced with
 SHA1, and encryption is performed with AES\-CBC\-128.  Role\-level logins
 are not yet supported.
 
-ipmitool must be linked with the \fIOpenSSL\fP library in order to
+.BR ipmitool
+must be linked with the \fIOpenSSL\fP library in order to
 perform the encryption functions and support the \fIlanplus\fP
 interface.  If the required packages are not found it will not be
 compiled in and supported.
 
-You can tell ipmitool to use the lanplus interface with the
+You can tell
+.BR ipmitool
+to use the lanplus interface with the
 \fB\-I\fR \fIlanplus\fP option:
 
 .PP 
-ipmitool \fB\-I\fR \fIlanplus\fP 
+> ipmitool \fB\-I\fR \fIlanplus\fP 
 \fB\-H\fR <\fIhostname\fP>
 [\fB\-U\fR <\fIusername\fP>]
 [\fB\-P\fR <\fIpassword\fP>]
 <\fIcommand\fP>
 
 A hostname must be given on the command line in order to use the 
-lan interface with ipmitool.  With the exception of the \fB\-A\fR and
+lan interface with \fBipmitool\fR. With the exception of the \fB\-A\fR and
 \fB\-C\fR options the rest of the command line options are identical to
 those available for the \fIlan\fP interface.
 
 The \fB\-C\fR option allows you specify the authentication, integrity,
 and encryption algorithms to use for for \fIlanplus\fP session based
 on the cipher suite ID found in the IPMIv2.0 specification in table
-22\-19.  The default cipher suite is \fI3\fP which specifies
-RAKP\-HMAC\-SHA1 authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128
-encryption algorightms.
+22\-20.  The default cipher suite is \fI17\fP which specifies
+RAKP\-HMAC\-SHA256 authentication, HMAC\-SHA256\-128 integrity, and 
+AES\-CBC\-128 encryption algorightms.
 
 .SH "FREE INTERFACE"
 .LP
-The ipmitool \fIfree\fP interface utilizes the FreeIPMI libfreeipmi
+The
+.BR ipmitool
+\fIfree\fP interface utilizes the FreeIPMI libfreeipmi
 drivers.  
 .LP
-You can tell ipmitool to use the FreeIPMI interface with the \-I option:
+You can tell
+.BR ipmitool
+to use the FreeIPMI interface with the \-I option:
 .PP
-ipmitool \fB\-I\fR \fIfree\fP <\fIcommand\fP>
+> ipmitool \fB\-I\fR \fIfree\fP <\fIcommand\fP>
 
 
 .SH "IMB INTERFACE"
 .LP
-The ipmitool \fIimb\fP interface supports the Intel IMB (Intel
+The
+.BR ipmitool
+\fIimb\fP interface supports the Intel IMB (Intel
 Inter-module Bus) Interface through the /dev/imb device.  
 .LP
-You can tell ipmitool to use the IMB interface with the \-I option:
+You can tell
+.BR ipmitool
+to use the IMB interface with the \-I option:
 .PP
-ipmitool \fB\-I\fR \fIimb\fP <\fIcommand\fP>
+> ipmitool \fB\-I\fR \fIimb\fP <\fIcommand\fP>
 
 .SH "EXAMPLES"
 .TP 
@@ -3727,13 +3827,29 @@ Chassis Power is on
 > ipmitool \-I lan \-H 1.2.3.4 \-f passfile chassis power on
 .br 
 Chassis Power Control: Up/On
-	
-.SH "AUTHOR"
-Duncan Laurie <duncan@iceblink.org>
+
+.SH FILES
+.TP
+.B @IANADIR@/enterprise-numbers
+system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers
+.TP
+.B ~/@IANAUSERDIR@/enterprise-numbers
+user's override for the system IANA PEN registry, this file if it exists is loaded instead
+of the system registry (see above).
+
+.SH "AUTHORS"
+Originally written by Duncan Laurie <duncan@iceblink.org>.
+.br
+Numerous contributors over time.
+
+.SH "BUGS"
+Any bugs found in \fIipmitool\fP please report via \fIGitHub\fP issue system at
+https://github.com/ipmitool/ipmitool/issues
+
 .SH "SEE ALSO"
 .TP 
 IPMItool Homepage
-http://ipmitool.sourceforge.net
+http://github.com/ipmitool/ipmitool
 .TP 
 Intelligent Platform Management Interface Specification
 http://www.intel.com/design/servers/ipmi