Merge from emacs-23.

[gnu-emacs] / etc / tutorials / TUTORIAL

diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index 94ed19d413b7b3567689ec93ce5e2d27da49469b..7b5dfc7f4d32d7567636d8bf1afa441ad398cfc2 100644 (file)
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -498,12 +498,12 @@ you save, Emacs leaves the original file under a changed name in case
 you later decide that your changes were a mistake.
 
 If you look near the bottom of the screen you will see a line that
-begins and ends with dashes, and starts with "--:--- TUTORIAL" or
-something like that.  This part of the screen normally shows the name
-of the file that you are visiting.  Right now, you are visiting a file
-called "TUTORIAL" which is your personal scratch copy of the Emacs
-tutorial.  When you find a file with Emacs, that file's name will
-appear in that precise spot.
+begins with dashes, and starts with "--:--- TUTORIAL" or something
+like that.  This part of the screen normally shows the name of the
+file that you are visiting.  Right now, you are visiting a file called
+"TUTORIAL" which is your personal scratch copy of the Emacs tutorial.
+When you find a file with Emacs, that file's name will appear in that
+precise spot.
 
 One special thing about the command for finding a file is that you
 have to say what file name you want.  We say the command "reads an
@@ -1122,7 +1122,7 @@ This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
 
   Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
-    2007, 2008, 2009 Free Software Foundation, Inc.
+    2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1143,4 +1143,3 @@ Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
 using, writing, and sharing free software!
 
-;;; arch-tag: a0f84628-777f-4238-8865-451a73167f55