Merge from mainline.

23 files changed, 1 insertions, 23 deletions

diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index 2c1f6149204..7b5dfc7f4d3 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -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
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index bd1f0468246..ee22c0870d8 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -1185,4 +1185,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; Local Variables:
 ;;;   coding: windows-1251
 ;;; End:
-;;; arch-tag: 70cf6ad7-c2e4-41fe-8199-74aa52683b0e
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 6cd6ff430b6..b4dd0f47f85 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -1024,4 +1024,3 @@ Emacs 自身的版权问题虽比本文档要复杂一些，但也基于相同的精神。敬请阅读文
 ;;; coding: chinese-iso-8bit
 ;;; End:
 
-;;; arch-tag: 46a53d82-a85a-46b6-bdc7-583aca063578
diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs
index a3cdabdd854..3a74ac4b2d1 100644
--- a/etc/tutorials/TUTORIAL.cs
+++ b/etc/tutorials/TUTORIAL.cs
@@ -1037,4 +1037,3 @@ GNU Emacsu sv齧 ptel鵰.  Pom醜ejte pot韗at softwarovou obstrukci
 ;;; coding: iso-latin-2
 ;;; End:
 
-;;; arch-tag: 479ef577-3d4d-4384-aeea-9fe79d5e89ca
diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de
index 65be22445d4..211b5329cd5 100644
--- a/etc/tutorials/TUTORIAL.de
+++ b/etc/tutorials/TUTORIAL.de
@@ -1506,4 +1506,3 @@ freie Software verwenden, verteilen, oder sogar selber schreiben.
 ;;;   coding: latin-1
 ;;; End:
 
-;;; arch-tag: a8f2fe06-631d-4ae1-887e-446f971b0baa
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index 63cc6426a47..4c72dc9cbbf 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1115,4 +1115,3 @@ kaj kompletigis Sergio B. Pokrovskij.
 ;;;   coding: latin-3
 ;;; End:
 
-;; arch-tag: ee436ebb-58b6-4102-9402-1e92c33966e9
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 3d0bbc1494c..088a3304e80 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -1205,4 +1205,3 @@ compartiendo software libre!
 ;;;   coding: latin-1
 ;;; End:
 
-;;; arch-tag: 66aae86e-6f86-4a3e-b82a-44a783f774fd
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 038430e6a0c..d778d852446 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -1192,4 +1192,3 @@ Cette traduction fran鏰ise a 閠� effectu閑 par 蓃ic Jacoboni
 ;;;   sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: f6c5c2ff-bf24-477c-bd18-32f76f51ba65
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 8c376314d2e..2ef60c2f962 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1008,7 +1008,7 @@ find-file.
 讙讬专住讛 讝讜 砖诇 讛砖讬注讜专 讛讬谞讛 讞诇拽 诪讞讘讬诇转 GNU Emacs. 讛讬讗 诪讜讙谞转 讘讝讻讜讬讜转 讬讜爪专讬诐
 讜谞讬转谞转 诇讛注转拽讛 讜讛驻爪转 注讜转拽讬诐 讘转谞讗讬诐 诪住讜讬讬诪讬诐 讻讚诇拽诪谉:
 
-                       Copyright (C) 2010 Free Software Foundation, Inc.
+                       Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
 鈥廏NU Emacs 讛讬谞讜 转讻谞讛 讞驻砖讬转; 讝讻讜转讻诐 诇讛驻讬爪讜 讜\讗讜 诇砖谞讜转讜 讘讻驻讜祝 诇转谞讗讬
 讛专砖讬讜谉 GNU General Public License, 讻驻讬 砖讛讜讗 讬讜爪讗 诇讗讜专 注"讬 Free
diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it
index 00739912433..a92b455ffe4 100644
--- a/etc/tutorials/TUTORIAL.it
+++ b/etc/tutorials/TUTORIAL.it
@@ -1109,4 +1109,3 @@ condividendo software libero!
 ;;;   coding: latin-1
 ;;; End:
 
-;;; arch-tag: c6f7079d-8032-473d-91d4-36754af15719
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja
index 331eaef30d5..35f39e41108 100644
--- a/etc/tutorials/TUTORIAL.ja
+++ b/etc/tutorials/TUTORIAL.ja
@@ -1085,4 +1085,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;; coding: iso-2022-jp
 ;;; End:
 
-;;; arch-tag: 7136abc2-eb97-4f51-80a2-fa690ba4cfe8
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko
index 19cf60647bf..c6f6e83f2dc 100644
--- a/etc/tutorials/TUTORIAL.ko
+++ b/etc/tutorials/TUTORIAL.ko
@@ -998,4 +998,3 @@ COPYING$(C@L6s4B(B $(CFD@O@;(B $(C@P0m(B $(C3-(B $(CHD?!(B GNU $(C@L8
 $(CAV=J=C?@(B.  $(C@Z@/(B $(C<RGAF.?~>n8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(C<RGAF.?~>n(B
 $(C9fGX8&(B ("$(C<R@/1G(B") $(C1Y@}GO4B5%(B $(C55?s=C4Y(B.
 
-;;; arch-tag: 44503bc5-b2c1-4169-962d-9d33157221a9
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index 5b77d27c0ec..800eba73ac4 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1244,4 +1244,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;;   coding: latin-1
 ;;; End:
 
-;;; arch-tag: 3399e308-e605-4125-8fbb-b2fe91ac3149
diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl
index cb436cd03bd..5f46b11f2f1 100644
--- a/etc/tutorials/TUTORIAL.pl
+++ b/etc/tutorials/TUTORIAL.pl
@@ -1237,4 +1237,3 @@ u縴waj眂, tworz眂 i dziel眂 si� oprogramowaniem swobodnym.
 ;;; sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: 6c6b7445-4cd5-44ca-a101-7f4697b92f60
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR
index a08386b9f2d..2949024c000 100644
--- a/etc/tutorials/TUTORIAL.pt_BR
+++ b/etc/tutorials/TUTORIAL.pt_BR
@@ -1078,4 +1078,3 @@ Emacs para seus amigos. Ajude a erradicar o obstrucionismo de software
 ;;;   sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: 8ea256d6-2c4a-49ee-ac08-0ea6ef25bf8d
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index d5417e41b5c..9be059bd2cd 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -1105,4 +1105,3 @@ folosind, scriind 篿 distribuind free software!
 ;;; coding: iso-latin-2
 ;;; End:
 
-;;; arch-tag: dcf252cf-bd67-4f8d-a440-1ec4b8dbfd70
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru
index e2e5bb3ff54..daa00f6e4ef 100644
--- a/etc/tutorials/TUTORIAL.ru
+++ b/etc/tutorials/TUTORIAL.ru
@@ -1156,4 +1156,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: ad4e5698-ea8b-45b7-b236-ed5ad5b72d2b
diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk
index a799eb94052..73ab5a4f0ee 100644
--- a/etc/tutorials/TUTORIAL.sk
+++ b/etc/tutorials/TUTORIAL.sk
@@ -1096,4 +1096,3 @@ GNU Emacsu svojim priate祇m.  Pom醜ajte potla鑟va� softwarov� ob箃rukciu
 ;;; coding: iso-latin-2
 ;;; End:
 
-;;; arch-tag: 87861cfa-5cf6-4b87-9fab-86c93c5ca9f3
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl
index be0032f4639..0acdcd614d2 100644
--- a/etc/tutorials/TUTORIAL.sl
+++ b/etc/tutorials/TUTORIAL.sl
@@ -1129,4 +1129,3 @@ pi筫te in delite prosto programje!
 ;;; sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: 985059e4-44c6-4ac9-b627-46c8db57acf6
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv
index e22a2a7c806..66ba6f12b70 100644
--- a/etc/tutorials/TUTORIAL.sv
+++ b/etc/tutorials/TUTORIAL.sv
@@ -1143,4 +1143,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;;   sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: b352f774-622b-4cc6-85ce-43e3baf4fc1b
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th
index e2c302c2393..602621d666d 100644
--- a/etc/tutorials/TUTORIAL.th
+++ b/etc/tutorials/TUTORIAL.th
@@ -1005,4 +1005,3 @@ Translate - January 1999 by Virach Sornlertlamvanich
 ;;;   sentence-end-double-space: nil
 ;;; End:
 
-;;; arch-tag: 79ad252a-448a-4dc9-a4cb-2097dd1ec014
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index ea0b1ec040e..a69d23c471d 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -96,4 +96,3 @@ Maintainer: Chao-Hong Liu <chliu@gnu.org>
 ;;; coding: utf-8
 ;;; End:
 
-;;; arch-tag: 8788b16b-e739-4304-a7f2-729bdb999fa0
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index cadb7bfa2b1..0f51c91d38f 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -1083,4 +1083,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; coding: chinese-big5
 ;;; End:
 
-;;; arch-tag: a51dafb4-e602-432b-8020-5d5d5f150811