diff --git a/ChangeLog b/ChangeLog
index a4194b20d..efc2d9adb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-02-26  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* docs/help2man: Upgraded to 1.020.
+	* docs/grub.8: Regenerated.
+	* docs/grub-install.8: Likewise.
+	* docs/mbchk.1: Likewise.
+
+	* docs/tutorial.texi (Boot): Rewritten heavily. Added the notes
+	on FreeBSD, NetBSD, OpenBSD, DOS/Windows and SCO UnixWare.
+	* docs/menu.lst: Load "/boot/loader" instead of "/kernel" in the
+	FreeBSD entry. This is consistent with the documentation.
+	
 2000-02-25  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* netboot/fsys_tftp.c (tftp_read): Set BUF_READ to zero if
diff --git a/configure b/configure
index a334689a9..6589bc9c1 100644
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using Autoconf version 2.14a 
+# Generated automatically using Autoconf version 2.14a
 # Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -11,6 +11,31 @@ ac_arg_with_help=
 ac_arg_enable_help=
 ac_arg_var_help=
 ac_default_prefix=/usr/local
+# Factorizing default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#include <sys/types.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
 # Any additions from configure.in:
 ac_arg_enable_help="$ac_arg_enable_help
   --enable-maintainer-mode enable make rules and dependencies not useful
@@ -159,10 +184,7 @@ do
     continue
   fi
 
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`echo "$ac_option" | sed -n 's/^[^=]*=//p'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
@@ -195,7 +217,7 @@ do
     ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+      { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; }
     fi
     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
     eval "enable_${ac_feature}=no" ;;
@@ -204,7 +226,7 @@ do
     ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+      { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; }
     fi
     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
     case "$ac_option" in
@@ -226,7 +248,7 @@ do
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
-  -help | --help | --hel | --he)
+  -help | --help | --hel | --he | -h)
     # 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 <<\EOF
@@ -241,13 +263,13 @@ CFLAGS...), give to `configure' the definition as VAR=VALUE.
 Defaults for the options are specified in brackets.
 
 Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
+  -h, --help              print this message
+      --version           print the version of autoconf that created configure
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE
+  -n, --no-create         do not create output files
 
-Directory and file names:
+Directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
@@ -277,24 +299,26 @@ Program names:
 EOF
     cat <<\EOF
 Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
+  --build=BUILD      configure for building on BUILD [BUILD=HOST]
+  --host=HOST        configure for HOST [guessed]
+  --target=TARGET    configure for TARGET [TARGET=HOST]
 
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
+X features:
+  --x-includes=DIR    X include files are in DIR
+  --x-libraries=DIR   X library files are in DIR
 EOF
     test -n "$ac_arg_enable_help" && echo "
---enable options recognized:$ac_arg_enable_help"
+Optional features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]\
+$ac_arg_enable_help"
     test -n "$ac_arg_with_help" && echo "
---with options recognized:$ac_arg_with_help"
+Optional packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)\
+$ac_arg_with_help"
     test -n "$ac_arg_var_help" && echo "
-Some of the influent environment variables:$ac_arg_var_help"
+Some influent environment variables:$ac_arg_var_help"
     exit 0 ;;
 
   -host | --host | --hos | --ho)
@@ -451,7 +475,7 @@ Some of the influent environment variables:$ac_arg_var_help"
     ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+      { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; }
     fi
     ac_package=`echo $ac_package| sed 's/-/_/g'`
     case "$ac_option" in
@@ -464,7 +488,7 @@ Some of the influent environment variables:$ac_arg_var_help"
     ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+      { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; }
     fi
     ac_package=`echo $ac_package| sed 's/-/_/g'`
     eval "with_${ac_package}=no" ;;
@@ -487,21 +511,23 @@ Some of the influent environment variables:$ac_arg_var_help"
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries="$ac_optarg" ;;
 
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "configure: error: unrecognized option: $ac_option
+Try \`configure --help' for more information." 1>&2; exit 1; }
     ;;
 
   *=*)
-    ac_envvar=`echo $ac_option|sed -e 's/=.*//'`
+    ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_envvar| sed 's/[_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_envvar: invalid variable name" 1>&2; exit 1; }
+    if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
+      { echo "configure: error: invalid variable name: $ac_envvar" 1>&2; exit 1; }
     fi
-    eval "${ac_envvar}='$ac_optarg'"
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
     export $ac_envvar ;;
 
   *)
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+      echo "configure: warning: invalid host type: $ac_option" 1>&2
     fi
     if test "x$nonopt" != xNONE; then
       { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
@@ -548,8 +574,8 @@ do
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_arg=`echo "$ac_arg"|sed "s/'/'\\\\\\\\''/g"`
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+  ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
   ac_configure_args="$ac_configure_args '$ac_arg'" ;;
   *) ac_configure_args="$ac_configure_args $ac_arg" ;;
   esac
@@ -579,7 +605,7 @@ if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo "$ac_prog"|sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -595,7 +621,7 @@ if test ! -r $srcdir/$ac_unique_file; then
     { echo "configure: error: cannot find sources in $srcdir" 1>&2; exit 1; }
   fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
@@ -630,7 +656,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 ac_exeext=
 ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
     ac_n= ac_c='
 ' ac_t='	'
@@ -641,7 +667,6 @@ else
   ac_n= ac_c='\c' ac_t=
 fi
 
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -677,7 +702,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install... $ac_c" 1>&6
-echo "configure:681: checking for a BSD compatible install" 1>&5
+echo "configure:706: checking for a BSD compatible install" 1>&5
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -734,7 +759,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane... $ac_c" 1>&6
-echo "configure:738: checking whether build environment is sane" 1>&5
+echo "configure:763: checking whether build environment is sane" 1>&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -778,7 +803,7 @@ else
   cat <<\EOF_SED >conftestsed
 s,\\,\\\\,g; s,\$,$$,g
 EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  program_transform_name=`echo $program_transform_name|sed -f conftestsed`
   rm -f conftestsed
 fi
 test "$program_prefix" != NONE &&
@@ -795,7 +820,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:799: checking for $ac_word" 1>&5
+echo "configure:824: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -825,7 +850,7 @@ test -n "$AWK" && break
 done
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}... $ac_c" 1>&6
-echo "configure:829: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
+echo "configure:854: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -851,14 +876,10 @@ else
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-
-
 PACKAGE=grub
 
-
 VERSION=0.5.94
 
-
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
 fi
@@ -870,11 +891,9 @@ cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-
-
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal... $ac_c" 1>&6
-echo "configure:878: checking for working aclocal" 1>&5
+echo "configure:897: checking for working aclocal" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -887,7 +906,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf... $ac_c" 1>&6
-echo "configure:891: checking for working autoconf" 1>&5
+echo "configure:910: checking for working autoconf" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -900,7 +919,7 @@ else
 fi
 
 echo $ac_n "checking for working automake... $ac_c" 1>&6
-echo "configure:904: checking for working automake" 1>&5
+echo "configure:923: checking for working automake" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -913,7 +932,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader... $ac_c" 1>&6
-echo "configure:917: checking for working autoheader" 1>&5
+echo "configure:936: checking for working autoheader" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -926,7 +945,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo... $ac_c" 1>&6
-echo "configure:930: checking for working makeinfo" 1>&5
+echo "configure:949: checking for working makeinfo" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -946,7 +965,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:950: checking for $ac_word" 1>&5
+echo "configure:969: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_AMTAR+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -975,7 +994,6 @@ fi
 test -n "$AMTAR" && break
 done
 
-
 AMTARFLAGS=
 if test -n "$AMTAR"; then
   if $SHELL -c "$AMTAR --version" > /dev/null 2>&1; then
@@ -983,19 +1001,13 @@ if test -n "$AMTAR"; then
   fi
 fi
 
-
-
-
-
-
-
 echo $ac_n "checking host system type... $ac_c" 1>&6
-echo "configure:994: checking host system type" 1>&5
+echo "configure:1006: checking host system type" 1>&5
 if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
 
-# Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-    else { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
+  # Make sure we can run config.sub.
+  if $ac_config_sub sun4 >/dev/null 2>&1; then :; else
+    { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
   fi
 
   ac_cv_host_alias=$host
@@ -1005,12 +1017,11 @@ if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x
     NONE)
       if ac_cv_host_alias=`$ac_config_guess`; then :
       else { echo "configure: error: cannot guess host type; you must specify one" 1>&2; exit 1; }
-      fi ;;
-    *) ac_cv_host_alias=$nonopt ;;
+      fi ;;    *) ac_cv_host_alias=$nonopt ;;
     esac ;;
   esac
 
-  ac_cv_host=`$ac_config_sub $ac_cv_host_alias`
+  ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
   ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
   ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
   ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -1026,24 +1037,17 @@ host_cpu=$ac_cv_host_cpu
 host_vendor=$ac_cv_host_vendor
 host_os=$ac_cv_host_os
 
-
-
-
-
 case "$host_cpu" in
 i[3456]86) host_cpu=i386 ;;
 *) { echo "configure: error: unsupported CPU type" 1>&2; exit 1; } ;;
 esac
 
-
-
-
 #
 # Options
 #
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles... $ac_c" 1>&6
-echo "configure:1047: checking whether to enable maintainer-specific portions of Makefiles" 1>&5
+echo "configure:1051: checking whether to enable maintainer-specific portions of Makefiles" 1>&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1053,7 +1057,6 @@ else
 fi
 
   echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
 
 if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -1063,13 +1066,12 @@ else
   MAINTAINER_MODE_FALSE=
 fi
   MAINT=$MAINTAINER_MODE_TRUE
-  
 
 if test "x$enable_maintainer_mode" = xyes; then
   # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1073: checking for $ac_word" 1>&5
+echo "configure:1075: checking for $ac_word" 1>&5
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1112,14 +1114,13 @@ fi
 # Programs
 #
 
-
 echo $ac_n "checking build system type... $ac_c" 1>&6
-echo "configure:1118: checking build system type" 1>&5
+echo "configure:1119: checking build system type" 1>&5
 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then
 
-# Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
-    else { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
+  # Make sure we can run config.sub.
+  if $ac_config_sub sun4 >/dev/null 2>&1; then :; else
+    { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
   fi
 
   ac_cv_build_alias=$build
@@ -1128,12 +1129,11 @@ if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" !=
     case $nonopt in
     NONE)
       ac_cv_build_alias=$host_alias ;;
-
     *) ac_cv_build_alias=$nonopt ;;
     esac ;;
   esac
 
-  ac_cv_build=`$ac_config_sub $ac_cv_build_alias`
+  ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
   ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
   ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
   ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -1149,9 +1149,6 @@ build_cpu=$ac_cv_build_cpu
 build_vendor=$ac_cv_build_vendor
 build_os=$ac_cv_build_os
 
-
-
-
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else
@@ -1161,7 +1158,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1165: checking for $ac_word" 1>&5
+echo "configure:1162: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1188,8 +1185,6 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-
-
 case "${CFLAGS+set} $ac_configure_args" in
  *" CFLAGS="* );;
  "set "*) ac_configure_args="CFLAGS='$CFLAGS' $ac_configure_args";;
@@ -1198,7 +1193,7 @@ esac
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1202: checking for $ac_word" 1>&5
+echo "configure:1197: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1228,7 +1223,7 @@ fi
     # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1232: checking for $ac_word" 1>&5
+echo "configure:1227: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1279,7 +1274,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1283: checking for $ac_word" 1>&5
+echo "configure:1278: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1311,11 +1306,10 @@ done
     fi
   fi
 
-
 test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ac_c" 1>&6
-echo "configure:1319: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5
+echo "configure:1313: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1326,12 +1320,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat >conftest.$ac_ext <<EOF
 
-#line 1330 "configure"
+#line 1324 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1354,15 +1348,15 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 77; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ac_c" 1>&6
-echo "configure:1361: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5
+echo "configure:1355: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-echo "configure:1366: checking whether we are using GNU C" 1>&5
+echo "configure:1360: checking whether we are using GNU C" 1>&5
 if test "${ac_cv_prog_gcc+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1371,7 +1365,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1389,7 +1383,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g... $ac_c" 1>&6
-echo "configure:1393: checking whether ${CC-cc} accepts -g" 1>&5
+echo "configure:1387: checking whether ${CC-cc} accepts -g" 1>&5
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1419,19 +1413,17 @@ else
   fi
 fi
 
-
 # Check whether --with-binutils or --without-binutils was given.
 if test "${with_binutils+set}" = set; then
   withval="$with_binutils"
   :
 fi
 
-
 if test "x$with_binutils" != x; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1435: checking for $ac_word" 1>&5
+echo "configure:1427: checking for $ac_word" 1>&5
 if test "${ac_cv_path_RANLIB+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1461,13 +1453,12 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-
 if test -z "$ac_cv_prog_RANLIB"; then
   if test -n "$ac_tool_prefix"; then
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1471: checking for $ac_word" 1>&5
+echo "configure:1462: checking for $ac_word" 1>&5
 if test "${ac_cv_path_RANLIB+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1506,7 +1497,7 @@ else
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1510: checking for $ac_word" 1>&5
+echo "configure:1501: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1546,22 +1537,26 @@ if test "x$ac_cv_prog_gcc" = xyes; then
     STAGE1_CFLAGS="-O2"
     GRUB_CFLAGS="-O2"
     echo $ac_n "checking whether optimization for size works... $ac_c" 1>&6
-echo "configure:1550: checking whether optimization for size works" 1>&5
+echo "configure:1541: checking whether optimization for size works" 1>&5
 if test "${size_flag+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
+
       saved_CFLAGS=$CFLAGS
       CFLAGS="-Os -g"
       cat >conftest.$ac_ext <<EOF
-#line 1558 "configure"
+#line 1549 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main ()
+{
 
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   size_flag=yes
 else
@@ -1572,7 +1567,7 @@ else
 fi
 rm -f conftest*
       CFLAGS=$saved_CFLAGS
-    
+
 fi
 echo "$ac_t""$size_flag" 1>&6
     if test "x$size_flag" = xyes; then
@@ -1583,10 +1578,6 @@ echo "$ac_t""$size_flag" 1>&6
   fi
 fi
 
-
-
-
-
 # Enforce coding standards.
 CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused"
 
@@ -1594,7 +1585,7 @@ if test "x$with_binutils" != x; then
   # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1598: checking for $ac_word" 1>&5
+echo "configure:1589: checking for $ac_word" 1>&5
 if test "${ac_cv_path_OBJCOPY+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1624,13 +1615,11 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-
-
 else
   # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1634: checking for $ac_word" 1>&5
+echo "configure:1623: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_OBJCOPY+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1657,14 +1646,12 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-
-
 fi
 
 # Defined in acinclude.m4.
 
 echo $ac_n "checking if C symbols get an underscore after compilation... $ac_c" 1>&6
-echo "configure:1668: checking if C symbols get an underscore after compilation" 1>&5
+echo "configure:1655: checking if C symbols get an underscore after compilation" 1>&5
 if test "${grub_cv_asm_uscore+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1677,7 +1664,7 @@ func (int *list)
 }
 EOF
 
-if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then
+if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then
   true
 else
   { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; }
@@ -1692,7 +1679,6 @@ fi
 rm -f conftest*
 fi
 
-
 if test "x$grub_cv_asm_uscore" = xyes; then
   cat >>confdefs.h <<EOF
 #define HAVE_ASM_USCORE $grub_cv_asm_uscore
@@ -1703,7 +1689,7 @@ fi
 echo "$ac_t""$grub_cv_asm_uscore" 1>&6
 
 echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses... $ac_c" 1>&6
-echo "configure:1707: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
+echo "configure:1693: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
 if test "${grub_cv_prog_objcopy_absolute+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1715,21 +1701,21 @@ cmain (void)
 }
 EOF
 
-if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
+if { (eval echo configure:1705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
 else
   { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; }
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 2000 8000 7C00; do
-  if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
+  if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
   else
     { echo "configure: error: ${CC-cc} cannot link at address $link_addr" 1>&2; exit 1; }
   fi
-  if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
+  if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
   else
     { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; }
   fi
-  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
     mv -f conftest conftest.old
   else
     grub_cv_prog_objcopy_absolute=no
@@ -1744,9 +1730,8 @@ if test "x$grub_cv_prog_objcopy_absolute" != xyes; then
   { echo "configure: error: GRUB requires a working absolute objcopy; upgrade your binutils" 1>&2; exit 1; }
 fi
 
-
 echo $ac_n "checking whether addr32 must be in the same line as the instruction... $ac_c" 1>&6
-echo "configure:1750: checking whether addr32 must be in the same line as the instruction" 1>&5
+echo "configure:1735: checking whether addr32 must be in the same line as the instruction" 1>&5
 if test "${grub_cv_asm_prefix_requirement+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1755,7 +1740,7 @@ else
 l1:	addr32	movb	%al, l1
 EOF
 
-if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
+if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
   grub_cv_asm_prefix_requirement=yes
 else
   grub_cv_asm_prefix_requirement=no
@@ -1764,7 +1749,6 @@ fi
 rm -f conftest*
 fi
 
-
 if test "x$grub_cv_asm_prefix_requirement" = xyes; then
   grub_tmp_addr32="addr32"
   grub_tmp_data32="data32"
@@ -1781,13 +1765,10 @@ cat >>confdefs.h <<EOF
 #define DATA32 $grub_tmp_data32
 EOF
 
-
 echo "$ac_t""$grub_cv_asm_prefix_requirement" 1>&6
 
-
-
 echo $ac_n "checking for .code16 addr32 assembler support... $ac_c" 1>&6
-echo "configure:1791: checking for .code16 addr32 assembler support" 1>&5
+echo "configure:1772: checking for .code16 addr32 assembler support" 1>&5
 if test "${grub_cv_asm_addr32+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1802,7 +1783,7 @@ else
   sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s
 fi
 
-if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
+if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
   grub_cv_asm_addr32=yes
 else
   grub_cv_asm_addr32=no
@@ -1811,27 +1792,29 @@ fi
 rm -f conftest*
 fi
 
-
 echo "$ac_t""$grub_cv_asm_addr32" 1>&6
 if test "x$grub_cv_asm_addr32" != xyes; then
   { echo "configure: error: GRUB requires GAS .code16 addr32 support; upgrade your binutils" 1>&2; exit 1; }
 fi
 
-
 echo $ac_n "checking if start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1823: checking if start is defined by the compiler" 1>&5
+echo "configure:1802: checking if start is defined by the compiler" 1>&5
 if test "${grub_cv_check_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1828 "configure"
+#line 1807 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl start")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_start_symbol=yes
 else
@@ -1841,8 +1824,8 @@ else
   grub_cv_check_start_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_start_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -1853,21 +1836,24 @@ fi
 
 echo "$ac_t""$grub_cv_check_start_symbol" 1>&6
 
-
 echo $ac_n "checking if _start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1859: checking if _start is defined by the compiler" 1>&5
+echo "configure:1841: checking if _start is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1864 "configure"
+#line 1846 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl _start")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_start_symbol=yes
 else
@@ -1877,8 +1863,8 @@ else
   grub_cv_check_uscore_start_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_uscore_start_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -1894,21 +1880,24 @@ if test "x$grub_cv_check_start_symbol" != "xyes" \
   { echo "configure: error: Neither start nor _start is defined" 1>&2; exit 1; }
 fi
 
-
 echo $ac_n "checking if __bss_start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1900: checking if __bss_start is defined by the compiler" 1>&5
+echo "configure:1885: checking if __bss_start is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1905 "configure"
+#line 1890 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl __bss_start")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_uscore_bss_start_symbol=yes
 else
@@ -1918,8 +1907,8 @@ else
   grub_cv_check_uscore_uscore_bss_start_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -1930,21 +1919,24 @@ fi
 
 echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6
 
-
 echo $ac_n "checking if _edata is defined by the compiler... $ac_c" 1>&6
-echo "configure:1936: checking if _edata is defined by the compiler" 1>&5
+echo "configure:1924: checking if _edata is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1941 "configure"
+#line 1929 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl _edata")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_edata_symbol=yes
 else
@@ -1954,8 +1946,8 @@ else
   grub_cv_check_uscore_edata_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_uscore_edata_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -1966,21 +1958,24 @@ fi
 
 echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6
 
-
 echo $ac_n "checking if edata is defined by the compiler... $ac_c" 1>&6
-echo "configure:1972: checking if edata is defined by the compiler" 1>&5
+echo "configure:1963: checking if edata is defined by the compiler" 1>&5
 if test "${grub_cv_check_edata_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1977 "configure"
+#line 1968 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl edata")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_edata_symbol=yes
 else
@@ -1990,8 +1985,8 @@ else
   grub_cv_check_edata_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_edata_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -2005,24 +2000,27 @@ echo "$ac_t""$grub_cv_check_edata_symbol" 1>&6
 if test "x$grub_cv_check_uscore_uscore_bss_start_symbol" != "xyes" \
 	-a "x$grub_cv_check_uscore_edata_symbol" != "xyes" \
 	-a "x$grub_cv_check_edata_symbol" != "xyes"; then
-  { echo "configure: error: None of __bss_start" 1>&2; exit 1; }
+  { echo "configure: error: None of __bss_start, _edata, edata defined" 1>&2; exit 1; }
 fi
 
-
 echo $ac_n "checking if end is defined by the compiler... $ac_c" 1>&6
-echo "configure:2014: checking if end is defined by the compiler" 1>&5
+echo "configure:2008: checking if end is defined by the compiler" 1>&5
 if test "${grub_cv_check_end_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2019 "configure"
+#line 2013 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl end")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_end_symbol=yes
 else
@@ -2032,8 +2030,8 @@ else
   grub_cv_check_end_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_end_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -2044,21 +2042,24 @@ fi
 
 echo "$ac_t""$grub_cv_check_end_symbol" 1>&6
 
-
 echo $ac_n "checking if _end is defined by the compiler... $ac_c" 1>&6
-echo "configure:2050: checking if _end is defined by the compiler" 1>&5
+echo "configure:2047: checking if _end is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_end_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2055 "configure"
+#line 2052 "configure"
 #include "confdefs.h"
 
-int main() {
+int
+main()
+{
 asm ("incl _end")
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_end_symbol=yes
 else
@@ -2068,8 +2069,8 @@ else
   grub_cv_check_uscore_end_symbol=no
 fi
 rm -f conftest*
-fi
 
+fi
 
 if test "x$grub_cv_check_uscore_end_symbol" = xyes; then
   cat >>confdefs.h <<\EOF
@@ -2092,7 +2093,6 @@ if test "${with_curses+set}" = set; then
   :
 fi
 
-
 # Get the filename or the whole disk and open it.
 # Known to work on NetBSD.
 echo $ac_n "checking for opendisk in -lutil... $ac_c" 1>&6
@@ -2110,11 +2110,15 @@ cat >conftest.$ac_ext <<EOF
     builtin and then its argument prototype would still apply.  */
 char opendisk();
 
-int main() {
+int
+main()
+{
 opendisk()
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_util_opendisk=yes
 else
@@ -2124,6 +2128,7 @@ else
   ac_cv_lib_util_opendisk=no
 fi
 rm -f conftest*
+
 LIBS="$ac_save_LIBS"
 fi
 echo "$ac_t""$ac_cv_lib_util_opendisk" 1>&6
@@ -2135,29 +2140,32 @@ EOF
 
 fi
 
-
 # Unless the user specify --without-curses, check for curses.
 if test "x$with_curses" != "xno"; then
   echo $ac_n "checking for wgetch in -lncurses... $ac_c" 1>&6
-echo "configure:2143: checking for wgetch in -lncurses" 1>&5
+echo "configure:2147: checking for wgetch in -lncurses" 1>&5
 if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2150 "configure"
+#line 2154 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char wgetch();
 
-int main() {
+int
+main()
+{
 wgetch()
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:2161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_ncurses_wgetch=yes
 else
@@ -2167,6 +2175,7 @@ else
   ac_cv_lib_ncurses_wgetch=no
 fi
 rm -f conftest*
+
 LIBS="$ac_save_LIBS"
 fi
 echo "$ac_t""$ac_cv_lib_ncurses_wgetch" 1>&6
@@ -2178,25 +2187,29 @@ EOF
 
 else
   echo $ac_n "checking for wgetch in -lcurses... $ac_c" 1>&6
-echo "configure:2182: checking for wgetch in -lcurses" 1>&5
+echo "configure:2191: checking for wgetch in -lcurses" 1>&5
 if test "${ac_cv_lib_curses_wgetch+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2189 "configure"
+#line 2198 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char wgetch();
 
-int main() {
+int
+main()
+{
 wgetch()
-; return 0; }
+  ;
+  return 0;
+}
 EOF
-if { (eval echo configure:2200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_curses_wgetch=yes
 else
@@ -2206,6 +2219,7 @@ else
   ac_cv_lib_curses_wgetch=no
 fi
 rm -f conftest*
+
 LIBS="$ac_save_LIBS"
 fi
 echo "$ac_t""$ac_cv_lib_curses_wgetch" 1>&6
@@ -2221,11 +2235,9 @@ fi
 
 fi
 
-
-
 # Check for headers.
 echo $ac_n "checking how to run the C preprocessor... $ac_c" 1>&6
-echo "configure:2229: checking how to run the C preprocessor" 1>&5
+echo "configure:2241: checking how to run the C preprocessor" 1>&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2240,13 +2252,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat >conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2256 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2257,13 +2269,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat >conftest.$ac_ext <<EOF
-#line 2261 "configure"
+#line 2273 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2274,13 +2286,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat >conftest.$ac_ext <<EOF
-#line 2278 "configure"
+#line 2290 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2308,17 +2320,18 @@ for ac_header in string.h strings.h ncurses/curses.h ncurses.h curses.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
 echo $ac_n "checking for $ac_header... $ac_c" 1>&6
-echo "configure:2312: checking for $ac_header" 1>&5
+echo "configure:2324: checking for $ac_header" 1>&5
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2329 "configure"
 #include "confdefs.h"
 #include <$ac_header>
+
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2337,11 +2350,10 @@ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
 EOF
- 
+
 fi
 done
 
-
 # Check for user options.
 
 # some compile-time options.
@@ -2351,7 +2363,6 @@ if test "${enable_lba_support_bitmap_check+set}" = set; then
   :
 fi
 
-
 if test "x$enable_lba_support_bitmap_check" != xno; then
   cat >>confdefs.h <<\EOF
 #define CHECK_LBA_SUPPORT_BITMAP 1
@@ -2366,7 +2377,6 @@ if test "${enable_ext2fs+set}" = set; then
   :
 fi
 
-
 if test x"$enable_ext2fs" != xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_EXT2FS=1"
 fi
@@ -2377,7 +2387,6 @@ if test "${enable_fat+set}" = set; then
   :
 fi
 
-
 if test x"$enable_fat" != xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FAT=1"
 fi
@@ -2388,7 +2397,6 @@ if test "${enable_ffs+set}" = set; then
   :
 fi
 
-
 if test x"$enable_ffs" != xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_FFS=1"
 fi
@@ -2399,24 +2407,20 @@ if test "${enable_minix+set}" = set; then
   :
 fi
 
-
 if test x"$enable_minix" != xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_MINIX=1"
 fi
 
-
 # Check whether --enable-gunzip or --disable-gunzip was given.
 if test "${enable_gunzip+set}" = set; then
   enableval="$enable_gunzip"
   :
 fi
 
-
 if test x"$enable_gunzip" = xno; then
   FSYS_CFLAGS="$FSYS_CFLAGS -DNO_DECOMPRESSION=1"
 fi
 
-
 # Check whether --enable-packet-retransmission or --disable-packet-retransmission was given.
 if test "${enable_packet_retransmission+set}" = set; then
   enableval="$enable_packet_retransmission"
@@ -2459,7 +2463,6 @@ if test "x$enable_3c529" = xyes; then
   NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o"
 fi
 
-
 # Check whether --enable-3c90x or --disable-3c90x was given.
 if test "${enable_3c90x+set}" = set; then
   enableval="$enable_3c90x"
@@ -2691,8 +2694,6 @@ if test "x$enable_via_rhine" = xyes; then
   NETBOOT_DRIVERS="$NETBOOT_DRIVERS via_rhine.o"
 fi
 
-
-
 if test "x$NET_CFLAGS" != x; then
   NETBOOT_SUPPORT_TRUE=
   NETBOOT_SUPPORT_FALSE='#'
@@ -2750,7 +2751,6 @@ if test "${enable_smc9000+set}" = set; then
   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"
 fi
 
-
 # Check whether --enable-ne-scan or --disable-ne-scan was given.
 if test "${enable_ne_scan+set}" = set; then
   enableval="$enable_ne_scan"
@@ -2759,7 +2759,6 @@ else
   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=0x280,0x300,0x320,0x340"
 fi
 
-
 # Check whether --enable-wd-default-mem or --disable-wd-default-mem was given.
 if test "${enable_wd_default_mem+set}" = set; then
   enableval="$enable_wd_default_mem"
@@ -2768,21 +2767,12 @@ else
   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"
 fi
 
-
 # Check whether --enable-cs-scan or --disable-cs-scan was given.
 if test "${enable_cs_scan+set}" = set; then
   enableval="$enable_cs_scan"
   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"
 fi
 
-
-
-
-
-
-
-
-
 trap '' 1 2 15
 cat >confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2819,9 +2809,7 @@ EOF
     sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
     ;;
   esac >>confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
     echo "updating cache $cache_file"
     cat confcache >$cache_file
@@ -2844,13 +2832,10 @@ if test "x$srcdir" = x.; then
   ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
 DEFS=-DHAVE_CONFIG_H
 
-
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 echo creating $CONFIG_STATUS
 cat >$CONFIG_STATUS <<EOF
 #! /bin/sh
@@ -2866,11 +2851,12 @@ cat >$CONFIG_STATUS <<EOF
 
 # Files that config.status was made for.
 config_files="\\
-    Makefile stage1/Makefile stage2/Makefile docs/Makefile debian/Makefile
-    lib/Makefile util/Makefile grub/Makefile netboot/Makefile
-    util/grub-install"
+  Makefile stage1/Makefile stage2/Makefile docs/Makefile debian/Makefile
+  lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-install"
 config_headers="\\
-    config.h"
+  config.h"
+config_commands="\\
+  default-1"
 
 ac_cs_usage="\\
 \\\`$CONFIG_STATUS' instantiates files from templates according to the
@@ -2881,36 +2867,74 @@ Usage: $CONFIG_STATUS [OPTIONS] FILE...
   --recheck    Update $CONFIG_STATUS by reconfiguring in the same conditions
   --version    Print the version of Autoconf and exit
   --help       Display this help and exit
+  --file=FILE[:TEMPLATE]
+               Instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+               Instantiate the configuration header FILE
 
-Files to instantiate:
-  Configuration files:
+Configuration files:
 \$config_files
-  Configuration headers:
+
+Configuration headers:
 \$config_headers
 
+Configuration commands:
+\$config_commands
+
 Report bugs to <bug-autoconf@gnu.org>."
 
 ac_cs_version="\\
 $CONFIG_STATUS generated by autoconf version 2.14a.
-Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by running
-  $0 $ac_configure_args"
+Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
+  `echo "$0 $ac_configure_args" | sed 's/[\\"\`\$]/\\\\&/g'`"
 
 # Root of the tmp file names.  Use pid to allow concurrent executions.
 ac_cs_root=cs\$\$
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-for ac_option
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test \$# != 0
 do
-  case "\$ac_option" in
+  case "\$1" in
+  --*=*)
+    ac_option=\`echo "\$1" | sed -e 's/=.*//'\`
+    ac_optarg=\`echo "\$1" | sed -e 's/[^=]*=//'\`
+    shift
+    set dummy "\$ac_option" "\$ac_optarg" \${1+"\$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+
+  case "\$1" in
+
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running \${CONFIG_SHELL-/bin/sh} $0 `echo "$ac_configure_args" | sed 's/[\\"\`\$]/\\\\&/g'` --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "\$ac_cs_version"; exit 0 ;;
-  -help | --help | --hel | --he | --h)
+  --he | --h)
+    # Conflict between --help and --header
+    echo "$CONFIG_STATUS: ambiguous option: \$ac_option
+Try \\\`$CONFIG_STATUS --help' for more information."; exit 1 ;;
+  -help | --help | --hel )
     echo "\$ac_cs_usage"; exit 0 ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="\$CONFIG_FILES \$1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="\$CONFIG_FILES \$1"
+    ac_need_defaults=false;;
+
   # Handling of arguments.
   'Makefile' ) CONFIG_FILES="\$CONFIG_FILES Makefile" ;;
   'stage1/Makefile' ) CONFIG_FILES="\$CONFIG_FILES stage1/Makefile" ;;
@@ -2922,30 +2946,39 @@ do
   'grub/Makefile' ) CONFIG_FILES="\$CONFIG_FILES grub/Makefile" ;;
   'netboot/Makefile' ) CONFIG_FILES="\$CONFIG_FILES netboot/Makefile" ;;
   'util/grub-install' ) CONFIG_FILES="\$CONFIG_FILES util/grub-install" ;;
+  'default-1' ) CONFIG_COMMANDS="\$CONFIG_COMMANDS default-1" ;;
   'config.h' ) CONFIG_HEADERS="\$CONFIG_HEADERS config.h" ;;
+
   # This is an error.
-  *) echo "$CONFIG_STATUS: invalid argument: \$ac_option"; exit 1 ;;
+  -*) echo "$CONFIG_STATUS: unrecognized option: \$1
+Try \\\`$CONFIG_STATUS --help' for more information."; exit 1 ;;
+  *) echo "$CONFIG_STATUS: invalid argument: \$1"; exit 1 ;;
   esac
+  shift
 done
 
 EOF
 
-cat >>$CONFIG_STATUS <<EOF
-# If there were arguments and we reach this point, then the user
-# has specified the files to intantiate.  If there were no arguments,
-# then the files were specified by envvars.  Set only the envvar that
-# are not set.
-if test \$# = 0; then
-  : \${CONFIG_FILES="\$config_files"}
-  : \${CONFIG_HEADERS="\$config_headers"}
+cat >>$CONFIG_STATUS <<\EOF
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+if $ac_need_defaults; then
+  : ${CONFIG_FILES=$config_files}
+  : ${CONFIG_HEADERS=$config_headers}
+  : ${CONFIG_COMMANDS=$config_commands}
 fi
 
-# Remove all the CONFIG_FILES, and trap to remove the temp files.
-rm -fr \`echo "\$CONFIG_FILES" | sed "s/:[^ ]*//g"\`
-trap 'rm -fr \$ac_cs_root*; exit 1' 1 2 15
+# Trap to remove the temp files.
+trap 'rm -fr $ac_cs_root*; exit 1' 1 2 15
 
 EOF
 
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+EOF
 
 cat >>$CONFIG_STATUS <<EOF
 
@@ -2953,9 +2986,12 @@ cat >>$CONFIG_STATUS <<EOF
 # CONFIG_FILES section.
 #
 
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g;
+   s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF
 s%@SHELL@%$SHELL%;t t
 s%@CFLAGS@%$CFLAGS%;t t
 s%@CPPFLAGS@%$CPPFLAGS%;t t
@@ -3026,66 +3062,66 @@ CEOF
 
 EOF
 
-cat >>$CONFIG_STATUS <<\EOF
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_lines=48
-ac_sed_frag=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_lines # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
-  else
-    sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
-  fi
-  if test ! -s $ac_cs_root.sfrag; then
-    ac_more_lines=false
-    rm -f $ac_cs_root.sfrag
-  else
-    # The purpose of the label and of the branching condition is to
-    # speed up the sed processing (if there are no `@' at all, there
-    # is no need to browse any of the substitutions).
-    # These are the two extra sed commands mentioned above.
-    (echo ':t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f $ac_cs_root.s$ac_sed_frag"
+  cat >>$CONFIG_STATUS <<\EOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=""
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
     else
-      ac_sed_cmds="$ac_sed_cmds | sed -f $ac_cs_root.s$ac_sed_frag"
+      sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
     fi
-    ac_sed_frag=`expr $ac_sed_frag + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_lines`
+    if test ! -s $ac_cs_root.sfrag; then
+      ac_more_lines=false
+      rm -f $ac_cs_root.sfrag
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag
+      if test -z "$ac_sed_cmds"; then
+  	ac_sed_cmds="sed -f $ac_cs_root.s$ac_sed_frag"
+      else
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $ac_cs_root.s$ac_sed_frag"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
   fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
+fi # test -n "$CONFIG_FILES"
 
 EOF
-
 cat >>$CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
     # The file is in a subdirectory.
     test ! -d "$ac_dir" && mkdir "$ac_dir"
     ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's%/[^/]*%../%g'`
   else
     ac_dir_suffix= ac_dots=
   fi
@@ -3107,16 +3143,23 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 
   echo creating "$ac_file"
   rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's%.*/%%'` by configure."
   case "$ac_file" in
   *[Mm]akefile*) ac_comsub="1i\\
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
 
-# Don't redirect the output to AC_FILE directly: use `mv' so that updating
-# is atomic, and doesn't need trapping.
-  ac_file_inputs=`echo $ac_file_in | sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  # Don't redirect the output to AC_FILE directly: use `mv' so that updating
+  # is atomic, and doesn't need trapping.
+  ac_file_inputs=`echo "$ac_file_in" |
+                  sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
+  for ac_file_input in $ac_file_inputs;
+  do
+    test -f "$ac_file_input" ||
+        { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; }
+  done
 EOF
 cat >>$CONFIG_STATUS <<EOF
   sed -e "$ac_comsub
@@ -3147,27 +3190,33 @@ cat >>$CONFIG_STATUS <<\EOF
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
 ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%;t t'
+ac_dB='[ 	].*$%\1#\2'
+ac_dC=' '
+ac_dD='%;t'
 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
 ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
 ac_uB='$%\1#\2define\3'
 ac_uC=' '
-ac_uD='%;t t'
+ac_uD='%;t'
 
 for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
   echo creating $ac_file
 
   rm -f $ac_cs_root.frag $ac_cs_root.in $ac_cs_root.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  ac_file_inputs=`echo "$ac_file_in" |
+                  sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
+    for ac_file_input in $ac_file_inputs;
+  do
+    test -f "$ac_file_input" ||
+        { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; }
+  done
   # Remove the trailing spaces.
   sed -e 's/[ 	]*$//' $ac_file_inputs >$ac_cs_root.in
 
@@ -3209,15 +3258,13 @@ EOF
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
 echo '  if egrep "^[ 	]*#[ 	]*define" $ac_cs_root.in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
-while :
+while grep . conftest.defines >/dev/null
 do
-  ac_lines=`grep -c . conftest.defines`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
   # Write a limited-size here document to $ac_cs_root.frag.
   echo '  cat >$ac_cs_root.frag <<CEOF' >>$CONFIG_STATUS
-  echo ': t' >>$CONFIG_STATUS
   echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
@@ -3237,14 +3284,10 @@ echo >>$CONFIG_STATUS
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
 rm -f conftest.tail
-while :
+while grep . conftest.undefs >/dev/null
 do
-  ac_lines=`grep -c . conftest.undefs`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
   # Write a limited-size here document to $ac_cs_root.frag.
   echo '  cat >$ac_cs_root.frag <<CEOF' >>$CONFIG_STATUS
-  echo ': t' >>$CONFIG_STATUS
   echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
   echo 'CEOF
@@ -3268,8 +3311,8 @@ cat >>$CONFIG_STATUS <<\EOF
     rm -f $ac_cs_root.h
   else
     # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'`
+    if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
       # The file is in a subdirectory.
       test ! -d "$ac_dir" && mkdir "$ac_dir"
     fi
@@ -3277,14 +3320,27 @@ cat >>$CONFIG_STATUS <<\EOF
     mv $ac_cs_root.h $ac_file
   fi
 fi; done
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
-
-
 EOF
 cat >>$CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then
+  ac_dest=`echo "$ac_file" | sed 's%:.*%%'`
+  ac_source=`echo "$ac_file" | sed 's%[^:]*:%%'`
+
+  case "$ac_dest" in
+    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
+  esac
+fi;done
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+
+#
+# CONFIG_COMMANDS section.
+#
 
 exit 0
 EOF
@@ -3292,6 +3348,4 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 trap 'exit 1' 1 2 15
 
-
 test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
-
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index be8ddf8f1..af5aad71d 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.016.
-.TH GRUB-INSTALL "8" "January 2000" "grub-install (GNU GRUB 0.5.94)" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
+.TH GRUB-INSTALL "8" "February 2000" "grub-install (GNU GRUB 0.5.94)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
diff --git a/docs/grub.8 b/docs/grub.8
index 47b8aadf1..b3cda5421 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.016.
-.TH GRUB "8" "January 2000" "GNU GRUB 0.5.94" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
+.TH GRUB "8" "February 2000" "GNU GRUB 0.5.94" FSF
 .SH NAME
 GRUB \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/help2man b/docs/help2man
index aa1df4837..b8c97b1d8 100644
--- a/docs/help2man
+++ b/docs/help2man
@@ -27,7 +27,7 @@ use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_TIME);
 
 my $this_program = 'help2man';
-my $this_version = '1.016';
+my $this_version = '1.020';
 my $version_info = <<EOT;
 $this_program $this_version
 
@@ -56,15 +56,15 @@ EXECUTABLE should accept `--help' and `--version' options.
 EOT
 
 my $section = 1;
-my ($include, $opt_name, $opt_include, $opt_output, $opt_no_info);
+my ($opt_name, @opt_include, $opt_output, $opt_no_info);
 
 # Parse options.
 Getopt::Long::config('bundling');
 GetOptions (
     'n|name=s'		=> \$opt_name,
     's|section=s'	=> \$section,
-    'i|include=s'	=> \$include,
-    'I|opt-include=s'	=> \$opt_include,
+    'i|include=s'	=> sub { push @opt_include, [ pop, 1 ] },
+    'I|opt-include=s'	=> sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	=> \$opt_output,
     'N|no-info'		=> \$opt_no_info,
     help		=> sub { print $help_info; exit },
@@ -74,50 +74,82 @@ GetOptions (
 die $help_info unless @ARGV == 1;
 
 my %include = ();
+my %append = ();
 my @include = (); # retain order given in include file
 
+# Provide replacement `quote-regex' operator for pre-5.005.
+BEGIN { eval q(sub qr { '' =~ $_[0]; $_[0] }) if $] < 5.005 }
+
 # Process include file (if given).  Format is:
 #
-# [section name]
-# verbatim text
+#   [section name]
+#   verbatim text
+#
+# or
+#
+#   /pattern/
+#   verbatim text
+#
 
-if ($include or $opt_include)
+for (@opt_include)
 {
-    if (open INC, $include || $opt_include)
+    my ($inc, $required) = @$_;
+
+    next unless -f $inc or $required;
+    die "$this_program: can't open `$inc' ($!)\n"
+	unless open INC, $inc;
+
+    my $key;
+    my $hash = \%include;
+
+    while (<INC>)
     {
-	my $sect;
-
-	while (<INC>)
+	# [section]
+	if (/^\[([^]]+)\]/)
 	{
-	    if (/^\[([^]]+)\]/)
-	    {
-		$sect = uc $1;
-		$sect =~ s/^\s+//;
-		$sect =~ s/\s+$//;
-		next;
-	    }
-
-	    # Silently ignore anything before the first
-	    # section--allows for comments and revision info.
-	    next unless $sect;
-
-	    push @include, $sect unless $include{$sect};
-	    $include{$sect} ||= '';
-	    $include{$sect} .= $_;
+	    $key = uc $1;
+	    $key =~ s/^\s+//;
+	    $key =~ s/\s+$//;
+	    $hash = \%include;
+	    push @include, $key unless $include{$key};
+	    next;
 	}
 
-	close INC;
+	# /pattern/
+	if (m!^/(.*)/([ims]*)!)
+	{
+	    my $pat = $2 ? "(?$2)$1" : $1;
 
-	die "$this_program: no valid information found in `$include'\n"
-	    unless %include;
+	    # Check pattern.
+	    eval { $key = qr($pat) };
+	    if ($@)
+	    {
+		$@ =~ s/ at .*? line \d.*//;
+		die "$inc:$.:$@";
+	    }
 
-	# Compress trailing blank lines.
-	for (keys %include) { $include{$_} =~ s/\n+$/\n/ }
-    }
-    else
-    {
-	die "$this_program: can't open `$include' ($!)\n" if $include;
+	    $hash = \%append;
+	    next;
+	}
+
+	# Silently ignore anything before the first
+	# section--allows for comments and revision info.
+	next unless $key;
+
+	$hash->{$key} ||= '';
+	$hash->{$key} .= $_;
     }
+
+    close INC;
+
+    die "$this_program: no valid information found in `$inc'\n"
+	unless $key;
+}
+
+# Compress trailing blank lines.
+for my $hash (\(%include, %append))
+{
+    for (keys %$hash) { $hash->{$_} =~ s/\n+$/\n/ }
 }
 
 # Turn off localisation of executable's ouput.
@@ -127,11 +159,10 @@ if ($include or $opt_include)
 setlocale LC_TIME, 'C';
 
 # Grab help and version info from executable.
-my $help_text = join '', map { expand $_ } `$ARGV[0] --help 2>/dev/null`
-    or die "$this_program: can't get `--help' info from $ARGV[0]\n";
-
-my $version_text = join '', map { expand $_ } `$ARGV[0] --version 2>/dev/null`
-    or die "$this_program: can't get `--version' info from $ARGV[0]\n";
+my ($help_text, $version_text) = map {
+    join '', map { s/ +$//; expand $_ } `$ARGV[0] --$_ 2>/dev/null`
+	or die "$this_program: can't get `--$_' info from $ARGV[0]\n"
+} qw(help version);
 
 my $date = strftime "%B %Y", localtime;
 (my $program = $ARGV[0]) =~ s!.*/!!;
@@ -194,20 +225,22 @@ $include{NAME} ||= "$program \\- manual page for $program $version\n";
 my $PROGRAM = uc $program;
 
 # Extract usage clause(s) [if any] for SYNOPSIS.
-if ($help_text =~ s/^Usage: +(\S.*)(\n *or: +\S.*)*//m)
+if ($help_text =~ s/^Usage:( +(\S+))(.*)((?:\n(?: {6}\1| *or: +\S).*)*)//m)
 {
-    my @syn = $1;
+    my @syn = $2 . $3;
 
-    if ($_ = $2)
+    if ($_ = $4)
     {
-	for (split /\n/) { push @syn, $1 if /or: +(\S.*)/ }
+	s/^\n//;
+	for (split /\n/) { s/^ *(or: +)?//; push @syn, $_ }
     }
 
     my $synopsis = '';
     for (@syn)
     {
 	$synopsis .= ".br\n" if $synopsis;
-	s/(\S+) *//;
+	s!^\S*/!!;
+	s/^(\S+) *//;
 	$synopsis .= ".B $1\n";
 	s/\s+$//;
 	s/(([][]|\.\.+)+)/\\fR$1\\fI/g;
@@ -238,6 +271,9 @@ s/\n\n+/\n\n/g;
 s/^\./\x80/mg;
 s/\\/\x81/g;
 
+# Start a new paragraph (if required) for these.
+s/([^\n])\n(Report +bugs|Email +bug +reports +to|Written +by)/$1\n\n$2/g;
+
 sub convert_option;
 
 while (length)
@@ -250,7 +286,7 @@ while (length)
     }
 
     # Copyright section
-    if (/^Copyright [\(\xa9]/)
+    if (/^Copyright +[(\xa9]/)
     {
 	$sect = 'COPYRIGHT';
 	$include{$sect} ||= '';
@@ -266,11 +302,11 @@ while (length)
 
 	    # Convert iso9959-1 copyright symbol or (c) to nroff
 	    # character.
-	    s/^Copyright (?:\xa9|\([Cc]\))/Copyright \\(co/mg;
+	    s/^Copyright +(?:\xa9|\([Cc]\))/Copyright \\(co/mg;
 
 	    # Insert line breaks before additional copyright messages
 	    # and the disclaimer.
-	    s/(.)\n(Copyright |This is free software)/$1\n.br\n$2/g;
+	    s/(.)\n(Copyright |This +is +free +software)/$1\n.br\n$2/g;
 
 	    # Join hyphenated lines.
 	    s/([A-Za-z])-\n */$1/g;
@@ -282,7 +318,7 @@ while (length)
     }
 
     # Catch bug report text.
-    if (/^(Report bugs|Email bug reports to) /)
+    if (/^(Report +bugs|Email +bug +reports +to) /)
     {
 	$sect = 'REPORTING BUGS';
     }
@@ -310,34 +346,44 @@ while (length)
 	next;
     }
 
+    my $matched = '';
     $include{$sect} ||= '';
+
     # Sub-sections have a trailing colon and the second line indented.
     if (s/^(\S.*:) *\n / /)
     {
+	$matched .= $& if %append;
 	$include{$sect} .= qq(.SS "$1"\n);
     }
 
     my $indent = 0;
     my $content = '';
 
-    # Tagged paragraph (option).
-    if (s/^( {1,10}(-\S+(?:, *-\S+)*))(?: +|\n( {20,}))([^\s-].*)\n//)
+    # Option with description.
+    if (s/^( {1,10}([+-]\S.*?))(?:(  +)|\n( {20,}))(\S.*)\n//)
     {
-	$indent = length ($3 || $1);
-	my $tag = $2;
-	my $desc = $4;
-	unless ($3)
+	$matched .= $& if %append;
+	$indent = length ($4 || "$1$3");
+	$content = ".TP\n\x82$2\n\x82$5\n";
+	unless ($4)
 	{
-	    $indent = length $1;
-	    $indent = length $1 if /^( {20,})[^\s-]/;
+	    # Indent may be different on second line.
+	    $indent = length $& if /^ {20,}/;
 	}
-
-	$content = ".TP\n\x82$tag\n\x82$desc\n";
     }
 
-    # Tagged paragraph (other).
+    # Option without description.
+    elsif (s/^ {1,10}([+-]\S.*)\n//)
+    {
+	$matched .= $& if %append;
+	$content = ".HP\n\x82$1\n";
+	$indent = 80; # not continued
+    }
+
+    # Indented paragraph with tag.
     elsif (s/^( +(\S.*?)  +)(\S.*)\n//)
     {
+	$matched .= $& if %append;
 	$indent = length $1;
 	$content = ".TP\n\x82$2\n\x82$3\n";
     }
@@ -345,6 +391,7 @@ while (length)
     # Indented paragraph.
     elsif (s/^( +)(\S.*)\n//)
     {
+	$matched .= $& if %append;
 	$indent = length $1;
 	$content = ".IP\n\x82$2\n";
     }
@@ -353,12 +400,17 @@ while (length)
     else
     {
 	s/(.*)\n//;
+	$matched .= $& if %append;
 	$content = ".PP\n" if $include{$sect};
 	$content .= "$1\n";
     }
 
     # Append continuations.
-    $content .= "\x82$1\n" while s/^ {$indent}(\S.*)\n//;
+    while (s/^ {$indent}(\S.*)\n//)
+    {
+	$matched .= $& if %append;
+	$content .= "\x82$1\n"
+    }
 
     # Move to next paragraph.
     s/^\n+//;
@@ -373,6 +425,19 @@ while (length)
 	s/(^| )(-[][\w=-]+)/$1 . convert_option $2/mge;
     }
 
+    # Check if matched paragraph contains /pat/.
+    if (%append)
+    {
+	for my $pat (keys %append)
+	{
+	    if ($matched =~ $pat)
+	    {
+		$content .= ".PP\n" unless $append{$pat} =~ /^\./;
+		$content .= $append{$pat};
+	    }
+	}
+    }
+
     $include{$sect} .= $content;
 }
 
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 70bb463e2..9123f6b56 100644
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.016.
-.TH MBCHK "1" "January 2000" "mbchk (GNU GRUB 0.5.94)" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
+.TH MBCHK "1" "February 2000" "mbchk (GNU GRUB 0.5.94)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS
diff --git a/docs/menu.lst b/docs/menu.lst
index 289ab6130..6f00726d5 100644
--- a/docs/menu.lst
+++ b/docs/menu.lst
@@ -19,7 +19,8 @@ module /boot/serverboot.gz
 
 # For booting Linux
 title  GNU/Linux
-kernel (hd1,0)/vmlinuz root=/dev/hdb1
+root (hd1,0)
+kernel /vmlinuz root=/dev/hdb1
 
 # For booting Mach (getting kernel from floppy)
 title  Utah Mach4 multiboot
@@ -28,10 +29,10 @@ pause  Insert the diskette now!!
 kernel (fd0)/boot/kernel root=hd0s3
 module (fd0)/boot/bootstrap
 
-# For booting FreeBSD (getting kernel from floppy)
-title  FreeBSD
+# For booting FreeBSD
+title  FreeBSD 3.4
 root   (hd0,2,a)
-kernel (fd0)/kernel
+kernel /boot/loader
 
 # For booting OS/2
 title OS/2
@@ -44,9 +45,9 @@ chainloader +1
 
 # For booting Windows NT or Windows95
 title Windows NT / Windows 95 boot menu
-root        (hd0,0)
+rootnoverify (hd0,0)
 makeactive
-chainloader +1
+chainloader  +1
 # For loading DOS if Windows NT is installed
 # chainload /bootsect.dos
 
diff --git a/docs/tutorial.texi b/docs/tutorial.texi
index 4f7cbd45f..43582ccf9 100644
--- a/docs/tutorial.texi
+++ b/docs/tutorial.texi
@@ -143,9 +143,11 @@ on the floppy.
 It is easy to create a GRUB boot floppy. Just follow this below:
 
 @example
+@group
 # cd /boot/grub
 # dd if=stage1 of=/dev/fd0 bs=512 count=1
 # dd if=stage2 of=/dev/fd0 bs=512 seek=1
+@end group
 @end example
 
 The device filename may be different. Consult the manual for your OS.
@@ -223,18 +225,37 @@ but, for some free operating systems, you need to use some OS-specific
 magic.
 
 @menu
-* Booting a Multiboot-compliant OS::
-* Booting GNU/Hurd::
-* Booting GNU/Linux::
-* Booting FreeBSD::
-* Booting NetBSD::
-* Booting OpenBSD::
+* General boot methods::
+* OS-specific notes::
+@end menu
+
+
+@node General boot methods
+@section How to boot operating systems
+
+GRUB has two distinct sets of boot methods, that is, loading an
+operating system directly and chain-loading another boot loader which
+then will load an operating system actually. Generally speaking, the
+former is preferable, because you don't need to install or maintain
+other boot loaders and GRUB is flexible enough to load an operating
+system from an arbitrary disk/partition. However, the latter is
+sometimes required, since GRUB doesn't support all the existing
+operating systems natively.
+
+@menu
+* Loading an operating system directly::
 * Chain-loading::
 @end menu
 
 
-@node Booting a Multiboot-compliant OS
-@section Booting a Multiboot-compliant OS
+@node Loading an operating system directly
+@subsection How to boot an OS directly by GRUB
+
+The native format supported by GRUB is Multiboot (@pxref{Top, Multiboot
+Specification, Motivation, multiboot, The Multiboot Specification}), but
+Linux, FreeBSD, NetBSD and OpenBSD are also supported for
+convenience. If you want to boot other operating systems, you will have
+to chain-load them (@pxref{Chain-loading}).
 
 Generally, GRUB can boot any Multiboot-compliant OS in the following
 steps:
@@ -242,22 +263,83 @@ steps:
 @enumerate
 @item
 Set GRUB's root device to the drive where the OS images are stored by
-the command @command{root} (@pxref{Command}).
+the command @command{root}.
 
 @item
-Load the kernel image by the command @command{kernel} (@pxref{Command}).
+Load the kernel image by the command @command{kernel}.
 
 @item
 Load the modules by the command @command{module} or
-@command{modulenounzip} as you need (@pxref{Command}).
+@command{modulenounzip} as you need.
 
 @item
-Run the command @command{boot} (@pxref{Command}).
+Run the command @command{boot}.
 @end enumerate
 
+Linux, FreeBSD, NetBSD and OpenBSD can be booted in a similar
+manner. You can load a kernel image by the command @command{kernel} and
+then run the command @command{boot}. If the kernel requires some
+parameters, just append the parameters to @command{kernel}, after the
+filename of the kernel. Also, please refer to @ref{OS-specific notes},
+for the information on your OS-specific issues.
 
-@node Booting GNU/Hurd
-@section Booting GNU/Hurd
+
+@node Chain-loading
+@subsection Load another boot loader to boot unsupported operating systems
+
+If you want to boot an unsupported operating system (e.g. Windows 95),
+chain-load the boot loader for the operating system. Normally, the boot
+loader is embedded in the @dfn{boot sector} of the partition on which
+the operating system is installed.
+
+First, set GRUB's root device to the partition by the command
+@command{rootnoverify}:
+
+@example
+grub> rootnoverify (hd0,0)
+@end example
+
+Second, set the @dfn{active} flag in the partition by the command
+@command{makeactive}@footnote{This is not necessary for most modern
+operating systems.}:
+
+@example
+grub> makeactive
+@end example
+
+Third, load the boot loader by the command @command{chainloader}:
+
+@example
+grub> chainloader +1
+@end example
+
+@samp{+1} indicates that GRUB should read one sector from the start of
+the partition. The complete description about this syntax can be found
+in @ref{Filesystem}. If this succeeds, run the command @command{boot}.
+
+However, DOS and Windows have a deficiency, so you might have to use
+more complicated instructions. @xref{OS-specific notes}, for more
+information.
+
+
+@node OS-specific notes
+@section Some caveats on OS-specific issues
+
+Here, we describe some caveats on several operating systems.
+
+@menu
+* GNU/Hurd::
+* GNU/Linux::
+* FreeBSD::
+* NetBSD::
+* OpenBSD::
+* DOS/Windows::
+* SCO UnixWare::
+@end menu
+
+
+@node GNU/Hurd
+@subsection GNU/Hurd
 
 Since GNU/Hurd is Multiboot-compliant, it is easy to boot it; there is
 nothing special. But do not forget that you specify a root partition to
@@ -270,19 +352,20 @@ you.
 Second, load the kernel and the module, like this:
 
 @example
+@group
 grub> kernel /boot/gnumach root=hd0s1
 grub> module /boot/serverboot
+@end group
 @end example
 
 And, finally, run the command @command{boot}.
 
 
-@node Booting GNU/Linux
-@section Booting GNU/Linux
+@node GNU/Linux
+@subsection GNU/Linux
 
 It is relatively easy to boot GNU/Linux from GRUB, because booting
-GNU/Linux somewhat resembles booting a Multiboot-compliant OS
-(@pxref{Booting a Multiboot-compliant OS}).
+GNU/Linux somewhat resembles booting a Multiboot-compliant OS.
 
 First, set GRUB's root device to the same drive as
 GNU/Linux's. Probably @code{find /vmlinuz} or such will help
@@ -314,69 +397,65 @@ grub> initrd /initrd
 And, finally, run the command @command{boot}.
 
 
-@node Booting FreeBSD
-@section Booting FreeBSD
+@node FreeBSD
+@subsection FreeBSD
 
-@c Probably we should fix the boot parameters before writing this
-@c section.
-FIXME
+GRUB can directly load both kernel formats, ELF and a.out, but this is
+deprecated, since FreeBSD's bootstrap interface is sometimes changed
+heavily and so GRUB can't guarantee to pass kernel parameters
+correctly.
 
-
-@node Booting NetBSD
-@section Booting NetBSD
-
-@c Likewise.
-FIXME
-
-
-@node Booting OpenBSD
-@section Booting OpenBSD
-
-@c Likewise.
-FIXME
-
-
-@node Chain-loading
-@section Chain-loading
-
-If you want to boot an unsupported operating system (i.e. Windows 95),
-chain-load the boot loader for the operating system. Normally, the boot
-loader is embedded in the @dfn{boot sector} of the partition on which
-the operating system is installed.
-
-First, set GRUB's root device to the partition by the command
-@command{rootnoverify}:
+Thus, we'd recommend loading the very flexible loader
+@file{/boot/loader} instead. See this example:
 
 @example
-grub> rootnoverify (hd0,0)
+@group
+grub> root (hd0,a)
+grub> kernel /boot/loader
+grub> boot
+@end group
 @end example
 
-Second, set the @dfn{active} flag in the partition by the command
-@command{makeactive}:
 
-@example
-grub> makeactive
-@end example
+@node NetBSD
+@subsection NetBSD
 
-Third, load the boot loader by the command @command{chainloader}:
+GRUB can load NetBSD a.out directly, by the following steps:
 
-@example
-grub> chainloader +1
-@end example
+@enumerate
+@item
+Set GRUB's root device by @command{root}.
 
-Do not care about what @samp{+1} is. We describe it later in
-@ref{Filesystem}. If this succeeds, run the command @command{boot}.
+@item
+Load the kernel by @command{kernel}.
 
-@strong{Caution:} Some boot loaders (such as the one in SCO Unixware
-7.1) are defective in the signature, so you will have to specify the
-option @option{--force} to @command{chainloader} for them. The option
-might seem to solve your problem, but we strongly recommend reporting
-the bug to the maintainer.
+@item
+Run @command{boot}.
+@end enumerate
 
-However, some tricks will be necessary if you have installed DOS or
-Windows on a non-first hard disk, because they cannot boot any disks
-except for the first one. The solution is to use the command
-@command{map} (@pxref{Command}), like this:
+For now, however, GRUB doesn't allow you to pass kernel parameters, so
+it may be better to chain-load it instead. @xref{Chain-loading}, for
+more information.
+
+
+@node OpenBSD
+@subsection OpenBSD
+
+The boot instructions are exactly the same as NetBSD (@pxref{NetBSD}).
+
+
+@node DOS/Windows
+@subsection DOS/Windows
+
+GRUB doesn't support DOS or Windows directly, so you must chain-load
+them (@pxref{Chain-loading}). However, their boot loaders have some
+critical deficiencies, so the general methods may not be enough.
+
+If you have installed DOS (or Windows) on a non-first hard disk, the
+disk swapping technique is necessary, because it cannot boot any disks
+but the first one. The solution used in GRUB is the command
+@command{map} (@pxref{Command}). For example, if the installed disk is
+the second hard disk, swap it for the first hard disk:
 
 @example
 @group
@@ -385,8 +464,51 @@ grub> map (hd1) (hd0)
 @end group
 @end example
 
-This performs the @dfn{logical} exchange between your first disk and
-your second one.
+This performs the @dfn{virtual} exchange between the two disks.
+
+@strong{Caution:} This is effective only if DOS (or Windows) uses BIOS
+to access the swapped disks. If it uses a special driver for them,
+probably this doesn't work.
+
+Another problem arises if you install more than one sets of DOS/Windows
+into one disk, because they could be confused if there are more than one
+primary partitions for DOS/Windows. Certainly you should avoid this way,
+but there is a solution if you do want to do so. Use the partition
+hiding/unhiding technique.
+
+If GRUB @dfn{hide}s a DOS (or Windows) partition, then it ignores the
+partition. If GRUB @dfn{unhide}s a DOS (or Windows) partition, it
+detects the partition. Thus, if you have installed DOS (or Windows) into
+the first partition and the second partition of the first hard disk,
+follow these below when booting the first:
+
+@example
+@group
+grub> unhide (hd0,0)
+grub> hide (hd0,1)
+grub> rootnoverify (hd0,0)
+grub> chainloader +1
+grub> makeactive
+grub> boot
+@end group
+@end example
+
+
+@node SCO UnixWare
+@subsection SCO UnixWare
+
+The boot loader in SCO UnixWare is known by the fact that its signature
+is wrong. So you will need to specify the option @option{--force} to
+@command{chainloader}, like this:
+
+@example
+@group
+grub> rootnoverify (hd1,0)
+grub> chainloader --force +1
+grub> makeactive
+grub> boot
+@end group
+@end example
 
 
 @node Configuration
diff --git a/netboot/Makefile.in b/netboot/Makefile.in
index e9bb04770..0cf07fd79 100644
--- a/netboot/Makefile.in
+++ b/netboot/Makefile.in
@@ -96,7 +96,7 @@ libdrivers_a_SOURCES = byteorder.h config.c etherboot.h \
 	main.c misc.c netboot_config.h netdevice.h nic.h osdep.h \
 	pci.c pci.h
 
-EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c59x.c 3c90x.c cs89x0.c \
+EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c90x.c cs89x0.c \
 	3c89x0.h eepro100.c epic100.c epic100.h i82586.c lance.c \
 	ns8390.c ns8390.h ntulip.c rtl8139.c sk_g16.c sk_g16.h \
 	smc9000.c smc9000.h tiara.c tulip.c tulip.h via-rhine.c
@@ -115,7 +115,7 @@ EXTRA_DIST = README.netboot 3c90x.txt ntulip.txt
 
 # What objects are derived from a driver?
 3c509_drivers = 3c509.o 3c529.o
-3c59x_drivers = 3c59x.o
+#3c59x_drivers = 3c59x.o
 3c90x_drivers = 3c90x.o
 cs89x0_drivers = cs89x0.o
 eepro100_drivers = eepro100.o
@@ -134,7 +134,7 @@ via_rhine_drivers = via_rhine.o
 # Per-object flags.
 3c509_o_CFLAGS = -DINCLUDE_3C509=1
 3c529_o_CFLAGS = -DINCLUDE_3C529=1
-3c59x_o_CFLAGS = -DINCLUDE_3C59X=1
+#3c59x_o_CFLAGS = -DINCLUDE_3C59X=1
 3c90x_o_CFLAGS = -DINCLUDE_3C90X=1
 cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
 eepro100_o_CFLAGS = -DINCLUDE_EEPRO100=1
@@ -184,11 +184,11 @@ DIST_COMMON =  Makefile.am Makefile.in compile
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
-DEP_FILES =  .deps/3c509.P .deps/3c59x.P .deps/3c90x.P .deps/config.P \
-.deps/cs89x0.P .deps/eepro100.P .deps/epic100.P .deps/fsys_tftp.P \
-.deps/i82586.P .deps/lance.P .deps/main.P .deps/misc.P .deps/ns8390.P \
-.deps/ntulip.P .deps/pci.P .deps/rtl8139.P .deps/sk_g16.P \
-.deps/smc9000.P .deps/tiara.P .deps/tulip.P .deps/via-rhine.P
+DEP_FILES =  .deps/3c509.P .deps/3c90x.P .deps/config.P .deps/cs89x0.P \
+.deps/eepro100.P .deps/epic100.P .deps/fsys_tftp.P .deps/i82586.P \
+.deps/lance.P .deps/main.P .deps/misc.P .deps/ns8390.P .deps/ntulip.P \
+.deps/pci.P .deps/rtl8139.P .deps/sk_g16.P .deps/smc9000.P \
+.deps/tiara.P .deps/tulip.P .deps/via-rhine.P
 SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES)
 OBJECTS = $(am_libdrivers_a_OBJECTS)
 
@@ -227,7 +227,6 @@ libdrivers_a-main.o: main.c
 libdrivers_a-misc.o: misc.c
 libdrivers_a-pci.o: pci.c
 libdrivers_a-3c509.o: 3c509.c
-libdrivers_a-3c59x.o: 3c59x.c
 libdrivers_a-3c90x.o: 3c90x.c
 libdrivers_a-cs89x0.o: cs89x0.c
 libdrivers_a-eepro100.o: eepro100.c
@@ -448,25 +447,6 @@ libdrivers_a-3c509.lo: 3c509.c
 	    >> .deps/$(*D)/$(*F).P; \
 	rm -f .deps/$(*D)/$(*F).pp
 
-libdrivers_a-3c59x.o: 3c59x.c
-	@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
-	$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
-	@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*D)/$(*F).P; \
-	rm .deps/$(*D)/$(*F).pp
-
-libdrivers_a-3c59x.lo: 3c59x.c
-	@echo '$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*D)/$(*F).P; \
-	rm -f .deps/$(*D)/$(*F).pp
-
 libdrivers_a-3c90x.o: 3c90x.c
 	@echo '$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o $@ $<'; \
 	$(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -Wp,-MD,.deps/$(*D)/$(*F).pp -c -o $@ $<
@@ -821,10 +801,10 @@ $(3c509_drivers): %.o: 3c509.c
 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
 
-$(3c59x_drivers): 3c59x.c 3c509.h
-$(3c59x_drivers): %.o: 3c59x.c
-	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
+#$(3c59x_drivers): 3c59x.c 3c509.h
+#$(3c59x_drivers): %.o: 3c59x.c
+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
 
 $(3c90x_drivers): 3c90x.c
 $(3c90x_drivers): %.o: 3c90x.c
diff --git a/stage2/Makefile.in b/stage2/Makefile.in
index 13dd014f5..92bbe4d79 100644
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -160,6 +160,7 @@ fat_stage1_5_exec_SOURCES = start.S asm.S common.c char_io.c disk_io.c \
 
 fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
 	-DNO_BLOCK_FILES=1
+
 fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
 
 # For ffs_stage1_5 target.