New directory

79 files changed, 303 insertions, 760 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 849c656fcb5..3b55fff5d12 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,72 +1,3 @@
-2003-09-03  Peter Runestig  <peter@runestig.com>
-
-        * makefile.w32-in: New file.
-
-2003-08-29  Richard M. Stallman  <rms@gnu.org>
-
-        * misc.texi (Saving Emacs Sessions): Correct previous change.
-
-2003-08-26  Per Abrahamsen  <abraham@dina.kvl.dk>
-
-        * widget.texi (User Interface): Explain the need of static text
-        around an editable field.
-
-2003-08-19  Luc Teirlinck  <teirllm@mail.auburn.edu>
-
-        * widget.texi (Basic Types): The argument to `:help-echo' can now
-        be a form that evaluates to a string.
-
-        * emacs.texi (Top): Update menu to reflect new Keyboard Macros
-        chapter.
-        (Intro): Include kmacro.texi after fixit.texi instead of after
-        custom.texi. (As suggested by Kim Storm.)
-
-2003-08-18  Luc Teirlinck  <teirllm@mail.auburn.edu>
-
-        * fixit.texi (Fixit): Update `Next' pointer.
-        * files.texi (Files): Update `Previous' pointer.
-        * kmacro.texi (Keyboard Macros): Remove redundant node and
-        section.
-        * emacs.texi (Intro): Include kmacro.texi after custom.texi.
-        (Suggested by Kim Storm.)
-        * Makefile (EMACSSOURCES): Add kmacro.texi. (Suggested by Kim
-        Storm.)
-
-2003-08-18  Kim F. Storm  <storm@cua.dk>
-
-        * kmacro.texi: New file describing enhanced keyboard macro
-        functionality.  Replaces old description in custom.texi.
-
-        * custom.texi (Customization): Add xref to Keyboard Macros chapter.
-        (Keyboard Macros): Move to new kmacro.texi file.
-
-        * emacs.texi (Keyboard Macros): Reference new keyboard macro topics.
-
-        * calc.texi (Queries in Macros): Update xref to keyboard macro query.
-
-2003-08-17  Edward M. Reingold  <reingold@emr.cs.iit.edu>
-
-        * calendar.texi (Specified Dates): Add `calendar-goto-day-of-year'.
-
-2003-08-17  Alex Schroeder  <alex@gnu.org>
-
-        * misc.texi (Saving Emacs Sessions): Manual M-x desktop-save not
-        required.
-
-2003-08-16  Richard M. Stallman  <rms@gnu.org>
-
-        * dired-x.texi (Shell Command Guessing): Explain *.
-
-2003-08-16  Chunyu Wang  <spr@db.cs.hit.edu.cn>  (tiny change)
-
-        * pcl-cvs.texi (Log Edit Mode): Fix key binding for
-        log-edit-insert-changelog.
-
-2003-08-05  Richard M. Stallman  <rms@gnu.org>
-
-        * programs.texi (Lisp Indent): Don't describe
-        lisp-indent-function property here.  Use xref to Lisp Manual.
-
 2003-08-03  Karl Berry  <karl@gnu.org>
 
         * info.texi: need @contents.
@@ -902,12 +833,10 @@
         University of Washington.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit
+;; coding: iso-2022-7bit-unix
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
         Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
-
-;;; arch-tag: f1d62776-3ed5-4811-9d96-267252577dbd
diff --git a/man/Makefile.in b/man/Makefile.in
index 2d3014c6dce..bb179e7d545 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -99,8 +99,7 @@ EMACSSOURCES= \
         ${srcdir}/msdog.texi \
         ${srcdir}/gnu.texi \
         ${srcdir}/glossary.texi \
-        ${srcdir}/ack.texi \
-        ${srcdir}/kmacro.texi
+        ${srcdir}/ack.texi
 
 info: $(INFO_TARGETS)
 
@@ -302,5 +301,3 @@ maintainer-clean: distclean
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 19cdb89e-4acb-448e-b0cc-2ddc05948ee2
diff --git a/man/abbrevs.texi b/man/abbrevs.texi
index ce6465564f5..55f9712ef92 100644
--- a/man/abbrevs.texi
+++ b/man/abbrevs.texi
@@ -445,7 +445,3 @@ customize dynamic abbreviation 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 abbreviation should ignore.
-
-@ignore
-   arch-tag: 638e0079-9540-48ec-9166-414083e16445
-@end ignore
diff --git a/man/ack.texi b/man/ack.texi
index 7aa3dd07629..0f8da05f455 100644
--- a/man/ack.texi
+++ b/man/ack.texi
@@ -1412,7 +1412,3 @@ in the distribution.)  We thank them for their generosity as well.
 This list intended to mention every contributor of a major package or
 feature we currently distribute; if you know of someone we have omitted,
 please report that as a manual bug.
-
-@ignore
-   arch-tag: bb1d0fa4-0240-4992-b5d4-8602d1e3d4ba
-@end ignore
diff --git a/man/ada-mode.texi b/man/ada-mode.texi
index a74150fe75a..a1012b8fbff 100644
--- a/man/ada-mode.texi
+++ b/man/ada-mode.texi
@@ -1279,7 +1279,3 @@ However, this would not work on vxworks, for instance, where
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 68cf0d8a-55cc-4190-a28d-4984fa56ed1e
-@end ignore
diff --git a/man/anti.texi b/man/anti.texi
index edf0031ee8c..ff3f5db7cae 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -146,7 +146,3 @@ one, @kbd{C-x e}.
 To keep up with decreasing computer memory capacity and disk space, many
 other functions and files have been eliminated in Emacs 21.3.
 @end itemize
-
-@ignore
-   arch-tag: 32932bd9-46f5-41b2-8a0e-fb0cc4caeb29
-@end ignore
diff --git a/man/autotype.texi b/man/autotype.texi
index e7df280f524..b8f59777242 100644
--- a/man/autotype.texi
+++ b/man/autotype.texi
@@ -659,7 +659,3 @@ of the expansion possibilities.
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: 54001b27-5ef8-4a9d-a199-905d650fafba
-@end ignore
diff --git a/man/back.texi b/man/back.texi
index d586b9afd63..c3372d30c71 100644
--- a/man/back.texi
+++ b/man/back.texi
@@ -66,7 +66,3 @@
 }
 
 \eject\bye
-
-@ignore
-   arch-tag: e1830f4c-dc4a-4314-b706-a03c7e93f022
-@end ignore
diff --git a/man/basic.texi b/man/basic.texi
index 6ae4c457b1a..6029b76cfea 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -810,6 +810,3 @@ additional times, to delete a total of 80 characters, by typing @kbd{C-x
 z z z}.  The first @kbd{C-x z} repeats the command once, and each
 subsequent @kbd{z} repeats it once again.
 
-@ignore
-   arch-tag: cda8952a-c439-41c1-aecf-4bc0d6482956
-@end ignore
diff --git a/man/buffers.texi b/man/buffers.texi
index b03209cd01c..7bb6f519f4d 100644
--- a/man/buffers.texi
+++ b/man/buffers.texi
@@ -601,7 +601,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/man/building.texi b/man/building.texi
index d28917ada22..5cadfbcc553 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -1088,7 +1088,3 @@ programs to be run in Emacs): in 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.
 @xref{Executing Lisp}.
-
-@ignore
-   arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
-@end ignore
diff --git a/man/calc.texi b/man/calc.texi
index 2ada16ce1bf..5d43afefd23 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -30801,7 +30801,7 @@ This command allows your keyboard macros to accept numbers or formulas
 as interactive input.  All the normal conventions of algebraic input,
 including the use of @kbd{$} characters, are supported.
 
-@xref{Keyboard Macro Query, , , emacs, the Emacs Manual}, for a description of
+@xref{Kbd Macro Query, , , emacs, the Emacs Manual}, for a description of
 @kbd{C-x q} (@code{kbd-macro-query}), the standard Emacs way to accept
 keyboard input during a keyboard macro.  In particular, you can use
 @kbd{C-x q} to enter a recursive edit, which allows the user to perform
@@ -35612,6 +35612,3 @@ the corresponding full Lisp name is derived by adding a prefix of
 @bye
 
 
-@ignore
-   arch-tag: 77a71809-fa4d-40be-b2cc-da3e8fb137c0
-@end ignore
diff --git a/man/calendar.texi b/man/calendar.texi
index fd287dec358..b5695c8c88b 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -183,8 +183,6 @@ specified in various ways.
 @table @kbd
 @item g d
 Move point to specified date (@code{calendar-goto-date}).
-@item g D
-Move point to specified day of year (@code{calendar-goto-day-of-year}).
 @item o
 Center calendar around specified month (@code{calendar-other-month}).
 @item .
@@ -198,12 +196,6 @@ of the month, and then moves to that date.  Because the calendar includes all
 dates from the beginning of the current era, you must type the year in its
 entirety; that is, type @samp{1990}, not @samp{90}.
 
-@kindex g D @r{(Calendar mode)}
-@findex calendar-goto-day-of-year
-  @kbd{g D} (@code{calendar-goto-day-of-year}) prompts for a year and
-day number, and moves to that date.  Negative day numbers count backward
-from the end of the year.
-
 @kindex o @r{(Calendar mode)}
 @findex calendar-other-month
   @kbd{o} (@code{calendar-other-month}) prompts for a month and year,
@@ -1506,7 +1498,3 @@ timeclock file manually, or if you change the value of any of
 timeclock's customizable variables, you should run the command
 @kbd{M-x timeclock-reread-log} to update the data in Emacs from the
 file.
-
-@ignore
-   arch-tag: 4531ef09-9df3-449d-9c52-2b5a4a337f92
-@end ignore
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 5703f7e8a0c..25f39d75cd6 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -4611,7 +4611,3 @@ Since most @ccmode{} variables are prepended with the string
 @end iftex
 
 @bye
-
-@ignore
-   arch-tag: c4cab162-5e57-4366-bdce-4a9db2fc97f0
-@end ignore
diff --git a/man/cl.texi b/man/cl.texi
index 805895329b2..eebd3ae4b5f 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -5361,7 +5361,3 @@ recursion.
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: b61e7200-3bfa-4a70-a9d3-095e152696f8
-@end ignore
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index bf2b7d606df..7545f9baf76 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1114,7 +1114,3 @@ rectangle containing the frame's title.
 rather than showing a frame right away.  In this situation, the icon
 is the only indication that Emacs has started; the text frame doesn't
 appear until you deiconify it.
-
-@ignore
-   arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
-@end ignore
diff --git a/man/commands.texi b/man/commands.texi
index b3fe5fa2471..b0727cfa1e4 100644
--- a/man/commands.texi
+++ b/man/commands.texi
@@ -265,7 +265,3 @@ with codes 128 through 255 can also appear in multibyte buffers.
   If you disable multibyte characters, then you can use only one
 alphabet of non-ASCII characters, but they all fit in one byte.  They
 use codes 0200 through 0377.  @xref{Single-Byte Character Support}.
-
-@ignore
-   arch-tag: 9be43eef-d1f4-4d03-a916-c741ea713a45
-@end ignore
diff --git a/man/custom.texi b/man/custom.texi
index cca5a538e14..4a89f8f086b 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -19,17 +19,15 @@ between sessions unless you save the customization in a file such as
 customizations for future sessions, this actually works by editing
 @file{.emacs} for you.
 
-  Another means of customization is the keyboard macro, which is a
-sequence of keystrokes to be replayed with a single command.
-@xref{Keyboard Macros}, for full instruction how to record, manage, and
-replay sequences of keys.
-
 @menu
 * Minor Modes::         Each minor mode is one feature you can turn on
                           independently of any others.
 * Variables::           Many Emacs commands examine Emacs variables
                           to decide what to do; by setting variables,
                           you can control their functioning.
+* Keyboard Macros::     A keyboard macro records a sequence of
+                          keystrokes to be replayed with a single
+                          command.
 * Key Bindings::        The keymaps say what command each key runs.
                           By changing them, you can "redefine keys".
 * Keyboard Translations::
@@ -1060,6 +1058,231 @@ value are @code{t}, @code{nil}, and anything else, just as for
 neither @code{t} nor @code{nil}, so normally Emacs does ask for
 confirmation about file settings for these variables.
 
+@node Keyboard Macros
+@section Keyboard Macros
+
+@cindex defining keyboard macros
+@cindex keyboard macro
+  A @dfn{keyboard macro} is a command defined by the user to stand for
+another sequence of keys.  For example, if you discover that you are
+about to type @kbd{C-n C-d} forty times, you can speed your work by
+defining a keyboard macro to do @kbd{C-n C-d} and calling it with a
+repeat count of forty.
+
+@table @kbd
+@item C-x (
+Start defining a keyboard macro (@code{start-kbd-macro}).
+@item C-x )
+End the definition of a keyboard macro (@code{end-kbd-macro}).
+@item C-x e
+Execute the most recent keyboard macro (@code{call-last-kbd-macro}).
+@item C-u C-x (
+Re-execute last keyboard macro, then add more keys to its definition.
+@item C-x q
+When this point is reached during macro execution, ask for confirmation
+(@code{kbd-macro-query}).
+@item M-x name-last-kbd-macro
+Give a command name (for the duration of the session) to the most
+recently defined keyboard macro.
+@item M-x insert-kbd-macro
+Insert in the buffer a keyboard macro's definition, as Lisp code.
+@item C-x C-k
+Edit a previously defined keyboard macro (@code{edit-kbd-macro}).
+@item M-x apply-macro-to-region-lines
+Run the last keyboard macro on each complete line in the region.
+@end table
+
+  Keyboard macros differ from ordinary Emacs commands in that they are
+written in the Emacs command language rather than in Lisp.  This makes it
+easier for the novice to write them, and makes them more convenient as
+temporary hacks.  However, the Emacs command language is not powerful
+enough as a programming language to be useful for writing anything
+intelligent or general.  For such things, Lisp must be used.
+
+  You define a keyboard macro while executing the commands which are the
+definition.  Put differently, as you define a keyboard macro, the
+definition is being executed for the first time.  This way, you can see
+what the effects of your commands are, so that you don't have to figure
+them out in your head.  When you are finished, the keyboard macro is
+defined and also has been, in effect, executed once.  You can then do the
+whole thing over again by invoking the macro.
+
+@menu
+* Basic Kbd Macro::     Defining and running keyboard macros.
+* Save Kbd Macro::      Giving keyboard macros names; saving them in files.
+* Kbd Macro Query::     Making keyboard macros do different things each time.
+@end menu
+
+@node Basic Kbd Macro
+@subsection Basic Use
+
+@kindex C-x (
+@kindex C-x )
+@kindex C-x e
+@findex start-kbd-macro
+@findex end-kbd-macro
+@findex call-last-kbd-macro
+  To start defining a keyboard macro, type the @kbd{C-x (} command
+(@code{start-kbd-macro}).  From then on, your keys continue to be
+executed, but also become part of the definition of the macro.  @samp{Def}
+appears in the mode line to remind you of what is going on.  When you are
+finished, the @kbd{C-x )} command (@code{end-kbd-macro}) terminates the
+definition (without becoming part of it!).  For example,
+
+@example
+C-x ( M-f foo C-x )
+@end example
+
+@noindent
+defines a macro to move forward a word and then insert @samp{foo}.
+
+  The macro thus defined can be invoked again with the @kbd{C-x e}
+command (@code{call-last-kbd-macro}), which may be given a repeat count
+as a numeric argument to execute the macro many times.  @kbd{C-x )} can
+also be given a repeat count as an argument, in which case it repeats
+the macro that many times right after defining it, but defining the
+macro counts as the first repetition (since it is executed as you define
+it).  Therefore, giving @kbd{C-x )} an argument of 4 executes the macro
+immediately 3 additional times.  An argument of zero to @kbd{C-x e} or
+@kbd{C-x )} means repeat the macro indefinitely (until it gets an error
+or you type @kbd{C-g} or, on MS-DOS, @kbd{C-@key{BREAK}}).
+
+  If you wish to repeat an operation at regularly spaced places in the
+text, define a macro and include as part of the macro the commands to move
+to the next place you want to use it.  For example, if you want to change
+each line, you should position point at the start of a line, and define a
+macro to change that line and leave point at the start of the next line.
+Then repeating the macro will operate on successive lines.
+
+  When a command reads an argument with the minibuffer, your
+minibuffer input becomes part of the macro along with the command.  So
+when you replay the macro, the command gets the same argument as
+when you entered the macro.  For example,
+
+@example
+C-x ( C-a C-@key{SPC} C-n M-w C-x b f o o @key{RET} C-y C-x b @key{RET} C-x )
+@end example
+
+@noindent
+defines a macro that copies the current line into the buffer
+@samp{foo}, then returns to the original buffer.
+
+  You can use function keys in a keyboard macro, just like keyboard
+keys.  You can even use mouse events, but be careful about that: when
+the macro replays the mouse event, it uses the original mouse position
+of that event, the position that the mouse had while you were defining
+the macro.  The effect of this may be hard to predict.  (Using the
+current mouse position would be even less predictable.)
+
+  One thing that doesn't always work well in a keyboard macro is the
+command @kbd{C-M-c} (@code{exit-recursive-edit}).  When this command
+exits a recursive edit that started within the macro, it works as you'd
+expect.  But if it exits a recursive edit that started before you
+invoked the keyboard macro, it also necessarily exits the keyboard macro
+as part of the process.
+
+  After you have terminated the definition of a keyboard macro, you can add
+to the end of its definition by typing @kbd{C-u C-x (}.  This is equivalent
+to plain @kbd{C-x (} followed by retyping the whole definition so far.  As
+a consequence it re-executes the macro as previously defined.
+
+@findex edit-kbd-macro
+@kindex C-x C-k
+  You can edit a keyboard macro already defined by typing @kbd{C-x C-k}
+(@code{edit-kbd-macro}).  Follow that with the keyboard input that you
+would use to invoke the macro---@kbd{C-x e} or @kbd{M-x @var{name}} or
+some other key sequence.  This formats the macro definition in a buffer
+and enters a specialized major mode for editing it.  Type @kbd{C-h m}
+once in that buffer to display details of how to edit the macro.  When
+you are finished editing, type @kbd{C-c C-c}.
+
+@findex apply-macro-to-region-lines
+  The command @kbd{M-x apply-macro-to-region-lines} repeats the last
+defined keyboard macro on each complete line within the current region.
+It does this line by line, by moving point to the beginning of the line
+and then executing the macro.
+
+@node Save Kbd Macro
+@subsection Naming and Saving Keyboard Macros
+
+@cindex saving keyboard macros
+@findex name-last-kbd-macro
+  If you wish to save a keyboard macro for longer than until you define the
+next one, you must give it a name using @kbd{M-x name-last-kbd-macro}.
+This reads a name as an argument using the minibuffer and defines that name
+to execute the macro.  The macro name is a Lisp symbol, and defining it in
+this way makes it a valid command name for calling with @kbd{M-x} or for
+binding a key to with @code{global-set-key} (@pxref{Keymaps}).  If you
+specify a name that has a prior definition other than another keyboard
+macro, an error message is shown and nothing is changed.
+
+@findex insert-kbd-macro
+  Once a macro has a command name, you can save its definition in a file.
+Then it can be used in another editing session.  First, visit the file
+you want to save the definition in.  Then use this command:
+
+@example
+M-x insert-kbd-macro @key{RET} @var{macroname} @key{RET}
+@end example
+
+@noindent
+This inserts some Lisp code that, when executed later, will define the
+same macro with the same definition it has now.  (You need not
+understand Lisp code to do this, because @code{insert-kbd-macro} writes
+the Lisp code for you.)  Then save the file.  You can load the file
+later with @code{load-file} (@pxref{Lisp Libraries}).  If the file you
+save in is your init file @file{~/.emacs} (@pxref{Init File}) then the
+macro will be defined each time you run Emacs.
+
+  If you give @code{insert-kbd-macro} a numeric argument, it makes
+additional Lisp code to record the keys (if any) that you have bound to the
+keyboard macro, so that the macro will be reassigned the same keys when you
+load the file.
+
+@node Kbd Macro Query
+@subsection Executing Macros with Variations
+
+@kindex C-x q
+@findex kbd-macro-query
+  Using @kbd{C-x q} (@code{kbd-macro-query}), you can get an effect
+similar to that of @code{query-replace}, where the macro asks you each
+time around whether to make a change.  While defining the macro,
+type @kbd{C-x q} at the point where you want the query to occur.  During
+macro definition, the @kbd{C-x q} does nothing, but when you run the
+macro later, @kbd{C-x q} asks you interactively whether to continue.
+
+  The valid responses when @kbd{C-x q} asks are @key{SPC} (or @kbd{y}),
+@key{DEL} (or @kbd{n}), @key{RET} (or @kbd{q}), @kbd{C-l} and @kbd{C-r}.
+The answers are the same as in @code{query-replace}, though not all of
+the @code{query-replace} options are meaningful.
+
+  These responses include @key{SPC} to continue, and @key{DEL} to skip
+the remainder of this repetition of the macro and start right away with
+the next repetition.  @key{RET} means to skip the remainder of this
+repetition and cancel further repetitions.  @kbd{C-l} redraws the screen
+and asks you again for a character to say what to do.
+
+  @kbd{C-r} enters a recursive editing level, in which you can perform
+editing which is not part of the macro.  When you exit the recursive
+edit using @kbd{C-M-c}, you are asked again how to continue with the
+keyboard macro.  If you type a @key{SPC} at this time, the rest of the
+macro definition is executed.  It is up to you to leave point and the
+text in a state such that the rest of the macro will do what you
+want.@refill
+
+  @kbd{C-u C-x q}, which is @kbd{C-x q} with a numeric argument,
+performs a completely different function.  It enters a recursive edit
+reading input from the keyboard, both when you type it during the
+definition of the macro, and when it is executed from the macro.  During
+definition, the editing you do inside the recursive edit does not become
+part of the macro.  During macro execution, the recursive edit gives you
+a chance to do some particularized editing on each repetition.
+@xref{Recursive Edit}.
+
+  Another way to vary the behavior of a keyboard macro is to use a
+register as a counter, incrementing it on each repetition of the macro.
+@xref{RegNumbers}.
+
 @node Key Bindings
 @section Customizing Key Bindings
 @cindex key bindings
@@ -2287,7 +2510,3 @@ If that user name matches the real user-ID, then Emacs uses @env{HOME};
 otherwise, it looks up the home directory corresponding to that user
 name in the system's data base of users.
 @c  LocalWords:  backtab
-
-@ignore
-   arch-tag: c68abddb-4410-4fb5-925f-63394e971d93
-@end ignore
diff --git a/man/dired-x.texi b/man/dired-x.texi
index d0e30803fb7..a1172019544 100644
--- a/man/dired-x.texi
+++ b/man/dired-x.texi
@@ -700,9 +700,6 @@ where each @var{command} can either be a string or a lisp expression
 that evaluates to a string.  If several commands are given, all of
 them will temporarily be pushed onto the history.
 
-If @samp{*} in the shell command, that means to substitute the file
-name.
-
 You can set this variable in your @file{~/.emacs}.  For example,
 to add rules for @samp{.foo} and @samp{.bar} file extensions, write
 
@@ -1315,7 +1312,3 @@ Lawrence R. Dodd
 
 @bye
 @c dired-x.texi ends here.
-
-@ignore
-   arch-tag: 201727aa-9318-4c74-a0d7-4f51c550c4de
-@end ignore
diff --git a/man/dired.texi b/man/dired.texi
index 92d93324dd4..40882d7ad22 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -1086,7 +1086,3 @@ matching a given regular expression.
 variable @code{find-ls-option}, whose default value specifies using
 options @samp{-ld} for @code{ls}.  If your listings are corrupted, you
 may need to change the value of this variable.
-
-@ignore
-   arch-tag: d105f9b9-fc1b-4c5f-a949-9b2cf3ca2fc1
-@end ignore
diff --git a/man/display.texi b/man/display.texi
index fd7f2a10b28..b8ea515acfa 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -1037,7 +1037,3 @@ tab character.  To enable this feature, set the variable
 a minor mode that highlights the line containing point.  Use @kbd{M-x
 hl-line-mode} to enable or disable it in the current buffer.  @kbd{M-x
 global-hl-line-mode} enables or disables the same mode globally.
-
-@ignore
-   arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
-@end ignore
diff --git a/man/doclicense.texi b/man/doclicense.texi
index 23ec98c202f..0369ea06bbb 100644
--- a/man/doclicense.texi
+++ b/man/doclicense.texi
@@ -366,7 +366,3 @@ If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.
-
-@ignore
-   arch-tag: c1679162-1d8a-4f02-bc52-2e71765f0165
-@end ignore
diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index 8e3510242cf..8a500a0feba 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -1451,7 +1451,3 @@ in on with the command @kbd{C-c b m}.
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 52fe78ac-a1c4-48e7-815e-0a31acfad4bf
-@end ignore
diff --git a/man/ediff.texi b/man/ediff.texi
index 7bd67407146..7499f6d7935 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -2473,7 +2473,3 @@ Eli Zaretskii (eliz@@is.elta.co.il)
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46
-@end ignore
diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index bdeea1f4703..ab47e5a900a 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -1380,7 +1380,3 @@ Content-Disposition Header Field
 @bye
 
 @c End:
-
-@ignore
-   arch-tag: c7ef2fd0-a91c-4e10-aa52-c1a2b11b1a8d
-@end ignore
diff --git a/man/emacs.texi b/man/emacs.texi
index 6f42f53e8d4..ca5ddf039ba 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -166,8 +166,6 @@ Important Text-Changing Commands
 * Display::             Controlling what text is displayed.
 * Search::              Finding or replacing occurrences of a string.
 * Fixit::               Commands especially useful for fixing typos.
-* Keyboard Macros::     A keyboard macro records a sequence of
-                          keystrokes to be replayed with a single command.
 
 Major Structures of Emacs
 * Files::               All about handling files.
@@ -336,16 +334,6 @@ Commands for Fixing Typos
 * Fixing Case::         Correcting case of last word entered.
 * Spelling::            Apply spelling checker to a word or a whole buffer.
 
-Keyboard Macros
-
-* Basic Keyboard Macro::     Defining and running keyboard macros.
-* Keyboard Macro Ring::      Where previous keyboard macros are saved.
-* Keyboard Macro Counter::   Inserting incrementing numbers in macros.
-* Keyboard Macro Query::     Making keyboard macros do different things each time.
-* Save Keyboard Macro::      Giving keyboard macros names; saving them in files.
-* Edit Keyboard Macro::      Editing keyboard macros.
-* Keyboard Macro Step-Edit::   Interactively executing and editing a keyboard macro.
-
 File Handling
 
 * File Names::          How to type and edit file-name arguments.
@@ -733,6 +721,8 @@ Customization
 * Variables::           Many Emacs commands examine Emacs variables
                           to decide what to do; by setting variables,
                           you can control their functioning.
+* Keyboard Macros::     A keyboard macro records a sequence of
+                          keystrokes to be replayed with a single command.
 * Key Bindings::        The keymaps say what command each key runs.
                           By changing them, you can "redefine keys".
 * Keyboard Translations::
@@ -754,6 +744,12 @@ Variables
 * Locals::              Per-buffer values of variables.
 * File Variables::      How files can specify variable values.
 
+Keyboard Macros
+
+* Basic Kbd Macro::     Defining and running keyboard macros.
+* Save Kbd Macro::      Giving keyboard macros names; saving them in files.
+* Kbd Macro Query::     Making keyboard macros do different things each time.
+
 Customizing Key Bindings
 
 * Keymaps::             Generalities.  The global keymap.
@@ -1467,7 +1463,6 @@ edit files while running shell commands.
 @include display.texi
 @include search.texi
 @include fixit.texi
-@include kmacro.texi
 @include files.texi
 @include buffers.texi
 @include windows.texi
@@ -1547,6 +1542,3 @@ edit files while running shell commands.
 @contents
 @bye
 
-@ignore
-   arch-tag: ed48740a-410b-46ea-9387-c9a9252a3392
-@end ignore
diff --git a/man/entering.texi b/man/entering.texi
index 9200082328a..5b6c28472bf 100644
--- a/man/entering.texi
+++ b/man/entering.texi
@@ -149,7 +149,3 @@ inspired by the use of @kbd{C-z} and @kbd{C-c} on several operating
 systems as the characters for stopping or killing a program, but that is
 their only relationship with the operating system.  You can customize
 these keys to run any commands of your choice (@pxref{Keymaps}).
-
-@ignore
-   arch-tag: df798d8b-f253-4113-b585-f528f078a944
-@end ignore
diff --git a/man/eshell.texi b/man/eshell.texi
index d9b1ac3b105..188ac520a16 100644
--- a/man/eshell.texi
+++ b/man/eshell.texi
@@ -1,5 +1,5 @@
 \input texinfo  @c -*-texinfo-*-
-@c "@(#)$Name:  $:$Id: eshell.texi,v 1.18 2003/02/04 14:53:27 lektu Exp $"
+@c "@(#)$Name:  $:$Id: eshell.texi,v 1.17 2002/12/10 13:16:31 pj Exp $"
 @c %**start of header
 @setfilename ../info/eshell
 @settitle Eshell: The Emacs Shell
@@ -1128,7 +1128,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/man/eudc.texi b/man/eudc.texi
index aaf130eb489..511069973df 100644
--- a/man/eudc.texi
+++ b/man/eudc.texi
@@ -973,7 +973,3 @@ in testing and proofreading the code and docs of @file{ph.el}.
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: 1b79460b-4ea1-441d-ab45-05ddd16ef241
-@end ignore
diff --git a/man/faq.texi b/man/faq.texi
index f569615e179..b25ef4bca6f 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -5441,7 +5441,3 @@ part of the Gnus distribution.
 
 @contents
 @bye
-
-@ignore
-   arch-tag: fee0d62d-06cf-43d8-ac21-123408eaf10f
-@end ignore
diff --git a/man/files.texi b/man/files.texi
index 17eab9117f7..2c18092286c 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 1985,86,87,93,94,95,97,99, 2000, 2001
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Files, Buffers, Keyboard Macros, Top
+@node Files, Buffers, Fixit, Top
 @chapter File Handling
 @cindex files
 
@@ -3186,7 +3186,3 @@ powerful heuristic defaults (@pxref{FFAP}), often based on the text at
 point.  Partial Completion mode offers other features extending
 @code{find-file}, which can be used with @code{ffap}.
 @xref{Completion Options}.
-
-@ignore
-   arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
-@end ignore
diff --git a/man/fixit.texi b/man/fixit.texi
index 75dde658680..21f613a93ad 100644
--- a/man/fixit.texi
+++ b/man/fixit.texi
@@ -1,7 +1,7 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Fixit, Keyboard Macros, Search, Top
+@node Fixit, Files, Search, Top
 @chapter Commands for Fixing Typos
 @cindex typos, fixing
 @cindex mistakes, correcting
@@ -342,7 +342,3 @@ dictionary.  The completion dictionary must be different because it
 cannot use employ root and affix information.  For some languages
 there is a spell checking dictionary but no word completion
 dictionary.
-
-@ignore
-   arch-tag: 3359a443-96ed-448f-9f05-c8111ba8eac0
-@end ignore
diff --git a/man/forms.texi b/man/forms.texi
index 74876760ccc..91a1f456f24 100644
--- a/man/forms.texi
+++ b/man/forms.texi
@@ -973,7 +973,3 @@ Software Foundation.  Thanks, Richard!
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 2ac9810b-aa49-4ea6-8030-d7f1ecd467ed
-@end ignore
diff --git a/man/frames.texi b/man/frames.texi
index b7aab80ed57..57798a374d9 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -954,7 +954,3 @@ functionality is still available by holding down the @kbd{SHIFT} key
 when you press the mouse button.  The Linux console supports this
 mode if it has support for the mouse enabled, e.g.@: using the
 @command{gpm} daemon.
-
-@ignore
-   arch-tag: 7dcf3a31-a43b-45d4-a900-445b10d77e49
-@end ignore
diff --git a/man/glossary.texi b/man/glossary.texi
index 258e6f581b8..c347eb3f982 100644
--- a/man/glossary.texi
+++ b/man/glossary.texi
@@ -1279,6 +1279,3 @@ 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/man/gnu.texi b/man/gnu.texi
index 4185f8f9114..e8b3bc482d4 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -542,7 +542,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/man/gnus-faq.texi b/man/gnus-faq.texi
index 804da4cafcf..acdb0edd5e4 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -671,6 +671,3 @@ Use an nnbabyl:all.SCORE (or nnmh, or nnml, or whatever) file containing:
 @end itemize
 
 
-@ignore
-   arch-tag: 64dc5692-edb4-4848-a965-7aa0181acbb8
-@end ignore
diff --git a/man/gnus.texi b/man/gnus.texi
index 9fa1285b915..b9e6dfc84a2 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -22229,7 +22229,3 @@ former).  The manual is unambiguous, but it can be confusing.
 @end iftex
 
 @c End:
-
-@ignore
-   arch-tag: c9fa47e7-78ca-4681-bda9-9fef45d1c819
-@end ignore
diff --git a/man/help.texi b/man/help.texi
index f9c873db0c2..b6431c5ede4 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -587,7 +587,3 @@ Areas of the mode line are examples.  This help will normally be
 shown in the echo area when you move point into the active text.  In
 a window system you can display the help text as a ``tooltip''
 (sometimes known as ``balloon help'').  @xref{Tooltips}.
-
-@ignore
-   arch-tag: 6f33ab62-bc75-4367-8057-fd67cc15c3a1
-@end ignore
diff --git a/man/idlwave.texi b/man/idlwave.texi
index fde5cd389d6..6cd3cb0f1b9 100644
--- a/man/idlwave.texi
+++ b/man/idlwave.texi
@@ -3529,7 +3529,3 @@ instead.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: f1d73958-1423-4127-b8aa-f7b953d64492
-@end ignore
diff --git a/man/indent.texi b/man/indent.texi
index d2134103240..a940bc77a95 100644
--- a/man/indent.texi
+++ b/man/indent.texi
@@ -245,7 +245,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 three
 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/man/info.texi b/man/info.texi
index 3ec983003f7..26f23ac7264 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -6,7 +6,7 @@
 @syncodeindex vr cp
 @syncodeindex ky cp
 @comment %**end of header
-@comment $Id: info.texi,v 1.34 2003/08/03 18:29:52 karl Exp $
+@comment $Id: info.texi,v 1.33 2003/07/16 22:17:40 karl Exp $
 
 @copying
 This file describes how to use Info, the on-line, menu-driven GNU
@@ -1456,7 +1456,3 @@ topics discussed in this document.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore
diff --git a/man/killing.texi b/man/killing.texi
index 59aa5bb9200..4118a4c56f5 100644
--- a/man/killing.texi
+++ b/man/killing.texi
@@ -644,7 +644,3 @@ rectangle shifts right.
   The command @kbd{M-x string-insert-rectangle} is similar to
 @code{string-rectangle}, but inserts the string on each line,
 shifting the original text to the right.
-
-@ignore
-   arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
-@end ignore
diff --git a/man/m-x.texi b/man/m-x.texi
index 8881850d323..fca7d101a97 100644
--- a/man/m-x.texi
+++ b/man/m-x.texi
@@ -73,7 +73,3 @@ together with following 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/man/macos.texi b/man/macos.texi
index 6a7c918a7f9..7a266697781 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -244,7 +244,3 @@ returns the GNU or Unix equivalent.  The function
 @code{posix-file-name-to-mac} performs the opposite conversion.  They
 are useful for constructing AppleScript commands to be passed to
 @code{do-applescript}.
-
-@ignore
-   arch-tag: a822c2ab-4273-4997-927e-c153bb71dcf6
-@end ignore
diff --git a/man/maintaining.texi b/man/maintaining.texi
index b5f13d5fb9f..9683ffa62d8 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -1273,7 +1273,3 @@ commands.
 @vindex emerge-startup-hook
   After setting up the merge, Emerge runs the hook
 @code{emerge-startup-hook} (@pxref{Hooks}).
-
-@ignore
-   arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb
-@end ignore
diff --git a/man/major.texi b/man/major.texi
index 4c933b13db0..16887fe788a 100644
--- a/man/major.texi
+++ b/man/major.texi
@@ -169,7 +169,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/man/makefile.w32-in b/man/makefile.w32-in
deleted file mode 100644
index 16d6a972237..00000000000
--- a/man/makefile.w32-in
+++ /dev/null
@@ -1,329 +0,0 @@
-#### Makefile for the Emacs Manual and other documentation.
-
-# Copyright (C) 2003
-#  Free Software Foundation, Inc.
-
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Where to find the source code.  The source code for Emacs's C kernel is
-# expected to be in $(srcdir)/src, and the source code for Emacs's
-# utility programs is expected to be in $(srcdir)/lib-src.  This is
-# set by the configure script's `--srcdir' option.
-srcdir=.
-
-infodir = $(srcdir)/../info
-
-# The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
-MULTI_INSTALL_INFO = $(srcdir)\..\nt\multi-install-info.bat
-INFO_TARGETS = $(infodir)/emacs $(infodir)/ccmode \
-                $(infodir)/cl $(infodir)/dired-x \
-                $(infodir)/ediff $(infodir)/forms \
-                $(infodir)/gnus $(infodir)/info \
-                $(infodir)/message $(infodir)/mh-e \
-                $(infodir)/reftex $(infodir)/sc \
-                $(infodir)/vip $(infodir)/viper \
-                $(infodir)/widget $(infodir)/efaq \
-                $(infodir)/ada-mode $(infodir)/autotype \
-                $(infodir)/calc $(infodir)/idlwave \
-                $(infodir)/eudc $(infodir)/ebrowse \
-                $(infodir)/pcl-cvs $(infodir)/woman \
-                $(infodir)/emacs-mime $(infodir)/eshell \
-                $(infodir)/speedbar $(infodir)/tramp \
-                $(infodir)/ses $(infodir)/smtpmail
-DVI_TARGETS =   emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-                 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
-                 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
-                 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-                 pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
-                 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi
-INFOSOURCES = info.texi
-
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-        texi2dvi $<
-
-TEXI2DVI = texi2dvi
-ENVADD = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-         "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
-
-EMACSSOURCES= \
-        $(srcdir)/emacs.texi \
-        $(srcdir)/doclicense.texi \
-        $(srcdir)/screen.texi \
-        $(srcdir)/commands.texi \
-        $(srcdir)/entering.texi \
-        $(srcdir)/basic.texi \
-        $(srcdir)/mini.texi \
-        $(srcdir)/m-x.texi \
-        $(srcdir)/help.texi \
-        $(srcdir)/mark.texi \
-        $(srcdir)/killing.texi \
-        $(srcdir)/regs.texi \
-        $(srcdir)/display.texi \
-        $(srcdir)/search.texi \
-        $(srcdir)/fixit.texi \
-        $(srcdir)/files.texi \
-        $(srcdir)/buffers.texi \
-        $(srcdir)/windows.texi \
-        $(srcdir)/frames.texi \
-        $(srcdir)/mule.texi \
-        $(srcdir)/major.texi \
-        $(srcdir)/indent.texi \
-        $(srcdir)/text.texi \
-        $(srcdir)/programs.texi \
-        $(srcdir)/building.texi \
-        $(srcdir)/maintaining.texi \
-        $(srcdir)/abbrevs.texi \
-        $(srcdir)/picture.texi \
-        $(srcdir)/sending.texi \
-        $(srcdir)/rmail.texi \
-        $(srcdir)/dired.texi \
-        $(srcdir)/calendar.texi \
-        $(srcdir)/misc.texi \
-        $(srcdir)/custom.texi \
-        $(srcdir)/trouble.texi \
-        $(srcdir)/cmdargs.texi \
-        $(srcdir)/xresources.texi \
-        $(srcdir)/anti.texi \
-        $(srcdir)/macos.texi \
-        $(srcdir)/msdog.texi \
-        $(srcdir)/gnu.texi \
-        $(srcdir)/glossary.texi \
-        $(srcdir)/ack.texi \
-        $(srcdir)/kmacro.texi
-
-info: $(INFO_TARGETS)
-        $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
-
-dvi: $(DVI_TARGETS)
-
-# Note that all the Info targets build the Info files
-# in srcdir.  There is no provision for Info files
-# to exist in the build directory.
-# In a distribution of Emacs, the Info files should be up to date.
-
-# The following target uses an explicit -o switch to work around
-# the @setfilename directive in info.texi, which is required for
-# the Texinfo distribution.
-
-$(infodir)/info: $(INFOSOURCES)
-        $(MAKEINFO) --no-split info.texi -o $@
-
-info.dvi: $(INFOSOURCES)
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
-
-$(infodir)/emacs: $(EMACSSOURCES)
-        $(MAKEINFO) emacs.texi
-
-emacs.dvi: $(EMACSSOURCES)
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
-
-# This target is here so you could easily get the list of the *.texi
-# files which belong to the Emacs manual (as opposed to the separate
-# manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
-# say things like "grep foo `make emacsman`".
-emacsman:
-        @echo $(EMACSSOURCES)
-
-$(infodir)/ccmode: cc-mode.texi
-        $(MAKEINFO) cc-mode.texi
-cc-mode.dvi: cc-mode.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
-
-$(infodir)/ada-mode: ada-mode.texi
-        $(MAKEINFO) ada-mode.texi
-ada-mode.dvi: ada-mode.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
-
-$(infodir)/pcl-cvs: pcl-cvs.texi
-        $(MAKEINFO) pcl-cvs.texi
-pcl-cvs.dvi: pcl-cvs.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
-
-$(infodir)/eshell: eshell.texi
-        $(MAKEINFO) eshell.texi
-eshell.dvi: eshell.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
-
-$(infodir)/cl: cl.texi
-        $(MAKEINFO) cl.texi
-cl.dvi: cl.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
-
-$(infodir)/dired-x: dired-x.texi
-        $(MAKEINFO) dired-x.texi
-dired-x.dvi: dired-x.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
-
-$(infodir)/ediff: ediff.texi
-        $(MAKEINFO) ediff.texi
-ediff.dvi: ediff.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
-
-$(infodir)/forms: forms.texi
-        $(MAKEINFO) forms.texi
-forms.dvi: forms.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
-
-$(infodir)/gnus: gnus.texi
-        $(MAKEINFO) gnus.texi
-gnus.dvi: gnus.texi
-        sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi 
-        $(ENVADD) $(TEXI2DVI) gnustmp.texi
-        cp gnustmp.dvi $*.dvi
-        rm gnustmp.*
-
-$(infodir)/message: message.texi
-        $(MAKEINFO) message.texi
-message.dvi: message.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
-
-$(infodir)/mh-e: mh-e.texi
-        $(MAKEINFO) mh-e.texi
-mh-e.dvi: mh-e.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
-
-$(infodir)/reftex: reftex.texi
-        $(MAKEINFO) reftex.texi
-reftex.dvi: reftex.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
-
-$(infodir)/sc: sc.texi
-        $(MAKEINFO) sc.texi
-sc.dvi: sc.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
-
-$(infodir)/vip: vip.texi
-        $(MAKEINFO) vip.texi
-vip.dvi: vip.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
-
-$(infodir)/viper: viper.texi
-        $(MAKEINFO) viper.texi
-viper.dvi: viper.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
-
-$(infodir)/widget: widget.texi
-        $(MAKEINFO) widget.texi
-widget.dvi: widget.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
-
-$(infodir)/efaq: faq.texi
-        $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
-
-../etc/GNU: gnu1.texi gnu.texi
-        $(MAKEINFO) --no-headers -o ../etc/GNU gnu1.texi
-
-$(infodir)/autotype: autotype.texi
-        $(MAKEINFO) autotype.texi
-autotype.dvi: autotype.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
-
-$(infodir)/calc: calc.texi
-        $(MAKEINFO) calc.texi
-
-calc.dvi: calc.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
-
-# This is produced with --no-split to avoid making files whose
-# names clash on DOS 8+3 filesystems
-$(infodir)/idlwave: idlwave.texi
-        $(MAKEINFO) --no-split idlwave.texi
-idlwave.dvi: idlwave.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
-
-$(infodir)/eudc: eudc.texi
-        $(MAKEINFO) eudc.texi
-eudc.dvi: eudc.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
-
-$(infodir)/ebrowse: ebrowse.texi
-        $(MAKEINFO) ebrowse.texi
-ebrowse.dvi: ebrowse.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
-
-$(infodir)/woman: woman.texi
-        $(MAKEINFO) woman.texi
-woman.dvi: woman.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
-
-$(infodir)/speedbar: speedbar.texi
-        $(MAKEINFO) speedbar.texi
-speedbar.dvi: speedbar.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
-
-$(infodir)/emacs-mime: emacs-mime.texi
-        $(MAKEINFO) emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
-
-$(infodir)/tramp: tramp.texi
-        $(MAKEINFO) tramp.texi
-tramp.dvi: tramp.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
-
-$(infodir)/ses: ses.texi
-        $(MAKEINFO) ses.texi
-ses.dvi: ses.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
-
-$(infodir)/smtpmail: smtpmail.texi
-        $(MAKEINFO) smtpmail.texi
-smtpmail.dvi: smtpmail.texi
-        $(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi
-
-mostlyclean:
-        rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
-
-clean: mostlyclean
-        rm -f *.dvi
-        rm -f $(infodir)/emacs* $(infodir)/ccmode* \
-                $(infodir)/cl* $(infodir)/dired-x* \
-                $(infodir)/ediff* $(infodir)/forms* \
-                $(infodir)/gnus* $(infodir)/info* \
-                $(infodir)/message* $(infodir)/mh-e* \
-                $(infodir)/reftex* $(infodir)/sc* \
-                $(infodir)/vip* $(infodir)/viper* \
-                $(infodir)/widget* $(infodir)/efaq* \
-                $(infodir)/ada-mode* $(infodir)/autotype* \
-                $(infodir)/calc* $(infodir)/idlwave* \
-                $(infodir)/eudc* $(infodir)/ebrowse* \
-                $(infodir)/pcl-cvs* $(infodir)/woman* \
-                $(infodir)/emacs-mime* $(infodir)/eshell* \
-                $(infodir)/speedbar* $(infodir)/tramp* \
-                $(infodir)/ses* $(infodir)/smtpmail*
-
-distclean: clean
-
-maintainer-clean: distclean
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
-# Don't delete these, because they are outside the current directory.
-#       for file in $(INFO_TARGETS); do rm -f $${file}*; done
-
-
-# Formerly this directory had texindex.c and getopt.c in it
-# and this makefile built them to make texindex.
-# That caused trouble because this is run entirely in the source directory.
-# Since we expect to get texi2dvi from elsewhere,
-# it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 6e99da59-ad27-4816-82a0-cde9a101efae
diff --git a/man/mark.texi b/man/mark.texi
index 42192ded85a..ec91e66fb21 100644
--- a/man/mark.texi
+++ b/man/mark.texi
@@ -425,6 +425,3 @@ the buffer and position of the latest entry in the global ring.  It also
 rotates the ring, so that successive uses of @kbd{C-x C-@key{SPC}} take
 you to earlier and earlier buffers.
 
-@ignore
-   arch-tag: f35e4d82-911b-4cfc-a3d7-3c87b2abba20
-@end ignore
diff --git a/man/message.texi b/man/message.texi
index 41c563ca383..d26ae9a5e33 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -1410,7 +1410,3 @@ basis of the new @code{Cc} header, except if this header is
 @bye
 
 @c End:
-
-@ignore
-   arch-tag: 16ab76af-a281-4e34-aed6-5624569f7601
-@end ignore
diff --git a/man/mh-e.texi b/man/mh-e.texi
index efecc1d927d..406506d36a0 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
-@c $Id: mh-e.texi,v 1.14 2003/02/04 14:53:28 lektu Exp $
+@c $Id: mh-e.texi,v 1.13 2002/10/02 23:24:31 karl Exp $
 @c %**start of header
 @setfilename ../info/mh-e
 @settitle mh-e
@@ -3952,7 +3952,3 @@ Public License instead of this License.
 @c XXX In the sections on customizing mh-e, you can add cross-references
 @c to the Emacs manual and the Emacs Lisp manual wherever they are
 @c useful. @pxref{node, , section, emacs, The GNU Emacs Manual}
-
-@ignore
-   arch-tag: b778477d-1a10-4a99-84de-f877a2ea6bef
-@end ignore
diff --git a/man/mini.texi b/man/mini.texi
index 1022424f3de..88aac3bdc74 100644
--- a/man/mini.texi
+++ b/man/mini.texi
@@ -571,7 +571,3 @@ list in the variable @code{command-history}.  Each element is a Lisp
 expression which describes one command and its arguments.  Lisp programs
 can re-execute a command by calling @code{eval} with the
 @code{command-history} element.
-
-@ignore
-   arch-tag: ba913cfd-b70e-400f-b663-22b2c309227f
-@end ignore
diff --git a/man/misc.texi b/man/misc.texi
index aab01beb5f9..520bcb66869 100644
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -1886,16 +1886,18 @@ Customization}) to set @code{desktop-enable} to a non-@code{nil} value,
 or add these lines at the end of your @file{.emacs} file:
 
 @example
-(require 'desktop)
-(setq desktop-enable t)
+(desktop-load-default)
+(desktop-read)
 @end example
 
 @noindent
 @findex desktop-save
-The first time you exit Emacs, you will be asked whether you want to
-save your session.  Once you have done that, exiting Emacs will save
-the state again in subsequent sessions.  You can also save the state
-at any time, without exiting Emacs, by typing @kbd{M-x desktop-save}.
+The first time you save the state of the Emacs session, you must do it
+manually, with the command @kbd{M-x desktop-save}.  Once you have done
+that, exiting Emacs will save the state again---not only the present
+Emacs session, but also subsequent sessions.  You can also save the
+state at any time, without exiting Emacs, by typing @kbd{M-x
+desktop-save} again.
 
   In order for Emacs to recover the state from a previous session, you
 must start it with the same current directory as you used when you
@@ -2448,7 +2450,3 @@ Likewise, @kbd{M-x snake} provides an implementation of Snake.
 @findex zone
 The command @kbd{M-x zone} plays games with the display when Emacs is
 idle.
-
-@ignore
-   arch-tag: 8f094220-c0d5-4e9e-af7d-3e0da8187474
-@end ignore
diff --git a/man/msdog.texi b/man/msdog.texi
index c6629ab63d4..6be4f703f79 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -843,6 +843,3 @@ subsequent commands.  Many users find this frustrating.
 You can reenable Windows's default handling of tapping the @key{ALT} key
 by setting @code{w32-pass-alt-to-system} to a non-@code{nil} value.
 
-@ignore
-   arch-tag: f39d2590-5dcc-4318-88d9-0eb73ca10fa2
-@end ignore
diff --git a/man/mule.texi b/man/mule.texi
index 065c9c736c3..ccba75e9327 100644
--- a/man/mule.texi
+++ b/man/mule.texi
@@ -1404,7 +1404,3 @@ its internal representation within Emacs.
 
   To find out which charset a character in the buffer belongs to,
 put point before it and type @kbd{C-u C-x =}.
-
-@ignore
-   arch-tag: 310ba60d-31ef-4ce7-91f1-f282dd57b6b3
-@end ignore
diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi
index 650e3cc50d1..04952efd3cb 100644
--- a/man/pcl-cvs.texi
+++ b/man/pcl-cvs.texi
@@ -1,5 +1,5 @@
 \input texinfo  @c -*-texinfo-*-
-@c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.20 2003/08/14 04:53:30 kfogel Exp $"
+@c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.18 2002/12/07 13:38:26 pj Exp $"
 @c %**start of header
 @setfilename ../info/pcl-cvs
 @settitle PCL-CVS --- Emacs Front-End to CVS
@@ -1193,7 +1193,7 @@ kill the contents of the buffer with @kbd{C-w}.
 If you work by writing entries in the @file{ChangeLog}
 (@pxref{(emacs)Change Log}) and then commit the change under revision
 control, you can generate the Log Edit text from the ChangeLog using
-@kbd{C-c C-a} (@kbd{log-edit-insert-changelog}).  This looks for
+@kbd{C-a C-a} (@kbd{log-edit-insert-changelog}).  This looks for
 entries for the file(s) concerned in the top entry in the ChangeLog
 and uses those paragraphs as the log text.  This text is only inserted
 if the top entry was made under your user name on the current date.
@@ -1443,7 +1443,3 @@ this manual.
 @summarycontents
 @contents
 @bye
-
-@ignore
-   arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235
-@end ignore
diff --git a/man/picture.texi b/man/picture.texi
index e62962b0ff7..e792878ae46 100644
--- a/man/picture.texi
+++ b/man/picture.texi
@@ -261,7 +261,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: b7589747-683c-4f40-aed8-1b10403cb666
-@end ignore
diff --git a/man/programs.texi b/man/programs.texi
index e3775569860..a6fa49b2ec7 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -486,10 +486,49 @@ expression.
 
 @cindex @code{lisp-indent-function} property
   You can override the standard pattern in various ways for individual
-functions, according to the @code{lisp-indent-function} property of
-the function name.  Normally you would use this for macro definitions
-and specify it using the @code{declare} construct (@pxref{Defining
-Macros,,, elisp, the Emacs Lisp Reference Manual}).
+functions, according to the @code{lisp-indent-function} property of the
+function name.  There are four possibilities for this property:
+
+@table @asis
+@item @code{nil}
+This is the same as no property---use the standard indentation pattern.
+@item @code{defun}
+Handle this function like a @samp{def} construct: treat the second
+line as the start of a @dfn{body}.
+@item a number, @var{number}
+The first @var{number} arguments of the function are
+@dfn{distinguished} arguments; the rest are considered the body
+of the expression.  A line in the expression is indented according to
+whether the first argument on it is distinguished or not.  If the
+argument is part of the body, the line is indented @code{lisp-body-indent}
+more columns than the open-parenthesis starting the containing
+expression.  If the argument is distinguished and is either the first
+or second argument, it is indented @emph{twice} that many extra columns.
+If the argument is distinguished and not the first or second argument,
+the line uses the standard pattern.
+@item a symbol, @var{symbol}
+@var{symbol} should be a function name; that function is called to
+calculate the indentation of a line within this expression.  The
+function receives two arguments:
+@table @asis
+@item @var{state}
+The value returned by @code{parse-partial-sexp} (a Lisp primitive for
+indentation and nesting computation) when it parses up to the
+beginning of this line.
+@item @var{pos}
+The position at which the line being indented begins.
+@end table
+@noindent
+It should return either a number, which is the number of columns of
+indentation for that line, or a list whose car is such a number.  The
+difference between returning a number and returning a list is that a
+number says that all following lines at the same nesting level should
+be indented just like this one; a list says that following lines might
+call for different indentations.  This makes a difference when the
+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
 
 @node C Indent
 @subsection Commands for C Indentation
@@ -2283,7 +2322,3 @@ Insert or align a comment.
 
   The variable @code{asm-comment-char} specifies which character
 starts comments in assembler syntax.
-
-@ignore
-   arch-tag: c7ee7409-40a4-45c7-bfb7-ae7f2c74d0c0
-@end ignore
diff --git a/man/reftex.texi b/man/reftex.texi
index b1c4ae561ba..449efce9ce5 100644
--- a/man/reftex.texi
+++ b/man/reftex.texi
@@ -5591,6 +5591,3 @@ part does not reset the chapter counter.  See new option
 @contents
 @bye
 
-@ignore
-   arch-tag: 1e055774-0576-4b1b-b47f-550d0961fd43
-@end ignore
diff --git a/man/regs.texi b/man/regs.texi
index ab1ef42e2f1..1ec319e5282 100644
--- a/man/regs.texi
+++ b/man/regs.texi
@@ -319,7 +319,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/man/rmail.texi b/man/rmail.texi
index b5e339aedf9..9e6db0b9df5 100644
--- a/man/rmail.texi
+++ b/man/rmail.texi
@@ -1230,7 +1230,3 @@ this, and you would rather read your mail in the order in which it was
 received, you can tell @code{movemail} to reverse the order of
 downloaded messages by adding the @samp{-r} flag to
 @code{rmail-movemail-flags}.
-
-@ignore
-   arch-tag: 034965f6-38df-47a2-a9f1-b8bc8ab37e23
-@end ignore
diff --git a/man/sc.texi b/man/sc.texi
index 5e911e2df72..c9f03d8f906 100644
--- a/man/sc.texi
+++ b/man/sc.texi
@@ -2521,7 +2521,3 @@ its @var{variable} name.
 @summarycontents
 @contents
 @bye
-
-@ignore
-   arch-tag: 0521847a-4680-44b6-ae6e-13ce20e18436
-@end ignore
diff --git a/man/screen.texi b/man/screen.texi
index be9623e08b0..2f5b66936be 100644
--- a/man/screen.texi
+++ b/man/screen.texi
@@ -347,7 +347,3 @@ can type the item's letter or digit to select the item.
   Some of the commands in the menu bar have ordinary key bindings as
 well; if so, the menu lists one equivalent key binding in parentheses
 after the item itself.
-
-@ignore
-   arch-tag: 104ba40e-d972-4866-a542-a98be94bdf2f
-@end ignore
diff --git a/man/search.texi b/man/search.texi
index 7e7c1c43723..ea08626a6ab 100644
--- a/man/search.texi
+++ b/man/search.texi
@@ -1121,7 +1121,3 @@ instead.
 (@pxref{Tags Search}) or through Dired @kbd{A} command
 (@pxref{Operating on Files}), or ask the @code{grep} program to do it
 (@pxref{Grep Searching}).
-
-@ignore
-   arch-tag: fd9d8e77-66af-491c-b212-d80999613e3e
-@end ignore
diff --git a/man/sending.texi b/man/sending.texi
index 81bcd0de706..502663a3520 100644
--- a/man/sending.texi
+++ b/man/sending.texi
@@ -703,7 +703,3 @@ and facilities that send mail.
 in this chapter about the @samp{*mail*} buffer and Mail mode does not
 apply; the other methods use a different format of text in a different
 buffer, and their commands are different as well.
-
-@ignore
-   arch-tag: d8a3dfc3-5d87-45c5-a7f2-69871b8e4fd6
-@end ignore
diff --git a/man/ses.texi b/man/ses.texi
index 05f321fb4ff..d280b14cc28 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -839,7 +839,3 @@ Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr}
 @c ===================================================================
 
 @bye
-
-@ignore
-   arch-tag: 10a4ee1c-7ef4-4c06-8b7a-f975e39f0dec
-@end ignore
diff --git a/man/smtpmail.texi b/man/smtpmail.texi
index c04d5a19bd2..f1074dd1000 100644
--- a/man/smtpmail.texi
+++ b/man/smtpmail.texi
@@ -385,7 +385,3 @@ cannot accept mail.
 
 @contents
 @bye
-
-@ignore
-   arch-tag: 6316abdf-b366-4562-87a2-f37e8f894b6f
-@end ignore
diff --git a/man/speedbar.texi b/man/speedbar.texi
index 0ea8327e512..3b5e827fdcb 100644
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
-@c $Id: speedbar.texi,v 1.11 2002/10/02 23:24:31 karl Exp $
+@c $Id: speedbar.texi,v 1.10 2002/03/16 19:33:21 eliz Exp $
 
 @setfilename ../info/speedbar
 @settitle Speedbar: File/Tag summarizing utility
@@ -1247,7 +1247,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/man/texinfo.tex b/man/texinfo.tex
index a7225c8a37e..35b3020e628 100644
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -6339,5 +6339,3 @@ should work if nowhere else does.}
 @c time-stamp-format: "%:y-%02m-%02d.%02H"
 @c time-stamp-end: "}"
 @c End:
-
-% arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
diff --git a/man/text.texi b/man/text.texi
index acc2414b3e5..bf68558d869 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -2277,6 +2277,3 @@ uncompression (@pxref{Compressed Files}).  To disable format conversion
 but allow character code conversion and/or automatic uncompression if
 appropriate, use @code{format-find-file} with suitable arguments.
 
-@ignore
-   arch-tag: 8db54ed8-2036-49ca-b0df-23811d03dc70
-@end ignore
diff --git a/man/tramp.texi b/man/tramp.texi
index 31f5689e79f..07cffe26137 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -2119,7 +2119,3 @@ would have to be installed from the start, too.
 @c ** Use `filename' resp. `file name' consistently.
 @c ** Use `host' resp. `machine' consistently.
 @c ** Consistent small or capitalized words especially in menues.
-
-@ignore
-   arch-tag: f96dd66e-6dd3-4c92-8d77-9c56205ba808
-@end ignore
diff --git a/man/trampver.texi b/man/trampver.texi
index 4f9ba4dd49b..f728531b9e9 100644
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -58,6 +58,3 @@
 @c Otherwise, '/dev/null/' is tken, which leaves this part empty.
 
 
-@ignore
-   arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c
-@end ignore
diff --git a/man/trouble.texi b/man/trouble.texi
index c2c483a08da..737fcf12fb0 100644
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -1062,7 +1062,3 @@ Look in the service directory for someone who might help you for a fee.
 The service directory is found in the file named @file{etc/SERVICE} in the
 Emacs distribution.
 @end itemize
-
-@ignore
-   arch-tag: c9cba76d-b2cb-4e0c-ae3f-19d5ef35817c
-@end ignore
diff --git a/man/vip.texi b/man/vip.texi
index 959841b7996..fc34eacc865 100644
--- a/man/vip.texi
+++ b/man/vip.texi
@@ -1944,7 +1944,3 @@ file.
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: 7c5d17b9-1d21-4261-a88a-b9fdbbf1020b
-@end ignore
diff --git a/man/viper.texi b/man/viper.texi
index 2e27a682236..c0059da3a97 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -4542,7 +4542,3 @@ zapman@@cc.gatech.edu (Jason Zapman II),
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: f53e866a-15cf-4b1e-aead-77da9da1e864
-@end ignore
diff --git a/man/widget.texi b/man/widget.texi
index b3485066aac..d1d7bae0315 100644
--- a/man/widget.texi
+++ b/man/widget.texi
@@ -10,7 +10,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2000, 2002, 2003 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2002 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -211,16 +211,7 @@ change you make must be contained within a single editable text field.
 For example, capitalizing all text from the middle of one field to the
 middle of another field is prohibited.
 
-Editable text fields are created by the @code{editable-field} widget.
-
-An editable fields must be surrounded by static text on both sides, that
-is, text that does not change in the lifetime of the widget.  If the
-field extend to the end of the line, the terminating line-feed character
-will count as the necessary static text on that end, but you will have
-to provide the static text before the field yourself.  The
-@code{:format} keyword is useful for generating the static text; for
-instance, if you give it a value of @code{"Name: %v"}, the "Name: " part
-will count as the static text.
+Editing text fields are created by the @code{editable-field} widget.
 
 The editing text fields are highlighted with the
 @code{widget-field-face} face, making them easy to find.
@@ -582,9 +573,8 @@ Emacsen that supports it.
 Specifies how to display a message whenever you move to the widget with
 either @code{widget-forward} or @code{widget-backward} or move the mouse
 over it (using the standard @code{help-echo} mechanism).  The argument
-is either a string to display, a function of one argument, the widget,
-which should return a string to display, or a form that evaluates to
-such a string.
+is either a string to display or a function of one argument, the widget,
+which should return a string to display.
 
 @vindex indent@r{ keyword}
 @item :indent
@@ -1790,7 +1780,3 @@ variables, and widgets described in this manual.
 @setchapternewpage odd
 @contents
 @bye
-
-@ignore
-   arch-tag: 2b427731-4c61-4e72-85de-5ccec9c623f0
-@end ignore
diff --git a/man/windows.texi b/man/windows.texi
index 100abaf3c93..bc6347c53ed 100644
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -400,7 +400,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/man/woman.texi b/man/woman.texi
index 36cd254e6d3..590b78022f6 100644
--- a/man/woman.texi
+++ b/man/woman.texi
@@ -1,5 +1,5 @@
 \input texinfo   @c -*-texinfo-*-
-@c $Id: woman.texi,v 1.13 2002/12/10 13:20:09 pj Exp $
+@c $Id: woman.texi,v 1.12 2002/10/02 23:24:31 karl Exp $
 @c %**start of header
 @setfilename ../info/woman
 @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
@@ -1642,7 +1642,3 @@ Eli Zaretskii, @email{eliz@@is.elta.co.il}
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: a1a6b715-396f-4378-9b94-0b2ca0aa5028
-@end ignore
diff --git a/man/xresources.texi b/man/xresources.texi
index 5d040b61a05..702c6feedc4 100644
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -929,7 +929,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.
-
-@ignore
-   arch-tag: 9b6ff773-48b6-41f6-b2f9-f114b8bdd97f
-@end ignore