Merge from mainline.

150 files changed, 102 insertions, 599 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c2d058119a4..84fa7f875c4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * building.texi (Compilation): Improve instructions for running two
+        compilations (Bug#7573).
+
+        * files.texi (Backup Names): Document the new location of the
+        last-resort backup file.
+
+        * files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
+        manual.  Explain why directory-abbrev-alist elements should be anchored
+        (Bug#7777).
+
+2011-01-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows Startup): Correct inaccurate description of
+        differences between emacsclient.exe and emacsclientw.exe.
+
 2011-01-02  Chong Yidong  <cyd@stupidchicken.com>
 
         * rmail.texi (Rmail Display): Edit for grammar and conciseness.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 0d22870a5db..441a08f3be0 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,7 +1,8 @@
 #### Makefile for 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/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index 160c70471dd..24bbfb014e8 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -455,7 +455,3 @@ customize dynamic abbrev expansion to handle optional prefixes by setting
 the variable @code{dabbrev-abbrev-skip-leading-regexp}.  Its value
 should be a regular expression that matches the optional prefix that
 dynamic abbrev expression should ignore.
-
-@ignore
-   arch-tag: 638e0079-9540-48ec-9166-414083e16445
-@end ignore
diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index fd54aea4eb2..86c1da45145 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -135,7 +135,3 @@ Support for Sun windows has been added.
 To keep up with decreasing computer memory capacity and disk space, many
 other functions and files have been eliminated in Emacs 22.3.
 @end itemize
-
-@ignore
-   arch-tag: 32932bd9-46f5-41b2-8a0e-fb0cc4caeb29
-@end ignore
diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi
index c19fd3a5cc8..fe8f9636e88 100644
--- a/doc/emacs/arevert-xtra.texi
+++ b/doc/emacs/arevert-xtra.texi
@@ -186,7 +186,3 @@ should at the very least make clear whether enabling auto-reverting
 for the buffer reliably assures that all information in the buffer is
 completely up to date (or will be after @code{auto-revert-interval}
 seconds).
-
-@ignore
-   arch-tag: 2983e613-a272-45f6-9593-3010ad7f865e
-@end ignore
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 7cee61db71e..55c9af4916f 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -674,7 +674,3 @@ provides a different and customizable mouse buffer menu which you may
 prefer.  It replaces the bindings of @code{mouse-buffer-menu},
 normally on @kbd{C-Down-Mouse-1}, and the menu bar buffer menu.  You
 can customize the menu in the @code{msb} Custom group.
-
-@ignore
-   arch-tag: 08c43460-f4f4-4b43-9cb5-1ea9ad991695
-@end ignore
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 98420b1f569..551ed3c5cee 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -122,10 +122,10 @@ confirmation before actually killing a compilation that is running.
 You can also kill the compilation process with @kbd{M-x
 kill-compilation}.
 
-  If you want to run two compilations at once, you should start the
-first one, then rename the @samp{*compilation*} buffer (perhaps using
-@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
-compilation.  That will create a new @samp{*compilation*} buffer.
+  To run two compilations at once, start the first one, then rename
+the @samp{*compilation*} buffer (perhaps using @code{rename-uniquely};
+@pxref{Misc Buffer}), then switch buffers and start the other
+compilation.  This will create a new @samp{*compilation*} buffer.
 
   Emacs does not expect a compiler process to launch asynchronous
 subprocesses; if it does, and they keep running after the main
@@ -1641,7 +1641,3 @@ both modes it has the effect of installing the function definition
 that point is in, but the way of doing so is different according to
 where the relevant Lisp environment is found.
 
-
-@ignore
-   arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
-@end ignore
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 2f6a09ba672..cc6151a7426 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -900,7 +900,3 @@ for example in the European style to @var{day}, @var{month}, @var{year}.)
 @var{mark} which specifies how to mark the date in the calendar display.
 If one of these functions decides that it applies to a certain date,
 it returns a value that contains @var{mark}, as described above.
-
-@ignore
-   arch-tag: 52cb299f-fd1f-4616-bfe6-91b988669431
-@end ignore
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 0cdd348dae6..17de12363d6 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1709,7 +1709,3 @@ data in Emacs from the file.
 @ifnottex
 @include cal-xtra.texi
 @end ifnottex
-
-@ignore
-   arch-tag: 4531ef09-9df3-449d-9c52-2b5a4a337f92
-@end ignore
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index dc0ff935f78..5d5587cf4f1 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1163,7 +1163,3 @@ test case that simplifies debugging of display problems.
 
   The @samp{--xrm} option (@pxref{Resources}) specifies additional
 X resource values.
-
-@ignore
-   arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
-@end ignore
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 8d7e2556ddd..8e7856fb43c 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -195,7 +195,3 @@ specific variables will make sense.
 @ifnottex
 @lowersections
 @end ifnottex
-
-@ignore
-   arch-tag: 9be43eef-d1f4-4d03-a916-c741ea713a45
-@end ignore
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index b3efaff3c65..031ea8f5e7f 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2605,7 +2605,3 @@ stop working.  It is therefore advisable to use one and only one
 coding system, for your init file as well as the files you edit.  For
 example, don't mix the @samp{latin-1} and @samp{latin-9} coding
 systems.
-
-@ignore
-   arch-tag: c68abddb-4410-4fb5-925f-63394e971d93
-@end ignore
diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi
index aa2e83f129d..be377656119 100644
--- a/doc/emacs/dired-xtra.texi
+++ b/doc/emacs/dired-xtra.texi
@@ -42,7 +42,3 @@ without explicitly assigned switches.)
 You can make Dired forget about all subdirectory switches and relist
 all subdirectories with the buffer's default switches using
 @kbd{M-x dired-reset-subdir-switches}.  This also reverts the Dired buffer.
-
-@ignore
-   arch-tag: e3865701-9179-4ffb-bc34-d321111c688d
-@end ignore
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 92105e65664..5f3436d080d 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1404,7 +1404,3 @@ it onto a Dired buffer; this either moves, copies, or creates a link
 to the file in that directory.  Precisely which action is taken is
 determined by the originating program.  Dragging files out of a Dired
 buffer is currently not supported.
-
-@ignore
-   arch-tag: d105f9b9-fc1b-4c5f-a949-9b2cf3ca2fc1
-@end ignore
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 0af2b022104..53d09f2e2c5 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1401,7 +1401,3 @@ page for other output.  On such terminals, you might want to set the variable
 @code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
 assume, when resumed, that the screen page it is using still contains
 what Emacs last wrote there.
-
-@ignore
-   arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
-@end ignore
diff --git a/doc/emacs/doclicense.texi b/doc/emacs/doclicense.texi
index 6e9f5a144b9..51342e96d60 100644
--- a/doc/emacs/doclicense.texi
+++ b/doc/emacs/doclicense.texi
@@ -506,7 +506,3 @@ to permit their use in free software.
 @c ispell-local-pdict: "ispell-dict"
 @c End:
 
-@ignore
-   arch-tag: d68e7b7a-0c7c-4c15-905b-a9482214e25a
-@end ignore
-
diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi
index 9d20b335355..ee75a07d100 100644
--- a/doc/emacs/emacs-xtra.texi
+++ b/doc/emacs/emacs-xtra.texi
@@ -136,7 +136,3 @@ the Emacs manual.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 75c33f13-32c6-41b6-9537-847a312e2e49
-@end ignore
diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi
index 5db2d2b4a2a..144c5465e24 100644
--- a/doc/emacs/emerge-xtra.texi
+++ b/doc/emacs/emerge-xtra.texi
@@ -412,7 +412,3 @@ commands.
 @ifnottex
 @xref{Hooks}.
 @end ifnottex
-
-@ignore
-   arch-tag: cda63f09-9c5f-4ea1-adb9-4a820fdfb24e
-@end ignore
diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi
index 349e6326ec1..44af26a5dfd 100644
--- a/doc/emacs/entering.texi
+++ b/doc/emacs/entering.texi
@@ -181,7 +181,3 @@ keys to run any commands of your choice (@pxref{Keymaps}).
 @ifnottex
 @lowersections
 @end ifnottex
-
-@ignore
-   arch-tag: df798d8b-f253-4113-b585-f528f078a944
-@end ignore
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 0df3769cd8b..c88ff90ac39 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -568,10 +568,10 @@ another from the newly saved contents if you save again.
 appending @samp{~} to the file name being edited; thus, the backup
 file for @file{eval.c} would be @file{eval.c~}.
 
-  If access control stops Emacs from writing backup files under the usual
-names, it writes the backup file as @file{%backup%~} in your home
-directory.  Only one such file can exist, so only the most recently
-made such backup is available.
+  If access control stops Emacs from writing backup files under the
+usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
+Only one such file can exist, so only the most recently made such
+backup is available.
 
   Emacs can also make @dfn{numbered backup files}.  Numbered backup
 file names contain @samp{.~}, the number, and another @samp{~} after
@@ -1160,7 +1160,6 @@ links point to directories.
 
 @vindex find-file-existing-other-name
 @vindex find-file-suppress-same-file-warnings
-
   Normally, if you visit a file which Emacs is already visiting under
 a different name, Emacs displays a message in the echo area and uses
 the existing buffer visiting that file.  This can happen on systems
@@ -1182,6 +1181,31 @@ then the file name recorded for a buffer is the file's @dfn{truename}
 than the name you specify.  Setting @code{find-file-visit-truename} also
 implies the effect of @code{find-file-existing-other-name}.
 
+@cindex directory name abbreviation
+@vindex directory-abbrev-alist
+  Sometimes, a directory is ordinarily accessed through a symbolic
+link, and you may want Emacs to preferentially display its ``linked''
+name instead of its truename.  To do this, customize the variable
+@code{directory-abbrev-alist}.  Each element in this list should have
+the form @code{(@var{from} . @var{to})}, which says to replace
+@var{from} with @var{to} when it appears in a directory name.  For
+this feature to work properly, @var{from} and @var{to} should point to
+the same file.  The @var{from} string is actually a regular expression
+(@pxref{Regexps}); it should always start with @samp{\`}, to avoid
+matching to an incorrect part of the original directory name.  The
+@var{to} string should be an ordinary absolute directory name.  Do not
+use @samp{~} to stand for a home directory in the @var{to} string;
+Emacs performs these substitutions separately.
+
+  Here's an example, from a system on which file system
+@file{/home/fsf} and so on are normally accessed through symbolic
+links named @file{/fsf} and so on.
+
+@example
+(("\\`/home/fsf" . "/fsf")
+ ("\\`/home/gd" . "/gd"))
+@end example
+
 @node Directories
 @section File Directories
 
@@ -1974,7 +1998,3 @@ menu, where each existing fileset is represented by a submenu.
 Control} to describe sets of files to be treated as a group for
 purposes of version control operations.  Those filesets are unnamed
 and do not persist across Emacs sessions.
-
-@ignore
-   arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
-@end ignore
diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi
index 4b1f592be67..ad18de451ce 100644
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@ -423,7 +423,3 @@ that it only checks words in comments and string constants.  This
 feature is useful for editing programs.  Type @kbd{M-x
 flyspell-prog-mode} to enable or disable this mode in the current
 buffer.
-
-@ignore
-   arch-tag: 3359a443-96ed-448f-9f05-c8111ba8eac0
-@end ignore
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index fdf6733d26b..e44913a4e45 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -582,7 +582,3 @@ to @samp{continue}, provided Abbrev mode is enabled.@refill
 
   Type @samp{;?} or @samp{;C-h} to display a list of all the built-in
 Fortran abbrevs and what they stand for.
-
-@ignore
-   arch-tag: 23ed7c36-1517-4646-9235-2d5ade5f06f6
-@end ignore
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index dadba9fb95f..55111ff53d5 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1439,7 +1439,3 @@ again.
 In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
 enable terminal mouse support.  You must have the gpm package
 installed and running on your system in order for this to work.
-
-@ignore
-   arch-tag: 7dcf3a31-a43b-45d4-a900-445b10d77e49
-@end ignore
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index d75673c65d3..fe19cde5edf 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -1372,7 +1372,3 @@ Yanking means reinserting text previously killed (q.v.@:).  It can be
 used to undo a mistaken kill, or for copying or moving text.  Some
 other systems call this ``pasting.''  @xref{Yanking}.
 @end table
-
-@ignore
-   arch-tag: 0dd53ce1-5f09-4ac2-b13b-cf22b0f28d23
-@end ignore
diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi
index 7f5bef785f0..66046a3105e 100644
--- a/doc/emacs/gnu.texi
+++ b/doc/emacs/gnu.texi
@@ -549,7 +549,3 @@ this are bureaucracy and isometric struggles against competition.  Free
 software will greatly reduce these drains in the area of software
 production.  We must do this, in order for technical gains in productivity
 to translate into less work for us.
-
-@ignore
-   arch-tag: 21eb38f8-6fa0-480a-91cd-f3dab7148542
-@end ignore
diff --git a/doc/emacs/gpl.texi b/doc/emacs/gpl.texi
index 7fe5c3ebe40..1908d1f8f98 100644
--- a/doc/emacs/gpl.texi
+++ b/doc/emacs/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: 8b9947e1-c830-4d70-8907-a97e556731ba
-@end ignore
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 2c701c8a4df..0542a86fbc9 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -677,7 +677,3 @@ help text for active buffer text using the keyboard.  @kbd{C-h .}
 character after point, using the echo area.  To display help text
 automatically whenever it is available on the character after point, set
 the variable @code{help-at-pt-display-when-idle} to @code{t}.
-
-@ignore
-   arch-tag: 6f33ab62-bc75-4367-8057-fd67cc15c3a1
-@end ignore
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 86e15605edc..5c400e2b089 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -258,7 +258,3 @@ preserving the columns of all nonblank text.  @kbd{M-x tabify} scans the
 region for sequences of spaces, and converts sequences of at least two
 spaces to tabs if that can be done without changing indentation.  @kbd{M-x
 untabify} changes all tabs in the region to appropriate numbers of spaces.
-
-@ignore
-   arch-tag: acc07de7-ae11-4ee8-a159-cb59c473f0fb
-@end ignore
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 119b08065e5..30ad749d774 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -667,7 +667,3 @@ navigate to each of the words you want in the list, mark it (e.g. with
 @kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and
 insert a newline after the word in the target list by pressing
 @key{RET}.
-
-@ignore
-   arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
-@end ignore
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi
index 6807c62049e..b388d9be28c 100644
--- a/doc/emacs/kmacro.texi
+++ b/doc/emacs/kmacro.texi
@@ -569,7 +569,3 @@ including the final @kbd{C-j}), and appends them at the end of the
 keyboard macro; it then terminates the step-editing and replaces the
 original keyboard macro with the edited macro.
 @end itemize
-
-@ignore
-   arch-tag: c1b0dd3b-3159-4c08-928f-52e763953e9c
-@end ignore
diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi
index 3489bed0d8c..cbc9a36f55a 100644
--- a/doc/emacs/m-x.texi
+++ b/doc/emacs/m-x.texi
@@ -69,7 +69,3 @@ the command is followed by arguments.
   @kbd{M-x} works by running the command
 @code{execute-extended-command}, which is responsible for reading the
 name of another command and invoking it.
-
-@ignore
-   arch-tag: b67bff53-9628-4666-b94e-eda972a7ba56
-@end ignore
diff --git a/doc/emacs/major.texi b/doc/emacs/major.texi
index 78fdbf6a96f..0e089d9a8a1 100644
--- a/doc/emacs/major.texi
+++ b/doc/emacs/major.texi
@@ -235,7 +235,3 @@ However, this does not happen if the buffer contents specify a major
 mode, and certain ``special'' major modes do not allow the mode to
 change.  You can turn off this mode-changing feature by setting
 @code{change-major-mode-with-file-name} to @code{nil}.
-
-@ignore
-   arch-tag: f2558800-cf32-4839-8acb-7d3b4df2a155
-@end ignore
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 1b702273be6..1a25ef1e130 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -447,7 +447,3 @@ mode only until the mark is deactivated.  One reason you may want to
 use them is that some commands operate on the entire buffer instead of
 the region when Transient Mark mode is off.  Enabling Transient Mark
 mode momentarily gives you a way to use these commands on the region.
-
-@ignore
-   arch-tag: f35e4d82-911b-4cfc-a3d7-3c87b2abba20
-@end ignore
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index bf7e4469dd9..737f0357e82 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -654,7 +654,3 @@ password (@pxref{Killing}).  You may type either @key{RET} or
 @key{ESC} to submit the password.  Any other self-inserting character
 key inserts the associated character into the password, and all other
 input is ignored.
-
-@ignore
-   arch-tag: ba913cfd-b70e-400f-b663-22b2c309227f
-@end ignore
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index c989ded26d7..afad6b2c879 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2883,7 +2883,3 @@ idle.
 @ifnottex
 @lowersections
 @end ifnottex
-
-@ignore
-   arch-tag: 8f094220-c0d5-4e9e-af7d-3e0da8187474
-@end ignore
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi
index 70ed3dde916..48602dfbd37 100644
--- a/doc/emacs/msdog-xtra.texi
+++ b/doc/emacs/msdog-xtra.texi
@@ -613,7 +613,3 @@ MS-DOS supports only some of the possible options you can mention in
 the @code{dired-listing-switches} variable.  The options that work are
 @samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, @samp{-r}, @samp{-S},
 @samp{-s}, @samp{-t}, and @samp{-u}.
-
-@ignore
-   arch-tag: 868d50ff-07f8-4a13-a807-dab6f1cdb431
-@end ignore
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 0c0dcb3f4af..306cb213374 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -90,20 +90,24 @@ Via the Emacs client program, @file{emacsclient.exe} or
 programs, and to reuse a running Emacs process for serving editing
 jobs required by other programs.  @xref{Emacs Server}.  The difference
 between @file{emacsclient.exe} and @file{emacsclientw.exe} is that the
-former waits for Emacs to signal that the editing job is finished,
-while the latter does not wait.  Which one of them to use in each case
-depends on the expectations of the program that needs editing
-services.  If the program will use the edited files, it needs to wait
-for Emacs, so you should use @file{emacsclient.exe}.  By contrast, if
-the results of editing are not needed by the invoking program, you
-will be better off using @file{emacsclientw.exe}.  A notable situation
-where you would want @file{emacsclientw.exe} is when you right-click
-on a file in the Windows Explorer and select ``Open With'' from the
-pop-up menu.  Use the @samp{--alternate-editor=} or @samp{-a} options
-if Emacs might not be running (or not running as a server) when
-@command{emacsclient} is invoked---that will always give you an
-editor.  When invoked via @command{emacsclient}, Emacs will start in
-the current directory of the program that invoked
+former is a console program, while the latter is a Windows GUI
+program.  Both programs wait for Emacs to signal that the editing job
+is finished, before they exit and return control to the program that
+invoked them.  Which one of them to use in each case depends on the
+expectations of the program that needs editing services.  If that
+program is itself a console (text-mode) program, you should use
+@file{emacsclient.exe}, so that any of its messages and prompts appear
+in the same command window as those of the invoking program.  By
+contrast, if the invoking program is a GUI program, you will be better
+off using @file{emacsclientw.exe}, because @file{emacsclient.exe} will
+pop up a command window if it is invoked from a GUI program.  A
+notable situation where you would want @file{emacsclientw.exe} is when
+you right-click on a file in the Windows Explorer and select ``Open
+With'' from the pop-up menu.  Use the @samp{--alternate-editor=} or
+@samp{-a} options if Emacs might not be running (or not running as a
+server) when @command{emacsclient} is invoked---that will always give
+you an editor.  When invoked via @command{emacsclient}, Emacs will
+start in the current directory of the program that invoked
 @command{emacsclient}.
 @end enumerate
 
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 1d4d90c5bff..054b973df9a 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1745,7 +1745,3 @@ highlighted region covering a contiguous range of character positions
 may look discontinuous if the region spans reordered text.  This is
 normal and similar to behavior of other programs that support
 bidirectional text.
-
-@ignore
-   arch-tag: 310ba60d-31ef-4ce7-91f1-f282dd57b6b3
-@end ignore
diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi
index 36254ea9993..750c78f95ad 100644
--- a/doc/emacs/picture-xtra.texi
+++ b/doc/emacs/picture-xtra.texi
@@ -285,7 +285,3 @@ other modes.  @kbd{C-c C-y} (@code{picture-yank-rectangle}) inserts
 (by overwriting) the rectangle that was most recently killed, while
 @kbd{C-c C-x} (@code{picture-yank-rectangle-from-register}) does
 likewise for the rectangle found in a specified register.
-
-@ignore
-   arch-tag: 10e423ad-d896-42f2-a7e8-7018adeaf8c2
-@end ignore
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index cfe32eab35a..f1fc28f2112 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1839,7 +1839,3 @@ starts comments in assembler syntax.
 @ifnottex
 @include fortran-xtra.texi
 @end ifnottex
-
-@ignore
-   arch-tag: c7ee7409-40a4-45c7-bfb7-ae7f2c74d0c0
-@end ignore
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 731e03cde0b..39ad0e721a8 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -330,7 +330,3 @@ points to.
 Insert in the buffer the @emph{contents} of the file that bookmark
 @var{bookmark} points to.
 @end table
-
-@ignore
-   arch-tag: b00af991-ebc3-4b3a-8e82-a3ac81ff2e64
-@end ignore
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 581845fc42a..1e8983c2675 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1506,7 +1506,3 @@ include the following in the Rmail inbox list:
 @smallexample
 maildir://var/spool/mail/in
 @end smallexample
-
-@ignore
-   arch-tag: 034965f6-38df-47a2-a9f1-b8bc8ab37e23
-@end ignore
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index c3b2e178278..093296b73df 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -320,7 +320,3 @@ items, and then you can type @key{RET} to select the item.
 that item; it is usually the initial of some word in the item's name.
 This letter or digit is separated from the item name by @samp{=>}.  You
 can type the item's letter or digit to select the item.
-
-@ignore
-   arch-tag: 104ba40e-d972-4866-a542-a98be94bdf2f
-@end ignore
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index fdf48230fb7..c38e07ef3ed 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1378,7 +1378,3 @@ it never deletes lines that are only partially contained in the region
 
 If a match is split across lines, this command keeps all those lines.
 @end table
-
-@ignore
-   arch-tag: fd9d8e77-66af-491c-b212-d80999613e3e
-@end ignore
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 8dbe24856ab..c1e8d7eac11 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -713,7 +713,3 @@ buffer, and their commands are different as well.
   Similarly, to specify your preferred method for reading mail,
 customize the variable @code{read-mail-command}.  The default is
 @code{rmail} (@pxref{Rmail}).
-
-@ignore
-   arch-tag: d8a3dfc3-5d87-45c5-a7f2-69871b8e4fd6
-@end ignore
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 75fcc865636..9435401541b 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2925,7 +2925,3 @@ then inserts the generated table in the proper syntax into the
 destination buffer.  The default destination buffer is
 @code{table.@var{lang}}, where @var{lang} is the language you
 specified.
-
-@ignore
-   arch-tag: 8db54ed8-2036-49ca-b0df-23811d03dc70
-@end ignore
diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi
index 89e84287499..b75b4cd6562 100644
--- a/doc/emacs/vc-xtra.texi
+++ b/doc/emacs/vc-xtra.texi
@@ -24,7 +24,3 @@ the Emacs Manual}).  This chapter describes more advanced VC usage.
 @iftex
 @include vc1-xtra.texi
 @end iftex
-
-@ignore
-   arch-tag: 11a18d0e-1baf-49da-8e38-f61195ae4dc3
-@end ignore
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 668c3a4168b..0ea5b247282 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -787,7 +787,3 @@ only for repositories from hosts that match the pattern.
 operations in the variable @code{vc-cvs-global-switches}.  These
 switches are inserted immediately after the @code{cvs} command, before
 the name of the operation to invoke.
-
-@ignore
-   arch-tag: 8e8c2a01-ad41-4e61-a89a-60131ad67263
-@end ignore
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8071f957439..c919ff5039b 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -397,7 +397,3 @@ windows together.  You can also turn it on by customizing the variable
 scroll-all-scroll-down-all}, @kbd{M-x scroll-all-page-down-all} and
 their corresponding ``up'' equivalents.  To make this mode useful,
 you should bind these commands to appropriate keys.
-
-@ignore
-   arch-tag: 8bea7453-d4b1-49b1-9bf4-cfe4383e1113
-@end ignore
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 89ec08d820d..c890fac2b55 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -1219,7 +1219,3 @@ family.  It corresponds to the fifth part of an X font name.  It is one of
 @noindent
 @var{size} is a decimal number that describes the font size in points.
 @end ifnottex
-
-@ignore
-   arch-tag: 9b6ff773-48b6-41f6-b2f9-f114b8bdd97f
-@end ignore
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 1b7b803b39c..4320a29f60f 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -449,8 +449,8 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-        2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+    2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 91648e2d662..9dc31978630 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,7 +1,8 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 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/lispintro/doclicense.texi b/doc/lispintro/doclicense.texi
index 1aa76136110..51342e96d60 100644
--- a/doc/lispintro/doclicense.texi
+++ b/doc/lispintro/doclicense.texi
@@ -506,7 +506,3 @@ to permit their use in free software.
 @c ispell-local-pdict: "ispell-dict"
 @c End:
 
-@ignore
-   arch-tag: 839f250e-4800-4bc9-bd28-49ec7968331f
-@end ignore
-
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6a51b3f506b..40481acec12 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.texi (Directory Names): Move directory-abbrev-alist doc to
+        Emacs manual.
+
+2011-01-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Directory Names): Explain why FROM in
+        directory-abbrev-alist should begin with \`.  (Bug#7777)
+
 2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index dcc3c57663b..00232b36f48 100644
--- a/doc/lispref/abbrevs.texi
+++ b/doc/lispref/abbrevs.texi
@@ -512,7 +512,3 @@ added to the table.
 
 @end table
 
-
-@ignore
-   arch-tag: 5ffdbe08-2cd4-48ec-a5a8-080f95756eec
-@end ignore
diff --git a/doc/lispref/advice.texi b/doc/lispref/advice.texi
index 544a6a211eb..b4a6862e19b 100644
--- a/doc/lispref/advice.texi
+++ b/doc/lispref/advice.texi
@@ -777,7 +777,3 @@ pieces of advice is the same.  The only difference is that
 executed even if some previous piece of advice had an error or a
 non-local exit.  If any around-advice is protected, then the whole
 around-advice onion is protected as a result.
-
-@ignore
-   arch-tag: 80c135c2-f1c3-4f8d-aa85-f8d8770d307f
-@end ignore
diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi
index 7c5df41158b..1fa604edbcc 100644
--- a/doc/lispref/anti.texi
+++ b/doc/lispref/anti.texi
@@ -154,7 +154,3 @@ Many variables have been removed, including @code{read-circle},
 @code{inhibit-changing-match-data}, @code{wrap-prefix}, and
 @code{line-prefix},
 @end itemize
-
-@ignore
-   arch-tag: 1d0ef137-2bad-430e-ae8e-d820d569b5a6
-@end ignore
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index 373da7b1e12..5bfc57c99dd 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -36,7 +36,3 @@ are peculiar to Emacs Lisp or relate specifically to editing.
 
 @hfil
 @bye
-
-@ignore
-   arch-tag: ac7694c8-1f02-4b42-9531-33ba13b179e1
-@end ignore
diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index e196ce03962..813ddf50378 100644
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -752,7 +752,3 @@ This normal hook is run by @code{revert-buffer} after inserting
 the modified contents---but only if @code{revert-buffer-function} is
 @code{nil}.
 @end defvar
-
-@ignore
-   arch-tag: 295a6321-e5ab-46d5-aef5-0bb4f447a67f
-@end ignore
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 64d10fa4a2d..9c8072ad6b0 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -1,7 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/buffers
 @node Buffers, Windows, Backups and Auto-Saving, Top
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 29e104c769e..6d078713f24 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -3386,7 +3386,3 @@ This normal hook (@pxref{Standard Hooks}) is run when a keyboard
 macro terminates, regardless of what caused it to terminate (reaching
 the macro end or an error which ended the macro prematurely).
 @end defvar
-
-@ignore
-   arch-tag: e34944ad-7d5c-4980-be00-36a5fe54d4b1
-@end ignore
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index 3b4897336e4..562df191dae 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -790,7 +790,3 @@ The @code{silly-loop} function is somewhat more complex:
 @end group
 @end example
 
-
-@ignore
-   arch-tag: f78e3050-2f0a-4dee-be27-d9979a0a2289
-@end ignore
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index f3da3ccd341..3371773b399 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1319,7 +1319,3 @@ quit, and the quit happens immediately after the function
 @code{ftp-setup-buffer} returns but before the variable @code{process} is
 set, the process will not be killed.  There is no easy way to fix this bug,
 but at least it is very unlikely.
-
-@ignore
-   arch-tag: 8abc30d4-4d3a-47f9-b908-e9e971c18c6d
-@end ignore
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 8ce523dda2e..1d68dee4ea8 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -1282,7 +1282,3 @@ the inferior widgets will convert @emph{their} inferior widgets.  If
 the data structure is itself recursive, this conversion is an infinite
 recursion.  The @code{lazy} widget prevents the recursion: it convert
 its @code{:type} argument only when needed.
-
-@ignore
-   arch-tag: d1b8fad3-f48c-4ce4-a402-f73b5ef19bd2
-@end ignore
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 13ebbabbb9a..cc4c280ee48 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -817,7 +817,3 @@ the error.
 successfully, then point is located at the end of the form.  In this
 case, this technique can't localize the error precisely, but can still
 show you which function to check.
-
-@ignore
-   arch-tag: ddc57378-b0e6-4195-b7b6-43f8777395a7
-@end ignore
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7c7db8a0eb8..34d81068916 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5954,7 +5954,3 @@ This hook is used for internal purposes: setting up communication with
 the window system, and creating the initial window.  Users should not
 interfere with it.
 @end defvar
-
-@ignore
-   arch-tag: ffdf5714-7ecf-415b-9023-fbc6b409c2c6
-@end ignore
diff --git a/doc/lispref/doclicense.texi b/doc/lispref/doclicense.texi
index 9adddffba98..0c2d47827a9 100644
--- a/doc/lispref/doclicense.texi
+++ b/doc/lispref/doclicense.texi
@@ -508,7 +508,3 @@ to permit their use in free software.
 @c Local Variables:
 @c ispell-local-pdict: "ispell-dict"
 @c End:
-
-@ignore
-   arch-tag: 9014cf6e-f3c4-401d-b8da-4fe52723984c
-@end ignore
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index cd2c128696d..18625f1fed8 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1588,7 +1588,3 @@ If non-@code{nil}, an expression to test for at every stop point.  If
 the result is non-@code{nil}, then break.  Errors are ignored.
 @xref{Global Break Condition}.
 @end defopt
-
-@ignore
-   arch-tag: 74842db8-019f-4818-b5a4-b2de878e57fd
-@end ignore
diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi
index f7d1eaae028..c19cf5c00a0 100644
--- a/doc/lispref/elisp-covers.texi
+++ b/doc/lispref/elisp-covers.texi
@@ -251,7 +251,3 @@
 
 @end titlepage
 @bye
-
-@ignore
-   arch-tag: 02d65d63-3b64-49bc-a5c0-bfd5eabb6c98
-@end ignore
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 1ec1029b96d..669739cd01e 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -203,7 +203,3 @@ This is a subcategory of @code{domain-error}.@*
 This is a subcategory of @code{domain-error}.@*
 @xref{Math Functions}.
 @end table
-
-@ignore
-   arch-tag: 717c6048-5d9d-4c7d-9a62-df57390b6f19
-@end ignore
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index d5d271c1ad6..6e3b1e18c16 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -748,7 +748,3 @@ particular elements, like this:
 @end group
 @end example
 @end defvar
-
-@ignore
-   arch-tag: f723a4e0-31b3-453f-8afc-0bf8fd276d57
-@end ignore
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index e2d22033a0e..0dd876251a9 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1906,51 +1906,22 @@ Don't try concatenating a slash by hand, as in
 because this is not portable.  Always use
 @code{file-name-as-directory}.
 
-@cindex directory name abbreviation
-  Directory name abbreviations are useful for directories that are
-normally accessed through symbolic links.  Sometimes the users recognize
-primarily the link's name as ``the name'' of the directory, and find it
-annoying to see the directory's ``real'' name.  If you define the link
-name as an abbreviation for the ``real'' name, Emacs shows users the
-abbreviation instead.
-
-@defopt directory-abbrev-alist
-The variable @code{directory-abbrev-alist} contains an alist of
-abbreviations to use for file directories.  Each element has the form
-@code{(@var{from} . @var{to})}, and says to replace @var{from} with
-@var{to} when it appears in a directory name.  The @var{from} string is
-actually a regular expression; it ought to always start with @samp{\`}.
-The @var{to} string should be an ordinary absolute directory name.  Do
-not use @samp{~} to stand for a home directory in that string.  The
-function @code{abbreviate-file-name} performs these substitutions.
-
-You can set this variable in @file{site-init.el} to describe the
-abbreviations appropriate for your site.
-
-Here's an example, from a system on which file system @file{/home/fsf}
-and so on are normally accessed through symbolic links named @file{/fsf}
-and so on.
-
-@example
-(("\\`/home/fsf" . "/fsf")
- ("\\`/home/gp" . "/gp")
- ("\\`/home/gd" . "/gd"))
-@end example
-@end defopt
-
   To convert a directory name to its abbreviation, use this
 function:
 
 @defun abbreviate-file-name filename
 @anchor{Definition of abbreviate-file-name}
-This function applies abbreviations from @code{directory-abbrev-alist}
-to its argument, and also substitutes @samp{~} for the user's home
-directory if the argument names a file in the home directory or one of
-its subdirectories.  (If the home directory is a root directory, it is
-not replaced with @samp{~}, because this does not make the result
-shorter on many systems.)  You can use it for directory names and for
-file names, because it recognizes abbreviations even as part of the
-name.
+This function returns an abbreviated form of @var{filename}.  It
+applies the abbreviations specified in @code{directory-abbrev-alist}
+(@pxref{File Aliases,,File Aliases, emacs, The GNU Emacs Manual}),
+then substitutes @samp{~} for the user's home directory if the
+argument names a file in the home directory or one of its
+subdirectories.  If the home directory is a root directory, it is not
+replaced with @samp{~}, because this does not make the result shorter
+on many systems.
+
+You can use this function for directory names and for file names,
+because it recognizes abbreviations even as part of the name.
 @end defun
 
 @node File Name Expansion
@@ -3187,7 +3158,3 @@ will produce good, general extensions we can install in Emacs.
 names or values---because a program that general is probably difficult
 to write, and slow.  Instead, choose a set of possible data types that
 are reasonably flexible, and not too hard to encode.
-
-@ignore
-   arch-tag: 141f74ce-6ae3-40dc-a6c4-ef83fc4ec35c
-@end ignore
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 8318f2c7b74..0d83aadbcd2 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2477,7 +2477,3 @@ The functions @code{x-pixel-width} and @code{x-pixel-height} return the
 width and height of an X Window frame, measured in pixels.
 @end ignore
 
-
-@ignore
-   arch-tag: 94977df6-3dca-4730-b57b-c6329e9282ba
-@end ignore
diff --git a/doc/lispref/front-cover-1.texi b/doc/lispref/front-cover-1.texi
index 5c9f4351f42..56d0f2b1c2d 100644
--- a/doc/lispref/front-cover-1.texi
+++ b/doc/lispref/front-cover-1.texi
@@ -50,7 +50,3 @@
 
 @end titlepage
 @bye
-
-@ignore
-   arch-tag: 5182b306-c403-4e4f-ba24-e1911bc6da9d
-@end ignore
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 198cc1a1ae6..e704f928589 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1510,7 +1510,3 @@ See @ref{Mapping Functions}.
 @item undefined
 See @ref{Functions for Key Lookup}.
 @end table
-
-@ignore
-   arch-tag: 39100cdf-8a55-4898-acba-595db619e8e2
-@end ignore
diff --git a/doc/lispref/gpl.texi b/doc/lispref/gpl.texi
index 163af4627bb..244f3330d44 100644
--- a/doc/lispref/gpl.texi
+++ b/doc/lispref/gpl.texi
@@ -721,7 +721,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: d00ac830-e120-41fb-bbc5-7ca3eeaa227f
-@end ignore
diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi
index 82c172c753e..e1830b23014 100644
--- a/doc/lispref/hash.texi
+++ b/doc/lispref/hash.texi
@@ -355,7 +355,3 @@ This returns the rehash threshold of @var{table}.
 @defun hash-table-size table
 This returns the current nominal size of @var{table}.
 @end defun
-
-@ignore
-   arch-tag: 3b5107f9-d2f0-47d5-ad61-3498496bea0e
-@end ignore
diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi
index 941956534cc..f010e6176fd 100644
--- a/doc/lispref/help.texi
+++ b/doc/lispref/help.texi
@@ -1,7 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/help
 @node Documentation, Files, Modes, Top
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index c76634be453..7f371b22a9a 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -343,7 +343,3 @@ Manual}.
 @item write-region-annotate-functions
 @xref{Format Conversion}.
 @end table
-
-@ignore
-   arch-tag: 55fd0296-d906-4551-b300-979d3846aa88
-@end ignore
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index aba8cca80eb..cfb83cd659d 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -1400,7 +1400,3 @@ Symbol indicating the type of process: @code{real}, @code{network},
 @code{serial}
 
 @end table
-
-@ignore
-   arch-tag: 4b2c33bc-d7e4-43f5-bc20-27c0db52a53e
-@end ignore
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 881ae942236..325799e77a5 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -546,7 +546,3 @@ Friedrich Pukelsheim, Arnold D. Robbins, Raul Rockwell, Jason Rumney,
 Per Starb@"ack, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill
 Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding,
 Carl Witty, Dale Worley, Rusty Wright, and David D. Zuhn.
-
-@ignore
-   arch-tag: d156593f-82f8-4708-a844-204e48f7f2aa
-@end ignore
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 6f0a953efe2..2c1b8aebbbf 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2796,7 +2796,3 @@ menu of Shell mode, after the item @code{break}:
   [work] '("Work" . work-command) 'break)
 @end example
 @end defun
-
-@ignore
-   arch-tag: cfb87287-9364-4e46-9e93-6c2f7f6ae794
-@end ignore
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index 56e6c47990e..53f2c26f5c4 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -42,7 +42,3 @@ pushed or held down.
 @end tex
 
 @bye
-
-@ignore
-   arch-tag: 9e03a1c7-6f62-4346-85d9-ed5b79386e07
-@end ignore
diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi
index 4435af43c8c..2cb7647cccc 100644
--- a/doc/lispref/lists.texi
+++ b/doc/lispref/lists.texi
@@ -1888,7 +1888,3 @@ use the ring as a first-in-first-out queue.  For example:
         (ring-remove fifo)))
      @result{} (0 t one t "two")
 @end lisp
-
-@ignore
-   arch-tag: 31fb8a4e-4aa8-4a74-a206-aa00451394d4
-@end ignore
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index b7f430b88bb..5733df87d17 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -994,7 +994,3 @@ symbol, and the value is a list of forms.  The forms are evaluated
 when the key matches the absolute true name or feature name of the
 library being loaded.
 @end defvar
-
-@ignore
-   arch-tag: df731f89-0900-4389-a436-9105241b6f7a
-@end ignore
diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi
index fff0594947c..fed639499c8 100644
--- a/doc/lispref/locals.texi
+++ b/doc/lispref/locals.texi
@@ -217,7 +217,3 @@ Used for communication between mouse commands and scroll-bar commands.
 @xref{Saving Buffers}.
 @end table
 
-
-@ignore
-   arch-tag: 6baae835-b667-4447-91e2-9829ae1cf543
-@end ignore
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index a74bcb17a52..2c4e3747b1b 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -732,7 +732,3 @@ indentation is being computed by @kbd{C-M-q}; if the value is a
 number, @kbd{C-M-q} need not recalculate indentation for the following
 lines until the end of the list.
 @end table
-
-@ignore
-   arch-tag: d4cce66d-1047-45c3-bfde-db6719d6e82b
-@end ignore
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 3314ec25c84..3e2172436f8 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -674,7 +674,3 @@ mark is active, and there's a valid region in the buffer.  Commands
 that operate on the region (instead of on text near point) when
 there's an active mark should use this to test whether to do that.
 @end defun
-
-@ignore
-   arch-tag: b1ba2e7a-a0f3-4c5e-875c-7d8e22d73299
-@end ignore
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 0d907ea6532..728f613ed98 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2202,7 +2202,3 @@ arrives, whichever comes first.  If @var{args} is non-@code{nil}, the
 actual message is obtained by passing @var{string} and @var{args}
 through @code{format}.  @xref{Formatting Strings}.
 @end defun
-
-@ignore
-   arch-tag: bba7f945-9078-477f-a2ce-18818a6e1218
-@end ignore
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 11898894dac..7ff8d6724c5 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1921,7 +1921,3 @@ strings in the return value are decoded using
 @code{locale-coding-system}.  @xref{Locales,,, libc, The GNU Libc Manual},
 for more information about locales and locale items.
 @end defun
-
-@ignore
-   arch-tag: be705bf8-941b-4c35-84fc-ad7d20ddb7cb
-@end ignore
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index b27d206eb49..360bd44fe01 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -1217,7 +1217,3 @@ On some machines, any integer representable in Lisp may be the result
 of @code{random}.  On other machines, the result can never be larger
 than a certain maximum or less than a certain (negative) minimum.
 @end defun
-
-@ignore
-   arch-tag: 574e8dd2-d513-4616-9844-c9a27869782e
-@end ignore
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 7b9603c3361..6cd746e59ce 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2106,7 +2106,3 @@ that for two strings to be equal, they have the same text properties.
 @end group
 @end example
 @end defun
-
-@ignore
-   arch-tag: 9711a66e-4749-4265-9e8c-972d55b67096
-@end ignore
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index e5df6d967dd..194548d589c 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -2237,7 +2237,3 @@ be loaded through it.
 This variable is ignored if the given @var{library} is statically
 linked into Emacs.
 @end defvar
-
-@ignore
-   arch-tag: 8378814a-30d7-467c-9615-74a80b9988a7
-@end ignore
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 138f8d934e6..08b181599bc 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2010
+@c Copyright (C) 2010, 2011
 @c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/package
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 0b5dcd44dd8..1cf09cbcbda 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -985,7 +985,3 @@ This is the contents of foo@point{}
 @end group
 @end example
 @end defspec
-
-@ignore
-   arch-tag: 56e8ff26-4ffe-4832-a141-7e991a2d0f87
-@end ignore
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 00b8f547f97..6e2b0670b1d 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -3018,7 +3018,3 @@ Fetching data from this structure:
 (bindat-get-field decoded 'item 1 'id)
      @result{} "BCDEFG"
 @end lisp
-
-@ignore
-   arch-tag: ba9da253-e65f-4e7f-b727-08fba0a1df7a
-@end ignore
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 17dec5c8003..908b776a858 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1831,7 +1831,3 @@ values of the variables @code{sentence-end-double-space}
 @code{sentence-end-without-period} and
 @code{sentence-end-without-space}.
 @end defun
-
-@ignore
-   arch-tag: c2573ca2-18aa-4839-93b8-924043ef831f
-@end ignore
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 81a0c6b952e..69253eb9123 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -729,7 +729,3 @@ bv
 @noindent
 These results make sense because the binary codes for control-_ and
 control-W are 11111 and 10111, respectively.
-
-@ignore
-   arch-tag: fcf1084a-cd29-4adc-9f16-68586935b386
-@end ignore
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index 39943372e2c..1fa6695bee8 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -837,7 +837,3 @@ variable.  The string should hold a @samp{%}-specification to be used
 in the C function @code{sprintf}.  For further restrictions on what
 you can use, see the variable's documentation string.
 @end defvar
-
-@ignore
-   arch-tag: 07636b8c-c4e3-4735-9e06-2e864320b434
-@end ignore
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index bb550346e9d..438619ff0de 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -1142,7 +1142,3 @@ This function makes @var{char} case-invariant, with syntax
 This command displays a description of the contents of the current
 buffer's case table.
 @end deffn
-
-@ignore
-   arch-tag: 700b8e95-7aa5-4b52-9eb3-8f2e1ea152b4
-@end ignore
diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi
index 257a2a4c9ac..d2884357d5e 100644
--- a/doc/lispref/symbols.texi
+++ b/doc/lispref/symbols.texi
@@ -590,7 +590,3 @@ between a missing property and a property with the value @code{nil}.
 The value is actually the tail of @var{plist} whose @code{car} is
 @var{property}.
 @end defun
-
-@ignore
-   arch-tag: 8750b7d2-de4c-4923-809a-d35fc39fd8ce
-@end ignore
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 89fa440068e..8d91db01ad3 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -1192,7 +1192,3 @@ category table.  It inserts the descriptions in a buffer, and then
 displays that buffer.  If @var{buffer-or-name} is non-@code{nil}, it
 describes the category table of that buffer instead.
 @end deffn
-
-@ignore
-   arch-tag: 4d914e96-0283-445c-9233-75d33662908c
-@end ignore
diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl
index b1c65fcf2ce..ce2b54a8501 100755
--- a/doc/lispref/tindex.pl
+++ b/doc/lispref/tindex.pl
@@ -123,4 +123,3 @@ foreach $key (keys %removed) {
     print "  $key\n";
 }
 
-# arch-tag: f8460df6-6bef-4c98-8555-e2c63a88b0fa
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 8726625afed..634c7da353c 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1115,7 +1115,3 @@ This is the @dfn{footer line}; it appears at the very end of the file.
 Its purpose is to enable people to detect truncated versions of the file
 from the lack of a footer line.
 @end table
-
-@ignore
-   arch-tag: 9ea911c2-6b1d-47dd-88b7-0a94e8b27c2e
-@end ignore
diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make
index edd23050287..3b7a581e519 100644
--- a/doc/lispref/two-volume.make
+++ b/doc/lispref/two-volume.make
@@ -221,4 +221,3 @@ elisp2-init: vol2.texi
 # You should have received a copy of the GNU General Public License
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
  
-# arch-tag: 5c258a2e-d4a9-4d0e-b279-fb3a6faa27eb
diff --git a/doc/lispref/two.el b/doc/lispref/two.el
index 339ec299dd4..1759d9c2930 100644
--- a/doc/lispref/two.el
+++ b/doc/lispref/two.el
@@ -76,5 +76,4 @@ This is for the *Elisp Ref Manual*."
 (defun volume-numbers-toc-markup-I () (volume-numbers-toc-markup "I"))
 (defun volume-numbers-toc-markup-II () (volume-numbers-toc-markup "II"))
 
-;; arch-tag: 848955fe-e9cf-45e7-a2f1-570ef156d6a5
 ;;; two.el ends here
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 2baf3895822..b7b5ebb4cef 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1929,7 +1929,3 @@ Attempting to assign them any other value will result in an error:
 (setq window-min-height 5.0)
 @error{} Wrong type argument: integerp, 5.0
 @end example
-
-@ignore
-   arch-tag: 5ff62c44-2b51-47bb-99d4-fea5aeec5d3e
-@end ignore
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 77fd44fb162..b2e50dbda0c 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2607,7 +2607,3 @@ frame selected.
 Lock fontification function, which will be called whenever parts of a
 buffer are (re)fontified because a window was scrolled or its size
 changed.  @xref{Other Font Lock Variables}.
-
-@ignore
-   arch-tag: 3f6c36e8-df49-4986-b757-417feed88be3
-@end ignore
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index ec117affda2..48bde6b61ba 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -127,4 +127,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7
diff --git a/doc/man/ctags.1 b/doc/man/ctags.1
index 9a6505b020e..1eab02f2145 100644
--- a/doc/man/ctags.1
+++ b/doc/man/ctags.1
@@ -1,3 +1 @@
 .so man1/etags.1
-
-.\" arch-tag: 54d4579b-9d66-4ba5-9fda-f01ec83612ad
diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1
index 5481a497809..5afe59d6bc1 100644
--- a/doc/man/ebrowse.1
+++ b/doc/man/ebrowse.1
@@ -101,4 +101,3 @@ document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
 .
-.\" arch-tag: b771158b-90cb-43a5-b9af-dbc506311817
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 89eafc9ba51..10fcc186fdd 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -660,4 +660,3 @@ document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
 .
-.\" arch-tag: 04dfd376-b46e-4924-919a-cecc3b257eaa
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 6af699e036b..cae4d76634b 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -94,4 +94,3 @@ for the Debian GNU/Linux system (but may be used by others).
 .SH COPYING
 This manual page is in the public domain.
 
-.\" arch-tag: 2b35e723-b197-4073-8752-231bc8b3d3f3
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 177809d4d74..f6b46add215 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -284,4 +284,3 @@ document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
 
-.\" arch-tag: 9534977f-af78-42f0-991d-1df6b6c05573
diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1
index 8161b09bcba..45a6abfd579 100644
--- a/doc/man/grep-changelog.1
+++ b/doc/man/grep-changelog.1
@@ -78,4 +78,3 @@ document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
 .
-.\" arch-tag: c6df2aea-f3ac-49c7-981b-7b3aae648cda
diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1
index f50d74dacd5..545b128b40d 100644
--- a/doc/man/rcs-checkin.1
+++ b/doc/man/rcs-checkin.1
@@ -85,4 +85,3 @@ document into another language, under the above conditions for
 modified versions, except that this permission notice may be stated
 in a translation approved by the Free Software Foundation.
 .
-.\" arch-tag: d903862f-cc72-487c-8fd2-5c63677f325d
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