--- a/etc/TUTORIAL	Mon Aug 13 10:02:48 2007 +0200
+++ b/etc/TUTORIAL	Mon Aug 13 10:03:52 2007 +0200
@@ -313,11 +313,11 @@
 top of the screen."  So C-u 0 C-l means "redraw the
 screen, putting the current line at the top.")
 
->> Type Control-h k Control-f.
+>> Type Control-x 2
    See how this window shrinks, while a new one appears
-   to display documentation on the Control-f command.
+   to display contents of this buffer.
 
->> Type C-x 1 and see the documentation listing window disappear.
+>> Type C-x 1 and see the new window disappear.
 
 
 * INSERTING AND DELETING
@@ -762,10 +762,10 @@
 area contains the bottom line of the screen.
 
 
-* MODE LINE
+* MODELINE
 -----------
 
-The line immediately above the echo area it is called the "mode line".
+The line immediately above the echo area it is called the "modeline".
 The mode line says something like this:
 
 --**-XEmacs: TUTORIAL          (Fundamental)--L670--58%----------------
@@ -820,7 +820,7 @@
 
 >> Use C-u C-v once or more to bring this line near the top of screen.
 >> Type C-h m, to see how Text mode differs from Fundamental mode.
->> Type C-x 1 to remove the documentation from the screen.
+>> Type q to remove the documentation from the screen.
 
 Major modes are called major because there are also minor modes.
 Minor modes are alternatives not to the major modes, just minor
@@ -879,7 +879,7 @@
 When you type C-s you'll notice that the string "I-search" appears as
 a prompt in the echo area.  This tells you that Emacs is in what is
 called an incremental search waiting for you to type the thing that
-you want to search for.  <RET> terminates a search.
+you want to search for.  <Return> terminates a search.
 
 >> Now type C-s to start a search.  SLOWLY, one letter at a time,
    type the word 'cursor', pausing after you type each
@@ -890,10 +890,11 @@
 >> Type <RET> to terminate the search.
 
 Did you see what happened?  Emacs, in an incremental search, tries to
-go to the occurrence of the string that you've typed out so far.  To
-go to the next occurrence of 'cursor' just type C-s again.  If no such
-occurrence exists Emacs beeps and tells you the search is currently
-"failing", C-g would also terminate the search.
+go to the occurrence of the string that you've typed out so far,
+highlighting it for your convenience.  To go to the next occurrence of
+'cursor' just type C-s again.  If no such occurrence exists Emacs
+beeps and tells you the search is currently "failing", C-g would also
+terminate the search.
 
 NOTE: On some systems, typing C-s will freeze the screen and you will
 see no further output from Emacs.  This indicates that an operating
@@ -1049,9 +1050,7 @@
 
 This displays the documentation of the function, as well as its
 name, in an Emacs window.  When you are finished reading the
-output, type C-x 1 to get rid of the help text.  You do not have
-to do this right away.  You can do some editing while referring
-to the help text, and then type C-x 1.
+output, type q to get rid of the help text.
 
 Here are some other useful C-h options:
 
@@ -1062,21 +1061,16 @@
    This prints all the information Emacs has about the
    function which implements the C-p command.
 
-   C-h a	Command Apropos.  Type in a keyword and Emacs will list
-		all the commands whose names contain that keyword.
-		These commands can all be invoked with Meta-x.
-		For some commands, Command Apropos will also list a one
-		or two character sequence which runs the same command.
-
->> Type C-h a file<Return>.
+   C-h a	Hyper Apropos.  Type in a keyword and Emacs will list
+		all the functions and variables whose names contain
+		that keyword.  The commands that can be invoked with
+		Meta-x, an asterisk will be displayed to the left.
 
-This displays in another window a list of all M-x commands with "file"
-in their names.  You will see character-commands like C-x C-f listed
-beside the corresponding command names such as find-file.
+>> Type C-h a newline<Return>.
 
->> Type C-M-v to scroll the help window.  Do this a few times.
-
->> Type C-x 1 to delete the help window.
+This displays a list of all functions and variables with "newline" in
+their names.  Press <Return> or click the middle mouse button to find
+out more about a function or variable.  Type `q' to exit hyper-apropos.
 
 
 * CONCLUSION
@@ -1095,7 +1089,8 @@
 
 This tutorial descends from a long line of Emacs tutorials
 starting with the one written by Stuart Cracraft for the original Emacs.
-Ben Wing updated the tutorial for X Windows.
+Ben Wing updated the tutorial for X Windows.  Martin Buchholz and
+Hrvoje Niksic added more corrections for XEmacs.
 
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions: