Use @file for buffers, per the Texinfo manual

* doc/misc/ada-mode.texi, doc/misc/auth.texi, doc/misc/calc.texi:
* doc/misc/ebrowse.texi, doc/misc/efaq.texi, doc/misc/emacs-gnutls.texi:
* doc/misc/epa.texi, doc/misc/ert.texi, doc/misc/eshell.texi:
* doc/misc/eww.texi, doc/misc/flymake.texi, doc/misc/gnus.texi:
* doc/misc/info.texi, doc/misc/message.texi, doc/misc/mh-e.texi: 
* doc/misc/newsticker.texi, doc/misc/pcl-cvs.texi, doc/misc/rcirc.texi:
* doc/misc/sem-user.texi, doc/misc/smtpmail.texi, doc/misc/url.texi:
* doc/misc/viper.texi, doc/misc/wisent.texi, doc/misc/woman.texi: 
Use @file for buffers, per the Texinfo manual.

25 files changed, 176 insertions, 167 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 770819ee445..13d147f7e72 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-12  Glenn Morris  <rgm@gnu.org>
+
+        * ada-mode.texi, auth.texi, calc.texi, ebrowse.texi, efaq.texi:
+        * emacs-gnutls.texi, epa.texi, ert.texi, eshell.texi, eww.texi:
+        * flymake.texi, gnus.texi, info.texi, message.texi, mh-e.texi:
+        * newsticker.texi, pcl-cvs.texi, rcirc.texi, sem-user.texi:
+        * smtpmail.texi, url.texi, viper.texi, wisent.texi, woman.texi:
+        Use @file for buffers, per the Texinfo manual.
+
 2014-03-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * org.texi: Don't set txicodequoteundirected and txicodequotebacktick
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index f20f0910763..71f020ceb28 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -352,7 +352,7 @@ Invoke @samp{Ada | Project | Load}, and load a project file that specifies @code
 
 The @code{Check file}, @code{Compile file}, and @code{Build} commands
 all place compilation errors in a separate buffer named
-@code{*compilation*}.
+@file{*compilation*}.
 
 Each line in this buffer will become active: you can simply click on
 it with the middle button of the mouse, or move point to it and press
@@ -374,8 +374,8 @@ An Emacs Ada mode project file specifies what directories hold sources
 for your project, and allows you to customize the compilation commands
 and other things on a per-project basis.
 
-Note that Ada mode project files @samp{*.adp} are different than GNAT
-compiler project files @samp{*.gpr}. However, Emacs Ada mode can use a
+Note that Ada mode project files @file{*.adp} are different than GNAT
+compiler project files @file{*.gpr}. However, Emacs Ada mode can use a
 GNAT project file to specify the project directories. If no
 other customization is needed, a GNAT project file can be used without
 an Emacs Ada mode project file.
@@ -728,7 +728,7 @@ Yes, this is missing the keyword @code{body}; another compiler error
 example.
 
 In buffer @file{hello.adb}, invoke @samp{Ada | Check file}. You should
-get a @code{*compilation*} buffer containing something like (the
+get a @file{*compilation*} buffer containing something like (the
 directory paths will be different):
 
 @smallexample
@@ -815,7 +815,7 @@ Emacs has remembered the main file, in the project variable
 @code{main}, and used it for the Build command.
 
 Finally, again while in @file{hello_pkg.adb}, invoke @samp{Ada | Run}.
-The @code{*run*} buffer displays @code{Hello from hello_pkg.adb}.
+The @file{*run*} buffer displays @code{Hello from hello_pkg.adb}.
 
 One final point. If you switch back to buffer @file{hello.adb}, and
 invoke @samp{Ada | Run}, @file{hello_2.exe} will be run. That is
@@ -876,7 +876,7 @@ In buffer @file{hello.adb}, invoke @samp{Ada | Project | Load...}, and
 select @file{Example_2/hello.adp}.
 
 Then, again in buffer @file{hello.adb}, invoke @samp{Ada | Set main and
-Build}. You should get a @code{*compilation*} buffer containing
+Build}. You should get a @file{*compilation*} buffer containing
 something like (the directory paths will be different):
 
 @example
@@ -960,7 +960,7 @@ In buffer @file{hello_3.adb}, invoke @samp{Ada | Project | Load...}, and
 select @file{Example_3/Other/other.adp}.
 
 Then, again in @file{hello_3.adb}, invoke @samp{Ada | Set main and
-Build}. You should get a @code{*compilation*} buffer containing
+Build}. You should get a @file{*compilation*} buffer containing
 something like (the directory paths will be different):
 
 @example
@@ -1043,7 +1043,7 @@ In buffer @file{hello_4.adb}, invoke @samp{Ada | Project | Load...}, and
 select @file{Example_4/Gnat_Project/hello_4.gpr}.
 
 Then, again in @file{hello_4.adb}, invoke @samp{Ada | Set main and
-Build}. You should get a @code{*compilation*} buffer containing
+Build}. You should get a @file{*compilation*} buffer containing
 something like (the directory paths will be different):
 
 @smallexample
@@ -1110,7 +1110,7 @@ In buffer @file{hello_5.adb}, invoke @samp{Ada | Project | Load...}, and
 select @file{Example_5/hello_5.adp}.
 
 Then, again in @file{hello_5.adb}, invoke @samp{Ada | Set main and
-Build}. You should get a @code{*compilation*} buffer containing
+Build}. You should get a @file{*compilation*} buffer containing
 something like (the directory paths will be different):
 
 @smallexample
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 993062f8082..110473209c4 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -127,7 +127,7 @@ later.
 
 If you have problems with the search, set @code{auth-source-debug} to
 @code{'trivia} and see what host, port, and user the library is
-checking in the @samp{*Messages*} buffer.  Ditto for any other
+checking in the @file{*Messages*} buffer.  Ditto for any other
 problems, your first step is always to see what's being checked.  The
 second step, of course, is to write a blog entry about it and wait for
 the answer in the comments.
@@ -382,7 +382,7 @@ The auth-source library lets you control logging output easily.
 
 @defvar auth-source-debug
 Set this variable to @code{'trivia} to see lots of output in
-@samp{*Messages*}, or set it to a function that behaves like
+@file{*Messages*}, or set it to a function that behaves like
 @code{message} to do your own logging.
 @end defvar
 
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 4010d6c8c19..366f1e3f03d 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -3960,7 +3960,7 @@ Next, let's add the line we got from our least-squares fit.
 @ifinfo
 (If you are reading this tutorial on-line while running Calc, typing
 @kbd{g a} may cause the tutorial to disappear from its window and be
-replaced by a buffer named @samp{*Gnuplot Commands*}.  The tutorial
+replaced by a buffer named @file{*Gnuplot Commands*}.  The tutorial
 will reappear when you terminate GNUPLOT by typing @kbd{g q}.)
 @end ifinfo
 
@@ -9617,8 +9617,8 @@ numeric entry, undo, numeric prefix arguments, etc.
 @cindex Starting the Calculator
 @cindex Running the Calculator
 To start the Calculator in its standard interface, type @kbd{M-x calc}.
-By default this creates a pair of small windows, @samp{*Calculator*}
-and @samp{*Calc Trail*}.  The former displays the contents of the
+By default this creates a pair of small windows, @file{*Calculator*}
+and @file{*Calc Trail*}.  The former displays the contents of the
 Calculator stack and is manipulated exclusively through Calc commands.
 It is possible (though not usually necessary) to create several Calc
 mode buffers each of which has an independent stack, undo list, and
@@ -9626,7 +9626,7 @@ mode settings.  There is exactly one Calc Trail buffer; it records a
 list of the results of all calculations that have been done.  The
 Calc Trail buffer uses a variant of Calc mode, so Calculator commands
 still work when the trail buffer's window is selected.  It is possible
-to turn the trail window off, but the @samp{*Calc Trail*} buffer itself
+to turn the trail window off, but the @file{*Calc Trail*} buffer itself
 still exists and is updated silently.  @xref{Trail Commands}.
 
 @kindex C-x * c
@@ -10150,10 +10150,10 @@ forget what it was, just run @code{C-x * q} again and enter
 @samp{$} as the formula.
 
 If this is the first time you have used the Calculator in this Emacs
-session, the @kbd{C-x * q} command will create the @code{*Calculator*}
+session, the @kbd{C-x * q} command will create the @file{*Calculator*}
 buffer and perform all the usual initializations; it simply will
 refrain from putting that buffer up in a new window.  The Quick
-Calculator refers to the @code{*Calculator*} buffer for all mode
+Calculator refers to the @file{*Calculator*} buffer for all mode
 settings.  Thus, for example, to set the precision that the Quick
 Calculator uses, simply run the full Calculator momentarily and use
 the regular @kbd{p} command.
@@ -10341,9 +10341,9 @@ that you must always press @kbd{w} yourself to see the messages).
 @pindex another-calc
 It is possible to have any number of Calc mode buffers at once.
 Usually this is done by executing @kbd{M-x another-calc}, which
-is similar to @kbd{C-x * c} except that if a @samp{*Calculator*}
+is similar to @kbd{C-x * c} except that if a @file{*Calculator*}
 buffer already exists, a new, independent one with a name of the
-form @samp{*Calculator*<@var{n}>} is created.  You can also use the
+form @file{*Calculator*<@var{n}>} is created.  You can also use the
 command @code{calc-mode} to put any buffer into Calculator mode, but
 this would ordinarily never be done.
 
@@ -10358,7 +10358,7 @@ global default values of these variables are used only when a new
 Calculator buffer is created.  The @code{calc-quit} command saves
 the stack and mode settings of the buffer being quit as the new defaults.
 
-There is only one trail buffer, @samp{*Calc Trail*}, used by all
+There is only one trail buffer, @file{*Calc Trail*}, used by all
 Calculator buffers.
 
 @node Troubleshooting Commands,  , Multiple Calculators, Introduction
@@ -11882,7 +11882,7 @@ the stack objects at the levels determined by the point and the mark.
 @pindex calc-edit-finish
 @cindex Editing the stack with Emacs
 The @kbd{`} (@code{calc-edit}) command creates a temporary buffer
-(@samp{*Calc Edit*}) for editing the top-of-stack value using regular
+(@file{*Calc Edit*}) for editing the top-of-stack value using regular
 Emacs commands.  Note that @kbd{`} is a backquote, not a quote. With a
 numeric prefix argument, it edits the specified number of stack entries
 at once.  (An argument of zero edits the entire stack; a negative
@@ -11895,9 +11895,9 @@ usual meaning (``insert a newline'') if it's a situation where you
 might want to insert new lines into the editing buffer.
 
 When you finish editing, the Calculator parses the lines of text in
-the @samp{*Calc Edit*} buffer as numbers or formulas, replaces the
+the @file{*Calc Edit*} buffer as numbers or formulas, replaces the
 original stack elements in the original buffer with these new values,
-then kills the @samp{*Calc Edit*} buffer.  The original Calculator buffer
+then kills the @file{*Calc Edit*} buffer.  The original Calculator buffer
 continues to exist during editing, but for best results you should be
 careful not to change it until you have finished the edit.  You can
 also cancel the edit by killing the buffer with @kbd{C-x k}.
@@ -11908,7 +11908,7 @@ For example, editing @samp{a + 2} to @samp{3 + 2} and pressing
 finish, Calc will put the result on the stack without evaluating it.
 
 If you give a prefix argument to @kbd{C-c C-c},
-Calc will not kill the @samp{*Calc Edit*} buffer.  You can switch
+Calc will not kill the @file{*Calc Edit*} buffer.  You can switch
 back to that buffer and continue editing if you wish.  However, you
 should understand that if you initiated the edit with @kbd{`}, the
 @kbd{C-c C-c} operation will be programmed to replace the top of the
@@ -11918,13 +11918,13 @@ with other editing commands, though, such as @kbd{s e}
 (@code{calc-edit-variable}; @pxref{Operations on Variables}).
 
 If the @code{calc-edit} command involves more than one stack entry,
-each line of the @samp{*Calc Edit*} buffer is interpreted as a
+each line of the @file{*Calc Edit*} buffer is interpreted as a
 separate formula.  Otherwise, the entire buffer is interpreted as
 one formula, with line breaks ignored.  (You can use @kbd{C-o} or
 @kbd{C-q C-j} to insert a newline in the buffer without pressing @key{RET}.)
 
 The @kbd{`} key also works during numeric or algebraic entry.  The
-text entered so far is moved to the @code{*Calc Edit*} buffer for
+text entered so far is moved to the @file{*Calc Edit*} buffer for
 more extensive editing than is convenient in the minibuffer.
 
 @node Trail Commands, Keep Arguments, Editing Stack Entries, Stack and Trail
@@ -23604,7 +23604,7 @@ of 3 is used.  The lower this limit is, the greater the chance that Calc
 will be unable to integrate a function it could otherwise handle.  Raising
 this limit allows the Calculator to solve more integrals, though the time
 it takes may grow exponentially.  You can monitor the integrator's actions
-by creating an Emacs buffer called @code{*Trace*}.  If such a buffer
+by creating an Emacs buffer called @file{*Trace*}.  If such a buffer
 exists, the @kbd{a i} command will write a log of its actions there.
 
 If you want to manipulate integrals in a purely symbolic way, you can
@@ -27653,17 +27653,17 @@ only during integration by @kbd{a i}.
 @subsection Debugging Rewrites
 
 @noindent
-If a buffer named @samp{*Trace*} exists, the rewrite mechanism will
+If a buffer named @file{*Trace*} exists, the rewrite mechanism will
 record some useful information there as it operates.  The original
 formula is written there, as is the result of each successful rewrite,
 and the final result of the rewriting.  All phase changes are also
 noted.
 
-Calc always appends to @samp{*Trace*}.  You must empty this buffer
+Calc always appends to @file{*Trace*}.  You must empty this buffer
 yourself periodically if it is in danger of growing unwieldy.
 
 Note that the rewriting mechanism is substantially slower when the
-@samp{*Trace*} buffer exists, even if the buffer is not visible on
+@file{*Trace*} buffer exists, even if the buffer is not visible on
 the screen.  Once you are done, you will probably want to kill this
 buffer (with @kbd{C-x k *Trace* @key{RET}}).  If you leave it in
 existence and forget about it, all your future rewrite commands will
@@ -27986,7 +27986,7 @@ be considered a ``femto-ton,'' but it is written as @samp{1000 at}
 @kindex u v
 @pindex calc-enter-units-table
 The @kbd{u v} (@code{calc-enter-units-table}) command displays the units table
-in another buffer called @code{*Units Table*}.  Each entry in this table
+in another buffer called @file{*Units Table*}.  Each entry in this table
 gives the unit name as it would appear in an expression, the definition
 of the unit in terms of simpler units, and a full name or description of
 the unit.  Fundamental units are defined as themselves; these are the
@@ -29267,7 +29267,7 @@ result is a surface plot where
 is the height of the point
 at coordinate @expr{(x_i, y_j)} on the surface.  The 3D graph will
 be displayed from a certain default viewpoint; you can change this
-viewpoint by adding a @samp{set view} to the @samp{*Gnuplot Commands*}
+viewpoint by adding a @samp{set view} to the @file{*Gnuplot Commands*}
 buffer as described later.  See the GNUPLOT documentation for a
 description of the @samp{set view} command.
 
@@ -29330,7 +29330,7 @@ you give the @kbd{g p} command, all the curves will be drawn superimposed
 on the same axes.
 
 The @kbd{g a} command (and many others that affect the current graph)
-will cause a special buffer, @samp{*Gnuplot Commands*}, to be displayed
+will cause a special buffer, @file{*Gnuplot Commands*}, to be displayed
 in another window.  This buffer is a template of the commands that will
 be sent to GNUPLOT when it is time to draw the graph.  The first
 @kbd{g a} command adds a @code{plot} command to this buffer.  Succeeding
@@ -29341,7 +29341,7 @@ directly, but you can if you wish.  The only constraint is that there
 must be only one @code{plot} command, and it must be the last command
 in the buffer.  If you want to save and later restore a complete graph
 configuration, you can use regular Emacs commands to save and restore
-the contents of the @samp{*Gnuplot Commands*} buffer.
+the contents of the @file{*Gnuplot Commands*} buffer.
 
 @vindex PlotData1
 @vindex PlotData2
@@ -29393,10 +29393,10 @@ separate ``z''s).  With a zero prefix, it takes three stack entries
 but the ``z'' entry is a vector of curve values.  With a negative
 prefix @expr{-n}, it takes @expr{n} vectors of the form @expr{[x, y, z]}.
 The @kbd{g A} command works by adding a @code{splot} (surface-plot)
-command to the @samp{*Gnuplot Commands*} buffer.
+command to the @file{*Gnuplot Commands*} buffer.
 
 (Although @kbd{g a} adds a 2D @code{plot} command to the
-@samp{*Gnuplot Commands*} buffer, Calc changes this to @code{splot}
+@file{*Gnuplot Commands*} buffer, Calc changes this to @code{splot}
 before sending it to GNUPLOT if it notices that the data points are
 evaluating to @code{xyz} calls.  It will not work to mix 2D and 3D
 @kbd{g a} curves in a single graph, although Calc does not currently
@@ -29428,7 +29428,7 @@ affect the last curve in the list.
 @kindex g p
 @pindex calc-graph-plot
 The @kbd{g p} (@code{calc-graph-plot}) command uses GNUPLOT to draw
-the graph described in the @samp{*Gnuplot Commands*} buffer.  Any
+the graph described in the @file{*Gnuplot Commands*} buffer.  Any
 GNUPLOT parameters which are not defined by commands in this buffer
 are reset to their default values.  The variables named in the @code{plot}
 command are written to a temporary data file and the variable names
@@ -29462,7 +29462,7 @@ the current graph is three-dimensional.
 The @kbd{g P} (@code{calc-graph-print}) command is like @kbd{g p},
 except that it sends the output to a printer instead of to the
 screen.  More precisely, @kbd{g p} looks for @samp{set terminal}
-or @samp{set output} commands in the @samp{*Gnuplot Commands*} buffer;
+or @samp{set output} commands in the @file{*Gnuplot Commands*} buffer;
 lacking these it uses the default settings.  However, @kbd{g P}
 ignores @samp{set terminal} and @samp{set output} commands and
 uses a different set of default values.  All of these values are
@@ -29481,7 +29481,7 @@ The @kbd{g g} (@code{calc-graph-grid}) command turns the ``grid''
 on and off.  It is off by default; tick marks appear only at the
 edges of the graph.  With the grid turned on, dotted lines appear
 across the graph at each tick mark.  Note that this command only
-changes the setting in @samp{*Gnuplot Commands*}; to see the effects
+changes the setting in @file{*Gnuplot Commands*}; to see the effects
 of the change you must give another @kbd{g p} command.
 
 @kindex g b
@@ -29519,7 +29519,7 @@ time. This is usually more than adequate, but there are cases where
 it will not be.  For example, plotting @expr{1 + x} with @expr{x} in the
 interval @samp{[0 ..@: 1e-6]} will round all the data points down
 to 1.0!  Putting the command @samp{set precision @var{n}} in the
-@samp{*Gnuplot Commands*} buffer will cause the data to be computed
+@file{*Gnuplot Commands*} buffer will cause the data to be computed
 at precision @var{n} instead of 5.  Since this is such a rare case,
 there is no keystroke-based command to set the precision.
 
@@ -29534,9 +29534,9 @@ The default title is blank (no title).
 The @kbd{g n} (@code{calc-graph-name}) command sets the title of an
 individual curve.  Like the other curve-manipulating commands, it
 affects the most recently added curve, i.e., the last curve on the
-list in the @samp{*Gnuplot Commands*} buffer.  To set the title of
+list in the @file{*Gnuplot Commands*} buffer.  To set the title of
 the other curves you must first juggle them to the end of the list
-with @kbd{g j}, or edit the @samp{*Gnuplot Commands*} buffer by hand.
+with @kbd{g j}, or edit the @file{*Gnuplot Commands*} buffer by hand.
 Curve titles appear in the key; if the key is turned off they are
 not used.
 
@@ -29549,7 +29549,7 @@ The @kbd{g t} (@code{calc-graph-title-x}) and @kbd{g T}
 and ``y'' axes, respectively.  These titles appear next to the
 tick marks on the left and bottom edges of the graph, respectively.
 Calc does not have commands to control the tick marks themselves,
-but you can edit them into the @samp{*Gnuplot Commands*} buffer if
+but you can edit them into the @file{*Gnuplot Commands*} buffer if
 you wish.  See the GNUPLOT documentation for details.
 
 @kindex g r
@@ -29663,7 +29663,7 @@ value.
 The @code{dumb} device is an interface to ``dumb terminals,'' i.e.,
 terminals with no special graphics facilities.  It writes a crude
 picture of the graph composed of characters like @code{-} and @code{|}
-to a buffer called @samp{*Gnuplot Trail*}, which Calc then displays.
+to a buffer called @file{*Gnuplot Trail*}, which Calc then displays.
 The graph is made the same size as the Emacs screen, which on most
 dumb terminals will be
 @texline @math{80\times24}
@@ -29678,7 +29678,7 @@ spaces.  These are the desired width and height of the graph in
 characters.  Also, the device name @code{big} is like @code{dumb}
 but creates a graph four times the width and height of the Emacs
 screen.  You will then have to scroll around to view the entire
-graph.  In the @samp{*Gnuplot Trail*} buffer, @key{SPC}, @key{DEL},
+graph.  In the @file{*Gnuplot Trail*} buffer, @key{SPC}, @key{DEL},
 @kbd{<}, and @kbd{>} are defined to scroll by one screenful in each
 of the four directions.
 
@@ -29697,7 +29697,7 @@ used.  Many other ``devices'' are really file formats like
 @code{postscript}; in these cases the output in the desired format
 goes into the file you name with @kbd{g O}.  Type @kbd{g O stdout
 @key{RET}} to set GNUPLOT to write to its standard output stream,
-i.e., to @samp{*Gnuplot Trail*}.  This is the default setting.
+i.e., to @file{*Gnuplot Trail*}.  This is the default setting.
 
 Another special output name is @code{tty}, which means that GNUPLOT
 is going to write graphics commands directly to its standard output,
@@ -29721,7 +29721,7 @@ permanently by the @kbd{m m} (@code{calc-save-modes}) command.  The
 default number of data points (see @kbd{g N}) and the X geometry
 (see @kbd{g X}) are also saved.  Other graph information is @emph{not}
 saved; you can save a graph's configuration simply by saving the contents
-of the @samp{*Gnuplot Commands*} buffer.
+of the @file{*Gnuplot Commands*} buffer.
 
 @vindex calc-gnuplot-plot-command
 @vindex calc-gnuplot-default-device
@@ -29762,7 +29762,7 @@ Entering @samp{800x500+0+0} would create an 800-by-500 pixel
 window in the upper-left corner of the screen.  This command has no
 effect if the current device is @code{windows}.
 
-The buffer called @samp{*Gnuplot Trail*} holds a transcript of the
+The buffer called @file{*Gnuplot Trail*} holds a transcript of the
 session with GNUPLOT@.  This shows the commands Calc has ``typed'' to
 GNUPLOT and the responses it has received.  Calc tries to notice when an
 error message has appeared here and display the buffer for you when
@@ -29779,7 +29779,7 @@ usage of GNUPLOT.
 @pindex calc-graph-command
 The @kbd{g C} (@code{calc-graph-command}) command prompts you to
 enter any line of text, then simply sends that line to the current
-GNUPLOT process.  The @samp{*Gnuplot Trail*} buffer looks deceptively
+GNUPLOT process.  The @file{*Gnuplot Trail*} buffer looks deceptively
 like a Shell buffer but you can't type commands in it yourself.
 Instead, you must use @kbd{g C} for this purpose.
 
@@ -29788,21 +29788,21 @@ Instead, you must use @kbd{g C} for this purpose.
 @pindex calc-graph-view-commands
 @pindex calc-graph-view-trail
 The @kbd{g v} (@code{calc-graph-view-commands}) and @kbd{g V}
-(@code{calc-graph-view-trail}) commands display the @samp{*Gnuplot Commands*}
-and @samp{*Gnuplot Trail*} buffers, respectively, in another window.
+(@code{calc-graph-view-trail}) commands display the @file{*Gnuplot Commands*}
+and @file{*Gnuplot Trail*} buffers, respectively, in another window.
 This happens automatically when Calc thinks there is something you
 will want to see in either of these buffers.  If you type @kbd{g v}
 or @kbd{g V} when the relevant buffer is already displayed, the
-buffer is hidden again.  (Note that on MS-Windows, the @samp{*Gnuplot
+buffer is hidden again.  (Note that on MS-Windows, the @file{*Gnuplot
 Trail*} buffer will usually show nothing of interest, because
 GNUPLOT's responses are not communicated back to Calc.)
 
 One reason to use @kbd{g v} is to add your own commands to the
-@samp{*Gnuplot Commands*} buffer.  Press @kbd{g v}, then use
+@file{*Gnuplot Commands*} buffer.  Press @kbd{g v}, then use
 @kbd{C-x o} to switch into that window.  For example, GNUPLOT has
 @samp{set label} and @samp{set arrow} commands that allow you to
 annotate your plots.  Since Calc doesn't understand these commands,
-you have to add them to the @samp{*Gnuplot Commands*} buffer
+you have to add them to the @file{*Gnuplot Commands*} buffer
 yourself, then use @w{@kbd{g p}} to replot using these new commands.  Note
 that your commands must appear @emph{before} the @code{plot} command.
 To get help on any GNUPLOT feature, type, e.g., @kbd{g C help set label}.
@@ -29826,7 +29826,7 @@ exit Emacs if you haven't killed it manually by then.
 @kindex g K
 @pindex calc-graph-kill
 The @kbd{g K} (@code{calc-graph-kill}) command is like @kbd{g q}
-except that it also views the @samp{*Gnuplot Trail*} buffer so that
+except that it also views the @file{*Gnuplot Trail*} buffer so that
 you can see the process being killed.  This is better if you are
 killing GNUPLOT because you think it has gotten stuck.
 
@@ -30181,7 +30181,7 @@ trail all at once.  This mode would normally be used when running
 Calc standalone (@pxref{Standalone Operation}).
 
 If you aren't using the X window system, you must switch into
-the @samp{*Calc Keypad*} window, place the cursor on the desired
+the @file{*Calc Keypad*} window, place the cursor on the desired
 ``key,'' and type @key{SPC} or @key{RET}.  If you think this
 is easier than using Calc normally, go right ahead.
 
@@ -32313,7 +32313,7 @@ after Calc itself is loaded.
 The properties of @code{calc-define} are evaluated in the same order
 that they were added.  They can assume that the Calc modules @file{calc.el},
 @file{calc-ext.el}, and @file{calc-macs.el} have been fully loaded, and
-that the @samp{*Calculator*} buffer will be the current buffer.
+that the @file{*Calculator*} buffer will be the current buffer.
 
 If your @code{calc-define} property only defines algebraic functions,
 you can be sure that it will have been evaluated before Calc tries to
@@ -32400,9 +32400,9 @@ the function with code that looks roughly like this:
 @end smallexample
 
 @findex calc-select-buffer
-The @code{calc-select-buffer} function selects the @samp{*Calculator*}
+The @code{calc-select-buffer} function selects the @file{*Calculator*}
 buffer if necessary, say, because the command was invoked from inside
-the @samp{*Calc Trail*} window.
+the @file{*Calc Trail*} window.
 
 @findex calc-set-command-flag
 You can call, for example, @code{(calc-set-command-flag 'no-align)} to
@@ -32432,7 +32432,7 @@ Do not clear @code{calc-inverse-flag}, @code{calc-hyperbolic-flag},
 and @code{calc-keep-args-flag} at the end of this command.
 
 @item do-edit
-Switch to buffer @samp{*Calc Edit*} after this command.
+Switch to buffer @file{*Calc Edit*} after this command.
 
 @item hold-trail
 Do not move trail pointer to end of trail when something is recorded
@@ -33154,7 +33154,7 @@ It is, of course, polite to put the Calc stack back the way you
 found it when you are done, unless the user of your program is
 actually expecting it to affect the stack.
 
-Note that you do not actually have to switch into the @samp{*Calculator*}
+Note that you do not actually have to switch into the @file{*Calculator*}
 buffer in order to use @code{calc-eval}; it temporarily switches into
 the stack buffer if necessary.
 
@@ -33689,7 +33689,7 @@ entries.)
 @end defun
 
 @defun calc-refresh
-Erase the @code{*Calculator*} buffer and reformat its contents from memory.
+Erase the @file{*Calculator*} buffer and reformat its contents from memory.
 This must be called after changing any parameter, such as the current
 display radix, which might change the appearance of existing stack
 entries.  (During a keyboard macro invoked by the @kbd{X} key, refreshing
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index 9e9596d236a..3d1ce5e5da3 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -495,7 +495,7 @@ The same functionality is available from the menu opened with
 
 @node Member Display
 @section Displaying Members
-@cindex @samp{*Members*} buffer
+@cindex @file{*Members*} buffer
 @cindex @samp{*Globals*}
 @cindex freezing a member buffer
 @cindex member lists, in tree buffers
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index ca9e24fbeaa..51d2cc00d5a 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2410,12 +2410,12 @@ printed an error message?  If so, compiling from within Emacs using the
 @kbd{M-x compile} and @kbd{M-x recompile} commands is a much more
 effective way of doing that.  Emacs automatically intercepts the compile
 error messages, inserts them into a special buffer called
-@code{*compilation*}, and lets you visit the locus of each message in
+@file{*compilation*}, and lets you visit the locus of each message in
 the source.  Type @kbd{C-x `} to step through the offending lines one by
 one (starting with Emacs 22, you can also use @kbd{M-g M-p} and
 @kbd{M-g M-n} to go to the previous and next matches directly).  Click
 @kbd{Mouse-2} or press @key{RET} on a message text in the
-@code{*compilation*} buffer to go to the line whose number is mentioned
+@file{*compilation*} buffer to go to the line whose number is mentioned
 in that message.
 
 But if you indeed need to go to a certain text line, type @kbd{M-g M-g}
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 9d250e06888..d6a95a46296 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -104,7 +104,7 @@ properly.  Well, there's something to be done in the last case.
 @defvar gnutls-log-level
 The @code{gnutls-log-level} variable sets the log level.  1 is
 verbose.  2 is very verbose.  5 is crazy.  Crazy!  Set it to 1 or 2
-and look in the @code{*Messages*} buffer for the debugging
+and look in the @file{*Messages*} buffer for the debugging
 information.
 @end defvar
 
@@ -148,7 +148,7 @@ instead.
 
 Because of the low-level interactions with the GnuTLS library, there
 is no way currently to ask if a certificate can be accepted.  You have
-to look in the @code{*Messages*} buffer.
+to look in the @file{*Messages*} buffer.
 @end defvar
 
 @defvar gnutls-min-prime-bits
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 4dbc1373d32..76794517692 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -97,7 +97,7 @@ EasyPG Assistant commands are prefixed by @samp{epa-}.  For example,
 
 EasyPG Assistant provides several cryptographic features which can be
 integrated into other Emacs functionalities.  For example, automatic
-encryption/decryption of @samp{*.gpg} files.
+encryption/decryption of @file{*.gpg} files.
 
 @node Commands
 @chapter Commands
@@ -161,7 +161,7 @@ Show all keys matched with @var{name} from the private keyring.
 @end deffn
 
 @noindent
-In @samp{*Keys*} buffer, several commands are available.  The common
+In @file{*Keys*} buffer, several commands are available.  The common
 use case is to export some keys to a file.  To do that, type @kbd{m}
 to select keys, type @kbd{o}, and then supply the filename.
 
@@ -355,10 +355,10 @@ use that option to ignore specific recipients for encryption purposes.
 
 @node Encrypting/decrypting gpg files
 @section Encrypting/decrypting gpg files
-By default, every file whose name ends with @samp{.gpg} will be
+By default, every file whose name ends with @file{.gpg} will be
 treated as encrypted.  That is, when you open such a file, the
 decrypted text is inserted in the buffer rather than encrypted one.
-Similarly, when you save the buffer to a @samp{foo.gpg} file,
+Similarly, when you save the buffer to a @file{foo.gpg} file,
 encrypted data is written.
 
 The file name pattern for encrypted files can be controlled by
@@ -492,7 +492,7 @@ collect necessary information to fix the bug, such as:
 
 Before reporting the bug, you should set @code{epg-debug} in the
 @file{~/.emacs} file and repeat the bug.  Then, include the contents
-of the @samp{ *epg-debug*} buffer.  Note that the first letter of the
+of the @file{ *epg-debug*} buffer.  Note that the first letter of the
 buffer name is a whitespace.
 
 @node GNU Free Documentation License
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index d57e629775c..586fab6cd5b 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -513,7 +513,7 @@ occurs even if the test fails.
 
 An exception to this are messages that the code under test prints with
 @code{message} and similar logging; tests should not bother restoring
-the @code{*Message*} buffer to its original state.
+the @file{*Message*} buffer to its original state.
 
 The above guidelines imply that tests should avoid calling highly
 customizable commands such as @code{find-file}, except, of course, if
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index befe3187d89..d52f3d92747 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -665,7 +665,7 @@ virtual devices.
 The buffer redirection operator, @code{>>>}, expects a buffer object
 on the right-hand side, into which it inserts the output of the
 left-hand side.  e.g., @samp{echo hello >>> #<buffer *scratch*>}
-inserts the string @code{"hello"} into the @code{*scratch*} buffer.
+inserts the string @code{"hello"} into the @file{*scratch*} buffer.
 
 @code{eshell-virtual-targets} is a list of mappings of virtual device
 names to functions.  Eshell comes with two virtual devices:
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 38bec5a4c8b..ebccb055c62 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -91,7 +91,7 @@ either prefix the file name with @code{file://} or use the command
 @kindex q
 @kindex w
 @kindex g
-  If loading the URL was successful the buffer @code{*eww*} is opened
+  If loading the URL was successful the buffer @file{*eww*} is opened
 and the web page is rendered in it.  You can leave EWW by pressing
 @kbd{q} or exit the browser by calling @kbd{eww-quit}.  To reload the
 web page hit @kbd{g} (@code{eww-reload}).  Pressing @kbd{w}
@@ -117,7 +117,7 @@ forth between them.  By pressing @kbd{l} (@code{eww-back-url}) you go
 to the previous URL.  You can go forward again with @kbd{r}
 (@code{eww-forward-url}).  If you want an overview of your browsing
 history press @kbd{H} (@code{eww-list-histories}) to open the history
-buffer @code{*eww history*}.  The history is lost when EWW is quit.
+buffer @file{*eww history*}.  The history is lost when EWW is quit.
 If you want to remember websites you can use bookmarks.
 
 @findex eww-add-bookmark
@@ -129,7 +129,7 @@ If you want to remember websites you can use bookmarks.
 (@code{eww-add-bookmark}) to store a bookmark for the current website.
 You can view stored bookmarks with @kbd{B}
 (@code{eww-list-bookmarks}).  This will open the bookmark buffer
-@code{*eww bookmarks*}.
+@file{*eww bookmarks*}.
 
 @findex eww-browse-with-external-browser
 @vindex shr-external-browser
@@ -156,7 +156,7 @@ browser by customizing
 @cindex Viewing Source
   You can view the source of a website with @kbd{v}
 (@code{eww-view-source}).  This will open a new buffer
-@code{*eww-source*} and insert the source.  The buffer will be set to
+@file{*eww-source*} and insert the source.  The buffer will be set to
 @code{html-mode} if available.
 
 @findex url-cookie-list
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index 5125acd1f0d..362bcd8280b 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -255,7 +255,7 @@ syntax check tool).
 
 Flymake uses a simple logging facility for indicating important points
 in the control flow.  The logging facility sends logging messages to
-the @code{*Messages*} buffer.  The information logged can be used for
+the @file{*Messages*} buffer.  The information logged can be used for
 resolving various problems related to Flymake.
 
 Logging output is controlled by the @code{flymake-log-level}
@@ -326,7 +326,7 @@ started after @code{flymake-no-changes-timeout} seconds.
 @item flymake-gui-warnings-enabled
 A boolean flag indicating whether Flymake will show message boxes for
 non-recoverable errors.  If @code{flymake-gui-warnings-enabled} is
-@code{nil}, these errors will only be logged to the @code{*Messages*}
+@code{nil}, these errors will only be logged to the @file{*Messages*}
 buffer.
 
 @item flymake-start-syntax-check-on-newline
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 44d1f0352f3..10bc617734f 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -998,7 +998,7 @@ terminology section (@pxref{Terminology}).
 @cindex finding news
 
 First of all, you should know that there is a special buffer called
-@code{*Server*} that lists all the servers Gnus knows about.  You can
+@file{*Server*} that lists all the servers Gnus knows about.  You can
 press @kbd{^} from the Group buffer to see it.  In the Server buffer,
 you can press @kbd{RET} on a defined server to see all the groups it
 serves (subscribed or not!).  You can also add or delete servers, edit
@@ -5888,7 +5888,7 @@ have posted almost the same article twice.
 If you have just posted the article, and change your mind right away,
 there is a trick you can use to cancel/supersede the article without
 waiting for the article to appear on your site first.  You simply return
-to the post buffer (which is called @code{*sent ...*}).  There you will
+to the post buffer (which is called @file{*sent ...*}).  There you will
 find the article you just posted, with all the headers intact.  Change
 the @code{Message-ID} header to a @code{Cancel} or @code{Supersedes}
 header by substituting one of those words for the word
@@ -11139,7 +11139,7 @@ If you're in the habit of exiting groups, and then changing your mind
 about it, you might set @code{gnus-kill-summary-on-exit} to @code{nil}.
 If you do that, Gnus won't kill the summary buffer when you exit it.
 (Quelle surprise!)  Instead it will change the name of the buffer to
-something like @samp{*Dead Summary ... *} and install a minor mode
+something like @file{*Dead Summary ... *} and install a minor mode
 called @code{gnus-dead-summary-mode}.  Now, if you switch back to this
 buffer, you'll find that all keys are mapped to a function called
 @code{gnus-summary-wake-up-the-dead}.  So tapping any keys in a dead
@@ -13732,7 +13732,7 @@ A hook run before attempting to connect to an @acronym{NNTP} server.
 @item nntp-record-commands
 @vindex nntp-record-commands
 If non-@code{nil}, @code{nntp} will log all commands it sends to the
-@acronym{NNTP} server (along with a timestamp) in the @samp{*nntp-log*}
+@acronym{NNTP} server (along with a timestamp) in the @file{*nntp-log*}
 buffer.  This is useful if you are debugging a Gnus/@acronym{NNTP} connection
 that doesn't seem to work.
 
@@ -19438,7 +19438,7 @@ Display the score of the current article
 @kindex V t (Summary)
 @findex gnus-score-find-trace
 Display all score rules that have been used on the current article
-(@code{gnus-score-find-trace}).  In the @code{*Score Trace*} buffer, you
+(@code{gnus-score-find-trace}).  In the @file{*Score Trace*} buffer, you
 may type @kbd{e} to edit score file corresponding to the score rule on
 current line and @kbd{f} to format (@code{gnus-score-pretty-print}) the
 score file and edit it.
@@ -25919,7 +25919,7 @@ Fortunately, setting up the Gnus registry is pretty easy:
 @end lisp
 
 This adds registry saves to Gnus newsrc saves (which happen on exit
-and when you press @kbd{s} from the @code{*Group*} buffer.  It also
+and when you press @kbd{s} from the @file{*Group*} buffer.  It also
 adds registry calls to article actions in Gnus (copy, move, etc.)@: so
 it's not easy to undo the initialization.  See
 @code{gnus-registry-initialize} for the gory details.
@@ -26204,8 +26204,8 @@ This variable controls whether to add timestamps to messages that are
 controlled by @code{gnus-verbose} and @code{gnus-verbose-backends} and
 are issued.  The default value is @code{nil} which means never to add
 timestamp.  If it is @code{log}, add timestamps to only the messages
-that go into the @samp{*Messages*} buffer (in XEmacs, it is the
-@w{@samp{ *Message-Log*}} buffer).  If it is neither @code{nil} nor
+that go into the @file{*Messages*} buffer (in XEmacs, it is the
+@w{@file{ *Message-Log*}} buffer).  If it is neither @code{nil} nor
 @code{log}, add timestamps not only to log messages but also to the ones
 displayed in the echo area.
 
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 384dfde2dc6..810f4d0f371 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -1145,7 +1145,7 @@ select in another window.
   Another way to produce new Info buffers in Emacs is to use a numeric
 prefix argument for the @kbd{C-h i} command (@code{info}) which
 switches to the Info buffer with that number.  Thus, @kbd{C-u 2 C-h i}
-switches to the buffer @samp{*info*<2>}, creating it if necessary.
+switches to the buffer @file{*info*<2>}, creating it if necessary.
 
 @findex info-display-manual
   If you have created many Info buffers in Emacs, you might find it
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 4f0795eccc4..9be8ca05620 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1451,7 +1451,7 @@ Look like @code{angles} if that doesn't require quoting, and
 Headers in this list that were previously generated by Message will be
 deleted before posting.  Let's say you post an article.  Then you decide
 to post it again to some other group, you naughty boy, so you jump back
-to the @code{*post-buf*} buffer, edit the @code{Newsgroups} line, and
+to the @file{*post-buf*} buffer, edit the @code{Newsgroups} line, and
 ship it off again.  By default, this variable makes sure that the old
 generated @code{Message-ID} is deleted, and a new one generated.  If
 this isn't done, the entire empire would probably crumble, anarchy would
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index f08ad954a93..c3b646fa145 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -1086,7 +1086,7 @@ on a desert island with a laptop and are without your manuals, you can
 get a summary of all these commands with GNU Emacs online help: use
 @kbd{C-h m} (@code{describe-mode}) for a brief summary of commands,
 @kbd{?} (@code{mh-help}) for an even briefer summary@footnote{This
-help appears in a buffer called @samp{*MH-E Help*}
+help appears in a buffer called @file{*MH-E Help*}
 (@pxref{Miscellaneous}).} (@kbd{C-c ?} in MH-Letter mode), or @kbd{C-h
 i} to read this manual via Info. The online help is quite good; try
 running @kbd{C-h C-h}. This brings up a list of available help topics,
@@ -3692,8 +3692,8 @@ Set the options @code{mh-new-messages-folders} and
 folders. Otherwise, list the folders that should be searched with the
 @samp{Choose Folders} menu item. See @code{mh-recursive-folders-flag}.
 
-@cindex buffers, @samp{*MH-E Folders*}
-@cindex @samp{*MH-E Folders*}
+@cindex buffers, @file{*MH-E Folders*}
+@cindex @file{*MH-E Folders*}
 @findex mh-kill-folder
 @findex mh-list-folders
 @findex mh-pack-folder
@@ -3707,7 +3707,7 @@ folders. Otherwise, list the folders that should be searched with the
 
 Other commands you can perform on folders include: @kbd{F l}
 (@code{mh-list-folders}), to place a listing of all the folders in
-your mail directory in a buffer called @samp{*MH-E Folders*}
+your mail directory in a buffer called @file{*MH-E Folders*}
 (@pxref{Miscellaneous}); @kbd{F k} (@code{mh-kill-folder}), to remove
 a folder; @kbd{F S} (@code{mh-sort-folder}), to sort the messages by
 date (see @command{sortm}(1) to see how to sort by other criteria);
@@ -3781,7 +3781,7 @@ When you want to quit using MH-E and go back to editing, you can use
 the @kbd{q} (@code{mh-quit}) command. This buries the buffers of the
 current MH-E folder and restores the buffers that were present when
 you first ran @kbd{M-x mh-rmail}. It also removes any MH-E working
-buffers whose name begins with @samp{ *mh-} or @samp{*MH-E }
+buffers whose name begins with @samp{ *mh-} or @file{*MH-E }
 (@pxref{Miscellaneous}). You can later restore your MH-E session by
 selecting the @samp{+inbox} buffer or by running @kbd{M-x mh-rmail}
 again.
@@ -5618,10 +5618,10 @@ field, this setting is vital so that you can read the mail you write!
 @node Checking Recipients, Sending Message, Sending PGP, Editing Drafts
 @section Checking Recipients
 
-@cindex @samp{*MH-E Recipients*}
+@cindex @file{*MH-E Recipients*}
 @cindex @command{whom}
 @cindex MH commands, @command{whom}
-@cindex buffers, @samp{*MH-E Recipients*}
+@cindex buffers, @file{*MH-E Recipients*}
 @cindex checking recipients
 @cindex recipients, checking
 @findex mh-check-whom
@@ -5629,7 +5629,7 @@ field, this setting is vital so that you can read the mail you write!
 
 The command @kbd{C-c C-w} (@code{mh-check-whom}) expands aliases so
 you can check the actual address(es) in the alias. A new buffer named
-@samp{*MH-E Recipients*} is created with the output of @command{whom}
+@file{*MH-E Recipients*} is created with the output of @command{whom}
 (@pxref{Miscellaneous})@footnote{See the section
 @uref{@value{MH-BOOK-HOME}/senove.html#WhaPro, What now?---and the
 whatnow Program} in the MH book.}.
@@ -5637,8 +5637,8 @@ whatnow Program} in the MH book.}.
 @node Sending Message, Killing Draft, Checking Recipients, Editing Drafts
 @section Sending a Message
 
-@cindex buffers, @samp{*MH-E Mail Delivery*}
-@cindex @samp{*MH-E Mail Delivery*}
+@cindex buffers, @file{*MH-E Mail Delivery*}
+@cindex @file{*MH-E Mail Delivery*}
 @cindex sending mail
 @findex mh-send-letter
 @kindex C-c C-c
@@ -5646,7 +5646,7 @@ whatnow Program} in the MH book.}.
 When you are all through editing a message, you send it with the
 command @kbd{C-c C-c} (@code{mh-send-letter}). You can give a prefix
 argument (as in @kbd{C-u C-c C-c}) to monitor the first stage of the
-delivery; this output can be found in a buffer called @samp{*MH-E Mail
+delivery; this output can be found in a buffer called @file{*MH-E Mail
 Delivery*} (@pxref{Miscellaneous}).
 
 @cindex sending mail
@@ -7157,7 +7157,7 @@ MH-E has been byte-compiled, you could try running @samp{locate
 mh-thread.elc} or otherwise find MH-E on your system and ensure that
 @file{mh-thread.elc} exists. If you have multiple versions and you
 find that one is compiled but the other is not, then go into your
-@samp{*scratch*} buffer in Emacs, enter @kbd{load-path C-j}, and
+@file{*scratch*} buffer in Emacs, enter @kbd{load-path C-j}, and
 ensure that the byte-compiled version appears first in the
 @code{load-path}. If you find that MH-E is not compiled and you
 installed MH-E yourself, please refer to the installation directions
@@ -7443,8 +7443,8 @@ sequence, use @kbd{S '} (@code{mh-narrow-to-tick}). When you want to
 widen the view to all your messages again, use @kbd{S w}
 (@code{mh-widen}).
 
-@cindex buffers, @samp{*MH-E Sequences*}
-@cindex @samp{*MH-E Sequences*}
+@cindex buffers, @file{*MH-E Sequences*}
+@cindex @file{*MH-E Sequences*}
 @findex mh-list-sequences
 @findex mh-msg-is-in-seq
 @kindex S l
@@ -7456,7 +7456,7 @@ display the sequences in which another message appears (as in @kbd{C-u
 42 S s @key{RET}}). Or, you can list all sequences in a selected
 folder (default is current folder) with @kbd{S l}
 (@code{mh-list-sequences}). The list appears in a buffer named
-@samp{*MH-E Sequences*} (@pxref{Miscellaneous}).
+@file{*MH-E Sequences*} (@pxref{Miscellaneous}).
 
 @cindex MH profile component, @samp{Previous-Sequence}
 @cindex @samp{cur} sequence
@@ -7676,8 +7676,8 @@ If a message is in any sequence (except @samp{Previous-Sequence:} and
 sequences in the destination folder. If this behavior is not desired,
 then turn off the option @code{mh-whitelist-preserves-sequences-flag}.
 
-@cindex @samp{*MH-E Log*}
-@cindex buffers, @samp{*MH-E Log*}
+@cindex @file{*MH-E Log*}
+@cindex buffers, @file{*MH-E Log*}
 @findex call-process
 @vindex mh-junk-background
 
@@ -7688,7 +7688,7 @@ turning on the option @code{mh-junk-background}. @footnote{Note that
 the option @code{mh-junk-background} is used as the @code{display}
 argument in the call to @code{call-process}. Therefore, turning on
 this option means setting its value to @samp{0}. You can also set its
-value to @samp{t} to direct the programs' output to the @samp{*MH-E
+value to @samp{t} to direct the programs' output to the @file{*MH-E
 Log*} buffer; this may be useful for debugging.}
 
 The following sections discuss the various counter-spam measures that
@@ -7976,16 +7976,16 @@ Display version information about MH-E and the MH mail handling
 system.
 @end ftable
 
-@cindex buffers, @samp{*MH-E Info*}
+@cindex buffers, @file{*MH-E Info*}
 @cindex MH-E version
-@cindex @samp{*MH-E Info*}
+@cindex @file{*MH-E Info*}
 @cindex version
 @kindex M-x mh-version
 
 One command worth noting is @kbd{M-x mh-version}. You can compare the
 version this command prints to the latest release (@pxref{Getting
 MH-E}). The output of @kbd{M-x mh-version}, found in a buffer named
-@samp{*MH-E Info*}, should usually be included with any bug report you
+@file{*MH-E Info*}, should usually be included with any bug report you
 submit (@pxref{Bug Reports}).
 
 @subheading MH-E Buffers
@@ -7994,16 +7994,16 @@ Besides the MH-Folder, MH-Show, and MH-Letter buffers, MH-E creates
 several other buffers. They are:
 
 @table @samp
-@cindex @samp{*MH-E Folders*}
-@cindex buffers, @samp{*MH-E Folders*}
+@cindex @file{*MH-E Folders*}
+@cindex buffers, @file{*MH-E Folders*}
 @findex mh-list-folders
 @item *MH-E Folders*
 @kindex F l
 This buffer contains the output of @kbd{F l} (@code{mh-list-folders}).
 @xref{Folders}.
 @c -------------------------
-@cindex @samp{*MH-E Help*}
-@cindex buffers, @samp{*MH-E Help*}
+@cindex @file{*MH-E Help*}
+@cindex buffers, @file{*MH-E Help*}
 @findex mh-help
 @item *MH-E Help*
 @kindex ?
@@ -8011,25 +8011,25 @@ This buffer contains the output of @kbd{F l} (@code{mh-list-folders}).
 This buffer contains the output of @kbd{?} (@code{mh-help}) and
 @kbd{C-c ?} in MH-Letter mode. @xref{Using This Manual}.
 @c -------------------------
-@cindex @samp{*MH-E Info*}
-@cindex buffers, @samp{*MH-E Info*}
+@cindex @file{*MH-E Info*}
+@cindex buffers, @file{*MH-E Info*}
 @item *MH-E Info*
 This buffer contains the output of @kbd{M-x mh-version @key{RET}}.
 @c -------------------------
-@cindex @samp{*MH-E Log*}
-@cindex buffers, @samp{*MH-E Log*}
+@cindex @file{*MH-E Log*}
+@cindex buffers, @file{*MH-E Log*}
 @item *MH-E Log*
 This buffer contains the last 100 lines of the output of the various
 MH commands.
 @c -------------------------
-@cindex @samp{*MH-E Mail Delivery*}
-@cindex buffers, @samp{*MH-E Mail Delivery*}
+@cindex @file{*MH-E Mail Delivery*}
+@cindex buffers, @file{*MH-E Mail Delivery*}
 @item *MH-E Mail Delivery*
 This buffer contains the transcript of a mail delivery. @xref{Sending
 Message}.
 @c -------------------------
-@cindex @samp{*MH-E Recipients*}
-@cindex buffers, @samp{*MH-E Recipients*}
+@cindex @file{*MH-E Recipients*}
+@cindex buffers, @file{*MH-E Recipients*}
 @findex mh-check-whom
 @item *MH-E Recipients*
 @kindex C-c C-w
@@ -8037,14 +8037,14 @@ This buffer contains the output of @kbd{C-c C-w}
 (@code{mh-check-whom}) and is killed when draft is sent.
 @xref{Checking Recipients}.
 @c -------------------------
-@cindex @samp{*MH-E Sequences*}
-@cindex buffers, @samp{*MH-E Sequences*}
+@cindex @file{*MH-E Sequences*}
+@cindex buffers, @file{*MH-E Sequences*}
 @item *MH-E Sequences*
 This buffer contains the output of @kbd{S l}
 (@code{mh-list-sequences}). @xref{Sequences}.
 @c -------------------------
-@cindex @samp{*mh-temp*}
-@cindex buffers, @samp{*mh-temp*}
+@cindex @file{*mh-temp*}
+@cindex buffers, @file{*mh-temp*}
 @item *mh-temp*
 This is a scratch, ephemeral, buffer used by MH-E functions. Note that
 it is hidden because the first character in the name is a space.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 0fc320e49e4..6ad8df52fd4 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -166,8 +166,8 @@ feeds (in tree form), a list of headlines for the current feed, and
 the content of the current headline.  Feeds can be placed into groups,
 which themselves can be placed in groups and so on.
 @item Newsticker's @emph{plainview} displays all headlines in a
-single buffer, called @samp{*newsticker*}.  The modeline in the
-@samp{*newsticker*} buffer informs you whenever new headlines have
+single buffer, called @file{*newsticker*}.  The modeline in the
+@file{*newsticker*} buffer informs you whenever new headlines have
 arrived.
 @end itemize
 In both views clicking mouse-button 2 or pressing @key{RET} on a
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index a1e49d7b165..d024d993a3b 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -116,7 +116,7 @@ Commands
 * Removing handled entries::    Uninteresting lines can easily be removed.
 * Ignoring files::              Telling CVS to ignore generated files.
 * Viewing differences::         Commands to @samp{diff} different versions.
-* Invoking Ediff::              Running @samp{ediff} from @samp{*cvs*} buffer.
+* Invoking Ediff::              Running @samp{ediff} from @file{*cvs*} buffer.
 * Updating files::              Updating files that Need-update.
 * Tagging files::               Tagging files.
 * Miscellaneous commands::      Miscellaneous commands.
@@ -264,7 +264,7 @@ The function @code{cvs-examine} will ask for a directory.  The command
 @samp{cvs -n update} will be run in that directory.  (It should contain
 files that have been checked out from a CVS archive.)  The output from
 @code{cvs} will be parsed and presented in a table in a buffer called
-@samp{*cvs*}.  It might look something like this:
+@file{*cvs*}.  It might look something like this:
 
 @example
 Repository : /usr/CVSroot
@@ -298,7 +298,7 @@ You can move the cursor up and down in the buffer with @kbd{C-n} and
 repository. @xref{Committing changes}.  You can also press @kbd{O} to
 update any of the files that are marked @samp{Need-Update}.  You can
 also run @kbd{M-x cvs-update @key{RET}} (bound to @kbd{M-u} in the
-@samp{*cvs*} buffer) to update all the files.
+@file{*cvs*} buffer) to update all the files.
 
 You can then press @kbd{=} to easily get a @samp{diff} between your
 modified file and the base version that you started from, or you can
@@ -309,7 +309,7 @@ about files}).
 @node Buffer contents
 @chapter Buffer contents
 @cindex Buffer contents
-@cindex @code{*cvs*} buffer contents
+@cindex @file{*cvs*} buffer contents
 
 The display contains several columns, some of which are optional.
 These columns are, from left to right:
@@ -449,7 +449,7 @@ marks are not ignored) or whichever file or directory the cursor is on.
 
 If a directory is selected but the command cannot be applied to a
 directory, then it will be applied to the set of files under this
-directory which are in the @samp{*cvs*} buffer.
+directory which are in the @file{*cvs*} buffer.
 
 @findex cvs-mode-force-command
 @findex cvs-allow-dir-commit
@@ -504,7 +504,7 @@ you can use in PCL-CVS@.  They are grouped together by type.
 * Removing handled entries::    Uninteresting lines can easily be removed.
 * Ignoring files::              Telling CVS to ignore generated files.
 * Viewing differences::         Commands to @samp{diff} different versions.
-* Invoking Ediff::              Running @samp{ediff} from @samp{*cvs*} buffer.
+* Invoking Ediff::              Running @samp{ediff} from @file{*cvs*} buffer.
 * Updating files::              Updating files that Need-update.
 * Tagging files::               Tagging files.
 * Miscellaneous commands::      Miscellaneous commands.
@@ -520,10 +520,10 @@ you can use in PCL-CVS@.  They are grouped together by type.
 @findex cvs-quickdir
 @cindex Creating the *cvs* buffer
 
-Most commands in PCL-CVS require that you have a @samp{*cvs*}
+Most commands in PCL-CVS require that you have a @file{*cvs*}
 buffer.  The commands that you use to get one are listed below.
 For each, a @samp{cvs} process will be run, the output will be parsed by
-PCL-CVS, and the result will be printed in the @samp{*cvs*} buffer (see
+PCL-CVS, and the result will be printed in the @file{*cvs*} buffer (see
 @ref{Buffer contents}, for a description of the buffer's contents).
 
 @table @kbd
@@ -547,7 +547,7 @@ in which the @samp{cvs update} will be run and the module to be checked
 out.
 
 @item M-x cvs-quickdir
-Populate the @samp{*cvs*} buffer by just looking at the @file{CVS/Entries}
+Populate the @file{*cvs*} buffer by just looking at the @file{CVS/Entries}
 files.  This is very much like @code{cvs-examine} except that it does
 not access the CVS repository, which is a major advantage when the
 repository is far away.  But of course, it will not be able to detect
@@ -628,7 +628,7 @@ to the ones PCL-CVS thinks are relevant.
 @end table
 
 @node Updating the buffer
-@section Updating the @samp{*cvs*} buffer
+@section Updating the @file{*cvs*} buffer
 @findex cvs-update
 @findex cvs-examine
 @findex cvs-status
@@ -636,7 +636,7 @@ to the ones PCL-CVS thinks are relevant.
 @findex cvs-mode-examine
 @findex cvs-mode-status
 
-The following commands can be used from within the @samp{*cvs*} buffer
+The following commands can be used from within the @file{*cvs*} buffer
 to update the display:
 
 @table @kbd
@@ -667,7 +667,7 @@ top-level directory, this is equivalent to @kbd{M-e}.
 @item s
 Runs @code{cvs-mode-status} on the selected files.  When run on the
 top-level directory, this is equivalent to @kbd{M-s}, except that
-CVS output will be shown in a @samp{*cvs-info*} buffer that will be
+CVS output will be shown in a @file{*cvs-info*} buffer that will be
 put in @samp{cvs-status-mode}.
 @end table
 
@@ -775,7 +775,7 @@ Committing changes basically works as follows:
 @item
 After having selected the files you want to commit, you type either
 @kbd{c} or @kbd{C} which brings up a special buffer
-@samp{*cvs-commit*}.
+@file{*cvs-commit*}.
 
 @item
 You type in the log message describing the changes you're about to
@@ -800,8 +800,8 @@ change this last detail with @code{log-edit-confirm}.
 
 As for the difference between @kbd{c} (i.e., @code{cvs-mode-commit}) and
 @kbd{C} (i.e., @code{cvs-mode-commit-setup}) is that the first gets you
-straight to @samp{*cvs-commit*} without erasing it or changing anything
-to its content, while the second first erases @samp{*cvs-commit*}
+straight to @file{*cvs-commit*} without erasing it or changing anything
+to its content, while the second first erases @file{*cvs-commit*}
 and tries to initialize it with a sane default (it does that by either
 using a template provided by the CVS administrator or by extracting a
 relevant log message from a @file{ChangeLog} file).
@@ -866,12 +866,12 @@ directory (@code{cvs-mode-add-change-log-entry-other-window}).
 @item l
 Call the command @code{cvs-mode-log} which runs @samp{cvs log} on all
 selected files, and show the result in a temporary buffer
-@samp{*cvs-info*} (@pxref{Log View Mode}).
+@file{*cvs-info*} (@pxref{Log View Mode}).
 
 @item s
 Call the command @code{cvs-mode-status} which runs @samp{cvs status} on
 all selected files, and show the result in a temporary buffer
-@samp{*cvs-info*}.
+@file{*cvs-info*}.
 @c Fixme: reinstate when node is written:
 @c (@pxref{CVS Status Mode}).
 @end table
@@ -1142,11 +1142,11 @@ Byte compile all selected files that end in @file{.el}.
 
 @item M-x cvs-mode-delete-lock
 This command deletes the lock files that
-the @samp{*cvs*} buffer informs you about.  You should normally never have to
+the @file{*cvs*} buffer informs you about.  You should normally never have to
 use this command, since CVS tries very carefully to always remove the
 lock files itself.
 
-You can only use this command when a message in the @samp{*cvs*} buffer tells
+You can only use this command when a message in the @file{*cvs*} buffer tells
 you so.  You should wait a while before using this command in case
 someone else is running a @code{cvs} command.
 
@@ -1161,7 +1161,7 @@ area (@code{cvs-help}).
 Bury the PCL-CVS buffer (@code{cvs-bury-buffer}).
 
 @item M-x cvs-mode-quit
-Quit PCL-CVS, killing the @samp{*cvs*} buffer.
+Quit PCL-CVS, killing the @file{*cvs*} buffer.
 @end table
 
 @node Log Edit Mode
@@ -1260,7 +1260,7 @@ entries}.
 @item cvs-auto-remove-directories
 If this variable is set to any non-@code{nil} value, directories that do
 not contain any files to be checked in will not be listed in the
-@samp{*cvs*} buffer.
+@file{*cvs*} buffer.
 
 @item cvs-auto-revert
 If this variable is set to any non-@samp{nil} value any buffers you have
@@ -1284,7 +1284,7 @@ useful if your site has several repositories.
 @item log-edit-require-final-newline
 @c wordy to avoid underfull hbox
 When you enter a log message by typing into the
-@samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically
+@file{*cvs-commit-message*} buffer, PCL-CVS normally automatically
 inserts a trailing newline, unless there already is one.  This behavior
 can be controlled via @samp{cvs-commit-buffer-require-final-newline}.
 If it is @samp{t} (the default behavior), a newline will always be
@@ -1340,7 +1340,7 @@ default.
 @vindex cvs-msg (face)
 
 PCL-CVS adds a few extra features, including menus, mouse bindings, and
-fontification of the @samp{*cvs*} buffer.  The faces defined for
+fontification of the @file{*cvs*} buffer.  The faces defined for
 fontification are listed below:
 
 @table @samp
@@ -1402,10 +1402,10 @@ Below is a partial list of currently known problems with PCL-CVS.
 @table @asis
 @item Unexpected output from CVS
 Unexpected output from CVS may confuse PCL-CVS@.  It will create
-warning messages in the @samp{*cvs*} buffer alerting you to any parse errors.
+warning messages in the @file{*cvs*} buffer alerting you to any parse errors.
 If you get these messages, please send a bug report to the email
-addresses listed above.  Include the contents of the @samp{*cvs*} buffer, the
-output of the CVS process (which should be found in the @samp{ *cvs-tmp*}
+addresses listed above.  Include the contents of the @file{*cvs*} buffer, the
+output of the CVS process (which should be found in the @file{ *cvs-tmp*}
 buffer), and the versions of Emacs, PCL-CVS and CVS you are using.
 @end table
 
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index 96acdf86cd2..6e136c3345a 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -212,7 +212,7 @@ Emacs, or join @code{#rcirc}, the channel about @code{rcirc}.
 
 @cindex server buffer
 When you have answered these questions, @code{rcirc} will create a server
-buffer, which will be named something like @code{*irc.freenode.net*},
+buffer, which will be named something like @file{*irc.freenode.net*},
 and a channel buffer for each of the channels you wanted to join.
 
 @kindex RET
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index e2f7ea51303..ebd301cf5f9 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -903,12 +903,12 @@ at a given buffer position.  The return value is an EIEIO object
 describing the context at @var{pos} (@pxref{Top,,,eieio,EIEIO
 manual}).
 
-When called interactively, this displays a @samp{*Semantic Context
+When called interactively, this displays a @file{*Semantic Context
 Analysis*} buffer containing a summary of the context at point.
 @end deffn
 
 @noindent
-The Prefix section of the @samp{*Semantic Context Analysis*} buffer
+The Prefix section of the @file{*Semantic Context Analysis*} buffer
 lists the tags based on the text at point.  If it shows only a simple
 string, the Semantic was unable to identify what the data type was.
 
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 24cbc56ecfa..901bfb0a903 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -409,7 +409,7 @@ clues to the reason for the error.
 @vindex smtpmail-debug-info
   The variable @code{smtpmail-debug-info} controls whether to print
 the SMTP protocol exchange in the minibuffer, and retain the entire
-exchange in a buffer @samp{*trace of SMTP session to @var{server}*},
+exchange in a buffer @file{*trace of SMTP session to @var{server}*},
 where @var{server} is the name of the mail server to which you send
 mail.
 
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 5cda62eade7..9c9e4f5a2bc 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1249,7 +1249,7 @@ if it exists.
 @defopt url-debug
 @cindex debugging
 Specifies the types of debug messages which are logged to
-the @code{*URL-DEBUG*} buffer.
+the @file{*URL-DEBUG*} buffer.
 @code{t} means log all messages.
 A number means log all messages and show them with @code{message}.
 It may also be a list of the types of messages to be logged.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 5cbf32c9297..58e74473b87 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -354,7 +354,7 @@ M-x viper-mode
 @end lisp
 
 When Emacs first comes up, if you have not specified a file on the
-command line, it will show the @samp{*scratch*} buffer, in the
+command line, it will show the @file{*scratch*} buffer, in the
 @samp{Lisp Interaction} mode.  After you invoke Viper, you can start
 editing files by using @kbd{:e}, @kbd{:vi}, or @kbd{v} commands.
 (@xref{File and Buffer Handling}, for more information on @kbd{v} and other
@@ -1840,7 +1840,7 @@ usually most effective:
 (set-face-background viper-replace-overlay-face "yellow")
 @end smallexample
 For a complete list of colors available to you, evaluate the expression
-@code{(x-defined-colors)}.  (Type it in the buffer @code{*scratch*} and then
+@code{(x-defined-colors)}.  (Type it in the buffer @file{*scratch*} and then
 hit the @kbd{C-j} key.
 
 @item viper-replace-overlay-cursor-color  "Red"
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index 3ee080f50e0..3eb5a582914 100644
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -689,7 +689,7 @@ Toggle whether to report verbose information on generated parser.
 @end deffn
 
 The verbose report is printed in the temporary buffer
-@code{*wisent-log*} when running interactively, or in file
+@file{*wisent-log*} when running interactively, or in file
 @file{wisent.output} when running in batch mode.  Different
 reports are separated from each other by a line like this:
 
@@ -760,7 +760,7 @@ Grammar contains 7 shift/reduce conflicts
 @end group
 @end example
 
-The @samp{*wisent-log*} buffer details things!
+The @file{*wisent-log*} buffer details things!
 
 The first section reports conflicts that were solved using precedence
 and/or associativity:
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index b221a380fa9..fbd4ede7aa2 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -826,7 +826,7 @@ shows manual sections and subsections by default, but you can change
 this by customizing @code{woman-imenu-generic-expression}.
 
 WoMan is configured not to replace spaces in an imenu
-@code{*Completion*} buffer.  For further documentation on the use of
+@file{*Completion*} buffer.  For further documentation on the use of
 imenu, such as menu sorting, see the source file @file{imenu.el}, which
 is distributed with GNU Emacs.
 
@@ -852,7 +852,7 @@ customization should be possible via existing user options.
 @vtable @code
 @item woman-show-log
 A boolean value that defaults to @code{nil}.  If non-@code{nil} then show the
-@code{*WoMan-Log*} buffer if appropriate, i.e., if any warning messages
+@file{*WoMan-Log*} buffer if appropriate, i.e., if any warning messages
 are written to it.  @xref{Log, , The *WoMan-Log* Buffer}.
 
 @item woman-pre-format-hook
@@ -1295,7 +1295,7 @@ on @uref{http://savannah.gnu.org/projects/emacs/}.  If it still fails, please
 @item
 use @kbd{M-x report-emacs-bug} to send a bug report.
 Please include the entry from the
-@code{*WoMan-Log*} buffer relating to the problem file, together with
+@file{*WoMan-Log*} buffer relating to the problem file, together with
 a brief description of the problem.  Please indicate where you got the
 man source file from, but do not send it unless asked to send it.
 @end enumerate