Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

[gnu-emacs] / etc / tutorials / TUTORIAL.th

diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th
index 8e70bc4fc7107d583b259d0116b776716e84a803..fae084cd5e8864b492fc70ab9d2369b06617c332 100644 (file)
--- a/etc/tutorials/TUTORIAL.th
+++ b/etc/tutorials/TUTORIAL.th
@@ -485,12 +485,6 @@ C-x C-f \e0\e,T!g\e1(P7S'R9\e(B, \e,TaEP(P`\e0BW\e1M9a\e0?i\e1A\e0"i\e1M\e0AY\e1E\e07Uh\e1\e07h\e
 >> \e0\e,T;i\e1M9$S\e0JQh\e1'\e(B C-x C-s, \e,T`\e0>Wh\e1M\e0(Q\e14`\e0!g\e1:JS`9R\e0$Yh\e1\e0AW\e1M!RCc\e0*i\e1"M'\e07h\e1R9\e(B.
    \e,T(P;CR!/\e(B "Write ...TUTORIAL.th" \e0\e,T7Uh\e1:CC\e07Q\e14\e0Eh\e1R'\e0JX\e14"M'K\e09i\e1R(M\e(B.
 
-\e0\e,T"i\e1M\e0JQ\e1'`!5\e(B: \e,Tc9:R'CP::\e(B, \e,T!RC\e0;i\e1M9$S\e0JQh\e1'\e(B C-x C-s \e,T(P7Sc\e0Ki\e1K\e09i\e1R(M*P\e0'Q\e1!aEP\e07h\e1R9(Pd\e0Ah\e1d\e04i\e1\e0CQ\e1:\e(B
-\e0\e,T"i\e1M$GRAc4f\e(B \e,T(R!\e0MU\e1aA!\e0Jl\e1\e(B. \e0\e,T9Uh\e1aJ4'\e0Gh\e1R\e(B "feature" \e,T"M'CP::;\e0/T\e1\e0:Q\e1\e05T\e1!RC\e07Uh\e1`\e0CU\e1B!\e0Gh\e1R\e(B "flow
-control" \e,Td\e04i\e1\e0"Q\e14"GR'!RC7S'R9"M'\e(B C-s \e,TaEPd\e0Ah\e1;\e0Eh\e1MBc\e0Ki\e1!\e0EQ\e1:\e0JYh\e1\e0MU\e1aA!\e0Jl\e1\e0MU\e1!\e(B. \e,Tc\e0*i\e1$S\e0JQh\e1'\e(B C-g
-\e,T`\e0>Wh\e1Ma\e0!i\e1d"d\e0Ah\e1c\e0Ki\e1K\e09i\e1R(M*P\e0'Q\e1!\e(B. \e,Ta\e0Ei\e1G\e04Y\e1:7\e07Uh\e1\e0Gh\e1R\e04i\e1GB\e(B "Spontaneous Entry to
-Incremental Search" \e,Tc9\e0$Yh\e1\e0AW\e1M"M'\e0MU\e1aA!\e0Jl\e1\e0+Vh\e1'(Pa9P9S!RC\e0(Q\e14!RC`\e0!Uh\e1BG\e0!Q\e1:\e(B "feature" \e0\e,T9Ui\e1\e(B.
-
 \e0\e,T7h\e1R9JRARC6(P`\e0BW\e1M9a\e0?i\e1A\e0"i\e1M\e0AY\e1E\e07Uh\e1\e0AU\e1M\e0BYh\e1a\e0Ei\e1G\e(B, \e,T`\e0>Wh\e1M\e07Uh\e1(P\e04Y\e1K\e0CW\e1Ma\e0!i\e1d"\e(B. \e0\e,T7h\e1R9JRARC6(P`\e0BW\e1M9\e(B
 \e,Ta\e0?i\e1A\e0"i\e1M\e0AY\e1E\e07Uh\e1\e0BQ\e1'd\e0Ah\e1;CR!/\e0!g\e1d\e04i\e1\e(B. \e0\e,T9Uh\e1`\e0;g\e19!RCJ\e0Ci\e1R'a\e0?i\e1A\e0"i\e1M\e0AY\e1EcK\e0Ah\e1"M'\e0MU\e1aA!\e0Jl\e1\e(B: \e,T`\e0BW\e1M9a\e0?i\e1A\e0"i\e1M\e0AY\e1E\e(B,
 \e0\e,T+Vh\e1'(P`\e0CTh\e1A\e05i\e19\e04i\e1GBK\e09i\e1R(M\e0Gh\e1R'`;\e0Eh\e1R\e(B, \e,Ta\e0Ei\e1G7S!RCa7C!\e0"i\e1M$GRA`\e0>Wh\e1M\e07Uh\e1(PJ\e0Ci\e1R'`\e0;g\e19a\e0?i\e1A\e0"i\e1M\e0AY\e1E\e05h\e1Md;\e(B.
@@ -970,8 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001-2011  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -1011,4 +1004,3 @@ Translate - January 1999 by Virach Sornlertlamvanich
 ;;;   sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: 79ad252a-448a-4dc9-a4cb-2097dd1ec014