Merge from mainline.

34 files changed, 2 insertions, 133 deletions

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 4ba74539b00..489f55ffaf4 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,7 +1,8 @@
 #### Makefile for documentation other than the Emacs manual.
 
 # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index fdb0bccc29d..399840a8a11 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -1524,7 +1524,3 @@ autofill the current comment.
 @printindex fn
 
 @bye
-
-@ignore
-   arch-tag: 68cf0d8a-55cc-4190-a28d-4984fa56ed1e
-@end ignore
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 4c2335a8b50..89fc511a783 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -664,7 +664,3 @@ of the expansion possibilities.
 @printindex vr
 
 @bye
-
-@ignore
-   arch-tag: 54001b27-5ef8-4a9d-a199-905d650fafba
-@end ignore
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index fe7918038e2..dcf1b521860 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1840,7 +1840,3 @@ whether a given D-Bus error is related to them.
 @include doclicense.texi
 
 @bye
-
-@ignore
-   arch-tag: 2eeec19d-0caf-44e0-a193-329d7f9951d8
-@end ignore
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 58fcc9ecbc0..9e19f4fe528 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -1258,7 +1258,3 @@ Lawrence R. Dodd
 @printindex vr
 
 @bye
-
-@ignore
-   arch-tag: 201727aa-9318-4c74-a0d7-4f51c550c4de
-@end ignore
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index a4278f05c69..9c6aaf5ba3c 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -1451,7 +1451,3 @@ in on with the command @kbd{C-c C-m m}.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 52fe78ac-a1c4-48e7-815e-0a31acfad4bf
-@end ignore
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 267a2bed84c..a6221119368 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -3791,7 +3791,3 @@ For example, C code uses .o on unix, and Emacs Lisp uses .elc.
 @end table
 
 @bye
-
-@ignore
-   arch-tag: c9bfdc6e-e6e9-4e87-97f7-d8348342fbf4
-@end ignore
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index ea5d2e478f0..da934ef23bb 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1906,7 +1906,3 @@ Allow method overloading of method-like functions in Emacs.
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 7225b7c7-2462-4563-99e7-836a20172178
-@end ignore
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 37eb94b9600..43ec07a6e77 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -496,7 +496,3 @@ buffer name is a whitespace.
 @bye
 
 @c End:
-
-@ignore
-   arch-tag: 7404e246-7d4c-4db4-9332-c1293a455a4f
-@end ignore
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 0d87d7d315a..724d92d5d92 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -1061,7 +1061,3 @@ We switched to using git for our version control system.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
-@end ignore
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index bea522983a8..0f5ff001d43 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1015,7 +1015,3 @@ Since it keeps the cursor up where the command was invoked.
 
 @printindex ky
 @bye
-
-@ignore
-   arch-tag: 776409ba-cb15-42b9-b2b6-d2bdc7ebad01
-@end ignore
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index bdbbee1b640..6fc2c265a29 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -749,7 +749,3 @@ It just kills all the active syntax check processes before calling
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 9f0db077-5598-49ab-90b9-8df9248a63ec
-@end ignore
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index fc809db576f..d8ae5bd66ea 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -976,7 +976,3 @@ Software Foundation.  Thanks, Richard!
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2ac9810b-aa49-4ea6-8030-d7f1ecd467ed
-@end ignore
diff --git a/doc/misc/gpl.texi b/doc/misc/gpl.texi
index 5b416d3cb41..1908d1f8f98 100644
--- a/doc/misc/gpl.texi
+++ b/doc/misc/gpl.texi
@@ -715,7 +715,3 @@ library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use
 the GNU Lesser General Public License instead of this License.  But
 first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@ignore
-   arch-tag: 0c4a2556-f87e-464f-9b1d-efd920fcaf67
-@end ignore
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 2e8aa8a0280..0e40a3ccd87 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -4295,7 +4295,3 @@ IDLWAVE is @samp{fsf-compat, xemacs-base, mail-lib}.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: f1d73958-1423-4127-b8aa-f7b953d64492
-@end ignore
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 03b9b64a395..e7cd8515ea4 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1508,7 +1508,3 @@ topics discussed in this document.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index dc391bd430a..1d4467e0269 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -349,7 +349,3 @@ And that's it!
 
 
 @bye
-
-@ignore
-   arch-tag: cb81470f-e080-489d-bb67-0d11516b63b9
-@end ignore
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 5f65522e9b6..0c8919ce531 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -315,7 +315,3 @@ Byte-compiling newsticker.el is recommended.
 @bye
 
 
-
-@ignore
-   arch-tag: 7a4de539-117c-4658-b799-0b9e3d0ccec0
-@end ignore
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 330e68603ca..6a39dcf1221 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -14759,10 +14759,6 @@ org-customize @key{RET}} and then click yourself through the tree.
 
 @bye
 
-@ignore
-        arch-tag: 7893d1Fe-cc57-4d13-b5e5-f494a1CBC7ac
-@end ignore
-
 @c Local variables:
 @c fill-column: 77
 @c indent-tabs-mode: nil
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 909c0e3507c..b9af986c15d 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -1432,7 +1432,3 @@ this manual.
 @printindex ky
 
 @bye
-
-@ignore
-   arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235
-@end ignore
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 43933996994..e68987618ee 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -948,7 +948,3 @@ The real answer, therefore, is a @code{/reconnect} command:
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2589e562-3843-4ffc-8c2f-477cbad57c01
-@end ignore
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 73f40c2559b..1e8f0ab2982 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -5890,7 +5890,3 @@ released on 7 Jan 1997.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 1e055774-0576-4b1b-b47f-550d0961fd43
-@end ignore
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index 58d50c97149..3b817383bfb 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -403,7 +403,3 @@ consult @ref{Remember, , , org}.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 5b980db0-20cc-4167-b845-52dc11d53b9f
-@end ignore
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index b85c9e88715..3ab5fdeb5d3 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -1941,7 +1941,3 @@ its @var{variable} name.
 @end iftex
 @printindex vr
 @bye
-
-@ignore
-   arch-tag: 0521847a-4680-44b6-ae6e-13ce20e18436
-@end ignore
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index f986c0fd452..ec35b92d61f 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -1330,7 +1330,3 @@ To add other kind of decorations on a tag, @code{NAME-highlight} must use
 @dfn{semantic-decorate-tag}, and other functions of the semantic
 decoration @var{api} found in this library.
 @end defun
-
-@ignore
-   arch-tag: 760dca58-7119-484e-8237-866cbaf36f79
-@end ignore
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 87ca1224516..352b303e553 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -622,7 +622,3 @@ Emacs Lisp.  It is an LALR parser suitable for complex languages.
 @c LocalWords: subsubsection sw sym texi texinfo titlefont titlepage
 @c LocalWords: tok TOKEN's toplevel typemodifiers uml unset untar
 @c LocalWords: uref usedb var vskip xref yak
-
-@ignore
-   arch-tag: cbc6e78c-4ff1-410e-9fc7-936487e39bbf
-@end ignore
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 94ef50e4348..8b081441462 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -982,7 +982,3 @@ Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr}
 @include doclicense.texi
 
 @bye
-
-@ignore
-   arch-tag: 10a4ee1c-7ef4-4c06-8b7a-f975e39f0dec
-@end ignore
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index b59c8ab5808..6fd9017d25b 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -415,7 +415,3 @@ cannot accept mail.
 @printindex fn
 
 @bye
-
-@ignore
-   arch-tag: 6316abdf-b366-4562-87a2-f37e8f894b6f
-@end ignore
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 88c293e67f1..7aa2a720239 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1253,7 +1253,3 @@ Two good values are @code{nil} and @code{statictag}.
 @bye
 @c  LocalWords:  speedbar's xref slowbar kbd subsubsection
 @c  LocalWords:  keybindings
-
-@ignore
-   arch-tag: e1fc85f0-1eeb-489f-a8d4-a2bfe711fa02
-@end ignore
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 62ed9d87b53..d78d5573920 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1194,7 +1194,3 @@ Connect directly.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: c96be356-7e2d-4196-bcda-b13246c5c3f0
-@end ignore
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index c136070a412..5020756a924 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1946,7 +1946,3 @@ file.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 7c5d17b9-1d21-4261-a88a-b9fdbbf1020b
-@end ignore
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 1b087559e86..27e99bff127 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -4558,7 +4558,3 @@ zapman@@cc.gatech.edu (Jason Zapman II),
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: f53e866a-15cf-4b1e-aead-77da9da1e864
-@end ignore
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 275da073a9f..21b00116875 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -1829,7 +1829,3 @@ variables, and widgets described in this manual.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 2b427731-4c61-4e72-85de-5ccec9c623f0
-@end ignore
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index acec1e8defe..3324ba612d7 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -1430,7 +1430,3 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il}
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: a1a6b715-396f-4378-9b94-0b2ca0aa5028
-@end ignore