diff --git a/AUTHORS b/AUTHORS
index 0115da208..a8060964d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,8 @@ script /sbin/grub-install, the utility /bin/mbchk, the new engine for
 builtin commands, disk swapping support, keyboard configuration support,
 network support, online help support, command-line history support,
 hidden menu support, the new Linux loader, serial terminal support,
-single-line editing support, and several new commands.
+single-line editing support, the utility /sbin/grub-md5-crypt, the new
+GRUB manual, and several new commands.
 
 Peter Astrand added support for a color menu.
 
diff --git a/ChangeLog b/ChangeLog
index 82d4390dc..d27851c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-22  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* docs/tutorial.texi: Miscellaneous updates.
+	* docs/user-ref.texi: Likewise.
+	* docs/appendices.texi: Likewise.
+	
 2000-10-22  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* util/grub-install.in (usage): Removed unnecessary commas.
diff --git a/docs/appendices.texi b/docs/appendices.texi
index 4e910bba3..0717fee27 100644
--- a/docs/appendices.texi
+++ b/docs/appendices.texi
@@ -183,6 +183,27 @@ grub> install /grub/stage1 d (hd0) /grub/stage2 p /grub/menu.lst
 @end example
 @end enumerate
 
+@item How to uninstall GRUB from my hard disk drive?
+
+There is no concept @dfn{uninstall} in boot loaders, because if you
+@dfn{uninstall} a boot loader, an unbootable machine would simply
+remain. So all you need to do is overwrite another boot loader you like
+to your disk, that is, install the boot loader without uninstalling
+GRUB.
+
+For example, if you want to install the boot loader for Windows, just
+run @code{FDISK /MBR} on Windows. If you want to install LILO@footnote{I
+can't imagine why you want to do such a thing, though}, run
+@code{/sbin/lilo} on GNU/Linux.
+
+@item GRUB hangs when accessing my large IDE disk.
+
+If your disk is bigger than 32GB, probably updating your mainboard BIOS
+will solve your problem. This bug is well-known and most vendors should
+provide fixed versions. For example, if you have ASUS-P3BF, upgrading
+the BIOS to V1007beta1 or later can fix it. Please ask your vendor, for
+more information.
+
 @item Why don't Linux, FreeBSD, NetBSD, etc. become Multiboot-compliant?
 
 Please ask the relevant maintainers. If all free kernels were
diff --git a/docs/tutorial.texi b/docs/tutorial.texi
index a97c8b5d0..39e462153 100644
--- a/docs/tutorial.texi
+++ b/docs/tutorial.texi
@@ -810,7 +810,7 @@ Reference Manual (@pxref{Introduction}).
 @node Network
 @chapter Downloading OS images from a network
 
-Although GRUB is a disk-based boot loader, it does provide some network
+Although GRUB is a disk-based boot loader, it does provide network
 support. To use the network support, you need to enable at least one
 network driver in the GRUB build process. For more information please
 see @file{netboot/README.netboot} in the source distribution.
@@ -983,7 +983,7 @@ password --md5 PASSWORD
 @end example
 
 If this is specified, GRUB disallows any interactive control, until you
-press the key @key{p} and enter @samp{PASSWORD}.  The option
+press the key @key{p} and enter a correct password.  The option
 @option{--md5} tells GRUB that @samp{PASSWORD} is in MD5 format.  If it
 is omitted, GRUB assumes the @samp{PASSWORD} is in clear text.
 
@@ -1036,5 +1036,5 @@ any user can execute commands in an entry, until GRUB encounters
 You can also use the command @command{password} instead of
 @command{lock}. In this case the boot process will ask for the password
 and stop if it was entered incorrectly.  Since the @command{password}
-takes its own @samp{PASSWORD} argument this is useful if you want
+takes its own @var{PASSWORD} argument this is useful if you want
 different passwords for different entries.
diff --git a/docs/user-ref.texi b/docs/user-ref.texi
index 90938f840..3c198f75c 100644
--- a/docs/user-ref.texi
+++ b/docs/user-ref.texi
@@ -154,6 +154,11 @@ available. In LBA mode, GRUB can access the entire disk.
 @item Network support
 GRUB is a disk-based boot loader but also has network support. You can
 load OS images from a network by using the @dfn{TFTP} protocol.
+
+@item Remote terminal support
+To support computers with no console, GRUB provides remote terminal
+support, so that you can control GRUB from a remote host. Only serial
+terminal support is implemented at the moment.
 @end table
 
 Future directions might include an internal programming language for