diff --git a/ChangeLog b/ChangeLog
index 29887eb80..a2a54f694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-02  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* docs/user-ref.texi (Invoking the grub shell): Added a caution.
+	Why don't so many people still understand that BIOS drive
+	numbering are different from OS device naming? How many cautions
+	and warnings should we write in the documentation? Sigh.
+	
 2000-06-01  OKUJI Yoshinori  <okuji@gnu.org>
 
 	From Chip Salzenberg:
diff --git a/docs/user-ref.texi b/docs/user-ref.texi
index b9bb90863..44c530c26 100644
--- a/docs/user-ref.texi
+++ b/docs/user-ref.texi
@@ -1297,7 +1297,12 @@ enter a correct password before running such an entry.
 @node Invoking the grub shell
 @chapter Invoking the grub shell
 
-This chapter documents the grub shell @command{grub}.
+This chapter documents the grub shell @command{grub}. Note that the grub
+shell is an emulator; it doesn't run under the native environment, so it
+sometimes does something wrong. Therefore, you shouldn't trust it too
+much. If there is anything wrong with it, don't hesitate to try the
+native GRUB environment, especially when it guesses a wrong map between
+BIOS drives and OS devices.
 
 @menu
 * Basic usage::                 How to use the grub shell