Fix minor whitespace issues after "." in manual.

Be more systematic about using "@." (not ".") at end of sentence that
ends in a capital letter, and about appending "@:" after non-ends of
sentences that end in a lower case letter followed by "." followed by
whitespace.  Omit unnecessary use of "@:" and "@.".  Similarly for "?"
and "!".  Be more consistent about putting a comma after "i.e." and
"e.g."; this is the typical American style and it's easier to code in
Texinfo.

Fixes: debbugs:12973

38 files changed, 310 insertions, 310 deletions

diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi
index d3c914d92b..0aeb74eabd 100644
--- a/doc/emacs/abbrevs.texi
+++ b/doc/emacs/abbrevs.texi
@@ -141,7 +141,7 @@ abbrev definitions, both global and local.
 
   When Abbrev mode is enabled, an abbrev expands whenever it is
 present in the buffer just before point and you type a self-inserting
-whitespace or punctuation character (@key{SPC}, comma, etc.@:).  More
+whitespace or punctuation character (@key{SPC}, comma, etc.).  More
 precisely, any character that is not a word constituent expands an
 abbrev, and any word-constituent character can be part of an abbrev.
 The most common way to use an abbrev is to insert it and then insert a
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 9fdead70f8..debf173635 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -44,7 +44,7 @@ Tomas Abrahamsson wrote @file{artist.el}, a package for producing
 @acronym{ASCII} art with a mouse or with keyboard keys.
 
 @item
-Jay K.@: Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
+Jay K. Adams wrote @file{jka-compr.el} and @file{jka-cmpr-hook.el},
 providing automatic decompression and recompression for compressed
 files.
 
@@ -96,13 +96,13 @@ Eli Barzilay wrote @file{calculator.el}, a desktop calculator for
 Emacs.
 
 @item
-Steven L.@: Baur wrote @file{footnote.el} which lets you include
+Steven L. Baur wrote @file{footnote.el} which lets you include
 footnotes in email messages; and @file{gnus-audio.el} and
 @file{earcon.el}, which provide sound effects for Gnus.  He also wrote
 @file{gnus-setup.el}.
 
 @item
-Alexander L.@: Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
+Alexander L. Belikoff, Sergey Berezin, Sacha Chua, David Edmondson,
 Noah Friedman, Andreas Fuchs, Mario Lang, Ben Mesander, Lawrence
 Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schaefer,
 Alex Schroeder, and Tom Tromey wrote ERC, an advanced Internet Relay
@@ -115,7 +115,7 @@ Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
-Anna M.@: Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
+Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
 
 @item
 Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing
@@ -130,14 +130,14 @@ Jim Blandy wrote Emacs 19's input system, brought its configuration and
 build process up to the GNU coding standards, and contributed to the
 frame support and multi-face support.  Jim also wrote @file{tvi970.el},
 terminal support for the TeleVideo 970 terminals; and co-wrote
-@file{wyse50.el} (q.v.@:).
+@file{wyse50.el} (q.v.).
 
 @item
 Per Bothner wrote @file{term.el}, a terminal emulator in an Emacs
 buffer.
 
 @item
-Terrence M.@: Brannon wrote @file{landmark.el}, a neural-network robot
+Terrence M. Brannon wrote @file{landmark.el}, a neural-network robot
 that learns landmarks.
 
 @item
@@ -162,7 +162,7 @@ Kevin Broadey wrote @file{foldout.el}, providing folding extensions to
 Emacs's outline modes.
 
 @item
-David M.@: Brown wrote @file{array.el}, for editing arrays and other
+David M. Brown wrote @file{array.el}, for editing arrays and other
 tabular data.
 
 @item
@@ -184,7 +184,7 @@ Emacs Lisp functions; and @file{trace.el}, a tracing facility for Emacs
 Lisp.
 
 @item
-Chris Chase, Carsten Dominik, and J.@: D.@: Smith wrote IDLWAVE mode,
+Chris Chase, Carsten Dominik, and J. D. Smith wrote IDLWAVE mode,
 for editing IDL and WAVE CL.
 
 @item
@@ -266,10 +266,10 @@ He also wrote @file{dynamic-setting.el}.
 @item
 Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
 cross-references in @LaTeX{} documents; and co-wrote IDLWAVE mode
-(q.v.@:).  He was the original author of Org mode, for maintaining notes,
+(q.v.).  He was the original author of Org mode, for maintaining notes,
 todo lists, and project planning.  Bastien Guerry subsequently took
 over maintainership.  Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart
-Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S.@: Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
+Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
 Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte,
 Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize,
 Piotr Zielinski, and others also wrote various Org mode components.
@@ -429,7 +429,7 @@ characters used by @TeX{} and net tradition.
 
 @item
 Bastien Guerry wrote @file{gnus-bookmark.el}, bookmark support for Gnus;
-as well as helping to maintain Org mode (q.v.@:).
+as well as helping to maintain Org mode (q.v.).
 
 @item
 Henry Guillaume wrote @file{find-file.el}, a package to visit files
@@ -456,7 +456,7 @@ Jesper Harder wrote @file{yenc.el}, for decoding yenc encoded messages.
 Alexandru Harsanyi wrote a library for accessing SOAP web services.
 
 @item
-K.@: Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
+K. Shane Hartman wrote @file{chistory.el} and @file{echistory.el},
 packages for browsing command history lists; @file{electric.el} and
 @file{helper.el}, which provide an alternative command loop and
 appropriate help facilities; @file{emacsbug.el}, a package for
@@ -617,7 +617,7 @@ Pavel Kobyakov wrote @file{flymake.el}, a minor mode for performing
 on-the-fly syntax checking.
 
 @item
-David M.@: Koppelman wrote @file{hi-lock.el}, a minor mode for
+David M. Koppelman wrote @file{hi-lock.el}, a minor mode for
 interactive automatic highlighting of parts of the buffer text.
 
 @item
@@ -630,7 +630,7 @@ menu support.
 
 @item
 Sebastian Kremer wrote @code{dired-mode}, with contributions by Lawrence
-R.@: Dodd.  He also wrote @file{ls-lisp.el}, a Lisp emulation of the
+R. Dodd.  He also wrote @file{ls-lisp.el}, a Lisp emulation of the
 @code{ls} command for platforms that don't have @code{ls} as a standard
 program.
 
@@ -647,7 +647,7 @@ Daniel LaLiberte wrote @file{edebug.el}, a source-level debugger for
 Emacs Lisp; @file{cl-specs.el}, specifications to help @code{edebug}
 debug code written using David Gillespie's Common Lisp support; and
 @file{isearch.el}, Emacs's incremental search minor mode.  He also
-co-wrote @file{hideif.el} (q.v.@:).
+co-wrote @file{hideif.el} (q.v.).
 
 @item
 Karl Landstrom and Daniel Colascione wrote @file{js.el}, a mode for
@@ -673,7 +673,7 @@ Emacs Lisp programs.
 
 @item
 Lars Lindberg wrote @file{msb.el}, which provides more flexible menus
-for buffer selection; co-wrote @file{imenu.el} (q.v.@:); and rewrote
+for buffer selection; co-wrote @file{imenu.el} (q.v.); and rewrote
 @file{dabbrev.el}, originally written by Don Morrison.
 
 @item
@@ -752,11 +752,11 @@ maintained CC Mode from Emacs 22 onwards.
 Michael McNamara and Wilson Snyder wrote Verilog mode.
 
 @item
-Christopher J.@: Madsen wrote @file{decipher.el}, a package for cracking
+Christopher J. Madsen wrote @file{decipher.el}, a package for cracking
 simple substitution ciphers.
 
 @item
-Neil M.@: Mager wrote @file{appt.el}, functions to notify users of their
+Neil M. Mager wrote @file{appt.el}, functions to notify users of their
 appointments.  It finds appointments recorded in the diary files
 used by the @code{calendar} package.
 
@@ -859,7 +859,7 @@ Erik Naggum wrote the time-conversion functions.  He also wrote
 @file{parse-time.el}, for parsing time strings.
 
 @item
-Takahashi Naoto co-wrote @file{quail.el} (q.v.@:), and wrote
+Takahashi Naoto co-wrote @file{quail.el} (q.v.), and wrote
 @file{robin.el}, another input method.
 
 @item
@@ -908,7 +908,7 @@ Takaaki Ota wrote @file{table.el}, a package for creating and editing
 embedded text-based tables.
 
 @item
-Pieter E.@: J.@: Pareit wrote @file{mixal-mode.el}, an editing mode for
+Pieter E. J. Pareit wrote @file{mixal-mode.el}, an editing mode for
 the MIX assembly language.
 
 @item
@@ -924,7 +924,7 @@ Damon Anton Permezel wrote @file{hanoi.el}, an animated demonstration of
 the ``Towers of Hanoi'' puzzle.
 
 @item
-William M.@: Perry wrote @file{mailcap.el} (with Lars Magne
+William M. Perry wrote @file{mailcap.el} (with Lars Magne
 Ingebrigtsen), a MIME media types configuration facility;
 @file{mwheel.el}, a package for supporting mouse wheels; co-wrote (with
 Dave Love) @file{socks.el}, a Socks v5 client; and developed the URL
@@ -953,7 +953,7 @@ support for Wyse 50 terminals.  He also co-wrote @file{compile.el}
 (q.v.@:) and @file{ada-stmt.el}.
 
 @item
-Richard L.@: Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
+Richard L. Pieri wrote @file{pop3.el}, a Post Office Protocol (RFC
 1460) interface for Emacs.
 
 @item
@@ -976,12 +976,12 @@ minor mode for displaying a ruler in the header line; and
 structures.
 
 @item
-Francesco A.@: Potorti wrote @file{cmacexp.el}, providing a command which
+Francesco A. Potorti wrote @file{cmacexp.el}, providing a command which
 runs the C preprocessor on a region of a file and displays the results.
 He also expanded and redesigned the @code{etags} program.
 
 @item
-Michael D.@: Prange and Steven A.@: Wood wrote @file{fortran.el}, a mode
+Michael D. Prange and Steven A. Wood wrote @file{fortran.el}, a mode
 for editing Fortran code.
 
 @item
@@ -989,7 +989,7 @@ Ashwin Ram wrote @file{refer.el}, commands to look up references in
 bibliography files by keyword.
 
 @item
-Eric S.@: Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
+Eric S. Raymond wrote @file{vc.el}, an interface to the RCS and SCCS
 source code version control systems, with Paul Eggert; @file{gud.el},
 a package for running source-level debuggers like GDB and SDB in
 Emacs; @file{asm-mode.el}, a mode for editing assembly language code;
@@ -1005,14 +1005,14 @@ used in Emacs Lisp library files; and code to set and make use of the
 which each lisp function loaded into Emacs came.
 
 @item
-Edward M.@: Reingold wrote the calendar and diary support,
+Edward M. Reingold wrote the calendar and diary support,
 with contributions from Stewart Clamen (@file{cal-mayan.el}), Nachum
 Dershowitz (@file{cal-hebrew.el}), Paul Eggert (@file{cal-dst.el}),
 Steve Fisk (@file{cal-tex.el}), Michael Kifer (@file{cal-x.el}), Lara
-Rios (@file{cal-menu.el}), and Denis B.@: Roegel (@file{solar.el}).
+Rios (@file{cal-menu.el}), and Denis B. Roegel (@file{solar.el}).
 Andy Oram contributed to its documentation.  Reingold also contributed
 to @file{tex-mode.el}, a mode for editing @TeX{} files, as did William
-F.@: Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
+F. Schelter, Dick King, Stephen Gildea, Michael Prange, and Jacob
 Gore.
 
 @item
@@ -1031,7 +1031,7 @@ VT line of terminals.
 
 @item
 Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
-terminals; and @file{gdb-ui.el}, a graphical user interface to GDB.
+terminals; and @file{gdb-ui.el}, a graphical user interface to GDB@.
 Together with Dmitry Dzhus, he wrote @file{gdb-mi.el}, the successor to
 @file{gdb-ui.el}.
 
@@ -1043,7 +1043,7 @@ into ``handwriting''.
 Markus Rost wrote @file{cus-test.el}, a testing framework for customize.
 
 @item
-Guillermo J.@: Rozas wrote @file{scheme.el}, a mode for editing Scheme and
+Guillermo J. Rozas wrote @file{scheme.el}, a mode for editing Scheme and
 DSSSL code.
 
 @item
@@ -1067,7 +1067,7 @@ Kevin Ryde wrote @file{info-xref.el}, a library for checking
 references in Info files.
 
 @item
-James B.@: Salem and Brewster Kahle wrote @file{completion.el}, providing
+James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
 dynamic word completion.
 
 @item
@@ -1091,7 +1091,7 @@ Michael Schmidt and Tom Perrine wrote @file{modula2.el}, a mode for
 editing Modula-2 code, based on work by Mick Jordan and Peter Robinson.
 
 @item
-Ronald S.@: Schnell wrote @file{dunnet.el}, a text adventure game.
+Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
 
 @item
 Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
@@ -1111,7 +1111,7 @@ for interactively running an SQL interpreter in an Emacs buffer;
 @file{cus-theme.el}, an interface for custom themes; @file{master.el}, a
 package for making a buffer @samp{master} over another; and
 @file{spam-stat.el}, for statistical detection of junk email.  He also
-wrote parts of the IRC client ERC (q.v.@:).
+wrote parts of the IRC client ERC (q.v.).
 
 @item
 Randal Schwartz wrote @file{pp.el}, a pretty-printer for lisp objects.
@@ -1162,7 +1162,7 @@ David Smith wrote @file{ielm.el}, a mode for interacting with the Emacs
 Lisp interpreter as a subprocess.
 
 @item
-Paul D.@: Smith wrote @file{snmp-mode.el}.
+Paul D. Smith wrote @file{snmp-mode.el}.
 
 @item
 William Sommerfeld wrote @file{scribe.el}, a mode for editing Scribe
@@ -1204,7 +1204,7 @@ cursor'' that you can move with the keyboard and use for copying text.
 Ken Stevens wrote @file{ispell.el}, a spell-checker interface.
 
 @item
-Kim F.@: Storm made many improvements to the Emacs display engine,
+Kim F. Storm made many improvements to the Emacs display engine,
 process support, and networking support. He also wrote
 @file{bindat.el}, a package for encoding and decoding binary data;
 CUA mode, which allows Emacs to emulate the standard CUA key
@@ -1278,12 +1278,12 @@ for Gnus; and @file{timezone.el}, providing functions for dealing with
 time zones.
 
 @item
-Neil W.@: Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
+Neil W. Van Dyke wrote @file{webjump.el}, a ``hot links'' package.
 
 @item
 Didier Verna wrote @file{rect.el}, a package of functions for
 operations on rectangle regions of text.  He also contributed to Gnus
-(q.v.@:).
+(q.v.).
 
 @item
 Joakim Verona implemented ImageMagick support.
@@ -1332,7 +1332,7 @@ the shift key and motion commands; and @file{dos-fns.el}, functions
 for use under MS-DOS.
 
 @item
-Joe Wells wrote the original version of @file{apropos.el} (q.v.@:);
+Joe Wells wrote the original version of @file{apropos.el} (q.v.);
 @file{resume.el}, support for processing command-line arguments after
 resuming a suspended Emacs job; and @file{mail-extr.el}, a package for
 extracting names and addresses from mail headers, with contributions
@@ -1351,7 +1351,7 @@ time spent on projects; the Bahá'í calendar support;
 @file{remember.el}, a mode for jotting down things to remember;
 @file{eudcb-mab.el}, an address book backend for the Emacs Unified
 Directory Client; and @code{eshell}, a command shell implemented
-entirely in Emacs Lisp.  He also contributed to Org mode (q.v.@:).
+entirely in Emacs Lisp.  He also contributed to Org mode (q.v.).
 
 @item
 Mike Williams wrote @file{thingatpt.el}, a library of functions for
@@ -1362,16 +1362,16 @@ Roland Winkler wrote @file{proced.el}, a system process editor.
 
 @item
 Bill Wohler wrote MH-E, the Emacs interface to the MH mail system;
-making use of earlier work by James R.@: Larus.  Satyaki Das, Peter S.@:
-Galbraith, Stephen Gildea, and Jeffrey C.@: Honig also wrote various
+making use of earlier work by James R. Larus.  Satyaki Das, Peter S.
+Galbraith, Stephen Gildea, and Jeffrey C. Honig also wrote various
 MH-E components.
 
 @item
-Dale R.@: Worley wrote @file{emerge.el}, a package for interactively
+Dale R. Worley wrote @file{emerge.el}, a package for interactively
 merging two versions of a file.
 
 @item
-Francis J.@: Wright wrote @file{woman.el}, a package for browsing
+Francis J. Wright wrote @file{woman.el}, a package for browsing
 manual pages without the @code{man} command.
 
 @item
@@ -1429,13 +1429,13 @@ messages; @file{rfc1843.el}, an HZ decoding package;
 other Gnus components.
 
 @item
-Ian T.@: Zimmerman wrote @file{gametree.el}.
+Ian T. Zimmerman wrote @file{gametree.el}.
 
 @item
 Reto Zimmermann wrote @file{vera-mode.el}.
 
 @item
-Neal Ziring and Felix S.@: T.@: Wu wrote @file{vi.el}, an emulation of the
+Neal Ziring and Felix S. T. Wu wrote @file{vi.el}, an emulation of the
 VI text editor.
 
 @item
diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi
index 5a957b0284..62348e6d2e 100644
--- a/doc/emacs/arevert-xtra.texi
+++ b/doc/emacs/arevert-xtra.texi
@@ -40,7 +40,7 @@ explained in the corresponding sections.
 @menu
 * Auto Reverting the Buffer Menu:: Auto Revert of the Buffer Menu.
 * Auto Reverting Dired::           Auto Revert of Dired buffers.
-* Supporting additional buffers::  How to add more Auto Revert support. 
+* Supporting additional buffers::  How to add more Auto Revert support.
 @end menu
 
 @node Auto Reverting the Buffer Menu
@@ -66,9 +66,9 @@ operating systems.  It may not work satisfactorily on some other
 systems.
 
 Dired buffers only auto-revert when the file list of the buffer's main
-directory changes (e.g. when a new file is added).  They do not
+directory changes (e.g., when a new file is added).  They do not
 auto-revert when information about a particular file changes
-(e.g. when the size changes) or when inserted subdirectories change.
+(e.g., when the size changes) or when inserted subdirectories change.
 To be sure that @emph{all} listed information is up to date, you have
 to manually revert using @kbd{g}, @emph{even} if auto-reverting is
 enabled in the Dired buffer.  Sometimes, you might get the impression
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 07060db5af..4d61df0966 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -107,7 +107,7 @@ just like digits.  Case is ignored.
 of a character, using the minibuffer.  If you enter a name, the
 command provides completion (@pxref{Completion}).  If you enter a
 code-point, it should be as a hexadecimal number (the convention for
-Unicode), or a number with a specified radix, e.g.@: @code{#o23072}
+Unicode), or a number with a specified radix, e.g., @code{#o23072}
 (octal); @xref{Integer Basics,,, elisp, The Emacs Lisp Reference
 Manual}.  The command then inserts the corresponding character into
 the buffer.  For example, both of the following insert the infinity
@@ -385,7 +385,7 @@ On some text terminals, Emacs may not recognize the @key{DEL} key
 properly.  @xref{DEL Does Not Delete}, if you encounter this problem.
 
   The @key{delete} (@code{delete-forward-char}) command deletes in the
-``opposite direction'': it deletes the character after point, i.e. the
+``opposite direction'': it deletes the character after point, i.e., the
 character under the cursor.  If point was at the end of a line, this
 joins the following line onto this one.  Like @kbd{@key{DEL}}, it
 deletes the text in the region if the region is active (@pxref{Mark}).
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi
index 8c6705cc0c..6940a0698f 100644
--- a/doc/emacs/buffers.texi
+++ b/doc/emacs/buffers.texi
@@ -44,8 +44,8 @@ variables}---variables that can have a different value in each buffer.
 by the largest buffer position representable by @dfn{Emacs integers}.
 This is because Emacs tracks buffer positions using that data type.
 For typical 64-bit machines, this maximum buffer size is @math{2^61 -
-2} bytes, or about 2 EiB.  For typical 32-bit machines, the maximum is
-usually @math{2^29 - 2} bytes, or about 512 MiB.  Buffer sizes are
+2} bytes, or about 2 EiB@.  For typical 32-bit machines, the maximum is
+usually @math{2^29 - 2} bytes, or about 512 MiB@.  Buffer sizes are
 also limited by the amount of memory in the system.
 
 @menu
@@ -614,7 +614,7 @@ names (all but one of them).
 
 @vindex uniquify-buffer-name-style
   Other methods work by adding parts of each file's directory to the
-buffer name.  To select one, load the library @file{uniquify} (e.g.
+buffer name.  To select one, load the library @file{uniquify} (e.g.,
 using @code{(require 'uniquify)}), and customize the variable
 @code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
 
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index e0ea72902f..7d6e7c9d6f 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -261,7 +261,7 @@ or previous error message for a different source file.
 @findex next-error-follow-minor-mode
   You can type @kbd{C-c C-f} to toggle Next Error Follow mode.  In
 this minor mode, ordinary cursor motion in the compilation buffer
-automatically updates the source buffer, i.e.@: moving the cursor over
+automatically updates the source buffer, i.e., moving the cursor over
 an error message causes the locus of that error to be displayed.
 
   The features of Compilation mode are also available in a minor mode
@@ -324,7 +324,7 @@ nohup @var{command}; sleep 1
 @ifnottex
   On the MS-DOS ``operating system'', asynchronous subprocesses are
 not supported, so @kbd{M-x compile} runs the compilation command
-synchronously (i.e.@: you must wait until the command finishes before
+synchronously (i.e., you must wait until the command finishes before
 you can do anything else in Emacs).  @xref{MS-DOS}.
 @end ifnottex
 
@@ -589,7 +589,7 @@ to recompile and restart the program.
 @findex gud-tooltip-mode
 @vindex gud-tooltip-echo-area
   GUD Tooltip mode is a global minor mode that adds tooltip support to
-GUD.  To toggle this mode, type @kbd{M-x gud-tooltip-mode}.  It is
+GUD@.  To toggle this mode, type @kbd{M-x gud-tooltip-mode}.  It is
 disabled by default.  If enabled, you can move the mouse cursor over a
 variable, a function, or a macro (collectively called
 @dfn{identifiers}) to show their values in tooltips
@@ -625,7 +625,7 @@ Set a breakpoint on the source line that point is on.
 
   @kbd{C-x @key{SPC}} (@code{gud-break}), when called in a source
 buffer, sets a debugger breakpoint on the current source line.  This
-command is available only after starting GUD.  If you call it in a
+command is available only after starting GUD@.  If you call it in a
 buffer that is not associated with any debugger subprocess, it signals
 a error.
 
@@ -756,7 +756,7 @@ This key is available only in the GUD interaction buffer.
 that makes sense.
 
   Because @key{TAB} serves as a completion command, you can't use it to
-enter a tab as input to the program you are debugging with GDB.
+enter a tab as input to the program you are debugging with GDB@.
 Instead, type @kbd{C-q @key{TAB}} to enter a tab.
 
 @node GUD Customization
@@ -774,7 +774,7 @@ Instead, type @kbd{C-q @key{TAB}} to enter a tab.
 you are using DBX; @code{sdb-mode-hook}, if you are using SDB;
 @code{xdb-mode-hook}, if you are using XDB; @code{perldb-mode-hook},
 for Perl debugging mode; @code{pdb-mode-hook}, for PDB;
-@code{jdb-mode-hook}, for JDB.  @xref{Hooks}.
+@code{jdb-mode-hook}, for JDB@.  @xref{Hooks}.
 
   The @code{gud-def} Lisp macro (@pxref{Defining Macros,,, elisp, the
 Emacs Lisp Reference Manual}) provides a convenient way to define an
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 09beabc40c..35b91b5a24 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -103,7 +103,7 @@ knows about.  These are: @code{holiday-general-holidays},
 @code{holiday-bahai-holidays}, @code{holiday-christian-holidays},
 @code{holiday-hebrew-holidays}, @code{holiday-islamic-holidays},
 @code{holiday-oriental-holidays}, and @code{holiday-other-holidays}.
-The names should be self-explanatory; e.g.@: @code{holiday-solar-holidays}
+The names should be self-explanatory; e.g., @code{holiday-solar-holidays}
 lists sun- and moon-related holidays.
 
 You can customize these lists of holidays to your own needs, deleting or
@@ -628,7 +628,7 @@ of the diary entries, or add items.
 variables @code{diary-comment-start} and @code{diary-comment-end} to
 strings that delimit comments.  The fancy display does not print
 comments.  You might want to put meta-data for the use of other packages
-(e.g.@: the appointment package,
+(e.g., the appointment package,
 @iftex
 @pxref{Appointments,,,emacs, the Emacs Manual})
 @end iftex
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index d1ddd0dce9..cf13b78796 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -1551,7 +1551,7 @@ diary file and iCalendar files, which are defined in ``RFC
 2445---Internet Calendaring and Scheduling Core Object Specification
 (iCalendar)'' (as well as the earlier vCalendar format).
 
-@c  Importing works for ``ordinary'' (i.e. non-recurring) events, but
+@c  Importing works for ``ordinary'' (i.e., non-recurring) events, but
 @c (at present) may not work correctly (if at all) for recurring events.
 @c Exporting of diary files into iCalendar files should work correctly
 @c for most diary entries.  This feature is a work in progress, so the
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index d4573eed5a..ebde2382c3 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -576,7 +576,7 @@ Emacs tries @env{TEMP}, then @env{TMPDIR}, then @env{TMP}, and finally
 This specifies the current time zone and possibly also daylight
 saving time information.  On MS-DOS, if @env{TZ} is not set in the
 environment when Emacs starts, Emacs defines a default value as
-appropriate for the country code returned by DOS.  On MS-Windows, Emacs
+appropriate for the country code returned by DOS@.  On MS-Windows, Emacs
 does not use @env{TZ} at all.
 @item USER
 The user's login name.  See also @env{LOGNAME}.  On MS-DOS, this
@@ -747,7 +747,7 @@ Use @var{font} as the default font.
 
 When passing a font name to Emacs on the command line, you may need to
 ``quote'' it, by enclosing it in quotation marks, if it contains
-characters that the shell treats specially (e.g.@: spaces).  For
+characters that the shell treats specially (e.g., spaces).  For
 example:
 
 @smallexample
@@ -839,7 +839,7 @@ otherwise use an appropriate standard mode for @var{num} colors.
 Depending on your terminal's capabilities, Emacs might be able to turn
 on a color mode for 8, 16, 88, or 256 as the value of @var{num}.  If
 there is no mode that supports @var{num} colors, Emacs acts as if
-@var{num} were 0, i.e.@: it uses the terminal's default color support
+@var{num} were 0, i.e., it uses the terminal's default color support
 mode.
 @end table
 If @var{mode} is omitted, it defaults to @var{ansi8}.
@@ -1070,7 +1070,7 @@ it.
 
   By default, Emacs uses an icon containing the Emacs logo.  On
 desktop environments such as Gnome, this icon is also displayed in
-other contexts, e.g.@: when switching into an Emacs frame.  The
+other contexts, e.g., when switching into an Emacs frame.  The
 @samp{-nbi} or @samp{--no-bitmap-icon} option tells Emacs to let the
 window manager choose what sort of icon to use---usually just a small
 rectangle containing the frame's title.
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index e63a98a972..5c5493884b 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -53,7 +53,7 @@ holding down the @key{Ctrl} key while pressing @kbd{a}; we will refer
 to this as @kbd{C-a} for short.  Similarly @kbd{Meta-a}, or @kbd{M-a}
 for short, is entered by holding down the @key{Alt} key and pressing
 @kbd{a}.  Modifier keys can also be applied to non-alphanumerical
-characters, e.g. @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
+characters, e.g., @kbd{C-@key{F1}} or @kbd{M-@key{left}}.
 
 @cindex @key{ESC} replacing @key{Meta} key
   You can also type Meta characters using two-character sequences
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 6ea1ad5535..dd8da41d0c 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -610,10 +610,10 @@ always considered safe.
 @vindex custom-enabled-themes
   Setting or saving Custom themes actually works by customizing the
 variable @code{custom-enabled-themes}.  The value of this variable is
-a list of Custom theme names (as Lisp symbols, e.g.@: @code{tango}).
+a list of Custom theme names (as Lisp symbols, e.g., @code{tango}).
 Instead of using the @file{*Custom Themes*} buffer to set
 @code{custom-enabled-themes}, you can customize the variable using the
-usual customization interface, e.g.@: with @kbd{M-x customize-option}.
+usual customization interface, e.g., with @kbd{M-x customize-option}.
 Note that Custom themes are not allowed to set
 @code{custom-enabled-themes} themselves.
 
@@ -2329,7 +2329,7 @@ Here a full file name is used, so no searching is done.
 @cindex loading Lisp libraries automatically
 @cindex autoload Lisp libraries
 Tell Emacs to find the definition for the function @code{myfunction}
-by loading a Lisp library named @file{mypackage} (i.e.@: a file
+by loading a Lisp library named @file{mypackage} (i.e., a file
 @file{mypackage.elc} or @file{mypackage.el}):
 
 @example
@@ -2496,7 +2496,7 @@ editor customizations even if you are running as the super user.
 
   More precisely, Emacs first determines which user's init file to use.
 It gets your user name from the environment variables @env{LOGNAME} and
-@env{USER}; if neither of those exists, it uses effective user-ID.
+@env{USER}; if neither of those exists, it uses effective user-ID@.
 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.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 69b72b2c73..3b461b443c 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -968,7 +968,7 @@ is the second argument.  The output of the @command{diff} program is
 shown in a buffer using Diff mode (@pxref{Comparing Files}).
 
   If the region is active, the default for the file read using the
-minibuffer is the file at the mark (i.e.@: the ordinary Emacs mark,
+minibuffer is the file at the mark (i.e., the ordinary Emacs mark,
 not a Dired mark; @pxref{Setting Mark}).  Otherwise, if the file at
 point has a backup file (@pxref{Backup}), that is the default.
 
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 876c46bdf1..8dc82d4b70 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -249,14 +249,14 @@ variables @code{scroll-up-aggressively} and
 position of point after scrolling.  The value of
 @code{scroll-up-aggressively} should be either @code{nil} (the
 default), or a floating point number @var{f} between 0 and 1.  The
-latter means that when point goes below the bottom window edge (i.e.@:
+latter means that when point goes below the bottom window edge (i.e.,
 scrolling forward), Emacs scrolls the window so that point is @var{f}
 parts of the window height from the bottom window edge.  Thus, larger
 @var{f} means more aggressive scrolling: more new text is brought into
 view.  The default value, @code{nil}, is equivalent to 0.5.
 
   Likewise, @code{scroll-down-aggressively} is used when point goes
-above the bottom window edge (i.e.@: scrolling backward).  The value
+above the bottom window edge (i.e., scrolling backward).  The value
 specifies how far point should be from the top margin of the window
 after scrolling.  Thus, as with @code{scroll-up-aggressively}, a
 larger value is more aggressive.
@@ -1089,7 +1089,7 @@ buffer text, so blank lines at the end of the buffer stand out because
 they lack this image.  To enable this feature, set the buffer-local
 variable @code{indicate-empty-lines} to a non-@code{nil} value.  You
 can enable or disable this feature for all new buffers by setting the
-default value of this variable, e.g.@: @code{(setq-default
+default value of this variable, e.g., @code{(setq-default
 indicate-empty-lines t)}.
 
 @cindex Whitespace mode
@@ -1258,7 +1258,7 @@ line looks like this:
 Here @var{hh} and @var{mm} are the hour and minute, followed always by
 @samp{am} or @samp{pm}.  @var{l.ll} is the average number, collected
 for the last few minutes, of processes in the whole system that were
-either running or ready to run (i.e.@: were waiting for an available
+either running or ready to run (i.e., were waiting for an available
 processor).  (Some fields may be missing if your operating system
 cannot support them.)  If you prefer time display in 24-hour format,
 set the variable @code{display-time-24hr-format} to @code{t}.
@@ -1369,7 +1369,7 @@ as octal escape sequences instead of caret escape sequences.
   Some non-@acronym{ASCII} characters have the same appearance as an
 @acronym{ASCII} space or hyphen (minus) character.  Such characters
 can cause problems if they are entered into a buffer without your
-realization, e.g.@: by yanking; for instance, source code compilers
+realization, e.g., by yanking; for instance, source code compilers
 typically do not treat non-@acronym{ASCII} spaces as whitespace
 characters.  To deal with this problem, Emacs displays such characters
 specially: it displays @code{U+00A0} (no-break space) with the
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 005215de64..423435ae11 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1323,13 +1323,13 @@ when you get it, not just free for the manufacturer.
 
 If you find GNU Emacs useful, please @strong{send a donation} to the
 Free Software Foundation to support our work.  Donations to the Free
-Software Foundation are tax deductible in the US.  If you use GNU Emacs
+Software Foundation are tax deductible in the US@.  If you use GNU Emacs
 at your workplace, please suggest that the company make a donation.
 For more information on how you can help, see
 @url{http://www.gnu.org/help/help.html}.
 
 We also sell hardcopy versions of this manual and @cite{An
-Introduction to Programming in Emacs Lisp}, by Robert J.@: Chassell.
+Introduction to Programming in Emacs Lisp}, by Robert J. Chassell.
 You can visit our online store at @url{http://shop.fsf.org/}.
 The income from sales goes to support the foundation's purpose: the
 development of new free software, and improvements to our existing
@@ -1350,15 +1350,15 @@ USA
 @unnumberedsec Acknowledgments
 
 Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas
-Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy
+Abrahamsson, Jay K. Adams, Alon Albert, Michael Albinus, Nagy
 Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström,
 Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
-Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff,
+Baumann, Steven L. Baur, Jay Belanger, Alexander L. Belikoff,
 Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl
-Berry, Anna M.@: Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
+Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
 Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner,
 Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin
-Broadey, Vincent Broman, Michael Brouwer, David M.@: Brown, Stefan Bruda,
+Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda,
 Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl,
 Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
 Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
@@ -1367,44 +1367,44 @@ Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag,
 Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki
 Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
 Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri
-Ding, Jan Djärv, Lawrence R.@: Dodd, Carsten Dominik, Scott Draves,
+Ding, Jan Djärv, Lawrence R. Dodd, Carsten Dominik, Scott Draves,
 Benjamin Drieu, Viktor Dukhovni, Jacques Duthen, Dmitry Dzhus, John
 Eaton, Rolf Ebert, Carl Edman, David Edmondson, Paul Eggert, Stephen
 Eglen, Christian Egli, Torbjörn Einarsson, Tsugutomo Enami, David
 Engster, Hans Henrik Eriksen, Michael Ernst, Ata Etemadi, Frederick
 Farnbach, Oscar Figueiredo, Fred Fish, Steve Fisk, Karl Fogel, Gary
-Foster, Eric S.@: Fraga, Romain Francoise, Noah Friedman, Andreas
-Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.@:
+Foster, Eric S. Fraga, Romain Francoise, Noah Friedman, Andreas
+Fuchs, Shigeru Fukaya, Hallvard Furuseth, Keith Gabryelski, Peter S.
 Galbraith, Kevin Gallagher, Kevin Gallo, Juan León Lahoz García,
 Howard Gayle, Daniel German, Stephen Gildea, Julien Gilles, David
 Gillespie, Bob Glickstein, Deepak Goel, David De La Harpe Golden, Boris
 Goldowsky, David Goodger, Chris Gray, Kevin Greiner, Michelangelo Grigni, Odd
 Gripenstam, Kai Großjohann, Michael Gschwind, Bastien Guerry, Henry
 Guillaume, Doug Gwyn, Bruno Haible, Ken'ichi Handa, Lars Hansen, Chris
-Hanson, Jesper Harder, Alexandru Harsanyi, K.@: Shane Hartman, John
-Heidemann, Jon K.@: Hellan, Magnus Henoch, Markus Heritsch, Dirk
+Hanson, Jesper Harder, Alexandru Harsanyi, K. Shane Hartman, John
+Heidemann, Jon K. Hellan, Magnus Henoch, Markus Heritsch, Dirk
 Herrmann, Karl Heuer, Manabu Higashida, Konrad Hinsen, Anders Holst,
-Jeffrey C.@: Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim
+Jeffrey C. Honig, Tassilo Horn, Kurt Hornik, Tom Houlder, Joakim
 Hove, Denis Howe, Lars Ingebrigtsen, Andrew Innes, Seiichiro Inoue,
 Philip Jackson, Martyn Jago, Pavel Janik, Paul Jarc, Ulf Jasper,
-Thorsten Jolitz, Michael K.@: Johnson, Kyle Jones, Terry Jones, Simon
+Thorsten Jolitz, Michael K. Johnson, Kyle Jones, Terry Jones, Simon
 Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani,
 Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David
 Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi,
 Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel
-Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K.@: Kolodney, David
-M.@: Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
+Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David
+M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
 Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl
-Landstrom, Mario Lang, Aaron Larson, James R.@: Larus, Vinicius Jose
+Landstrom, Mario Lang, Aaron Larson, James R. Larus, Vinicius Jose
 Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian
 Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link,
-Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C.@: Lopes,
+Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C. Lopes,
 Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha
 Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie,
-Christopher J.@: Madsen, Neil M.@: Mager, Ken Manheimer, Bill Mann,
+Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann,
 Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin,
 Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David
-Megginson, Stefan Merten, Ben A.@: Mesander, Wayne Mesard, Brad
+Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad
 Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Moellmann, Stefan
 Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
 Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
@@ -1412,44 +1412,44 @@ Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
 Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden,
 Andrew Norman, Kentaro Ohkouchi, Christian Ohler,
 Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota,
-Pieter E.@: J.@: Pareit, Ross Patterson, David Pearson, Juan Pechiar,
-Jeff Peck, Damon Anton Permezel, Tom Perrine, William M.@: Perry, Per
-Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L.@:
+Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar,
+Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
+Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L.
 Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian
-Plaunt, Alexander Pohoyda, David Ponce, Francesco A.@: Potorti,
-Michael D.@: Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin
-Ram, Eric S.@: Raymond, Paul Reilly, Edward M.@: Reingold, David
+Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potorti,
+Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin
+Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David
 Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick
-Roberts, Roland B.@: Roberts, John Robinson, Denis B.@: Roegel, Danny
+Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny
 Roozendaal, Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo
-J.@: Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang
-Rupprecht, Benjamin Rutt, Kevin Ryde, James B.@: Salem, Masahiko Sato,
+J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang
+Rupprecht, Benjamin Rutt, Kevin Ryde, James B. Salem, Masahiko Sato,
 Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, Ralph
-Schleicher, Gregor Schmid, Michael Schmidt, Ronald S.@: Schnell,
+Schleicher, Gregor Schmid, Michael Schmidt, Ronald S. Schnell,
 Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef,
 Rainer Schoepf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal
 Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham,
 Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor
 @v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
-David Smith, Paul D.@: Smith, Wilson Snyder, William Sommerfeld, Simon
+David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon
 South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann,
 Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken
-Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.@:
+Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F.
 Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto
 Takahashi, Steven Tamm, Luc Teirlinck, Jean-Philippe Theberge, Jens
-T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi,
+T. Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi,
 David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, Eli
 Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil
-W.@: Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
+W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey
 Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin
 Walters, Barry Warsaw, Christoph Wedler, Ilja Weis, Zhang Weize,
 Morten Welinder, Joseph Brian Wells, Rodney Whitby, John Wiegley,
 Sascha Wilde, Ed Wilkinson, Mike Williams, Roland Winkler, Bill
-Wohler, Steven A.@: Wood, Dale R.@: Worley, Francis J.@: Wright, Felix
-S.@: T.@: Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka,
+Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix
+S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka,
 Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan
 Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin,
-Shenghuo Zhu, Piotr Zielinski, Ian T.@: Zimmermann, Reto Zimmermann,
+Shenghuo Zhu, Piotr Zielinski, Ian T. Zimmermann, Reto Zimmermann,
 Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
 @end iftex
 
diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi
index 552580ef85..66b1066e88 100644
--- a/doc/emacs/emerge-xtra.texi
+++ b/doc/emacs/emerge-xtra.texi
@@ -186,12 +186,12 @@ haven't made a choice.  All differences start in the default-A state
 which one alternative is ``preferred'' (see below).
 
 When you select a difference, its state changes from default-A or
-default-B to plain A or B.  Thus, the selected difference never has
+default-B to plain A or B@.  Thus, the selected difference never has
 state default-A or default-B, and these states are never displayed in
 the mode line.
 
 The command @kbd{d a} chooses default-A as the default state, and @kbd{d
-b} chooses default-B.  This chosen default applies to all differences
+b} chooses default-B@.  This chosen default applies to all differences
 that you have never selected and for which no alternative is preferred.
 If you are moving through the merge sequentially, the differences you
 haven't selected are those following the selected one.  Thus, while
@@ -375,7 +375,7 @@ While this example shows C preprocessor conditionals delimiting the two
 alternative versions, you can specify the strings to use by setting
 the variable @code{emerge-combine-versions-template} to a string of your
 choice.  In the string, @samp{%a} says where to put version A, and
-@samp{%b} says where to put version B.  The default setting, which
+@samp{%b} says where to put version B@.  The default setting, which
 produces the results shown above, looks like this:
 
 @example
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 8b609891ca..1845ba3eed 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -72,7 +72,7 @@ directory into the minibuffer as the initial contents.  You can
 inhibit this insertion by changing the variable
 @code{insert-default-directory} to @code{nil} (@pxref{Minibuffer
 File}).  Regardless, Emacs always assumes that any relative file name
-is relative to the default directory, e.g. entering a file name
+is relative to the default directory, e.g., entering a file name
 without a directory specifies a file in the default directory.
 
 @findex cd
@@ -773,7 +773,7 @@ spurious, just use @kbd{p} to tell Emacs to go ahead anyway.
 multiple names, Emacs does not prevent two users from editing it
 simultaneously under different names.
 
-  A lock file cannot be written in some circumstances, e.g. if Emacs
+  A lock file cannot be written in some circumstances, e.g., if Emacs
 lacks the system permissions or the system does not support symbolic
 links.  In these cases, Emacs can still detect the collision when you
 try to save a file, by checking the file's last-modification date.  If
@@ -1948,7 +1948,7 @@ can use ImageMagick to render a wide variety of images.  The variable
 @code{imagemagick-enabled-types} lists the image types that Emacs may
 render using ImageMagick; each element in the list should be an
 internal ImageMagick name for an image type, as a symbol or an
-equivalent string (e.g.@: @code{BMP} for @file{.bmp} images).  To
+equivalent string (e.g., @code{BMP} for @file{.bmp} images).  To
 enable ImageMagick for all possible image types, change
 @code{imagemagick-enabled-types} to @code{t}.  The variable
 @code{imagemagick-types-inhibit} lists the image types which should
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index 43e2e63863..4a00090eba 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -89,7 +89,7 @@ Move to the beginning of the next statement
 @item C-c C-p
 Move to the beginning of the previous statement
 (@code{fortran-previous-statement}/@code{f90-previous-statement}).
-If there is no previous statement (i.e. if called from the first
+If there is no previous statement (i.e., if called from the first
 statement in the buffer), move to the start of the buffer.
 
 @kindex C-c C-e @r{(F90 mode)}
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 0ce5c64c0e..79276438eb 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -6,7 +6,7 @@
 @chapter Frames and Graphical Displays
 @cindex frames
 
-  When Emacs is started on a graphical display, e.g.@: on the X Window
+  When Emacs is started on a graphical display, e.g., on the X Window
 System, it occupies a graphical system-level ``window''.  In this
 manual, we call this a @dfn{frame}, reserving the word ``window'' for
 the part of the frame used for displaying a buffer.  A frame initially
@@ -246,8 +246,8 @@ Select the text you drag across, in the form of whole lines.
 
 @vindex mouse-highlight
   Some Emacs buffers include @dfn{buttons}, or @dfn{hyperlinks}:
-pieces of text that perform some action (e.g.@: following a reference)
-when activated (e.g.@: by clicking on them).  Usually, a button's text
+pieces of text that perform some action (e.g., following a reference)
+when activated (e.g., by clicking on them).  Usually, a button's text
 is visually highlighted: it is underlined, or a box is drawn around
 it.  If you move the mouse over a button, the shape of the mouse
 cursor changes and the button lights up.  If you change the variable
@@ -631,7 +631,7 @@ Monospace Bold Italic 12
 @cindex X Logical Font Description
   The third way to specify a font is to use an @dfn{XLFD} (@dfn{X
 Logical Font Description}).  This is the traditional method for
-specifying fonts under X.  Each XLFD consists of fourteen words or
+specifying fonts under X@.  Each XLFD consists of fourteen words or
 numbers, separated by dashes, like this:
 
 @example
@@ -644,7 +644,7 @@ characters (including none), and @samp{?} matches any single
 character.  However, matching is implementation-dependent, and can be
 inaccurate when wildcards match dashes in a long name.  For reliable
 results, supply all 14 dashes and use wildcards only within a field.
-Case is insignificant in an XLFD.  The syntax for an XLFD is as
+Case is insignificant in an XLFD@.  The syntax for an XLFD is as
 follows:
 
 @example
@@ -659,7 +659,7 @@ The entries have the following meanings:
 @item maker
 The name of the font manufacturer.
 @item family
-The name of the font family (e.g.@: @samp{courier}).
+The name of the font family (e.g., @samp{courier}).
 @item weight
 The font weight---normally either @samp{bold}, @samp{medium} or
 @samp{light}.  Some font names support other values.
@@ -1067,7 +1067,7 @@ attributes of the tooltip text are specified by the @code{tooltip}
 face, and by X resources (@pxref{X Resources}).
 
   @dfn{GUD tooltips} are special tooltips that show the values of
-variables when debugging a program with GUD.  @xref{Debugger
+variables when debugging a program with GUD@.  @xref{Debugger
 Operation}.
 
 @node Mouse Avoidance
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index 0912cfe531..c4f27a209f 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -14,7 +14,7 @@ as an abbrev for a long phrase that you want to insert frequently.
 @xref{Abbrevs}.
 
 @item Aborting
-Aborting means getting out of a recursive edit (q.v.@:).  The
+Aborting means getting out of a recursive edit (q.v.).  The
 commands @kbd{C-]} and @kbd{M-x top-level} are used for this.
 @xref{Quitting}.
 
@@ -62,7 +62,7 @@ function from those libraries.  This is called `autoloading'.
 @item Backtrace
 A backtrace is a trace of a series of function calls showing how a
 program arrived at a certain point.  It is used mainly for finding and
-correcting bugs (q.v.@:).  Emacs can display a backtrace when it signals
+correcting bugs (q.v.).  Emacs can display a backtrace when it signals
 an error or when you type @kbd{C-g} (@pxref{Glossary - Quitting}).
 @xref{Checklist}.
 
@@ -83,14 +83,14 @@ delimiter for you (@pxref{Matching,,Matching Parens}).
 @item Balanced Expressions
 A balanced expression is a syntactically recognizable expression, such
 as a symbol, number, string constant, block, or parenthesized expression
-in C.  @xref{Expressions,Balanced Expressions}.
+in C@.  @xref{Expressions,Balanced Expressions}.
 
 @item Balloon Help
 @xref{Glossary - Tooltips}.
 
 @item Base Buffer
 A base buffer is a buffer whose text is shared by an indirect buffer
-(q.v.@:).
+(q.v.).
 
 @item Bidirectional Text
 Some human languages, such as English, are written from left to right.
@@ -99,16 +99,16 @@ supports both of these forms, as well as any mixture of them---this
 is `bidirectional text'.  @xref{Bidirectional Editing}.
 
 @item Bind
-To bind a key sequence means to give it a binding (q.v.@:).
+To bind a key sequence means to give it a binding (q.v.).
 @xref{Rebinding}.
 
 @anchor{Glossary - Binding}
 @item Binding
 A key sequence gets its meaning in Emacs by having a binding, which is a
-command (q.v.@:), a Lisp function that is run when you type that
+command (q.v.), a Lisp function that is run when you type that
 sequence.  @xref{Commands,Binding}.  Customization often involves
 rebinding a character to a different command function.  The bindings of
-all key sequences are recorded in the keymaps (q.v.@:).  @xref{Keymaps}.
+all key sequences are recorded in the keymaps (q.v.).  @xref{Keymaps}.
 
 @item Blank Lines
 Blank lines are lines that contain only whitespace.  Emacs has several
@@ -126,13 +126,13 @@ external border, outside of everything including the menu bar, plus an
 internal border that surrounds the text windows, their scroll bars
 and fringes, and separates them from the menu bar and tool bar.  You
 can customize both borders with options and resources (@pxref{Borders
-X}).  Borders are not the same as fringes (q.v.@:).
+X}).  Borders are not the same as fringes (q.v.).
 
 @item Buffer
 The buffer is the basic editing unit; one buffer corresponds to one text
 being edited.  You normally have several buffers, but at any time you are
 editing only one, the `current buffer', though several can be visible
-when you are using multiple windows or frames (q.v.@:).  Most buffers
+when you are using multiple windows or frames (q.v.).  Most buffers
 are visiting (q.v.@:) some file.  @xref{Buffers}.
 
 @item Buffer Selection History
@@ -194,7 +194,7 @@ press a mouse button and release it without moving the mouse.
 @item Clipboard
 A clipboard is a buffer provided by the window system for transferring
 text between applications.  On the X Window System, the clipboard is
-provided in addition to the primary selection (q.v.@:); on MS-Windows and Mac,
+provided in addition to the primary selection (q.v.); on MS-Windows and Mac,
 the clipboard is used @emph{instead} of the primary selection.
 @xref{Clipboard}.
 
@@ -206,7 +206,7 @@ text to or from a variety of coding systems when reading or writing it.
 
 @item Command
 A command is a Lisp function specially defined to be able to serve as a
-key binding in Emacs.  When you type a key sequence (q.v.@:), its
+key binding in Emacs.  When you type a key sequence (q.v.), its
 binding (q.v.@:) is looked up in the relevant keymaps (q.v.@:) to find
 the command to run.  @xref{Commands}.
 
@@ -241,7 +241,7 @@ Reference Manual}) and programs in C and other languages
 A complete key is a key sequence that fully specifies one action to be
 performed by Emacs.  For example, @kbd{X} and @kbd{C-f} and @kbd{C-x m}
 are complete keys.  Complete keys derive their meanings from being bound
-(q.v.@:) to commands (q.v.@:).  Thus, @kbd{X} is conventionally bound to
+(q.v.@:) to commands (q.v.).  Thus, @kbd{X} is conventionally bound to
 a command to insert @samp{X} in the buffer; @kbd{C-x m} is
 conventionally bound to a command to begin composing a mail message.
 @xref{Keys}.
@@ -261,7 +261,7 @@ normally (but see @ref{Glossary - Truncation}) takes up more than one
 screen line when displayed.  We say that the text line is continued, and all
 screen lines used for it after the first are called continuation
 lines.  @xref{Continuation Lines}.  A related Emacs feature is
-`filling' (q.v.@:).
+`filling' (q.v.).
 
 @item Control Character
 A control character is a character that you type by holding down the
@@ -358,7 +358,7 @@ key or the @key{BACKSPACE} key, whichever one is easy to type.
 
 @item Deletion
 Deletion means erasing text without copying it into the kill ring
-(q.v.@:).  The alternative is killing (q.v.@:).  @xref{Killing,Deletion}.
+(q.v.).  The alternative is killing (q.v.).  @xref{Killing,Deletion}.
 
 @anchor{Glossary - Deletion of Files}
 @item Deletion of Files
@@ -401,7 +401,7 @@ confirmation.  The usual reason for disabling a command is that it is
 confusing for beginning users.  @xref{Disabling}.
 
 @item Down Event
-Short for `button down event' (q.v.@:).
+Short for `button down event' (q.v.).
 
 @item Drag Event
 A drag event is the kind of input event (q.v.@:) generated when you
@@ -431,7 +431,7 @@ them.
 
 @item Electric
 We say that a character is electric if it is normally self-inserting
-(q.v.@:), but the current major mode (q.v.@:) redefines it to do something
+(q.v.), but the current major mode (q.v.@:) redefines it to do something
 else as well.  For example, some programming language major modes define
 particular delimiter characters to reindent the line, or insert one or
 more newlines in addition to self-insertion.
@@ -440,7 +440,7 @@ more newlines in addition to self-insertion.
 @item End Of Line
 End of line is a character or a sequence of characters that indicate
 the end of a text line.  On GNU and Unix systems, this is a newline
-(q.v.@:), but other systems have other conventions.  @xref{Coding
+(q.v.), but other systems have other conventions.  @xref{Coding
 Systems,end-of-line}.  Emacs can recognize several end-of-line
 conventions in files and convert between them.
 
@@ -458,7 +458,7 @@ variables in the environment it passes to programs it invokes.
 An error occurs when an Emacs command cannot execute in the current
 circumstances.  When an error occurs, execution of the command stops
 (unless the command has been programmed to do otherwise) and Emacs
-reports the error by displaying an error message (q.v.@:).
+reports the error by displaying an error message (q.v.).
 @c Not helpful?
 @c Type-ahead is discarded.  Then Emacs is ready to read another
 @c editing command.
@@ -510,11 +510,11 @@ directory, but an absolute file name refers to the same file regardless
 of which directory is current.  On GNU and Unix systems, an absolute
 file name starts with a slash (the root directory) or with @samp{~/} or
 @samp{~@var{user}/} (a home directory).  On MS-Windows/MS-DOS, an
-absolute file name can also start with a drive letter and a colon, e.g.
+absolute file name can also start with a drive letter and a colon, e.g.,
 @samp{@var{d}:}.
 
 Some people use the term ``pathname'' for file names, but we do not;
-we use the word ``path'' only in the term ``search path'' (q.v.@:).
+we use the word ``path'' only in the term ``search path'' (q.v.).
 
 @item File-Name Component
 A file-name component names a file directly within a particular
@@ -556,25 +556,25 @@ fontset, rather than changing each font separately.  @xref{Fontsets}.
 @item Frame
 A frame is a rectangular cluster of Emacs windows.  Emacs starts out
 with one frame, but you can create more.  You can subdivide each frame
-into Emacs windows (q.v.@:).  When you are using a window system
-(q.v.@:), more than one frame can be visible at the same time.
+into Emacs windows (q.v.).  When you are using a window system
+(q.v.), more than one frame can be visible at the same time.
 @xref{Frames}.  Some other editors use the term ``window'' for this,
 but in Emacs a window means something else.
 
 @item Free Software
 Free software is software that gives you the freedom to share, study
 and modify it.  Emacs is free software, part of the GNU project
-(q.v.@:), and distributed under a copyleft (q.v.@:) license called the
+(q.v.), and distributed under a copyleft (q.v.@:) license called the
 GNU General Public License.  @xref{Copying}.
 
 @anchor{Glossary - Free Software Foundation}
 @item Free Software Foundation
 The Free Software Foundation (FSF) is a charitable foundation
-dedicated to promoting the development of free software (q.v.@:).
+dedicated to promoting the development of free software (q.v.).
 For more information, see @uref{http://fsf.org/, the FSF website}.
 
 @item Fringe
-On a graphical display (q.v.@:), there's a narrow portion of the frame
+On a graphical display (q.v.), there's a narrow portion of the frame
 (q.v.@:) between the text area and the window's border.  These
 ``fringes'' are used to display symbols that provide information about
 the buffer text (@pxref{Fringes}).  Emacs displays the fringe using a
@@ -585,7 +585,7 @@ special face (q.v.@:) called @code{fringe}.  @xref{Faces,fringe}.
 
 @item FTP
 FTP is an acronym for File Transfer Protocol.  This is one standard
-method for retrieving remote files (q.v.@:).
+method for retrieving remote files (q.v.).
 
 @item Function Key
 A function key is a key on the keyboard that sends input but does not
@@ -593,7 +593,7 @@ correspond to any character.  @xref{Function Keys}.
 
 @item Global
 Global means ``independent of the current environment; in effect
-throughout Emacs''.  It is the opposite of local (q.v.@:).  Particular
+throughout Emacs''.  It is the opposite of local (q.v.).  Particular
 examples of the use of `global' appear below.
 
 @item Global Abbrev
@@ -604,7 +604,7 @@ modes that do not have local (q.v.@:) definitions for the same abbrev.
 @item Global Keymap
 The global keymap (q.v.@:) contains key bindings that are in effect
 everywhere, except when overridden by local key bindings in a major
-mode's local keymap (q.v.@:).  @xref{Keymaps}.
+mode's local keymap (q.v.).  @xref{Keymaps}.
 
 @item Global Mark Ring
 The global mark ring records the series of buffers you have recently
@@ -624,7 +624,7 @@ that do not have their own local (q.v.@:) values for the variable.
 
 @item GNU
 GNU is a recursive acronym for GNU's Not Unix, and it refers to a
-Unix-compatible operating system which is free software (q.v.@:).
+Unix-compatible operating system which is free software (q.v.).
 @xref{Manifesto}.  GNU is normally used with Linux as the kernel since
 Linux works better than the GNU kernel.  For more information, see
 @uref{http://www.gnu.org/, the GNU website}.
@@ -639,7 +639,7 @@ that character (in ordinary editing modes).  @xref{Inserting Text}.
 
 @item Graphical Display
 A graphical display is one that can display images and multiple fonts.
-Usually it also has a window system (q.v.@:).
+Usually it also has a window system (q.v.).
 
 @item Highlighting
 Highlighting text means displaying it with a different foreground and/or
@@ -664,7 +664,7 @@ Help echo is a short message displayed in the echo area (q.v.@:) when
 the mouse pointer is located on portions of display that require some
 explanations.  Emacs displays help echo for menu items, parts of the
 mode line, tool-bar buttons, etc.  On graphical displays, the messages
-can be displayed as tooltips (q.v.@:).  @xref{Tooltips}.
+can be displayed as tooltips (q.v.).  @xref{Tooltips}.
 
 @item Home Directory
 Your home directory contains your personal files.  On a multi-user GNU
@@ -712,7 +712,7 @@ commands to adjust indentation.
 
 @item Indirect Buffer
 An indirect buffer is a buffer that shares the text of another buffer,
-called its base buffer (q.v.@:).  @xref{Indirect Buffers}.
+called its base buffer (q.v.).  @xref{Indirect Buffers}.
 
 @item Info
 Info is the hypertext format used by the GNU project for writing
@@ -726,7 +726,7 @@ frames.  @xref{User Input}.
 
 @item Input Method
 An input method is a system for entering non-@acronym{ASCII} text characters by
-typing sequences of @acronym{ASCII} characters (q.v.@:).  @xref{Input Methods}.
+typing sequences of @acronym{ASCII} characters (q.v.).  @xref{Input Methods}.
 
 @item Insertion
 Insertion means adding text into the buffer, either from the keyboard
@@ -761,8 +761,8 @@ Emacs calls ``binding a key sequence''.  @xref{Glossary - Binding}.
 @item Key Sequence
 A key sequence (key, for short) is a sequence of input events (q.v.@:)
 that are meaningful as a single unit.  If the key sequence is enough to
-specify one action, it is a complete key (q.v.@:); if it is not enough,
-it is a prefix key (q.v.@:).  @xref{Keys}.
+specify one action, it is a complete key (q.v.); if it is not enough,
+it is a prefix key (q.v.).  @xref{Keys}.
 
 @item Keymap
 The keymap is the data structure that records the bindings (q.v.@:) of
@@ -778,14 +778,14 @@ key sequences.
 @item Kill Ring
 The kill ring is where all text you have killed (@pxref{Glossary - Killing})
 recently is saved.  You can reinsert any of the killed text still in
-the ring; this is called yanking (q.v.@:).  @xref{Yanking}.
+the ring; this is called yanking (q.v.).  @xref{Yanking}.
 
 @anchor{Glossary - Killing}
 @item Killing
 Killing means erasing text and saving it on the kill ring so it can be
 yanked (q.v.@:) later.  Some other systems call this ``cutting''.
 Most Emacs commands that erase text perform killing, as opposed to
-deletion (q.v.@:).  @xref{Killing}.
+deletion (q.v.).  @xref{Killing}.
 
 @item Killing a Job
 Killing a job (such as, an invocation of Emacs) means making it cease
@@ -794,7 +794,7 @@ to exist.  Any data within it, if not saved in a file, is lost.
 
 @item Language Environment
 Your choice of language environment specifies defaults for the input
-method (q.v.@:) and coding system (q.v.@:).  @xref{Language
+method (q.v.@:) and coding system (q.v.).  @xref{Language
 Environments}.  These defaults are relevant if you edit
 non-@acronym{ASCII} text (@pxref{International}).
 
@@ -821,7 +821,7 @@ lists.  @xref{Moving by Parens}.
 Local means ``in effect only in a particular context''; the relevant
 kind of context is a particular function execution, a particular
 buffer, or a particular major mode.  It is the opposite of `global'
-(q.v.@:).  Specific uses of `local' in Emacs terminology appear below.
+(q.v.).  Specific uses of `local' in Emacs terminology appear below.
 
 @item Local Abbrev
 A local abbrev definition is effective only if a particular major mode
@@ -844,7 +844,7 @@ one of the modifier keys that can accompany any character.
 
 @item @kbd{M-C-}
 @kbd{M-C-} in the name of a character is an abbreviation for
-Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.@:).
+Control-Meta; it means the same thing as `@kbd{C-M-}' (q.v.).
 
 @item @kbd{M-x}
 @kbd{M-x} is the key sequence that is used to call an Emacs command by
@@ -875,14 +875,14 @@ fringe) and the window edge.
 
 @item Mark
 The mark points to a position in the text.  It specifies one end of the
-region (q.v.@:), point being the other end.  Many commands operate on
+region (q.v.), point being the other end.  Many commands operate on
 all the text from point to the mark.  Each buffer has its own mark.
 @xref{Mark}.
 
 @item Mark Ring
 The mark ring is used to hold several recent previous locations of the
 mark, in case you want to move back to them.  Each buffer has its
-own mark ring; in addition, there is a single global mark ring (q.v.@:).
+own mark ring; in addition, there is a single global mark ring (q.v.).
 @xref{Mark Ring}.
 
 @item Menu Bar
@@ -911,7 +911,7 @@ A Meta character is one whose character code includes the Meta bit.
 
 @item Minibuffer
 The minibuffer is the window that appears when necessary inside the
-echo area (q.v.@:), used for reading arguments to commands.
+echo area (q.v.), used for reading arguments to commands.
 @xref{Minibuffer}.
 
 @anchor{Glossary - Minibuffer History}
@@ -923,8 +923,8 @@ again.  @xref{Minibuffer History}.
 @item Minor Mode
 A minor mode is an optional feature of Emacs, which can be switched on
 or off independently of all other features.  Each minor mode has a
-command to turn it on or off.  Some minor modes are global (q.v.@:),
-and some are local (q.v.@:).  @xref{Minor Modes}.
+command to turn it on or off.  Some minor modes are global (q.v.),
+and some are local (q.v.).  @xref{Minor Modes}.
 
 @item Minor Mode Keymap
 A minor mode keymap is a keymap that belongs to a minor mode and is
@@ -933,7 +933,7 @@ over the buffer's local keymap, just as the local keymap takes
 precedence over the global keymap.  @xref{Keymaps}.
 
 @item Mode Line
-The mode line is the line at the bottom of each window (q.v.@:), giving
+The mode line is the line at the bottom of each window (q.v.), giving
 status information on the buffer displayed in that window.  @xref{Mode
 Line}.
 
@@ -949,7 +949,7 @@ yanking (q.v.@:) it.  @xref{Killing}.
 
 @item MULE
 MULE refers to the Emacs features for editing multilingual
-non-@acronym{ASCII} text using multibyte characters (q.v.@:).
+non-@acronym{ASCII} text using multibyte characters (q.v.).
 @xref{International}.
 
 @item Multibyte Character
@@ -959,7 +959,7 @@ since the number of non-@acronym{ASCII} characters is much more than 256.
 @xref{International Chars, International Characters}.
 
 @item Named Mark
-A named mark is a register (q.v.@:), in its role of recording a
+A named mark is a register (q.v.), in its role of recording a
 location in text so that you can move point to that location.
 @xref{Registers}.
 
@@ -1037,7 +1037,7 @@ specify a different file name.  @xref{Rmail}.
 @end ignore
 
 @item Primary Selection
-The primary selection is one particular X selection (q.v.@:); it is the
+The primary selection is one particular X selection (q.v.); it is the
 selection that most X applications use for transferring text to and from
 other applications.
 
@@ -1047,7 +1047,7 @@ uses the primary selection when appropriate.  @xref{Killing}.
 @item Prompt
 A prompt is text used to ask you for input.  Displaying a prompt
 is called prompting.  Emacs prompts always appear in the echo area
-(q.v.@:).  One kind of prompting happens when the minibuffer is used to
+(q.v.).  One kind of prompting happens when the minibuffer is used to
 read an argument (@pxref{Minibuffer}); the echoing that happens when
 you pause in the middle of typing a multi-character key sequence is also
 a kind of prompting (@pxref{Echo Area}).
@@ -1104,13 +1104,13 @@ correspond to changes that have been made in the text being edited.
 @xref{Glossary - Regular Expression}.
 
 @item Region
-The region is the text between point (q.v.@:) and the mark (q.v.@:).
+The region is the text between point (q.v.@:) and the mark (q.v.).
 Many commands operate on the text of the region.  @xref{Mark,Region}.
 
 @item Register
 Registers are named slots in which text, buffer positions, or
 rectangles can be saved for later use.  @xref{Registers}.  A related
-Emacs feature is `bookmarks' (q.v.@:).
+Emacs feature is `bookmarks' (q.v.).
 
 @anchor{Glossary - Regular Expression}
 @item Regular Expression
@@ -1134,13 +1134,13 @@ you have a supported method to gain access to those files.
 @item Restriction
 A buffer's restriction is the amount of text, at the beginning or the
 end of the buffer, that is temporarily inaccessible.  Giving a buffer a
-nonzero amount of restriction is called narrowing (q.v.@:); removing
-a restriction is called widening (q.v.@:).  @xref{Narrowing}.
+nonzero amount of restriction is called narrowing (q.v.); removing
+a restriction is called widening (q.v.).  @xref{Narrowing}.
 
 @item @key{RET}
 @key{RET} is a character that in Emacs runs the command to insert a
 newline into the text.  It is also used to terminate most arguments
-read in the minibuffer (q.v.@:).  @xref{User Input,Return}.
+read in the minibuffer (q.v.).  @xref{User Input,Return}.
 
 @item Reverting
 Reverting means returning to the original state.  Emacs lets you
@@ -1180,7 +1180,7 @@ files for certain purposes.  For example, the variable @code{load-path}
 holds a search path for finding Lisp library files.  @xref{Lisp Libraries}.
 
 @item Secondary Selection
-The secondary selection is one particular X selection (q.v.@:); some X
+The secondary selection is one particular X selection (q.v.); some X
 applications can use it for transferring text to and from other
 applications.  Emacs has special mouse commands for transferring text
 using the secondary selection.  @xref{Secondary Selection}.
@@ -1203,7 +1203,7 @@ selections whose values are text.  A program can also read the
 selections that other programs have set up.  This is the principal way
 of transferring text between window applications.  Emacs has commands to
 work with the primary (q.v.@:) selection and the secondary (q.v.@:)
-selection, and also with the clipboard (q.v.@:).
+selection, and also with the clipboard (q.v.).
 
 @item Self-Documentation
 Self-documentation is the feature of Emacs that can tell you what any
@@ -1297,7 +1297,7 @@ have.  To make a character Super, type it while holding down the
 @item Suspending
 Suspending Emacs means stopping it temporarily and returning control
 to its parent process, which is usually a shell.  Unlike killing a job
-(q.v.@:), you can later resume the suspended Emacs job without losing
+(q.v.), you can later resume the suspended Emacs job without losing
 your buffers, unsaved edits, undo history, etc.  @xref{Exiting}.
 
 @item @key{TAB}
@@ -1344,12 +1344,12 @@ they also specify formatting information.  @xref{Editing Format Info}.
 @item Theme
 A theme is a set of customizations (q.v.@:) that give Emacs a
 particular appearance or behavior.  For example, you might use a theme
-for your favorite set of faces (q.v.@:).
+for your favorite set of faces (q.v.).
 
 @item Tool Bar
 The tool bar is a line (sometimes multiple lines) of icons at the top
 of an Emacs frame.  Clicking on one of these icons executes a command.
-You can think of this as a graphical relative of the menu bar (q.v.@:).
+You can think of this as a graphical relative of the menu bar (q.v.).
 @xref{Tool Bars}.
 
 @anchor{Glossary - Tooltips}
@@ -1362,8 +1362,8 @@ clicks, etc.  @xref{Tooltips}.
 Top level is the normal state of Emacs, in which you are editing the
 text of the file you have visited.  You are at top level whenever you
 are not in a recursive editing level (q.v.@:) or the minibuffer
-(q.v.@:), and not in the middle of a command.  You can get back to top
-level by aborting (q.v.@:) and quitting (q.v.@:).  @xref{Quitting}.
+(q.v.), and not in the middle of a command.  You can get back to top
+level by aborting (q.v.@:) and quitting (q.v.).  @xref{Quitting}.
 
 @c FIXME?  Transient Mark Mode
 
@@ -1395,7 +1395,7 @@ back the text that existed earlier in the editing session.
 Unix is a class of multi-user computer operating systems with a long
 history.  There are several implementations today.  The GNU project
 (q.v.@:) aims to develop a complete Unix-like operating system that
-is free software (q.v.@:).
+is free software (q.v.).
 
 @item User Option
 A user option is a face (q.v.@:) or a variable (q.v.@:) that exists so
@@ -1413,7 +1413,7 @@ information on variables.
 
 @item Version Control
 Version control systems keep track of multiple versions of a source file.
-They provide a more powerful alternative to keeping backup files (q.v.@:).
+They provide a more powerful alternative to keeping backup files (q.v.).
 @xref{Version Control}.
 
 @item Visiting
@@ -1426,7 +1426,7 @@ tab, newline, and backspace).
 
 @item Widening
 Widening is removing any restriction (q.v.@:) on the current buffer;
-it is the opposite of narrowing (q.v.@:).  @xref{Narrowing}.
+it is the opposite of narrowing (q.v.).  @xref{Narrowing}.
 
 @item Window
 Emacs divides a frame (q.v.@:) into one or more windows, each of which
@@ -1438,7 +1438,7 @@ other editors use the term ``window'' for what we call a `frame'
 
 @item Window System
 A window system is software that operates on a graphical display
-(q.v.@:), to subdivide the screen so that multiple applications can
+(q.v.), to subdivide the screen so that multiple applications can
 have their] own windows at the same time.  All modern operating systems
 include a window system.
 
@@ -1451,7 +1451,7 @@ punctuation between them as insignificant.  @xref{Word Search}.
 
 @anchor{Glossary - Yanking}
 @item Yanking
-Yanking means reinserting text previously killed (q.v.@:).  It can be
+Yanking means reinserting text previously killed (q.v.).  It can be
 used to undo a mistaken kill, or for copying or moving text.  Some
 other systems call this ``pasting''.  @xref{Yanking}.
 @end table
diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi
index 0f21dd635d..805b10c819 100644
--- a/doc/emacs/gnu.texi
+++ b/doc/emacs/gnu.texi
@@ -34,7 +34,7 @@ our web site, @uref{http://www.gnu.org}.  For software tasks and other
 ways to contribute, see @uref{http://www.gnu.org/help}.
 @end quotation
 
-@unnumberedsec What's GNU?  Gnu's Not Unix!
+@unnumberedsec What's GNU@?  Gnu's Not Unix!
 
 GNU, which stands for Gnu's Not Unix, is the name for the complete
 Unix-compatible software system which I am writing so that I can give it
@@ -151,7 +151,7 @@ systems, approved for use in a residential area, and not in need of
 sophisticated cooling or power.
 
 I have found very many programmers eager to contribute part-time work for
-GNU.  For most projects, such part-time distributed work would be very hard
+GNU@.  For most projects, such part-time distributed work would be very hard
 to coordinate; the independently-written parts would not work together.
 But for the particular task of replacing Unix, this problem is absent.  A
 complete Unix system contains hundreds of utility programs, each of which
@@ -262,7 +262,7 @@ and you must charge for the program to support that.''
 @end quotation
 
 There are various forms of free or very cheap publicity that can be used to
-inform numbers of computer users about something like GNU.  But it may be
+inform numbers of computer users about something like GNU@.  But it may be
 true that one can reach more microcomputer users with advertising.  If this
 is really so, a business which advertises the service of copying and
 mailing GNU for a fee ought to be successful enough to pay for its
@@ -271,7 +271,7 @@ advertising pay for it.
 
 On the other hand, if many people get GNU from their friends, and such
 companies don't succeed, this will show that advertising was not really
-necessary to spread GNU.  Why is it that free market advocates don't
+necessary to spread GNU@.  Why is it that free market advocates don't
 want to let the free market decide this?@footnote{The Free Software
 Foundation raises most of its funds from a distribution service,
 although it is a charity rather than a company.  If @emph{no one}
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi
index 08914d2034..1cd7718204 100644
--- a/doc/emacs/indent.texi
+++ b/doc/emacs/indent.texi
@@ -134,7 +134,7 @@ leftward).
 
 This command can be used to remove all indentation from the lines in
 the region, by invoking it with a large negative argument,
-e.g. @kbd{C-u -1000 C-x @key{TAB}}.
+e.g., @kbd{C-u -1000 C-x @key{TAB}}.
 @end table
 
 @node Tab Stops
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 5510816b06..a8d08bd660 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -34,7 +34,7 @@ killing many different types of syntactic units.
 @cindex deletion
   Most commands which erase text from the buffer save it in the kill
 ring.  These are known as @dfn{kill} commands, and their names
-normally contain the word @samp{kill} (e.g. @code{kill-line}).  The
+normally contain the word @samp{kill} (e.g., @code{kill-line}).  The
 kill ring stores several recent kills, not just the last one, so
 killing is a very safe operation: you don't have to worry much about
 losing text that you previously killed.  The kill ring is shared by
@@ -284,7 +284,7 @@ position, if you wish, with @kbd{C-u C-@key{SPC}} (@pxref{Mark Ring}).
   With a plain prefix argument (@kbd{C-u C-y}), the command instead
 leaves the cursor in front of the inserted text, and sets the mark at
 the end.  Using any other prefix argument specifies an earlier kill;
-e.g. @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
+e.g., @kbd{C-u 4 C-y} reinserts the fourth most recent kill.
 @xref{Earlier Kills}.
 
   On graphical displays, @kbd{C-y} first checks if another application
@@ -535,13 +535,13 @@ or ``copy'' commands.
   Under X, whenever the region is active (@pxref{Mark}), the text in
 the region is saved in the primary selection.  This applies regardless
 of whether the region was made by dragging or clicking the mouse
-(@pxref{Mouse Commands}), or by keyboard commands (e.g. by typing
+(@pxref{Mouse Commands}), or by keyboard commands (e.g., by typing
 @kbd{C-@key{SPC}} and moving point; @pxref{Setting Mark}).
 
 @vindex select-active-regions
   If you change the variable @code{select-active-regions} to
 @code{only}, Emacs saves only temporarily active regions to the
-primary selection, i.e. those made with the mouse or with shift
+primary selection, i.e., those made with the mouse or with shift
 selection (@pxref{Shift Selection}).  If you change
 @code{select-active-regions} to @code{nil}, Emacs avoids saving active
 regions to the primary selection entirely.
@@ -841,8 +841,8 @@ has no effect for @kbd{C-x} and @kbd{C-c} (@pxref{Using Region}).
 
   To enter an Emacs command like @kbd{C-x C-f} while the mark is
 active, use one of the following methods: either hold @kbd{Shift}
-together with the prefix key, e.g. @kbd{S-C-x C-f}, or quickly type
-the prefix key twice, e.g. @kbd{C-x C-x C-f}.
+together with the prefix key, e.g., @kbd{S-C-x C-f}, or quickly type
+the prefix key twice, e.g., @kbd{C-x C-x C-f}.
 
   To disable the overriding of standard Emacs binding by CUA mode,
 while retaining the other features of CUA mode described below, set
@@ -862,7 +862,7 @@ of each line in the rectangle (on the same side as the cursor).
 
   With CUA you can easily copy text and rectangles into and out of
 registers by providing a one-digit numeric prefix to the kill, copy,
-and yank commands, e.g. @kbd{C-1 C-c} copies the region into register
+and yank commands, e.g., @kbd{C-1 C-c} copies the region into register
 @code{1}, and @kbd{C-2 C-v} yanks the contents of register @code{2}.
 
 @cindex global mark
@@ -875,7 +875,7 @@ position.
 
   For example, to copy words from various buffers into a word list in
 a given buffer, set the global mark in the target buffer, then
-navigate to each of the words you want in the list, mark it (e.g. with
+navigate to each of the words you want in the list, mark it (e.g., with
 @kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and
 insert a newline after the word in the target list by pressing
 @key{RET}.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 67214bde22..84cd3ae7f0 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -31,7 +31,7 @@ versions of a source file, storing information such as the creation
 time of each version, who made it, and a description of what was
 changed.
 
-  The Emacs version control interface is called @dfn{VC}.  VC commands
+  The Emacs version control interface is called @dfn{VC}@.  VC commands
 work with several different version control systems; currently, it
 supports GNU Arch, Bazaar, CVS, Git, Mercurial, Monotone, RCS,
 SCCS/CSSC, and Subversion.  Of these, the GNU project distributes CVS,
@@ -73,8 +73,8 @@ provides a uniform interface for common operations in many version
 control operations.
 
   Some uncommon or intricate version control operations, such as
-altering repository settings, are not supported in VC.  You should
-perform such tasks outside Emacs, e.g.@: via the command line.
+altering repository settings, are not supported in VC@.  You should
+perform such tasks outside Emacs, e.g., via the command line.
 
   This section provides a general overview of version control, and
 describes the version control systems that VC supports.  You can skip
@@ -128,13 +128,13 @@ which it refers to as @dfn{back ends}:
 @item
 SCCS was the first version control system ever built, and was long ago
 superseded by more advanced ones.  VC compensates for certain features
-missing in SCCS (e.g.@: tag names for releases) by implementing them
+missing in SCCS (e.g., tag names for releases) by implementing them
 itself.  Other VC features, such as multiple branches, are simply
 unavailable.  Since SCCS is non-free, we recommend avoiding it.
 
 @cindex CSSC
 @item
-CSSC is a free replacement for SCCS.  You should use CSSC only if, for
+CSSC is a free replacement for SCCS@.  You should use CSSC only if, for
 some reason, you cannot use a more recent and better-designed version
 control system.
 
@@ -455,7 +455,7 @@ and don't persist across sessions.
 @node VC With A Merging VCS
 @subsubsection Basic Version Control with Merging
 
-  On a merging-based version control system (i.e.@: most modern ones;
+  On a merging-based version control system (i.e., most modern ones;
 @pxref{VCS Merging}), @kbd{C-x v v} does the following:
 
 @itemize @bullet
@@ -467,7 +467,7 @@ files and ``modified'' files; @pxref{Registering}.)
 
 @item
 If none of the files in the VC fileset are registered with a version
-control system, register the VC fileset, i.e.@: place it under version
+control system, register the VC fileset, i.e., place it under version
 control.  @xref{Registering}.  If Emacs cannot find a system to
 register under, it prompts for a repository type, creates a new
 repository, and registers the VC fileset with it.
@@ -568,13 +568,13 @@ and Emacs fails to detect the correct one.
 Otherwise, if using CVS or RCS, you can specify a revision ID.
 
 If the fileset is modified (or locked), this makes Emacs commit with
-that revision ID.  You can create a new branch by supplying an
+that revision ID@.  You can create a new branch by supplying an
 appropriate revision ID (@pxref{Branches}).
 
 If the fileset is unmodified (and unlocked), this checks the specified
 revision into the working tree.  You can also specify a revision on
 another branch by giving its revision or branch ID (@pxref{Switching
-Branches}).  An empty argument (i.e.@: @kbd{C-u C-x v v @key{RET}})
+Branches}).  An empty argument (i.e., @kbd{C-u C-x v v @key{RET}})
 checks out the latest (``head'') revision on the current branch.
 
 This signals an error on a decentralized version control system.
@@ -759,7 +759,7 @@ comparison again, generating a new diff.
 prompts for two revision IDs (@pxref{VCS Concepts}), and displays a
 diff between those versions of the fileset.  This will not work
 reliably for multi-file VC filesets, if the version control system is
-file-based rather than changeset-based (e.g.@: CVS), since then
+file-based rather than changeset-based (e.g., CVS), since then
 revision IDs for different files would not be related in any
 meaningful way.
 
@@ -783,7 +783,7 @@ Ediff session.  @xref{Top,, Ediff, ediff, The Ediff Manual}.
 @findex vc-root-diff
 @kindex C-x v D
   @kbd{C-x v D} (@code{vc-root-diff}) is similar to @kbd{C-x v =}, but
-it displays the changes in the entire current working tree (i.e.@: the
+it displays the changes in the entire current working tree (i.e., the
 working tree containing the current VC fileset).  If you invoke this
 command from a Dired buffer, it applies to the working tree containing
 the directory.
@@ -795,7 +795,7 @@ from the first non-@code{nil} value amongst the variables
 @code{vc-@var{backend}-diff-switches}, @code{vc-diff-switches}, and
 @code{diff-switches} (@pxref{Comparing Files}), in that order.  Here,
 @var{backend} stands for the relevant version control system,
-e.g.@: @code{bzr} for Bazaar.  Since @code{nil} means to check the
+e.g., @code{bzr} for Bazaar.  Since @code{nil} means to check the
 next variable in the sequence, either of the first two may use the
 value @code{t} to mean no switches at all.  Most of the
 @code{vc-@var{backend}-diff-switches} variables default to @code{nil},
@@ -835,12 +835,12 @@ view diffs, or view log entries:
 
 @table @kbd
 @item p
-Annotate the previous revision, i.e.@: the revision before the one
+Annotate the previous revision, i.e., the revision before the one
 currently annotated.  A numeric prefix argument is a repeat count, so
 @kbd{C-u 10 p} would take you back 10 revisions.
 
 @item n
-Annotate the next revision, i.e.@: the revision after the one
+Annotate the next revision, i.e., the revision after the one
 currently annotated.  A numeric prefix argument is a repeat count.
 
 @item j
@@ -986,7 +986,7 @@ earlier revision.  This shows the changes to all files made in that
 revision.
 
 @item @key{RET}
-In a compact-style log buffer (e.g.@: the one created by @kbd{C-x v
+In a compact-style log buffer (e.g., the one created by @kbd{C-x v
 L}), toggle between showing and hiding the full log entry for the
 revision at point.
 @end table
@@ -1064,7 +1064,7 @@ the version control system which the VC Directory buffer should use.
 @pindex cvs
 @cindex CVS directory mode
   In addition to the VC Directory buffer, Emacs has a similar facility
-called PCL-CVS which is specialized for CVS.  @xref{Top, , About
+called PCL-CVS which is specialized for CVS@.  @xref{Top, , About
 PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.
 @end ifnottex
 
@@ -1080,7 +1080,7 @@ PCL-CVS, pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.
 and their version control statuses.  It lists files in the current
 directory (the one specified when you called @kbd{C-x v d}) and its
 subdirectories, but only those with a ``noteworthy'' status.  Files
-that are up-to-date (i.e.@: the same as in the repository) are
+that are up-to-date (i.e., the same as in the repository) are
 omitted.  If all the files in a subdirectory are up-to-date, the
 subdirectory is not listed either.  As an exception, if a file has
 become up-to-date as a direct result of a VC command, it is listed.
@@ -1131,7 +1131,7 @@ updates.  If you change the variable @code{vc-stay-local} or
 @code{vc-cvs-stay-local} (for CVS) to @code{nil} (@pxref{CVS
 Options}), then Emacs avoids contacting a remote repository when
 generating the VC Directory buffer (it will still contact it when
-necessary, e.g.@: when doing a commit).  This may be desirable if you
+necessary, e.g., when doing a commit).  This may be desirable if you
 are working offline or the network is slow.
 @end ifnottex
 
@@ -1307,7 +1307,7 @@ revision 1.2 has revision IDs 1.2.1.1, 1.2.1.2, @dots{}, the second
 branch created from revision 1.2 has revision IDs 1.2.2.1, 1.2.2.2,
 @dots{}, and so forth.  You can also specify the @dfn{branch ID},
 which is a branch revision ID omitting its final component
-(e.g.@: 1.2.1), to switch to the latest revision on that branch.
+(e.g., 1.2.1), to switch to the latest revision on that branch.
 
   On a locking-based system, switching to a different branch also
 unlocks (write-protects) the working tree.
@@ -1589,7 +1589,7 @@ source files.
   To produce a tags table, you run the @command{etags} shell command
 on a document or the source code file.  The @samp{etags} program
 writes the tags to a @dfn{tags table file}, or @dfn{tags file} in
-short.  The conventional name for a tags file is @file{TAGS}.
+short.  The conventional name for a tags file is @file{TAGS}@.
 @xref{Create Tags Table}.
 
   Emacs provides many commands for searching and replacing using the
@@ -1696,9 +1696,9 @@ tags.  Use the @samp{--packages-only} option to create tags for
 packages only.
 
 In Ada, the same name can be used for different kinds of entity
-(e.g.@:, for a procedure and for a function).  Also, for things like
-packages, procedures and functions, there is the spec (i.e.@: the
-interface) and the body (i.e.@: the implementation).  To make it
+(e.g., for a procedure and for a function).  Also, for things like
+packages, procedures and functions, there is the spec (i.e., the
+interface) and the body (i.e., the implementation).  To make it
 easier to pick the definition you want, Ada tag name have suffixes
 indicating the type of entity:
 
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 1836c1982e..c9d085a18f 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -53,7 +53,7 @@ commands.  The three most commonly-used Gnus buffers are the
 @dfn{group buffer}, the @dfn{summary buffer} and the @dfn{article
 buffer}.
 
-  The @dfn{group buffer} contains a list of article sources (e.g.@:
+  The @dfn{group buffer} contains a list of article sources (e.g.,
 newsgroups and email inboxes), which are collectively referred to as
 @dfn{groups}.  This is the first buffer Gnus displays when it starts
 up.  It normally displays only the groups to which you subscribe and
@@ -166,7 +166,7 @@ List zombie groups.
 @cindex unsubscribe groups
 @item u
 Toggle the subscription status of the group on the current line
-(i.e.@: turn a subscribed group into an unsubscribed group, or vice
+(i.e., turn a subscribed group into an unsubscribed group, or vice
 versa).  Invoking this on a killed or zombie group turns it into an
 unsubscribed group.
 
@@ -518,7 +518,7 @@ output is long).
 type @kbd{M-! gunzip foo.gz @key{RET}}.  That shell command normally
 creates the file @file{foo} and produces no terminal output.
 
-  A numeric argument to @code{shell-command}, e.g.@: @kbd{M-1 M-!},
+  A numeric argument to @code{shell-command}, e.g., @kbd{M-1 M-!},
 causes it to insert terminal output into the current buffer instead of
 a separate buffer.  It puts point before the output, and sets the mark
 after the output.  For instance, @kbd{M-1 M-! gunzip < foo.gz
@@ -599,7 +599,7 @@ the buffer and type the input, terminated by @key{RET}.
   While the subshell is waiting or running a command, you can switch
 windows or buffers and perform other editing in Emacs.  Emacs inserts
 the output from the subshell into the Shell buffer whenever it has
-time to process it (e.g.@: while waiting for keyboard input).
+time to process it (e.g., while waiting for keyboard input).
 
 @cindex @code{comint-highlight-input} face
 @cindex @code{comint-highlight-prompt} face
@@ -610,7 +610,7 @@ easier to distinguish input lines from the shell output.
 @xref{Faces}.
 
   To make multiple subshells, invoke @kbd{M-x shell} with a prefix
-argument (e.g. @kbd{C-u M-x shell}).  Then the command will read a
+argument (e.g., @kbd{C-u M-x shell}).  Then the command will read a
 buffer name, and create (or reuse) a subshell in that buffer.  You can
 also rename the @file{*shell*} buffer using @kbd{M-x rename-uniquely},
 then create a new @file{*shell*} buffer using plain @kbd{M-x shell}.
@@ -645,7 +645,7 @@ Coding}.
 @cindex @env{EMACS} environment variable
   Emacs sets the environment variable @env{INSIDE_EMACS} in the
 subshell to @samp{@var{version},comint}, where @var{version} is the
-Emacs version (e.g.@: @samp{24.1}).  Programs can check this variable
+Emacs version (e.g., @samp{24.1}).  Programs can check this variable
 to determine whether they are running inside an Emacs subshell.  (It
 also sets the @env{EMACS} environment variable to @code{t}, if that
 environment variable is not already defined.  However, this
@@ -1307,7 +1307,7 @@ mode-line.  Type @key{SPC} to display the next screenful of output, or
 @cindex Rlogin
 
   You can login to a remote computer, using whatever commands you
-would from a regular terminal (e.g.@: using the @code{telnet} or
+would from a regular terminal (e.g., using the @code{telnet} or
 @code{rlogin} commands), from a Term window.
 
   A program that asks you for a password will normally suppress
@@ -1531,7 +1531,7 @@ precedence.
 Create a new graphical @dfn{client frame}, instead of using an
 existing Emacs frame.  See below for the special behavior of @kbd{C-x
 C-c} in a client frame.  If Emacs cannot create a new graphical frame
-(e.g.@: if it cannot connect to the X server), it tries to create a
+(e.g., if it cannot connect to the X server), it tries to create a
 text terminal client frame, as though you had supplied the @samp{-t}
 option instead.
 
@@ -1630,7 +1630,7 @@ frame.  If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal})
 in a client frame, that command does not kill the Emacs session as it
 normally does (@pxref{Exiting}).  Instead, Emacs deletes the client
 frame; furthermore, if the client frame has an @command{emacsclient}
-waiting to regain control (i.e.@: if you did not supply the @samp{-n}
+waiting to regain control (i.e., if you did not supply the @samp{-n}
 option), Emacs deletes all other frames of the same client, and marks
 the client's server buffers as finished, as though you had typed
 @kbd{C-x #} in all of them.  If it so happens that there are no
@@ -1689,7 +1689,7 @@ for printing by calling the @command{lpr} program.  To change the
 printer program, customize the variable @code{lpr-command}.  To
 specify extra switches to give the printer program, customize the list
 variable @code{lpr-switches}.  Its value should be a list of option
-strings, each of which should start with @samp{-} (e.g.@: the option
+strings, each of which should start with @samp{-} (e.g., the option
 string @code{"-w80"} specifies a line width of 80 columns).  The
 default is the empty list, @code{nil}.
 
@@ -2404,7 +2404,7 @@ done by calling @code{browse-url} as a subroutine
 
   It can be useful to add @code{goto-address-mode} to mode hooks and
 hooks for displaying an incoming message
-(e.g.@: @code{rmail-show-message-hook} for Rmail, and
+(e.g., @code{rmail-show-message-hook} for Rmail, and
 @code{mh-show-mode-hook} for MH-E).  This is not needed for Gnus,
 which has a similar feature of its own.
 
@@ -2487,7 +2487,7 @@ find the one you select (@code{ffap-menu}).
 
 @findex animate-birthday-present
 @cindex animate
-  The @code{animate} package makes text dance (e.g.  @kbd{M-x
+  The @code{animate} package makes text dance (e.g., @kbd{M-x
 animate-birthday-present}).
 
 @findex blackbox
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index c619b1eb47..5272102659 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -69,7 +69,7 @@ command to select that mode (e.g., @kbd{M-x lisp-mode} enters Lisp mode).
 
 @vindex major-mode
   The value of the buffer-local variable @code{major-mode} is a symbol
-with the same name as the major mode command (e.g. @code{lisp-mode}).
+with the same name as the major mode command (e.g., @code{lisp-mode}).
 This variable is set automatically; you should not change it yourself.
 
   The default value of @code{major-mode} determines the major mode to
@@ -110,7 +110,7 @@ list of its key bindings, type @code{C-h m} (@code{describe-mode}).
   Every major mode, apart from Fundamental mode, defines a @dfn{mode
 hook}, a customizable list of Lisp functions to run each time the mode
 is enabled in a buffer.  @xref{Hooks}, for more information about
-hooks.  Each mode hook is named after its major mode, e.g. Fortran
+hooks.  Each mode hook is named after its major mode, e.g., Fortran
 mode has @code{fortran-mode-hook}.  Furthermore, all text-based major
 modes run @code{text-mode-hook}, and all programming language modes
 run @code{prog-mode-hook}, prior to running their own mode hooks.
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi
index 0d05c8ac9c..e634a5836d 100644
--- a/doc/emacs/msdog-xtra.texi
+++ b/doc/emacs/msdog-xtra.texi
@@ -52,7 +52,7 @@ about Emacs's special handling of text files under MS-DOS (and Windows).
 @kindex BS @r{(MS-DOS)}
   The key that is called @key{DEL} in Emacs (because that's how it is
 designated on most workstations) is known as @key{BS} (backspace) on a
-PC.  That is why the PC-specific terminal initialization remaps the
+PC@.  That is why the PC-specific terminal initialization remaps the
 @key{BS} key to act as @key{DEL}; the @key{DELETE} key is remapped to act
 as @kbd{C-d} for the same reasons.
 
@@ -233,7 +233,7 @@ The MS-DOS terminal doesn't support a vertical-bar cursor,
 so the bar cursor is horizontal, and the @code{@var{width}} parameter,
 if specified by the frame parameters, actually determines its height.
 For this reason, the @code{bar} and @code{hbar} cursor types produce
-the same effect on MS-DOS.  As an extension, the bar cursor
+the same effect on MS-DOS@.  As an extension, the bar cursor
 specification can include the starting scan line of the cursor as well
 as its width, like this:
 
@@ -320,7 +320,7 @@ converts them to underscores @samp{_}; thus your default init file
 @ifnottex
 (@pxref{Init File})
 @end ifnottex
-is called @file{_emacs} on MS-DOS.  Excess characters before or after
+is called @file{_emacs} on MS-DOS@.  Excess characters before or after
 the period are generally ignored by MS-DOS itself; thus, if you visit
 the file @file{LongFileName.EvenLongerExtension}, you will silently
 get @file{longfile.eve}, but Emacs will still display the long file
@@ -552,7 +552,7 @@ when invoked with the @samp{-nw} option.
 asynchronous subprocesses are not available.  In particular, Shell
 mode and its variants do not work.  Most Emacs features that use
 asynchronous subprocesses also don't work on MS-DOS, including
-Shell mode and GUD.  When in doubt, try and see; commands that
+Shell mode and GUD@.  When in doubt, try and see; commands that
 don't work output an error message saying that asynchronous processes
 aren't supported.
 
@@ -600,7 +600,7 @@ it, because MS-DOS provides no general way to terminate a process.
 Pressing @kbd{C-c} or @kbd{C-@key{BREAK}} might sometimes help in these
 cases.
 
-  Accessing files on other machines is not supported on MS-DOS.  Other
+  Accessing files on other machines is not supported on MS-DOS@.  Other
 network-oriented commands such as sending mail, Web browsing, remote
 login, etc., don't work either, unless network access is built into
 MS-DOS with some network redirector.
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index d8f9bb6961..644d812d7e 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -334,7 +334,7 @@ names that are associated with (a.k.a.@: @dfn{links to}) the file's
 data; this is only useful on NTFS volumes.  @code{uid} means display
 the numerical identifier of the user who owns the file.  @code{gid}
 means display the numerical identifier of the file owner's group.  The
-default value is @code{(links uid gid)} i.e.@: all the 3 optional
+default value is @code{(links uid gid)} i.e., all the 3 optional
 attributes are displayed.
 
 @vindex ls-lisp-emulation
@@ -354,12 +354,12 @@ Emulate @sc{gnu} systems; this is the default.  This sets
 Emulate Unix systems.  Like @code{GNU}, but sets
 @code{ls-lisp-verbosity} to @code{(links uid)}.
 @item MacOS
-Emulate MacOS.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
+Emulate MacOS@.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
 @code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}.
 @item MS-Windows
 Emulate MS-Windows.  Sets @code{ls-lisp-ignore-case} and
 @code{ls-lisp-dirs-first} to @code{t}, and @code{ls-lisp-verbosity} to
-@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X.
+@code{(links)} on Windows NT/2K/XP/2K3 and to @code{nil} on Windows 9X@.
 Note that the default emulation is @emph{not} @code{MS-Windows}, even
 on Windows, since many users of Emacs on those platforms prefer the
 @sc{gnu} defaults.
@@ -422,7 +422,7 @@ Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
 @file{C:\Users\@var{username}\AppData\Roaming} on Windows
 Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
 @file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
-9X/ME.  If this directory does not exist or cannot be accessed, Emacs
+9X/ME@.  If this directory does not exist or cannot be accessed, Emacs
 falls back to @file{C:\} as the default value of @code{HOME}.
 
   You can override this default value of @code{HOME} by explicitly
@@ -690,7 +690,7 @@ If you can go to the first subprocess, and tell it to exit, the second
 subprocess should continue normally.  However, if the second subprocess
 is synchronous, Emacs itself will be hung until the first subprocess
 finishes.  If it will not finish without user input, then you have no
-choice but to reboot if you are running on Windows 9X.  If you are
+choice but to reboot if you are running on Windows 9X@.  If you are
 running on Windows NT/2K/XP, you can use a process viewer application to kill
 the appropriate instance of NTVDM instead (this will terminate both DOS
 subprocesses).
@@ -714,7 +714,7 @@ character based on the type of the program.
 customized commands that run MS-Windows applications registered to
 handle a certain standard Windows operation for a specific type of
 document or file.  This function is a wrapper around the Windows
-@code{ShellExecute} API.  See the MS-Windows API documentation for
+@code{ShellExecute} API@.  See the MS-Windows API documentation for
 more details.
 @end ifnottex
 
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index ff0d43c566..edf2bb19a4 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -994,7 +994,7 @@ decoding.  (You can still use an unsuitable coding system if you enter
 its name at the prompt.)
 
 @c It seems that select-message-coding-system does this.
-@c Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still
+@c Both sendmail.el and smptmail.el call it; i.e., smtpmail.el still
 @c obeys sendmail-coding-system.
 @vindex sendmail-coding-system
   When you send a mail message (@pxref{Sending Mail}),
@@ -1039,7 +1039,7 @@ decoding it using coding system @var{right} instead.
 @findex set-buffer-file-coding-system
   The command @kbd{C-x @key{RET} f}
 (@code{set-buffer-file-coding-system}) sets the file coding system for
-the current buffer (i.e.@: the coding system to use when saving or
+the current buffer (i.e., the coding system to use when saving or
 reverting the file).  You specify which coding system using the
 minibuffer.  You can also invoke this command by clicking with
 @kbd{Mouse-3} on the coding system indicator in the mode line
@@ -1323,7 +1323,7 @@ scripts.@footnote{If you run Emacs on X, you may need to inform the X
 server about the location of the newly installed fonts with commands
 such as:
 @c FIXME?  I feel like this may be out of date.
-@c Eg the intlfonts tarfile is ~ 10 years old.
+@c E.g., the intlfonts tarfile is ~ 10 years old.
 
 @example
  xset fp+ /usr/local/share/emacs/fonts
@@ -1569,7 +1569,7 @@ no font appear as a hollow box.
 
   If you use Latin-1 characters but your terminal can't display
 Latin-1, you can arrange to display mnemonic @acronym{ASCII} sequences
-instead, e.g.@: @samp{"o} for o-umlaut.  Load the library
+instead, e.g., @samp{"o} for o-umlaut.  Load the library
 @file{iso-ascii} to do this.
 
 @vindex latin1-display
@@ -1591,7 +1591,7 @@ the range 0240 to 0377 octal (160 to 255 decimal) to handle the
 accented letters and punctuation needed by various European languages
 (and some non-European ones).  Note that Emacs considers bytes with
 codes in this range as raw bytes, not as characters, even in a unibyte
-buffer, i.e.@: if you disable multibyte characters.  However, Emacs
+buffer, i.e., if you disable multibyte characters.  However, Emacs
 can still handle these character codes as if they belonged to
 @emph{one} of the single-byte character sets at a time.  To specify
 @emph{which} of these codes to use, invoke @kbd{M-x
@@ -1767,7 +1767,7 @@ directionality when they are displayed.  The default value is
   Each paragraph of bidirectional text can have its own @dfn{base
 direction}, either right-to-left or left-to-right.  (Paragraph
 @c paragraph-separate etc have no influence on this?
-boundaries are empty lines, i.e.@: lines consisting entirely of
+boundaries are empty lines, i.e., lines consisting entirely of
 whitespace characters.)  Text in left-to-right paragraphs begins on
 the screen at the left margin of the window and is truncated or
 continued when it reaches the right margin.  By contrast, text in
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index df87cf9cb2..9a4daebd7e 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -52,10 +52,10 @@ on each line, with the following information:
 
 @itemize @bullet
 @item
-The package name (e.g. @samp{auctex}).
+The package name (e.g., @samp{auctex}).
 
 @item
-The package's version number (e.g. @samp{11.86}).
+The package's version number (e.g., @samp{11.86}).
 
 @item
 The package's status---normally one of @samp{available} (can be
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index b5bb33ad66..a7d8188af5 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -85,7 +85,7 @@ Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Delphi,
 Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont
 (@TeX{}'s companion for font creation), Modula2, Objective-C, Octave,
 Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and
-VHDL.  An alternative mode for Perl is called CPerl mode.  Modes are
+VHDL@.  An alternative mode for Perl is called CPerl mode.  Modes are
 also available for the scripting languages of the common GNU and Unix
 shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for
 makefiles, DNS master files, and various sorts of configuration files.
@@ -127,7 +127,7 @@ IDL/Pike/AWK (@pxref{Top, , CC Mode, ccmode, CC Mode}), and IDLWAVE
 @end ifinfo
 @ifnotinfo
   The Emacs distribution contains Info manuals for the major modes for
-Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE.  For
+Ada, C/C++/Objective C/Java/Corba IDL/Pike/AWK, and IDLWAVE@.  For
 Fortran mode, @pxref{Fortran,,, emacs-xtra, Specialized Emacs Features}.
 @end ifnotinfo
 
@@ -328,7 +328,7 @@ as you move around in a buffer.
   To either enable or disable Which Function mode, use the command
 @kbd{M-x which-function-mode}.  Which Function mode is a global minor
 mode.  By default, it takes effect in all major modes major modes that
-know how to support it (i.e.@: all the major modes that support
+know how to support it (i.e., all the major modes that support
 Imenu).  You can restrict it to a specific list of major modes by
 changing the value of the variable @code{which-func-modes} from
 @code{t} (which means to support all available major modes) to a list
@@ -391,7 +391,7 @@ indentation.
   When indenting a line that starts within a parenthetical grouping,
 Emacs usually places the start of the line under the preceding line
 within the group, or under the text after the parenthesis.  If you
-manually give one of these lines a nonstandard indentation (e.g.@: for
+manually give one of these lines a nonstandard indentation (e.g., for
 aesthetic purposes), the lines below will follow it.
 
   The indentation commands for most programming language modes assume
@@ -431,7 +431,7 @@ lines that start inside comments and strings.
   To reindent the contents of a single parenthetical grouping,
 position point before the beginning of the grouping and type
 @kbd{C-M-q}.  This changes the relative indentation within the
-grouping, without affecting its overall indentation (i.e.@: the
+grouping, without affecting its overall indentation (i.e., the
 indentation of the line where the grouping starts).  The function that
 @kbd{C-M-q} runs depends on the major mode; it is
 @code{indent-pp-sexp} in Lisp mode, @code{c-indent-exp} in C mode,
@@ -672,7 +672,7 @@ Put mark after following expression (@code{mark-sexp}).
 @findex backward-sexp
   To move forward over a balanced expression, use @kbd{C-M-f}
 (@code{forward-sexp}).  If the first significant character after point
-is an opening delimiter (e.g.@: @samp{(}, @samp{[} or @samp{@{} in C),
+is an opening delimiter (e.g., @samp{(}, @samp{[} or @samp{@{} in C),
 this command moves past the matching closing delimiter.  If the
 character begins a symbol, string, or number, the command moves over
 that.
@@ -924,7 +924,7 @@ negative argument @var{-n} removes @var{n} delimiters.
 
   If the region is not active, and there is no existing comment on the
 current line, @kbd{M-;} adds a new comment to the current line.  If
-the line is blank (i.e.@: empty or containing only whitespace
+the line is blank (i.e., empty or containing only whitespace
 characters), the comment is indented to the same position where
 @key{TAB} would indent to (@pxref{Basic Indent}).  If the line is
 non-blank, the comment is placed after the last non-whitespace
@@ -987,7 +987,7 @@ type @kbd{M-j} or @kbd{C-M-j} (@code{comment-indent-new-line}).  This
 breaks the current line, and inserts the necessary comment delimiters
 and indentation to continue the comment.
 
-  For languages with closing comment delimiters (e.g.@: @samp{*/} in
+  For languages with closing comment delimiters (e.g., @samp{*/} in
 C), the exact behavior of @kbd{M-j} depends on the value of the
 variable @code{comment-multi-line}.  If the value is @code{nil}, the
 command closes the comment on the old line and starts a new comment on
@@ -1631,7 +1631,7 @@ Enable (or disable) @dfn{subword mode}.  In subword mode, Emacs's word
 commands recognize upper case letters in
 @samp{StudlyCapsIdentifiers} as word boundaries.  This is indicated by
 the flag @samp{/w} on the mode line after the mode name
-(e.g. @samp{C/law}).  You can even use @kbd{M-x subword-mode} in
+(e.g., @samp{C/law}).  You can even use @kbd{M-x subword-mode} in
 non-CC Mode buffers.
 
 In the GNU project, we recommend using underscores to separate words
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 3938712a5e..23255e65c7 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -284,7 +284,7 @@ deleted remains current.  @kbd{d} with a prefix argument is equivalent
 to @kbd{C-d}.  Note that the Rmail summary versions of these commands
 behave slightly differently (@pxref{Rmail Summary Edit}).
 
-@c mention other hooks, eg show message hook?
+@c mention other hooks, e.g., show message hook?
 @vindex rmail-delete-message-hook
   Whenever Rmail deletes a message, it runs the hook
 @code{rmail-delete-message-hook}.  When the hook functions are invoked,
@@ -1490,7 +1490,7 @@ the machine on which to look for the POP server.
 @c FIXME mention --with-hesiod "support Hesiod to get the POP server host"?
 
 @cindex IMAP mailboxes
-  Another method for accessing remote mailboxes is IMAP.  This method is
+  Another method for accessing remote mailboxes is IMAP@.  This method is
 supported only by the Mailutils @code{movemail}.  To specify an IMAP
 mailbox in the inbox list, use the following mailbox @acronym{URL}:
 @samp{imap://@var{username}[:@var{password}]@@@var{hostname}}.  The
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 7dc5855cdf..a3abdd19c2 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -387,7 +387,7 @@ wrap around, going from the last page to the first page or vice versa.
 
 When the current match is on a history element, that history element
 is pulled into the minibuffer.  If you exit the incremental search
-normally (e.g. by typing @key{RET}), it remains in the minibuffer
+normally (e.g., by typing @key{RET}), it remains in the minibuffer
 afterwards.  Canceling the search, with @kbd{C-g}, restores the
 contents of the minibuffer when you began the search.
 
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 8802e5392d..732078a6a6 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -113,7 +113,7 @@ people use only standard field names with accepted meanings.
 @vindex user-full-name
 @vindex user-mail-address
   The @samp{From} header field identifies the person sending the email
-(i.e.@: you).  This should be a valid mailing address, as replies are
+(i.e., you).  This should be a valid mailing address, as replies are
 normally sent there.  The default contents of this header field are
 computed from the variables @code{user-full-name} (which specifies
 your full name) and @code{user-mail-address} (your email address).  On
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 6e895d3ac3..c12b96724b 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -818,10 +818,10 @@ indenting the current line.  @xref{Indentation}, for details.
 
   Text mode turns off the features concerned with comments except when
 you explicitly invoke them.  It changes the syntax table so that
-single-quotes are considered part of words (e.g.@: @samp{don't} is
+single-quotes are considered part of words (e.g., @samp{don't} is
 considered one word).  However, if a word starts with a single-quote,
 it is treated as a prefix for the purposes of capitalization
-(e.g.@: @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as
+(e.g., @kbd{M-c} converts @samp{'hello'} into @samp{'Hello'}, as
 expected).
 
 @cindex Paragraph-Indent Text mode
@@ -1096,9 +1096,9 @@ direct and indirect, and all of their bodies.
 current heading line as well as all the bodies in its subtree; the
 subheadings themselves are left visible.  The command @kbd{C-c C-k}
 (@code{show-branches}) reveals the subheadings, if they had previously
-been hidden (e.g.@: by @kbd{C-c C-d}).  The command @kbd{C-c C-i}
+been hidden (e.g., by @kbd{C-c C-d}).  The command @kbd{C-c C-i}
 (@code{show-children}) is a weaker version of this; it reveals just
-the direct subheadings, i.e.@: those one level down.
+the direct subheadings, i.e., those one level down.
 
 @findex hide-other
 @kindex C-c C-o @r{(Outline mode)}
@@ -1177,7 +1177,7 @@ in the mode line shows how deep you've gone.
 
   When zooming in on a heading, to see only the child subheadings specify
 a numeric argument: @kbd{C-u C-c C-z}.  The number of levels of children
-can be specified too (compare @kbd{M-x show-children}), e.g.@: @kbd{M-2
+can be specified too (compare @kbd{M-x show-children}), e.g., @kbd{M-2
 C-c C-z} exposes two levels of child subheadings.  Alternatively, the
 body can be specified with a negative argument: @kbd{M-- C-c C-z}.  The
 whole subtree can be expanded, similarly to @kbd{C-c C-s} (@kbd{M-x
@@ -1349,7 +1349,7 @@ date, beneath the heading line.  The command @kbd{C-c C-d}
   Once you have some TODO items planned in an Org file, you can add
 that file to the list of @dfn{agenda files} by typing @kbd{C-c [}
 (@code{org-agenda-file-to-front}).  Org mode is designed to let you
-easily maintain multiple agenda files, e.g.@: for organizing different
+easily maintain multiple agenda files, e.g., for organizing different
 aspects of your life.  The list of agenda files is stored in the
 variable @code{org-agenda-files}.
 
@@ -1372,7 +1372,7 @@ etc.
 export and publication.  To export the current buffer, type @kbd{C-c
 C-e} (@code{org-export}) anywhere in an Org buffer.  This command
 prompts for an export format; currently supported formats include
-HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF.  Some formats,
+HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF@.  Some formats,
 such as PDF, require certain system tools to be installed.
 
 @vindex org-publish-project-alist
@@ -1606,7 +1606,7 @@ when you type the corresponding one.
 @subsection @TeX{} Printing Commands
 
   You can invoke @TeX{} as an subprocess of Emacs, supplying either
-the entire contents of the buffer or just part of it (e.g.@: one
+the entire contents of the buffer or just part of it (e.g., one
 chapter of a larger document).
 
 @table @kbd
@@ -1681,7 +1681,7 @@ determined by the variable @code{tex-dvi-print-command}.
 shell command strings described in the preceding paragraph.  For
 example, if @code{tex-dvi-view-command} is @code{"xdvi"}, @kbd{C-c
 C-v} runs @command{xdvi @var{output-file-name}}.  In some cases,
-however, the file name needs to be embedded in the command, e.g.@: if
+however, the file name needs to be embedded in the command, e.g., if
 you need to provide the file name as an argument to one command whose
 output is piped to another.  You can specify where to put the file
 name with @samp{*} in the command string.  For example,
@@ -1936,7 +1936,7 @@ Emacs.
 
 @vindex sgml-xml-mode
   You may choose to use the less powerful SGML mode for editing XML,
-since XML is a strict subset of SGML.  To enable SGML mode in an
+since XML is a strict subset of SGML@.  To enable SGML mode in an
 existing buffer, type @kbd{M-x sgml-mode}.  On enabling SGML mode,
 Emacs examines the buffer to determine whether it is XML; if so, it
 sets the variable @code{sgml-xml-mode} to a non-@code{nil} value.
@@ -1950,7 +1950,7 @@ always insert explicit closing tags as well.
 @findex nroff-mode
 @vindex nroff-mode-hook
   Nroff mode, a major mode derived from Text mode, is
-specialized for editing nroff files (e.g.@: Unix man pages).  Type
+specialized for editing nroff files (e.g., Unix man pages).  Type
 @kbd{M-x nroff-mode} to enter this mode.  Entering Nroff mode runs the
 hook @code{text-mode-hook}, then @code{nroff-mode-hook}
 (@pxref{Hooks}).
@@ -2706,7 +2706,7 @@ and 3 rows, and a total of 5 cells.
 
 @findex table-insert-sequence
   @kbd{M-x table-insert-sequence} inserts a string into each cell.
-Each string is a part of a sequence i.e.@: a series of increasing
+Each string is a part of a sequence i.e., a series of increasing
 integer numbers.
 
 @cindex table for HTML and LaTeX
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 1a891a62b3..c6b8c2490c 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -332,9 +332,9 @@ contains the Emacs executable.
   Optionally, Emacs can generate a @dfn{core dump} when it crashes.  A
 core dump is a file containing voluminous data about the state of the
 program prior to the crash, usually examined by loading it into a
-debugger such as GDB.  On many platforms, core dumps are disabled by
+debugger such as GDB@.  On many platforms, core dumps are disabled by
 default, and you must explicitly enable them by running the shell
-command @samp{ulimit -c unlimited} (e.g.@: in your shell startup
+command @samp{ulimit -c unlimited} (e.g., in your shell startup
 script).
 
 @node After a Crash
@@ -373,7 +373,7 @@ symbols.
 @file{core.emacs}, so that another crash won't overwrite it.
 
   To use this script, run @code{gdb} with the file name of your Emacs
-executable and the file name of the core dump, e.g. @samp{gdb
+executable and the file name of the core dump, e.g., @samp{gdb
 /usr/bin/emacs core.emacs}.  At the @code{(gdb)} prompt, load the
 recovery script: @samp{source /usr/src/emacs/etc/emacs-buffer.gdb}.
 Then type the command @code{ybuffer-list} to see which buffers are
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index d13336b56d..291ad13b88 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -30,7 +30,7 @@
 you can generate change log entries from the version control log
 entries of previous commits.
 
-  Note that this only works with RCS or CVS.  This procedure would be
+  Note that this only works with RCS or CVS@.  This procedure would be
 particularly incorrect on a modern changeset-based version control
 system, where changes to the @file{ChangeLog} file would normally be
 committed as part of a changeset.  In that case, you should write the
@@ -195,7 +195,7 @@ Thus, you can use it to compare a tagged version against the current files,
 or two tagged versions against each other.
 
   On SCCS, VC implements tags itself; these tags are visible only
-through VC.  Most later systems (including CVS, Subversion, bzr, git,
+through VC@.  Most later systems (including CVS, Subversion, bzr, git,
 and hg) have a native tag facility, and VC uses it where available;
 those tags will be visible even when you bypass VC.
 
@@ -236,7 +236,7 @@ way, change the variable @code{vc-consult-headers} to @code{nil}.
 @vindex vc-@var{backend}-header
   To insert a suitable header string into the current buffer, type
 @kbd{C-x v h} (@code{vc-insert-headers}).  This command works only on
-Subversion, CVS, RCS, and SCCS.  The variable
+Subversion, CVS, RCS, and SCCS@.  The variable
 @code{vc-@var{backend}-header} contains the list of keywords to insert
 into the version header; for instance, CVS uses @code{vc-cvs-header},
 whose default value is @code{'("\$Id\$")}.  (The extra backslashes
@@ -353,7 +353,7 @@ changed erroneously, set @code{vc-mistrust-permissions} to @code{t}.
 Then VC always checks the master file to determine the file's status.
 
   VC determines the version control state of files under SCCS much as
-with RCS.  It does not consider SCCS version headers, though.  Thus,
+with RCS@.  It does not consider SCCS version headers, though.  Thus,
 the variable @code{vc-mistrust-permissions} affects SCCS use, but
 @code{vc-consult-headers} does not.
 
@@ -373,7 +373,7 @@ the name of the operation to invoke.
 network interactions to a minimum.  This is controlled by the variable
 @code{vc-cvs-stay-local}.  There is another variable,
 @code{vc-stay-local}, which enables the feature also for other back
-ends that support it, including CVS.  In the following, we will talk
+ends that support it, including CVS@.  In the following, we will talk
 only about @code{vc-cvs-stay-local}, but everything applies to
 @code{vc-stay-local} as well.
 
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index f87da5f391..9373d9b2f1 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -282,7 +282,7 @@ window one line taller, taking space from a vertically adjacent window
 without changing the height of the frame.  With a positive numeric
 argument, this command increases the window height by that many lines;
 with a negative argument, it reduces the height by that many lines.
-If there are no vertically adjacent windows (i.e. the window is at the
+If there are no vertically adjacent windows (i.e., the window is at the
 full frame height), that signals an error.  The command also signals
 an error if you attempt to reduce the height of any window below a
 certain minimum number of lines, specified by the variable
@@ -328,7 +328,7 @@ usually work by calling @code{switch-to-buffer} internally
 
 @findex display-buffer
   Some commands try to display ``intelligently'', trying not to take
-over the selected window, e.g. by splitting off a new window and
+over the selected window, e.g., by splitting off a new window and
 displaying the desired buffer there.  Such commands, which include the
 various help commands (@pxref{Help}), work by calling
 @code{display-buffer} internally.  @xref{Window Choice}, for details.
@@ -425,7 +425,7 @@ and display the buffer there.
 @cindex undoing window configuration changes
 @cindex window configuration changes, undoing
   Winner mode is a global minor mode that records the changes in the
-window configuration (i.e. how the frames are partitioned into
+window configuration (i.e., how the frames are partitioned into
 windows), so that you can ``undo'' them.  You can toggle Winner mode
 with @kbd{M-x winner-mode}, or by customizing the variable
 @code{winner-mode}.  When the mode is enabled, @kbd{C-c left}
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 5bdf734804..b3ed78d7f1 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -489,7 +489,7 @@ The color for the border shadow, on the top and the left.
 @cindex @file{~/.emacs.d/gtkrc} file
 
   If Emacs is compiled with GTK+ toolkit support, the simplest way to
-customize its GTK+ widgets (e.g.@: menus, dialogs, tool bars and
+customize its GTK+ widgets (e.g., menus, dialogs, tool bars and
 scroll bars) is to choose an appropriate GTK+ theme, for example with
 the GNOME theme selector.
 
@@ -499,7 +499,7 @@ resources are specified in either the file @file{~/.emacs.d/gtkrc}
 (for Emacs-specific GTK+ resources), or @file{~/.gtkrc-2.0} (for
 general GTK+ resources).  We recommend using @file{~/.emacs.d/gtkrc},
 since GTK+ seems to ignore @file{~/.gtkrc-2.0} when running GConf with
-GNOME.  Note, however, that some GTK themes may override
+GNOME@.  Note, however, that some GTK themes may override
 customizations in @file{~/.emacs.d/gtkrc}; there is nothing we can do
 about this.  GTK+ resources do not affect aspects of Emacs unrelated
 to GTK+ widgets, such as fonts and colors in the main Emacs window;
@@ -541,7 +541,7 @@ gtk-font-name = "courier 12"
 @noindent
 Note that in this case the font name must be supplied as a GTK font
 pattern (also called a @dfn{Pango font name}), not as a
-Fontconfig-style font name or XLFD.  @xref{Fonts}.
+Fontconfig-style font name or XLFD@.  @xref{Fonts}.
 
   To customize widgets you first define a @dfn{style}, and then apply
 the style to the widgets.  Here is an example that sets the font for
@@ -590,8 +590,8 @@ widget "*verticalScrollBar*" style "scroll"
 
   A GTK+ widget is specified by a @dfn{widget name} and a @dfn{widget
 class}.  The widget name refers to a specific widget
-(e.g.@: @samp{emacs-menuitem}), while the widget class refers to a
-collection of similar widgets (e.g.@: @samp{GtkMenuItem}).  A widget
+(e.g., @samp{emacs-menuitem}), while the widget class refers to a
+collection of similar widgets (e.g., @samp{GtkMenuItem}).  A widget
 always has a class, but need not have a name.
 
   @dfn{Absolute names} are sequences of widget names or widget
@@ -746,7 +746,7 @@ possible states are:
 This is the default state for widgets.
 @item ACTIVE
 This is the state for a widget that is ready to do something.  It is
-also for the trough of a scroll bar, i.e.@: @code{bg[ACTIVE] = "red"}
+also for the trough of a scroll bar, i.e., @code{bg[ACTIVE] = "red"}
 sets the scroll bar trough to red.  Buttons that have been pressed but
 not released yet (``armed'') are in this state.
 @item PRELIGHT
@@ -780,7 +780,7 @@ dialog.
 @item bg_pixmap[@var{state}] = "@var{pixmap}"
 This specifies an image background (instead of a background color).
 @var{pixmap} should be the image file name.  GTK can use a number of
-image file formats, including XPM, XBM, GIF, JPEG and PNG.  If you
+image file formats, including XPM, XBM, GIF, JPEG and PNG@.  If you
 want a widget to use the same image as its parent, use
 @samp{<parent>}.  If you don't want any image, use @samp{<none>}.
 @samp{<none>} is the way to cancel a background image inherited from a
@@ -790,7 +790,7 @@ You can't specify the file by its absolute file name.  GTK looks for
 the pixmap file in directories specified in @code{pixmap_path}.
 @code{pixmap_path} is a colon-separated list of directories within
 double quotes, specified at the top level in a @file{gtkrc} file
-(i.e.@: not inside a style definition; see example above):
+(i.e., not inside a style definition; see example above):
 
 @smallexample
 pixmap_path "/usr/share/pixmaps:/usr/include/X11/pixmaps"
@@ -814,8 +814,8 @@ GTK-style (or Pango) font name, like @samp{Sans Italic 10}.
   There are three ways to specify a color: a color name, an RGB
 triplet, or a GTK-style RGB triplet.  @xref{Colors}, for a description
 of color names and RGB triplets.  Color names should be enclosed with
-double quotes, e.g.@: @samp{"red"}.  RGB triplets should be written
-without double quotes, e.g.@: @samp{#ff0000}.  GTK-style RGB triplets
+double quotes, e.g., @samp{"red"}.  RGB triplets should be written
+without double quotes, e.g., @samp{#ff0000}.  GTK-style RGB triplets
 have the form @w{@code{@{ @var{r}, @var{g}, @var{b} @}}}, where
 @var{r}, @var{g} and @var{b} are either integers in the range 0-65535
 or floats in the range 0.0-1.0.