upstream

45 files changed, 461 insertions, 396 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a808a96b444..b796acd8b39 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,16 @@
+2011-11-17  Glenn Morris  <rgm@gnu.org>
+
+        * regs.texi (Bookmarks): Small fixes related to saving.  (Bug#10058)
+
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * killing.texi (Rectangles):
+        * misc.texi (Document View):
+        * modes.texi (Choosing Modes):
+        * msdog.texi (Windows Fonts):
+        * regs.texi (Rectangle Registers):
+        * search.texi (Isearch Yank): Fix typos.
+
 2011-11-06  Chong Yidong  <cyd@gnu.org>
 
         * windows.texi (Basic Window): Add xref to Cursor Display.
@@ -1226,7 +1239,8 @@
 
 2010-03-27  Nick Roberts  <nickrob@snap.net.nz>
 
-        doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
+        doc/emacs/building.texi: Describe restored GDB/MI functionality
+        removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz.
         doc/emacs/emacs.texi: Update node names for building.texi.
 
 2010-03-24  Glenn Morris  <rgm@gnu.org>
@@ -1711,7 +1725,7 @@
         (Table of Resources): Document fontBackend resource.
 
         * trouble.texi (Quitting): Add other undo bindings to table.
-        (DEL Does Not Delete): Note that the erasure key is usually labelled
+        (DEL Does Not Delete): Note that the erasure key is usually labeled
         "Backspace".  Remove discussion of obscure Xmodmap issue.
 
 2009-05-07  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 1cfb3d9ffe9..6801c7f1e0e 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -99,7 +99,7 @@ ERC distribution).
 
 @item
 Scott Bender, Michael Brouwer, Christophe de Dinechin, Carl Edman,
-Christian Limpach and Adrian Robert developed and maintained the 
+Christian Limpach and Adrian Robert developed and maintained the
 NeXTstep port of Emacs.
 
 @item
@@ -206,7 +206,7 @@ use it, Snake and Tetris.
 
 @item
 Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before
-it is analysed for spam.
+it is analyzed for spam.
 
 @item
 Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a
@@ -576,7 +576,7 @@ Emacs.
 
 @item
 Karel Klí@v{c} contributed SELinux support, for preserving the
-Security-Enchanced Linux context of files on backup and copy.
+Security-Enhanced Linux context of files on backup and copy.
 
 @item
 Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index cca9e441ed4..ac62e2d9652 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1251,7 +1251,7 @@ screen Emacs frame.
 In all-stop mode, whenever your program stops, @emph{all} threads of
 execution stop.  Likewise, whenever you restart the program, all
 threads start executing.  @xref{All-Stop Mode, , All-Stop Mode, gdb,
-The GNU debugger}.  You can enable this behaviour in Emacs by setting
+The GNU debugger}.  You can enable this behavior in Emacs by setting
 @code{gdb-non-stop-setting} to @code{nil} before starting a debugging
 session.
 
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index fd680576b4e..5b98216369d 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -82,7 +82,7 @@ under it.  It looks like this, in part:
 @group
 /- Emacs group: Customization of the One True Editor. -------------\
       [State]: visible group members are all at standard values.
-   
+
    See also [Manual].
 
 [Editing] : Basic text editing facilities.
@@ -547,7 +547,7 @@ such collections from one computer to another.
   To define a Custom theme, use @kbd{M-x customize-create-theme},
 which brings up a buffer named @samp{*New Custom Theme*}.  At the top
 of the buffer is an editable field where you can specify the name of
-the theme.  Click on the button labelled @samp{Insert Variable} to add
+the theme.  Click on the button labeled @samp{Insert Variable} to add
 a variable to the theme, and click on @samp{Insert Face} to add a
 face.  You can edit these values in the @samp{*New Custom Theme*}
 buffer like in an ordinary Customize buffer.  To remove an option from
@@ -1068,7 +1068,7 @@ other context has no special meaning.
 well as the major modes; in fact, you can use it more than once, first
 to set the major mode and then to enable minor modes which are
 specific to particular buffers.  Using @code{mode} for minor modes
-is deprecated, though---instead, use @code{eval: (minor-mode 1)}. 
+is deprecated, though---instead, use @code{eval: (minor-mode 1)}.
 
   Often, however, it is a mistake to enable minor modes in file local
 variables.  Most minor modes, like Auto Fill mode, represent individual user
@@ -1646,7 +1646,7 @@ ways to use these modifiers; the key labeled @key{Alt} on most
 keyboards usually issues the @key{Meta} modifier, not @key{Alt}.  The
 standard key bindings in Emacs do not include any characters with
 these modifiers.  However, you can customize Emacs to assign meanings
-to them.  The modifier bits are labelled as @samp{s-}, @samp{H-} and
+to them.  The modifier bits are labeled as @samp{s-}, @samp{H-} and
 @samp{A-} respectively.
 
   Even if your keyboard lacks these additional modifier keys, you can
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 6237b00c2ee..1443ad019bb 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -733,7 +733,7 @@ insert rectangles, and commands to make blank rectangles.
 @findex delete-rectangle
   There are two ways to erase the text in a rectangle: @kbd{C-x r d}
 (@code{delete-rectangle}) to delete the text outright, or @kbd{C-x r
-k} (@code{kill-rectangle}) to remove the text and and save it as the
+k} (@code{kill-rectangle}) to remove the text and save it as the
 @dfn{last killed rectangle}.  In both cases, erasing the
 region-rectangle is like erasing the specified text on each line of
 the rectangle; if there is any following text on the line, it moves
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 5a97fa8460b..3e1e67fecd8 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -120,7 +120,7 @@ Useful in this context is the listing of all faces obtained by @key{M-x}
 
 @subsection Open files by dragging to an Emacs window
 
-The default behaviour when a user drags files from another application
+The default behavior when a user drags files from another application
 into an Emacs frame is to insert the contents of all the dragged files
 into the current buffer.  To remap the @code{ns-drag-file} event to
 open the dragged files in the current frame use the following line:
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d7639b3b665..714e7f3441c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -236,7 +236,7 @@ for @var{regexp}.
 @cindex DVI file
 @cindex PDF file
 @cindex PS file
-@cindex Postscript file
+@cindex PostScript file
 @cindex OpenDocument file
 @cindex Microsoft Office file
 @cindex DocView mode
@@ -244,7 +244,7 @@ for @var{regexp}.
 @cindex document viewer (DocView)
 @findex doc-view-mode
 
-DocView mode (@code{doc-view-mode}) is a viewer for DVI, Postscript
+DocView mode (@code{doc-view-mode}) is a viewer for DVI, PostScript
 (PS), PDF, OpenDocument, and Microsoft Office documents.  It provides
 features such as slicing, zooming, and searching inside documents.  It
 works by converting the document to a set of images using the
@@ -257,16 +257,16 @@ displaying those images.
 @findex doc-view-toggle-display
 @findex doc-view-toggle-display
 @cindex doc-view-minor-mode
-  When you visit a document file with the exception of Postscript
+  When you visit a document file with the exception of PostScript
 files, Emacs automatically switches to DocView mode if possible
 @footnote{The needed external tools for this document type have to be
 available, emacs needs to run in a graphical frame, and PNG image
 support has to be compiled into emacs.  If any of these requirements
 is not fulfilled, DocView falls back to an appropriate mode.}.  When
-you visit a Postscript file, Emacs switches to PS mode, a major mode
-for editing Postscript files as text; however, it also enables DocView
+you visit a PostScript file, Emacs switches to PS mode, a major mode
+for editing PostScript files as text; however, it also enables DocView
 minor mode, so you can type @kbd{C-c C-c} to view the document with
-DocView.  (PDF and DVI files, unlike Postscript files, are not usually
+DocView.  (PDF and DVI files, unlike PostScript files, are not usually
 human-editable.)  In either case, repeating @kbd{C-c C-c}
 (@code{doc-view-toggle-display}) toggles between DocView and the file
 text.
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi
index d82423a73b4..5a786be62cf 100644
--- a/doc/emacs/modes.texi
+++ b/doc/emacs/modes.texi
@@ -368,7 +368,7 @@ compares the text at the start of the buffer to the variable
 @code{magic-mode-alist}, described above, except that is consulted
 only after @code{auto-mode-alist}.  By default,
 @code{magic-fallback-mode-alist} contains forms that check for image
-files, HTML/XML/SGML files, and Postscript files.
+files, HTML/XML/SGML files, and PostScript files.
 
 @vindex major-mode
   Once a major mode is chosen, Emacs sets the value of the variable
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 533872ddf61..bbaf31ade85 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -322,7 +322,7 @@ default value is @code{(links uid gid)} i.e.@: all the 3 optional
 attributes are displayed.
 
 @vindex ls-lisp-emulation
-  The variable @code{ls-lisp-emulation} controls the flavour of the
+  The variable @code{ls-lisp-emulation} controls the flavor of the
 @code{ls} emulation by setting the defaults for the 3 options
 described above: @code{ls-lisp-ignore-case},
 @code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}.  The value of
@@ -868,7 +868,7 @@ and @code{uniscribe} font backends are supported on Windows.  The
 @code{gdi} font backend is available on all versions of Windows, and
 supports all fonts that are natively supported by Windows.  The
 @code{uniscribe} font backend is available on Windows 2000 and later,
-and supports Truetype and Opentype fonts.  Some languages requiring
+and supports TrueType and OpenType fonts.  Some languages requiring
 complex layout can only be properly supported by the uniscribe
 backend.  By default, both backends are enabled if supported, with
 @code{uniscribe} taking priority over @code{gdi}.
@@ -914,7 +914,7 @@ as a fallback with the font family left unspecified.
 @vindex w32-charset-info-alist
 @item registry
 Specifies the character set registry that the font is
-expected to cover.  Most Truetype and Opentype fonts will be unicode fonts
+expected to cover.  Most TrueType and OpenType fonts will be unicode fonts
 that cover several national character sets, but you can narrow down the
 selection of fonts to those that support a particular character set by
 using a specific registry from @code{w32-charset-info-alist} here.
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index 41a807375a9..f7fd52bd28d 100644
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -145,7 +145,7 @@ rectangle) (@code{insert-register}).
 
   The @kbd{C-x r i @var{r}} (@code{insert-register}) command,
 previously documented in @ref{Text Registers}, inserts a rectangle
-rather than a a text string, if the register contains a rectangle.
+rather than a text string, if the register contains a rectangle.
 
 @node Configuration Registers
 @section Saving Window Configurations in Registers
@@ -278,7 +278,7 @@ you can use it to edit your bookmark definitions or annotate the
 bookmarks.  Type @kbd{C-h m} in the bookmark buffer for more
 information about its special editing commands.
 
-  When you kill Emacs, Emacs offers to save your bookmark values, if
+  When you kill Emacs, Emacs saves your bookmarks, if
 you have changed any bookmark values.  You can also save the bookmarks
 at any time with the @kbd{M-x bookmark-save} command.  Bookmarks are
 saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with
@@ -290,9 +290,10 @@ persist from one Emacs session to the next.
 @vindex bookmark-save-flag
   If you set the variable @code{bookmark-save-flag} to 1, each command
 that sets a bookmark will also save your bookmarks; this way, you
-don't lose any bookmark values even if Emacs crashes.  (The value, if
+don't lose any bookmark values even if Emacs crashes.  The value, if
 a number, says how many bookmark modifications should go by between
-saving.)
+saving.  If you set this variable to @code{nil}, Emacs only
+saves bookmarks if you explicitly use @kbd{M-x bookmark-save}.
 
 @vindex bookmark-search-size
   Bookmark position values are saved with surrounding context, so that
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 0b68373d47c..c6747042df5 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -309,7 +309,7 @@ search remains case-insensitive.
 @findex isearch-yank-char
   @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character
 from the search string, and @kbd{C-M-y} (@code{isearch-yank-char})
-appends the character after point to the the search string.  An
+appends the character after point to the search string.  An
 alternative method to add the character after point is to enter the
 minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f}
 at the end of the search string in the minibuffer.
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index ec159af6f84..ae7550d0fae 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -161,7 +161,7 @@ in the Emacs distribution.  Type @kbd{C-h C-f} to read the FAQ; type
 @cindex @key{BACKSPACE} vs @key{DEL}
 @cindex usual erasure key
 
-  Every keyboard has a large key, usually labelled @key{Backspace},
+  Every keyboard has a large key, usually labeled @key{Backspace},
 which is ordinarily used to erase the last character that you typed.
 We call this key @dfn{the usual erasure key}.  In Emacs, it is
 supposed to be equivalent to @key{DEL}.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 9d3894c38fc..bdcd9e9aea8 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp-intro.texi (etags): Fix typo.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 11ceea19eef..ef04626e95f 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -11,7 +11,7 @@
 @c ---------
 @c <<<< For hard copy printing, this file is now
 @c      set for smallbook, which works for all sizes
-@c      of paper, and with Postscript figures >>>>
+@c      of paper, and with PostScript figures >>>>
 @set smallbook
 @ifset smallbook
 @smallbook
@@ -357,7 +357,7 @@ every node in every chapter.
 * Conclusion::                  Now you have the basics.
 * the-the::                     An appendix: how to find reduplicated words.
 * Kill Ring::                   An appendix: how the kill ring works.
-* Full Graph::                  How to create a graph with labelled axes.
+* Full Graph::                  How to create a graph with labeled axes.
 * Free Software and Free Manuals::
 * GNU Free Documentation License::
 * Index::
@@ -793,9 +793,9 @@ The @code{current-kill} Function
 * Digression concerning error::  How to mislead humans, but not computers.
 * Determining the Element::
 
-A Graph with Labelled Axes
+A Graph with Labeled Axes
 
-* Labelled Example::
+* Labeled Example::
 * print-graph Varlist::         @code{let} expression in @code{print-graph}.
 * print-Y-axis::                Print a label for the vertical axis.
 * print-X-axis::                Print a horizontal label.
@@ -1023,7 +1023,7 @@ the command in parentheses, like this: @kbd{M-C-\}
 invoke the command; this is called @dfn{rebinding}.  @xref{Keymaps, ,
 Keymaps}.)  The abbreviation @kbd{M-C-\} means that you type your
 @key{META} key, @key{CTRL} key and @key{\} key all at the same time.
-(On many modern keyboards the @key{META} key is labelled
+(On many modern keyboards the @key{META} key is labeled
 @key{ALT}.)
 Sometimes a combination like this is called a keychord, since it is
 similar to the way you play a chord on a piano.  If your keyboard does
@@ -1031,7 +1031,7 @@ not have a @key{META} key, the @key{ESC} key prefix is used in place
 of it.  In this case, @kbd{M-C-\} means that you press and release your
 @key{ESC} key and then type the @key{CTRL} key and the @key{\} key at
 the same time.  But usually @kbd{M-C-\} means press the @key{CTRL} key
-along with the key that is labelled @key{ALT} and, at the same time,
+along with the key that is labeled @key{ALT} and, at the same time,
 press the @key{\} key.
 
 In addition to typing a lone keychord, you can prefix what you type
@@ -4749,7 +4749,7 @@ type in the name of the function whose source code you want to see,
 such as @code{mark-whole-buffer}, and then type @key{RET}.  Emacs will
 switch buffers and display the source code for the function on your
 screen.  To switch back to your current buffer, type @kbd{C-x b
-@key{RET}}.  (On some keyboards, the @key{META} key is labelled
+@key{RET}}.  (On some keyboards, the @key{META} key is labeled
 @key{ALT}.)
 
 @c !!! 22.1.1 tags table location in this paragraph
@@ -8200,7 +8200,7 @@ The command \\[yank] can retrieve it from there. @dots{} "
      ;;    it will be set in an error
      (setq this-command 'kill-region)
      ;;    Finally, in the then-part, send a message if you may copy
-     ;;    the text to the kill ring without signally an error, but
+     ;;    the text to the kill ring without signaling an error, but
      ;;    don't if you may not.
 @end group
 @group
@@ -13656,7 +13656,7 @@ list of supported languages.
 
 The @code{etags} program handles more than 20 languages, including
 Emacs Lisp, Common Lisp, Scheme, C, C++, Ada, Fortran, HTML, Java,
-LaTeX, Pascal, Perl, Postscript, Python, TeX, Texinfo, makefiles, and
+LaTeX, Pascal, Perl, PostScript, Python, TeX, Texinfo, makefiles, and
 most assemblers.  The program has no switches for specifying the
 language; it recognizes the language in an input file according to its
 file name and contents.
@@ -16962,7 +16962,7 @@ For this reason, I have written enhancements to the basic
 @code{print-graph-body} function that automatically print labels for
 the horizontal and vertical axes.  Since the label printing functions
 do not contain much new material, I have placed their description in
-an appendix.  @xref{Full Graph, , A Graph with Labelled Axes}.
+an appendix.  @xref{Full Graph, , A Graph with Labeled Axes}.
 
 @node Line Graph Exercise,  , Printed Axes, Readying a Graph
 @section Exercise
@@ -19447,7 +19447,7 @@ whether the kill ring is full or empty.  This is an act of
 exploration.
 
 From the human point of view, the act of exploration and discovery is
-not necessarily an error, and therefore should not be labelled as one,
+not necessarily an error, and therefore should not be labeled as one,
 even in the bowels of a computer.  As it is, the code in Emacs implies
 that a human who is acting virtuously, by exploring his or her
 environment, is making an error.  This is bad.  Even though the computer
@@ -19760,25 +19760,25 @@ as @code{kill-ring-yank-pointer} do not use this library, possibly
 because they were written earlier.
 
 @node Full Graph, Free Software and Free Manuals, Kill Ring, Top
-@appendix A Graph with Labelled Axes
+@appendix A Graph with Labeled Axes
 
 Printed axes help you understand a graph.  They convey scale.  In an
 earlier chapter (@pxref{Readying a Graph, ,  Readying a Graph}), we
 wrote the code to print the body of a graph.  Here we write the code
-for printing and labelling vertical and horizontal axes, along with the
+for printing and labeling vertical and horizontal axes, along with the
 body itself.
 
 @menu
-* Labelled Example::
+* Labeled Example::
 * print-graph Varlist::         @code{let} expression in @code{print-graph}.
 * print-Y-axis::                Print a label for the vertical axis.
 * print-X-axis::                Print a horizontal label.
 * Print Whole Graph::           The function to print a complete graph.
 @end menu
 
-@node Labelled Example, print-graph Varlist, Full Graph, Full Graph
+@node Labeled Example, print-graph Varlist, Full Graph, Full Graph
 @ifnottex
-@unnumberedsec Labelled Example Graph
+@unnumberedsec Labeled Example Graph
 @end ifnottex
 
 Since insertions fill a buffer to the right and below point, the new
@@ -19821,9 +19821,9 @@ Here is an example of how a finished graph should look:
 @end smallexample
 
 @noindent
-In this graph, both the vertical and the horizontal axes are labelled
+In this graph, both the vertical and the horizontal axes are labeled
 with numbers.  However, in some graphs, the horizontal axis is time
-and would be better labelled with months, like this:
+and would be better labeled with months, like this:
 
 @smallexample
 @group
@@ -19838,9 +19838,9 @@ and would be better labelled with months, like this:
 @end smallexample
 
 Indeed, with a little thought, we can easily come up with a variety of
-vertical and horizontal labelling schemes.  Our task could become
+vertical and horizontal labeling schemes.  Our task could become
 complicated.  But complications breed confusion.  Rather than permit
-this, it is better choose a simple labelling scheme for our first
+this, it is better choose a simple labeling scheme for our first
 effort, and to modify or replace it later.
 
 @need 1200
@@ -19864,7 +19864,7 @@ These considerations suggest the following outline for the
 We can work on each part of the @code{print-graph} function definition
 in turn.
 
-@node print-graph Varlist, print-Y-axis, Labelled Example, Full Graph
+@node print-graph Varlist, print-Y-axis, Labeled Example, Full Graph
 @comment  node-name,  next,  previous,  up
 @appendixsec The @code{print-graph} Varlist
 @cindex @code{print-graph} varlist
@@ -20391,7 +20391,7 @@ blank spaces and also separated according to the value of the variable
 The value of the variable @code{X-axis-label-spacing} should itself be
 measured in units of @code{symbol-width}, since you may want to change
 the width of the symbols that you are using to print the body of the
-graph without changing the ways the graph is labelled.
+graph without changing the ways the graph is labeled.
 
 @menu
 * Similarities differences::    Much like @code{print-Y-axis}, but not exactly.
@@ -20722,7 +20722,7 @@ Emacs will print the horizontal axis like this:
 Now we are nearly ready to print the whole graph.
 
 The function to print the graph with the proper labels follows the
-outline we created earlier (@pxref{Full Graph, , A Graph with Labelled
+outline we created earlier (@pxref{Full Graph, , A Graph with Labeled
 Axes}), but with additions.
 
 @need 1250
@@ -20857,7 +20857,7 @@ Finally, the code for the @code{print-graph} function:
 ;;; @r{Final version.}
 (defun print-graph
   (numbers-list &optional vertical-step)
-  "Print labelled bar graph of the NUMBERS-LIST.
+  "Print labeled bar graph of the NUMBERS-LIST.
 The numbers-list consists of the Y-axis values.
 @end group
 
@@ -21478,7 +21478,7 @@ each column."
 @group
 (defun print-graph
   (numbers-list &optional vertical-step horizontal-step)
-  "Print labelled bar graph of the NUMBERS-LIST.
+  "Print labeled bar graph of the NUMBERS-LIST.
 The numbers-list consists of the Y-axis values.
 @end group
 
@@ -21979,7 +21979,7 @@ each column."
 @group
 (defun print-graph
   (numbers-list &optional vertical-step horizontal-step)
-  "Print labelled bar graph of the NUMBERS-LIST.
+  "Print labeled bar graph of the NUMBERS-LIST.
 The numbers-list consists of the Y-axis values.
 @end group
 
@@ -22275,4 +22275,3 @@ airplane.
 @c @end iftex
 
 @bye
-
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index cbe016ac96d..0fa50492481 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,36 @@
+2011-11-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows)
+        (Deleting Windows): Use term window-combination-resize instead
+        of window-splits.
+
+2011-11-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Resizing Windows, Splitting Windows): Rename
+        occurrences of window-nest to window-combination-limit.
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * intro.texi (Lisp History): Fix typo.
+
+2011-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * windows.texi (Splitting Windows, Deleting Windows): Remove
+        references to splits status of windows.
+
+2011-11-10  Glenn Morris  <rgm@gnu.org>
+
+        * buffers.texi (Read Only Buffers): Expand a bit on why
+        toggle-read-only should only be used interactively.  (Bug#7292)
+
+2011-11-09  Chong Yidong  <cyd@gnu.org>
+
+        * windows.texi (Window Sizes): Document window-pixel-edges,
+        window-inside-pixel-edges, window-absolute-pixel-edges, and
+        window-inside-absolute-pixel-edges.
+        (Resizing Windows): shrink-window-if-larger-than-buffer works on
+        non-full-width windows.
+
 2011-11-09  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Resizing Windows): Rewrite documentation of
@@ -1094,9 +1127,9 @@
         * commands.texi (Misc Events): Add cross-references to where
         POSITION of a mouse event is described in detail.
 
-2010-08-08  Christoph  <cschol2112@googlemail.com>
+2010-08-08  Christoph Scholtes  <cschol2112@googlemail.com>
 
-        * control.texi (Handling Errors) <error-message-string>: Fix arg name.
+        * control.texi (Handling Errors)  <error-message-string>: Fix arg name.
 
 2010-08-08  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi
index 816d0f9faa8..ee2ce2e2001 100644
--- a/doc/lispref/buffers.texi
+++ b/doc/lispref/buffers.texi
@@ -748,10 +748,11 @@ of the list (comparison is done with @code{eq}).
 
 @deffn Command toggle-read-only &optional arg
 This command toggles whether the current buffer is read-only.  It is
-intended for interactive use; do not use it in programs.  At any given
-point in a program, you should know whether you want the read-only flag
-on or off; so you can set @code{buffer-read-only} explicitly to the
-proper value, @code{t} or @code{nil}.
+intended for interactive use; do not use it in programs (it may have
+side-effects, such as enabling View mode, and does not affect
+read-only text properties).  To change the read-only state of a buffer in
+a program, explicitly set @code{buffer-read-only} to the proper value.
+To temporarily ignore a read-only state, bind @code{inhibit-read-only}.
 
 If @var{arg} is non-@code{nil}, it should be a raw prefix argument.
 @code{toggle-read-only} sets @code{buffer-read-only} to @code{t} if
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 71b612c527d..86ecfd122ef 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2827,7 +2827,7 @@ If @code{file-remote-p} returns the same identifier for two different
 filenames, that means they are stored on the same file system and can
 be accessed locally with respect to each other.  This means, for
 example, that it is possible to start a remote process accessing both
-files at the same time.  Implementors of file handlers need to ensure
+files at the same time.  Implementers of file handlers need to ensure
 this principle is valid.
 
 @var{identification} specifies which part of the identifier shall be
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index d9399e98a69..d2e86a77112 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2414,7 +2414,7 @@ This function returns the ``vendor'' that provided the X server
 software (as a string).  Really this means whoever distributes the X
 server.
 
-When the developers of X labelled software distributors as
+When the developers of X labeled software distributors as
 ``vendors,'' they showed their false assumption that no system could
 ever be developed and distributed noncommercially.
 @end defun
@@ -2430,4 +2430,3 @@ This variable's value is @code{t} if no X window manager is in use.
 The functions @code{x-pixel-width} and @code{x-pixel-height} return the
 width and height of an X Window frame, measured in pixels.
 @end ignore
-
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 5cdd983f40d..0168c564e34 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -887,7 +887,7 @@ known to be unchanged since the last complete redisplay.
 @item unchanged_modified
 @itemx overlay_unchanged_modified
 The values of @code{modiff} and @code{overlay_modiff}, respectively,
-after the last compelete redisplay.  If their current values match
+after the last complete redisplay.  If their current values match
 @code{modiff} or @code{overlay_modiff}, that means
 @code{beg_unchanged} and @code{end_unchanged} contain no useful
 information.
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 7c070726023..44ac947fa99 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -101,7 +101,7 @@ for other purposes as well, such as writing editing commands.
   Dozens of Lisp implementations have been built over the years, each
 with its own idiosyncrasies.  Many of them were inspired by Maclisp,
 which was written in the 1960s at MIT's Project MAC.  Eventually the
-implementors of the descendants of Maclisp came together and developed a
+implementers of the descendants of Maclisp came together and developed a
 standard for Lisp systems, called Common Lisp.  In the meantime, Gerry
 Sussman and Guy Steele at MIT developed a simplified but very powerful
 dialect of Lisp, called Scheme.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index d4f8ee9708b..51d91572d0e 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -420,7 +420,7 @@ remote files.
 Per default, this variable is always set to @code{t}, meaning that a
 call of @code{process-file} could potentially change any file on a
 remote host.  When set to @code{nil}, a file handler could optimize
-its behaviour with respect to remote file attributes caching.
+its behavior with respect to remote file attributes caching.
 
 This variable should never be changed by @code{setq}.  Instead of, it
 shall be set only by let-binding.
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index b373d00bebf..e66dcc88f71 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -240,7 +240,7 @@ correct'
 counterintuitive
 cr
 creatable
-customie
+customize
 deactivate
 deactivated
 deassigns
@@ -331,7 +331,6 @@ for'
 formfeed
 forms'
 forw
-forwa
 found'
 frob
 from'
diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt
index 99b48d342ab..53a9f58cd01 100644
--- a/doc/lispref/two-volume-cross-refs.txt
+++ b/doc/lispref/two-volume-cross-refs.txt
@@ -87,7 +87,7 @@ to create             elisp2-aux-vol-added
 insert elisp2-aux-vol-added into vol1.aux  (append)
 insert elisp1-aux-vol-added into vol2.aux  (prepend)
 
-(so you dont have to do it again)
+(so you don't have to do it again)
 % cp vol1.aux elisp1-aux-ready
 % cp vol2.aux elisp2-aux-ready
 
@@ -120,7 +120,7 @@ Be sure that .fn file has no blank lines.
 % texindex vol1.fn
 % texindex vol2.fn
 
-(so you dont have to do it again)
+(so you don't have to do it again)
 % cp vol1.fns elisp1-fns-2vol-ready
 % cp vol2.fns elisp2-fns-2vol-ready
 
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 52ac5a53900..8c99a06909b 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -375,13 +375,13 @@ Bars}).  At the top of the window is an optional header line
 line (@pxref{Mode Line Format}).
 
   Emacs provides several functions for finding the height and width of
-a window.  Most of these functions report the values as integer
-multiples of the default character height and width.  On a graphical
-display, the actual screen size of this default height and width are
-those specified by the frame's default font.  Hence, if the buffer
-contains text that is displayed in a different size, the reported
-height and width of the window may differ from the actual number of
-text lines or columns displayed in it.
+a window.  Except where noted, these heights and widths are reported
+as integer numbers of lines and columns respectively.  On a graphical
+display, each ``line'' and ``column'' actually corresponds to the
+height and width of a ``default'' character specified by the frame's
+default font.  Thus, if a window is displaying text with a different
+font or size, the reported height and width for that window may differ
+from the actual number of text lines or columns displayed within it.
 
 @cindex window height
 @cindex height of a window
@@ -534,6 +534,45 @@ can be resized in the desired direction.  To determine that, use the
 function @code{window-resizable}.  @xref{Resizing Windows}.
 @end defun
 
+  The following functions can be used to find a window's size and
+position in pixels.  Though mostly useful on graphical displays, they
+can also be called on text-only terminals, where the screen area of
+each text character is taken to be ``one pixel''.
+
+@defun window-pixel-edges &optional window
+This function return a list of pixel coordinates for the edges of
+@var{window}.  If @var{window} is omitted or @code{nil}, it defaults
+to the selected window.
+
+The return value has the form @code{(@var{left} @var{top} @var{right}
+@var{bottom})}.  The list elements are, respectively, the X coordinate
+of the left window edge, the Y coordinate of the top edge, one more
+than the X coordinate of the right edge, and one more than the Y
+coordinate of the bottom edge.  The origin coordinate @samp{(0,0)} is
+taken to be the top left corner of the frame's window area.
+
+These edge values include the space used by the window's scroll bar,
+margins, fringes, header line, and mode line, if any.
+@end defun
+
+@defun window-inside-pixel-edges &optional window
+This function is like @code{window-pixel-edges}, except that it
+returns the edge coordinates for the window's text area, rather than
+the edge coordinates for the window itself.  @var{window} must specify
+a live window.
+@end defun
+
+@defun window-absolute-pixel-edges &optional window
+This function is like @code{window-pixel-edges}, except that it
+returns the edge coordinates relative to the top left corner of the
+display screen.
+@end defun
+
+@defun window-inside-absolute-pixel-edges &optional window
+This function is like @code{window-inside-pixel-edges}, except that it
+returns the edge coordinates relative to the top left corner of the
+display screen.  @var{window} must specify a live window.
+@end defun
 
 @node Resizing Windows
 @section Resizing Windows
@@ -593,10 +632,11 @@ the window cannot be resized as demanded, an error is signaled.
 The optional argument @var{ignore} has the same meaning as for the
 function @code{window-resizable} above.
 
-The choice of which window edge this function alters depends on the
-splitting and nesting status of the involved windows; in some cases,
-it may alter both edges.  @xref{Splitting Windows}.  To resize by
-moving only the bottom or right edge of a window, use the function
+The choice of which window edges this function alters depends on the
+values of the option @code{window-combination-resize} and the
+combination-limit status of the involved windows; in some cases, it may
+alter both edges.  @xref{Splitting Windows}.  To resize by moving only
+the bottom or right edge of a window, use the function
 @code{adjust-window-trailing-edge}, below.
 @end defun
 
@@ -604,104 +644,85 @@ moving only the bottom or right edge of a window, use the function
 @c shrink-window, and shrink-window-horizontally are documented in the
 @c Emacs manual.  They are not preferred for calling from Lisp.
 
-  The following function is useful for moving the line dividing two
-windows.
-
 @defun adjust-window-trailing-edge window delta &optional horizontal
 This function moves @var{window}'s bottom edge by @var{delta} lines.
-Optional argument @var{horizontal} non-@code{nil} means to move
-@var{window}'s right edge by @var{delta} columns.  The argument
-@var{window} defaults to the selected window.
+If optional argument @var{horizontal} is non-@code{nil}, it instead
+moves the right edge by @var{delta} columns.  If @var{window} is
+@code{nil}, it defaults to the selected window.
 
-If @var{delta} is greater zero, this moves the edge downwards or to the
-right.  If @var{delta} is less than zero, this moves the edge upwards or
-to the left. If the edge can't be moved by @var{delta} lines or columns,
-it is moved as far as possible in the desired direction but no error is
-signaled.
+A positive @var{delta} moves the edge downwards or to the right; a
+negative @var{delta} moves it upwards or to the left.  If the edge
+cannot be moved as far as specified by @var{delta}, this function
+moves it as far as possible but does not signal a error.
 
 This function tries to resize windows adjacent to the edge that is
-moved.  Only if this is insufficient, it will also resize windows not
-adjacent to that edge.  As a consequence, if you move an edge in one
-direction and back in the other direction by the same amount, the
-resulting window configuration will not be necessarily identical to the
-one before the first move.  So if your intend to just resize
-@var{window}, you should not use this function but call
-@code{window-resize} (see above) instead.
+moved.  If this is not possible for some reason (e.g. if that adjacent
+window is fixed-size), it may resize other windows.
 @end defun
 
+  The following commands resize windows in more specific ways.  When
+called interactively, they act on the selected window.
+
 @deffn Command fit-window-to-buffer &optional window max-height min-height override
-This command makes @var{window} the right height to display its
-contents exactly.  The default for @var{window} is the selected window.
-
-The optional argument @var{max-height} specifies the maximum total
-height the window is allowed to be; @code{nil} means use the maximum
-permissible height of a window on @var{window}'s frame.  The optional
-argument @var{min-height} specifies the minimum total height for the
-window; @code{nil} means use @code{window-min-height}.  All these height
-values include the mode line and/or header line.
-
-If the optional argument @var{override} is non-@code{nil}, this means to
-ignore any restrictions imposed by @code{window-min-height} and
-@code{window-min-width} on the size of @var{window}.
-
-This function returns non-@code{nil} if it orderly resized @var{window},
-and @code{nil} otherwise.
+This command adjusts the height of @var{window} to fit the text in it.
+It returns non-@code{nil} if it was able to resize @var{window}, and
+@code{nil} otherwise.  If @var{window} is omitted or @code{nil}, it
+defaults to the selected window.  Otherwise, it should be a live
+window.
+
+The optional argument @var{max-height}, if non-@code{nil}, specifies
+the maximum total height that this function can give @var{window}.
+The optional argument @var{min-height}, if no-@code{nil}, specifies
+the minimum total height that it can give, which overrides the
+variable @code{window-min-height}.
+
+If the optional argument @var{override} is non-@code{nil}, this
+function ignores any size restrictions imposed by
+@code{window-min-height} and @code{window-min-width}.
 @end deffn
 
 @deffn Command shrink-window-if-larger-than-buffer &optional window
-This command shrinks @var{window} vertically to be as small as possible
-while still showing the full contents of its buffer---but not less than
-@code{window-min-height} lines.  The argument @var{window} must denote
-a live window and defaults to the selected one.
-
-However, this command does nothing if the window is already too small to
-display the whole text of the buffer, or if part of the contents are
-currently scrolled off screen, or if the window is not the full width of
-its frame, or if the window is the only window in its frame.
-
-This command returns non-@code{nil} if it actually shrank the window
-and @code{nil} otherwise.
+This command attempts to reduce @var{window}'s height as much as
+possible while still showing its full buffer, but no less than
+@code{window-min-height} lines.  The return value is non-@code{nil} if
+the window was resized, and @code{nil} otherwise.  If @var{window} is
+omitted or @code{nil}, it defaults to the selected window.  Otherwise,
+it should be a live window.
+
+This command does nothing if the window is already too short to
+display all of its buffer, or if any of the buffer is scrolled
+off-screen, or if the window is the only live window in its frame.
 @end deffn
 
 @cindex balancing window sizes
-Emacs provides two functions to balance windows, that is, to even out
-the sizes of all windows on the same frame.  The minibuffer window and
-fixed-size windows are not resized by these functions.
-
 @deffn Command balance-windows &optional window-or-frame
 This function balances windows in a way that gives more space to
 full-width and/or full-height windows.  If @var{window-or-frame}
 specifies a frame, it balances all windows on that frame.  If
-@var{window-or-frame} specifies a window, it balances that window and
-its siblings (@pxref{Windows and Frames}) only.
+@var{window-or-frame} specifies a window, it balances only that window
+and its siblings (@pxref{Windows and Frames}).
 @end deffn
 
 @deffn Command balance-windows-area
 This function attempts to give all windows on the selected frame
-approximately the same share of the screen area.  This means that
-full-width or full-height windows are not given more space than other
-windows.
+approximately the same share of the screen area.  Full-width or
+full-height windows are not given more space than other windows.
 @end deffn
 
 @cindex maximizing windows
-The following function can be used to give a window the maximum possible
-size without deleting other ones.
-
 @deffn Command maximize-window &optional window
-This function maximizes @var{window}.  More precisely, this makes
-@var{window} as large as possible without resizing its frame or deleting
-other windows.  @var{window} can be any window and defaults to the
-selected one.
+This function attempts to make @var{window} as large as possible, in
+both dimensions, without resizing its frame or deleting other windows.
+If @var{window} is omitted or @code{nil}, it defaults to the selected
+window.
 @end deffn
 
 @cindex minimizing windows
-To make a window as small as possible without deleting it the
-following function can be used.
-
 @deffn Command minimize-window &optional window
-This function minimizes @var{window}.  More precisely, this makes
-@var{window} as small as possible without deleting it or resizing its
-frame.  @var{window} can be any window and defaults to the selected one.
+This function attempts to make @var{window} as small as possible, in
+both dimensions, without deleting it or resizing its frame.  If
+@var{window} is omitted or @code{nil}, it defaults to the selected
+window.
 @end deffn
 
 
@@ -719,7 +740,7 @@ This function creates a new live window next to the window
 to the selected window.  That window is ``split'', and reduced in
 size.  The space is taken up by the new window, which is returned.
 
-The optional second argument @var{size} determines the sizes of the
+The optional second argument @var{size} determines the sizes of
 @var{window} and/or the new window.  If it is omitted or @code{nil},
 both windows are given equal sizes; if there is an odd line, it is
 allocated to the new window.  If @var{size} is a positive number,
@@ -765,10 +786,10 @@ lieu of the usual action of @code{split-window}.
 
   As an example, we show a combination of @code{split-window} calls
 that yields the window configuration discussed in @ref{Windows and
-Frames}.  This example demonstrates splitting live windows as well as
-splitting internal windows.  We begin with a frame containing a single
-window (a live root window), which we denote by @var{W4}.  Calling
-@code{(split-window W3)} yields this window configuration:
+Frames}.  This example demonstrates splitting a live window as well as
+splitting an internal window.  We begin with a frame containing a
+single window (a live root window), which we denote by @var{W4}.
+Calling @code{(split-window W3)} yields this window configuration:
 
 @smallexample
 @group
@@ -816,15 +837,14 @@ internal window @var{W3} as the argument.  The result:
 @end smallexample
 
 @noindent
-A new live window, @var{W2}, is created to the left of @var{W3} (which
-encompasses the vertical window combination of @var{W4} and @var{W5}).
-A new internal window @var{W1} is also created, and becomes the new
-root window.
+A new live window @var{W2} is created, to the left of the internal
+window @var{W3}.  A new internal window @var{W1} is created, becoming
+the new root window.
 
   The following two options can be used to modify the operation of
 @code{split-window}.
 
-@defopt window-splits
+@defopt window-combination-resize
 If this variable is @code{nil}, @code{split-window} can only split a
 window (denoted by @var{window}) if @var{window}'s screen area is
 large enough to accommodate both itself and the new window.  This is
@@ -836,45 +856,16 @@ resize all windows that are part of the same combination as
 this may allow @code{split-window} to succeed even if @var{window} is
 a fixed-size window or too small to ordinarily split.
 
-In any case, the value of this variable is assigned to the splits status
-of the new window and, provided old and new window form a new
-combination, of the old window as well.  The splits status of a window
-can be retrieved by invoking the function @code{window-splits} and
-altered by the function @code{set-window-splits} described next.
+Also if this variable is non-@code{nil}, subsequent resizing and
+deleting @var{window} will usually affect @emph{all} windows in
+@var{window}'s combination.
 
-If @code{window-nest} (see below) is non-@code{nil}, the space for the
-new window is exclusively taken from the old window, but the splits
-status of the involved windows is nevertheless set as described here.
+The setting of this variable has no effect if
+@code{window-combination-limit} (see below) is non-@code{nil}.
 @end defopt
 
-@defun window-splits &optional window
-This function returns the splits status of @var{window}.  The argument
-@var{window} can be any window and defaults to the selected one.
-
-@cindex splits status
-The @dfn{splits status} of a window specifies how resizing and deleting
-that window may affect the size of other windows in the same window
-combination.  More precisely, if @var{window}'s splits status is
-@code{nil} and @var{window} is resized, the corresponding space is
-preferably taken from (or given to) @var{window}'s right sibling.  When
-@var{window} is deleted, its space is given to its left sibling.  If
-@var{window}'s splits status is non-@code{nil}, resizing and deleting
-@var{window} may resize @emph{all} windows in @var{window}'s
-combination.
-
-The splits status is initially set by @code{split-window}
-from the current value of the variable @code{window-splits} (see above)
-and can be reset by the function @code{set-window-splits} (see below).
-@end defun
-
-@defun set-window-splits window &optional status
-This function sets the splits status (see above) of @var{window} to
-@var{status}.  The argument @var{window} can be any window and defaults
-to the selected one.  The return value is @var{status}.
-@end defun
-
-To illustrate the use of @code{window-splits} consider the following
-window configuration:
+To illustrate the use of @code{window-combination-resize} consider the
+following window configuration:
 @smallexample
 @group
      ______________________________________
@@ -895,8 +886,9 @@ window configuration:
 @end group
 @end smallexample
 
-Splitting window @code{W3} with @code{window-splits} @code{nil}
-produces a configuration where the size of @code{W2} remains unchanged:
+Splitting window @code{W3} with @code{window-combination-resize}
+@code{nil} produces a configuration where the size of @code{W2} remains
+unchanged:
 @smallexample
 @group
      ______________________________________
@@ -917,10 +909,8 @@ produces a configuration where the size of @code{W2} remains unchanged:
 @end group
 @end smallexample
 
-Splitting @code{W3} with @code{window-splits} non-@code{nil} instead
-produces a configuration where all windows have approximately the same
-height:
-
+Splitting @code{W3} with @code{window-combination-resize} non-@code{nil}
+instead steals the space for @code{W4} from both @code{W2} and @code{W3}:
 @smallexample
 @group
      ______________________________________
@@ -941,34 +931,36 @@ height:
 @end group
 @end smallexample
 
-@defopt window-nest
+@defopt window-combination-limit
 If this variable is @code{nil}, @code{split-window} creates a new parent
 window if and only if the old window has no parent window or shall be
 split orthogonally to the combination it is part of.  If this variable
-is non-@code{nil}, @code{split-window} always creates a new parent
-window.  If this variable is always non-@code{nil}, a frame's window
-tree is a binary tree so every window but the frame's root window has
-exactly one sibling.
-
-The value of this variable is also assigned to the nest status of the
-new parent window.  The nest status of any window can be retrieved via
-the function @code{window-nest} and altered by the function
-@code{set-window-nest}, see below.
+is @code{t}, @code{split-window} always creates a new parent window.  If
+this variable is always @code{t}, a frame's window tree is a binary tree
+so every window but the frame's root window has exactly one sibling.
+Other values are reserved for future use.
+
+The value of this variable is also assigned to the combination-limit
+status of the new parent window.  The combination-limit status of any
+window can be retrieved via the function @code{window-combination-limit}
+and altered by the function @code{set-window-combination-limit}, see
+below.
 @end defopt
 
-@defun window-nest &optional window
-This function returns the nest status of @var{window}.  The argument
-@var{window} can be any window and defaults to the selected one.  Note,
-however, that the nest status is currently meaningful for internal
-windows only.
-
-@cindex nest status
-The @dfn{nest status} of a window specifies whether that window may be
-removed and its child windows recombined with that window's siblings
-when such a sibling's child window is deleted.  The nest status is
-initially assigned by @code{split-window} from the current value of the
-variable @code{window-nest} (see above) and can be reset by the function
-@code{set-window-nest} (see below).
+@defun window-combination-limit &optional window
+This function returns the combination-limit status of @var{window}.  The
+argument @var{window} can be any window and defaults to the selected
+one.  Note, however, that the combination-limit status is currently
+meaningful for internal windows only.
+
+@cindex combination-limit status
+The @dfn{combination-limit status} of a window specifies whether that
+window may be removed and its child windows recombined with that
+window's siblings when such a sibling's child window is deleted.  The
+combination-limit status is initially assigned by @code{split-window}
+from the current value of the variable @code{window-combination-limit}
+(see above) and can be reset by the function
+@code{set-window-combination-limit} (see below).
 
 If the return value is @code{nil}, child windows of @var{window} may be
 recombined with @var{window}'s siblings when a window gets deleted.  A
@@ -976,16 +968,17 @@ return value of @code{nil} means that child windows of @var{window} are
 never (re-)combined with @var{window}'s siblings in such a case.
 @end defun
 
-@defun set-window-nest window &optional status
-This functions sets the nest status (see above) of @var{window} to
-@var{status}.  The argument @var{window} can be any window and defaults
-to the selected one.  Note that setting the nest status is meaningful
-for internal windows only.  The return value is @var{status}.
+@defun set-window-combination-limit window &optional status
+This functions sets the combination-limit status (see above) of
+@var{window} to @var{status}.  The argument @var{window} can be any
+window and defaults to the selected one.  Note that setting the
+combination-limit status is meaningful for internal windows only.  The
+return value is @var{status}.
 @end defun
 
-To illustrate the use of @code{window-nest} consider the following
-configuration (throughout the following examples we shall assume that
-@code{window-splits} invariantly is @code{nil}).
+To illustrate the use of @code{window-combination-limit} consider the
+following configuration (throughout the following examples we shall
+assume that @code{window-combination-resize} invariantly is @code{nil}).
 @smallexample
 @group
      ______________________________________
@@ -1007,7 +1000,8 @@ configuration (throughout the following examples we shall assume that
 @end smallexample
 
 Splitting @code{W2} into two windows above each other with
-@code{window-nest} equal @code{nil} will get you a configuration like:
+@code{window-combination-limit} equal @code{nil} will get you a
+configuration like:
 @smallexample
 @group
      ______________________________________
@@ -1074,9 +1068,9 @@ follows:
 
 Hence, with respect to the initial configuration, window @code{W2} has
 grown at the expense of window @code{W3}.  If, however, in the initial
-configuration you had split @code{W2} with @code{window-nest} bound to
-@code{t}, a new internal window @code{W5} would have been created as
-depicted below.
+configuration you had split @code{W2} with
+@code{window-combination-limit} bound to @code{t}, a new internal window
+@code{W5} would have been created as depicted below.
 @smallexample
 @group
      ______________________________________
@@ -1189,12 +1183,12 @@ window parameters.  If the @code{delete-window} parameter specifies a
 function, that function is called with @var{window} as its sole
 argument.
 
-If the splits status of @var{window} (@pxref{Splitting Windows}) is
+If @code{window-combination-resize} (@pxref{Splitting Windows}) is
 @code{nil}, the space @var{window} took up is given to its left sibling
-if such a window exists and to its right sibling otherwise.  If the
-splits status of @var{window} is non-@code{nil}, its space is
-proportionally distributed among the remaining windows in the same
-combination.
+if such a window exists and to its right sibling otherwise.  If
+@code{window-combination-resize} is non-@code{nil}, the space of
+@var{window} is proportionally distributed among the remaining windows
+in the same combination.
 @end deffn
 
 @deffn Command delete-other-windows &optional window
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index b9175ce51ea..758cdde1dea 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * etags.1: Fix typo.
+
 2011-10-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacsclient.1: Document how -a "" starts the daemon.
@@ -18,7 +22,7 @@
 
         * Version 23.3 released.
 
-2011-01-02  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
+2011-01-02  Jari Aalto  <jari.aalto@cante.net>
 
         * emacsclient.1: Arrange options alphabetically (Bug#7620).
 
diff --git a/doc/man/etags.1 b/doc/man/etags.1
index f6b46add215..f7ffa112f3c 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -49,7 +49,7 @@ format understood by
 \&.  Both forms of the program understand
 the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang,
 Forth, HTML, LaTeX, Emacs Lisp/Common Lisp, Lua, Makefile, Pascal, Perl,
-PHP, Postscript, Python, Prolog, Scheme and
+PHP, PostScript, Python, Prolog, Scheme and
 most assembler\-like syntaxes.
 Both forms read the files specified on the command line, and write a tag
 table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 029406e2d30..924f3501bfa 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,22 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.texi (Agenda commands, Exporting Agenda Views): Fix typos.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede.texi (project-am-texinfo):
+        * gnus.texi (Sending or Not Sending):
+        * org.texi (Template elements): Fix typos.
+
+2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ediff.texi (Hooks):
+        * sem-user.texi (Semanticdb Roots): Fix typos.
+
+2011-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * semantic.texi (Tag handling): Fix typo.
+
 2011-10-31  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Other Gnus Versions): Remove.
@@ -58,7 +77,7 @@
 
         Release MH-E manual version 8.3.
 
-        * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
+        * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for
         release 8.3.
         (Preface): Updated support information.
         (From Bill Wohler): Reset text to original version. As a
@@ -296,7 +315,7 @@
 
 2011-08-15  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.texi (Evaluating code blocks):  Expanded discussion of
+        * org.texi (Evaluating code blocks): Expanded discussion of
         #+call: line syntax.
         (Header arguments in function calls): Expanded discussion of
         #+call: line syntax.
@@ -2290,7 +2309,7 @@
 2009-08-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping.
-        Describe autostart behaviour of dbus-ping.
+        Describe autostart behavior of dbus-ping.
         (Synchronous Methods, Asynchronous Methods): Use English numeric format
         for timeout values.
         (Top): Remove footnote saying D-Bus is not enabled by
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 66cdb200111..374158c2c78 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -184,7 +184,7 @@ convention, where file names are a simple modification of the Ada
 names, and the extension for specs and bodies are
 @samp{.ads} and @samp{.adb}, respectively.
 
-Ada mode uses the file extentions to allow moving from a package body
+Ada mode uses the file extensions to allow moving from a package body
 to the corresponding spec and back.
 
 Ada mode supports a list of alternative file extensions for specs and bodies.
@@ -209,7 +209,7 @@ whose extension is @file{.ads}, it will take the first available file
 that ends with either @file{.adb}, @file{_b.ada} or
 @file{.body}.
 
-Simililarly, if Ada mode is looking for a spec, it will look for
+Similarly, if Ada mode is looking for a spec, it will look for
 @file{.ads} or @file{_s.ada}.
 
 If the filename is not derived from the Ada name following the GNAT
@@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be
 included, separated from the word by a space.
 
 If the word starts with an asterisk (@key{*}), it defines the casing
-af a word fragemnt (or ``substring''); part of a word between two
+af a word fragment (or ``substring''); part of a word between two
 underscores or word boundary.
 
 For example:
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 887e3f3c808..55c2c4c0ae8 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -287,11 +287,11 @@ Configuration Basics
 
 Styles
 
-* Built-in Styles::             
-* Choosing a Style::            
-* Adding Styles::               
-* Guessing the Style::          
-* File Styles::                 
+* Built-in Styles::
+* Choosing a Style::
+* Adding Styles::
+* Guessing the Style::
+* File Styles::
 
 Customizing Auto-newlines
 
@@ -311,19 +311,19 @@ Indentation Engine Basics
 
 Syntactic Symbols
 
-* Function Symbols::            
-* Class Symbols::               
-* Conditional Construct Symbols::  
-* Switch Statement Symbols::    
-* Brace List Symbols::          
-* External Scope Symbols::      
-* Paren List Symbols::          
-* Literal Symbols::             
-* Multiline Macro Symbols::     
-* Objective-C Method Symbols::  
+* Function Symbols::
+* Class Symbols::
+* Conditional Construct Symbols::
+* Switch Statement Symbols::
+* Brace List Symbols::
+* External Scope Symbols::
+* Paren List Symbols::
+* Literal Symbols::
+* Multiline Macro Symbols::
+* Objective-C Method Symbols::
 * Java Symbols::
-* Statement Block Symbols::     
-* K&R Symbols::                 
+* Statement Block Symbols::
+* K&R Symbols::
 
 Customizing Indentation
 
@@ -343,8 +343,8 @@ Line-Up Functions
 
 Customizing Macros
 
-* Macro Backslashes::           
-* Macros with ;::               
+* Macro Backslashes::
+* Macros with ;::
 
 @end detailmenu
 @end menu
@@ -912,7 +912,7 @@ construct, should the point start inside it.  If @ccmode fails to find
 function beginnings or ends inside the current declaration scope, it
 will search the enclosing scopes.  If you want @ccmode to recognize
 functions only at the top level@footnote{this was @ccmode{}'s
-behaviour prior to version 5.32.}, set @code{c-defun-tatic} to
+behavior prior to version 5.32.}, set @code{c-defun-tatic} to
 @code{t}.
 
 These functions are analogous to the Emacs built-in commands
@@ -1173,7 +1173,7 @@ Full details on how these minor modes work are at @ref{Electric Keys},
 and @ref{Indentation Engine Basics}.
 
 You can toggle each of these minor modes on and off, and you can
-configure @ccmode{} so that it starts up with your favourite
+configure @ccmode{} so that it starts up with your favorite
 combination of them (@pxref{Sample .emacs File}).  By default, when
 you initialize a buffer, electric mode and syntactic-indentation mode
 are enabled but the other two modes are disabled.
@@ -2537,11 +2537,11 @@ As an alternative to writing a style definition yourself, you can have
 already formatted piece of your code, @ref{Guessing the Style}.
 
 @menu
-* Built-in Styles::             
-* Choosing a Style::            
-* Adding Styles::               
-* Guessing the Style::          
-* File Styles::                 
+* Built-in Styles::
+* Choosing a Style::
+* Adding Styles::
+* Guessing the Style::
+* File Styles::
 @end menu
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4266,19 +4266,19 @@ Java.  @ref{Java Symbols}.
 @end table
 
 @menu
-* Function Symbols::            
-* Class Symbols::               
-* Conditional Construct Symbols::  
-* Switch Statement Symbols::    
-* Brace List Symbols::          
-* External Scope Symbols::      
-* Paren List Symbols::          
-* Literal Symbols::             
-* Multiline Macro Symbols::     
-* Objective-C Method Symbols::  
+* Function Symbols::
+* Class Symbols::
+* Conditional Construct Symbols::
+* Switch Statement Symbols::
+* Brace List Symbols::
+* External Scope Symbols::
+* Paren List Symbols::
+* Literal Symbols::
+* Multiline Macro Symbols::
+* Objective-C Method Symbols::
 * Java Symbols::
-* Statement Block Symbols::     
-* K&R Symbols::                 
+* Statement Block Symbols::
+* K&R Symbols::
 @end menu
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6653,8 +6653,8 @@ these macros properly, see @ref{Macros with ;}.
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @menu
-* Macro Backslashes::           
-* Macros with ;::               
+* Macro Backslashes::
+* Macros with ;::
 @end menu
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index e6fb00d3482..79c7ada3b0b 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -553,7 +553,7 @@ data from a running system:
 @node Methods and Signal
 @section Applying the functionality.
 
-Methods and signals are the communicatione means to D-Bus.  The
+Methods and signals are the communication means to D-Bus.  The
 following functions return their specifications.
 
 @defun dbus-introspect-get-method-names bus service path interface
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 13b640a09fe..55dc7f9a822 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -518,7 +518,7 @@ It would look like this:
 (defun MY-LOAD (dir)
   "Load a project of type `cpp-root' for the directory DIR.
 Return nil if there isn't one."
-  ;; Use your preferred constructin method here.
+  ;; Use your preferred construction method here.
   (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
                                :locate-fcn 'MYFCN)
   )
@@ -3273,7 +3273,7 @@ Return the default macro to 'edit' for this object type.
 @end deffn
 
 @deffn Method project-compile-target-command :AFTER this
-Default target t- use when compling a texinfo file.
+Default target t- use when compiling a texinfo file.
 @end deffn
 
 @deffn Method ede-documentation :AFTER this
@@ -3370,7 +3370,7 @@ Type: @code{(or null string)} @*
 Default Value: @code{nil}
 
 Emacs regex matching auxiliary source code this target accepts.
-Aux source are source code files needed for compilation, which are not comiled
+Aux source are source code files needed for compilation, which are not compiled
 themselves.
 @refill
 
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 20c2ed90873..62cd684b57b 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1207,7 +1207,7 @@ This hook can be used to alter bindings in Ediff's keymap,
 @code{ediff-mode-map}.  These hooks are
 run right after the default bindings are set but before
 @code{ediff-load-hook}.  The regular user needs not be concerned with this
-hook---it is provided for implementors of other Emacs packages built on top
+hook---it is provided for implementers of other Emacs packages built on top
 of Ediff.
 
 @item ediff-before-setup-windows-hook
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index a9d80d868b6..c44cc1c9b09 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1048,7 +1048,7 @@ occurs.
 
 You can customize the value of the @code{mml-enable-flowed} variable
 to enable or disable the flowed encoding usage when newline
-characteres are present in the buffer.
+characters are present in the buffer.
 
 On decoding flowed text, lines with soft newline characters are filled
 together and wrapped after the column decided by
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index d1cecf1347a..00755262075 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -389,7 +389,7 @@ This checks that dividing one by zero signals an error of type
 @code{arith-error}.  The @code{:type} argument to @code{should-error}
 is optional; if absent, any type of error is accepted.
 @code{should-error} returns an error description of the error that was
-signalled, to allow additional checks to be made.  The error
+signaled, to allow additional checks to be made.  The error
 description has the format @code{(ERROR-SYMBOL . DATA)}.
 
 There is no @code{should-not-error} macro since tests that signal an
@@ -748,7 +748,7 @@ explanation function.
 
 Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch}
 are implemented on top of the lower-level test handling code in the
-sections of @file{ert.el} labelled ``Facilities for running a single test'',
+sections of @file{ert.el} labeled ``Facilities for running a single test'',
 ``Test selectors'', and ``Facilities for running a whole set of tests''.
 
 If you want to write code that works with ERT tests, you should take a
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 74082bfd3b1..d2705155887 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -379,7 +379,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el'
 sudo is an alias, defined as "*sudo $*"
 @end example
 
-Some of the built-in commands have a special behaviour in Eshell:
+Some of the built-in commands have a special behavior in Eshell:
 
 @table @code
 
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 7528abca58d..262c3d734fe 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point.
 
 @ifnottex
 @insertcopying
-@end ifnottex 
+@end ifnottex
 
 @menu
 * FAQ notation::
@@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope.
 There has never been a copyright infringement case involving the GPL to
 set any precedents.  Although legal actions have been brought against
 companies for violating the terms of the GPL, so far all have been
-settled out of court (in favour of the plaintiffs).  Please take any
+settled out of court (in favor of the plaintiffs).  Please take any
 discussion regarding this issue to the newsgroup
 @uref{news:gnu.misc.discuss}, which was created to hold the extensive
 flame wars on the subject.
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index e8e89ed2a30..b5bb75f7284 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -12,7 +12,7 @@
 @section Frequently Asked Questions
 
 @menu
-* FAQ - Changes::                           
+* FAQ - Changes::
 * FAQ - Introduction::                       About Gnus and this FAQ.
 * FAQ 1 - Installation FAQ::                 Installation of Gnus.
 * FAQ 2 - Startup / Group buffer::           Start up questions and the
@@ -37,7 +37,7 @@
 
 This is the new Gnus Frequently Asked Questions list.
 
-Please submit features and suggestions to the 
+Please submit features and suggestions to the
 @email{ding@@gnus.org, ding list}.
 
 @node FAQ - Changes
@@ -166,7 +166,7 @@ package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
 21 is outdated).
 You can get the latest released version of Gnus from
 @uref{http://www.gnus.org/dist/gnus.tar.gz}
-or via anonymous FTP from 
+or via anonymous FTP from
 @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
 
 @node FAQ 1-4
@@ -176,7 +176,7 @@ What to do with the tarball now?
 
 @subsubheading Answer
 
-Untar it via @samp{tar xvzf gnus.tar.gz} and do the common 
+Untar it via @samp{tar xvzf gnus.tar.gz} and do the common
 @samp{./configure; make; make install} circle.
 (under MS-Windows either get the Cygwin environment from
 @uref{http://www.cygwin.com}
@@ -344,7 +344,7 @@ hit @samp{C-y}.
 @subsection Getting Messages
 
 @menu
-* FAQ 3-1::     I just installed Gnus, started it via  @samp{M-x gnus} 
+* FAQ 3-1::     I just installed Gnus, started it via  @samp{M-x gnus}
                 but it only says "nntp (news) open error", what to do?
 * FAQ 3-2::     I'm working under Windows and have no idea what
                 ~/.gnus.el means.
@@ -369,8 +369,8 @@ hit @samp{C-y}.
 @node FAQ 3-1
 @subsubheading Question 3.1
 
-I just installed Gnus, started it via 
-@samp{M-x gnus} 
+I just installed Gnus, started it via
+@samp{M-x gnus}
 but it only says "nntp (news) open error", what to do?
 
 @subsubheading Answer
@@ -396,14 +396,14 @@ I'm working under Windows and have no idea what ~/.gnus.el means.
 The ~/ means the home directory where Gnus and Emacs look
 for the configuration files.  However, you don't really
 need to know what this means, it suffices that Emacs knows
-what it means :-) You can type 
-@samp{C-x C-f ~/.gnus.el RET } 
+what it means :-) You can type
+@samp{C-x C-f ~/.gnus.el RET }
 (yes, with the forward slash, even on Windows), and
 Emacs will open the right file for you.  (It will most
 likely be new, and thus empty.)
 However, I'd discourage you from doing so, since the
 directory Emacs chooses will most certainly not be what
-you want, so let's do it the correct way. 
+you want, so let's do it the correct way.
 The first thing you've got to do is to
 create a suitable directory (no blanks in directory name
 please) e.g. c:\myhome. Then you must set the environment
@@ -442,7 +442,7 @@ machine news.yourprovider.net login YourUserName password YourPassword
 .
 Make sure that the file isn't readable to others if you
 work on a OS which is capable of doing so.  (Under Unix
-say 
+say
 @example
 chmod 600 ~/.authinfo
 @end example
@@ -477,13 +477,13 @@ post on this server as well as I am, what's that?
 
 Some providers allow restricted anonymous access and full
 access only after authorization. To make Gnus send authinfo
-to those servers append 
+to those servers append
 
 @example
 force yes
 @end example
 @noindent
- 
+
 to the line for those servers in ~/.authinfo.
 
 @node FAQ 3-6
@@ -774,7 +774,7 @@ When I enter a group, all read messages are gone. How to view them again?
 
 @subsubheading Answer
 
-If you enter the group by saying  
+If you enter the group by saying
 @samp{RET}
 in group buffer with point over the group, only unread and ticked messages are loaded. Say
 @samp{C-u RET}
@@ -787,13 +787,13 @@ Loading only unread messages can be annoying if you have threaded view enabled,
 (setq gnus-fetch-old-headers 'some)
 @end example
 @noindent
- 
+
 in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load
-all articles (Warning: Both settings enlarge the amount of data which is 
+all articles (Warning: Both settings enlarge the amount of data which is
 fetched when you enter a group and slow down the process of entering a group).
 
-If you already use Gnus 5.10, you can say 
-@samp{/o N} 
+If you already use Gnus 5.10, you can say
+@samp{/o N}
 In summary buffer to load the last N messages, this feature is not available in 5.8.8
 
 If you don't want all old messages, but the parent of the message you're just reading,
@@ -822,9 +822,9 @@ How to view the headers of a message?
 
 @subsubheading Answer
 
-Say @samp{t} 
+Say @samp{t}
 to show all headers, one more
-@samp{t} 
+@samp{t}
 hides them again.
 
 @node FAQ 4-4
@@ -834,10 +834,10 @@ How to view the raw unformatted message?
 
 @subsubheading Answer
 
-Say 
-@samp{C-u g} 
+Say
+@samp{C-u g}
 to show the raw message
-@samp{g} 
+@samp{g}
 returns to normal view.
 
 @node FAQ 4-5
@@ -873,7 +873,7 @@ Say
 
 @example
 (eval-after-load "mm-decode"
- '(progn 
+ '(progn
       (add-to-list 'mm-discouraged-alternatives "text/html")
       (add-to-list 'mm-discouraged-alternatives "text/richtext")))
 @end example
@@ -1042,7 +1042,7 @@ back ends. Gnus thinks "highest-article-number -
 lowest-article-number = total-number-of-articles". This
 works OK for Usenet groups, but if you delete and move
 many messages in mail groups, this fails. To cure the
-symptom, enter the group via @samp{C-u RET} 
+symptom, enter the group via @samp{C-u RET}
 (this makes Gnus get all messages), then
 hit @samp{M P b} to mark all messages and
 then say @samp{B m name.of.group} to move
@@ -1162,7 +1162,7 @@ general rule (regular expression .*) which denotes where
 articles should go which don't match any other rule. If
 the folder doesn't exist yet, it will be created as soon
 as an article lands there.  By default the mail will be
-send to all groups whose rules match. If you 
+send to all groups whose rules match. If you
 don't want that (you probably don't want), say
 
 @example
@@ -1203,7 +1203,7 @@ from using them):
     ("Spam" "^CC: .*azzrael@@t-online.invalid")
     ("Spam" "^X-Mailer-Version: 1.50 BETA")
     ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*")
-    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)")
+    ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)")
     ("Spam" "")))
 @end example
 @noindent
@@ -1393,13 +1393,13 @@ You can use ispell.el to spell-check stuff in Emacs. So the
 first thing to do is to make sure that you've got either
 @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell}
 or @uref{http://aspell.sourceforge.net/, aspell}
-installed and in your Path. Then you need 
+installed and in your Path. Then you need
 @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el}
-and for on-the-fly spell-checking 
+and for on-the-fly spell-checking
 @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}.
-Ispell.el is shipped with Emacs and available through the XEmacs package system, 
-flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is 
-available through the package system, so there should be no need to install them 
+Ispell.el is shipped with Emacs and available through the XEmacs package system,
+flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is
+available through the package system, so there should be no need to install them
 manually.
 
 Ispell.el assumes you use ispell, if you choose aspell say
@@ -1408,7 +1408,7 @@ Ispell.el assumes you use ispell, if you choose aspell say
 (setq ispell-program-name "aspell")
 @end example
 @noindent
- 
+
 in your Emacs configuration file.
 
 If you want your outgoing messages to be spell-checked, say
@@ -1445,7 +1445,7 @@ Yes, say something like
               (ispell-change-dictionary "english")))))
 @end example
 @noindent
- 
+
 in ~/.gnus.el. Change "^de\\." and "deutsch8" to something
 that suits your needs.
 
@@ -1472,7 +1472,7 @@ cause Gnus to insert the full address for you. See the
 node "Mail Aliases" in Message (not Gnus) manual for
 details.
 
-However, what you really want is the Insidious Big Brother 
+However, what you really want is the Insidious Big Brother
 Database bbdb. Get it through the XEmacs package system or from
 @uref{http://bbdb.sourceforge.net/, bbdb's homepage}.
 Now place the following in ~/.gnus.el, to activate bbdb for Gnus:
@@ -1488,7 +1488,7 @@ place them in ~/.emacs:
 
 @example
 (require 'bbdb)
-;;If you don't live in Northern America, you should disable the 
+;;If you don't live in Northern America, you should disable the
 ;;syntax check for telephone numbers by saying
 (setq bbdb-north-american-phone-numbers-p nil)
 ;;Tell bbdb about your email address:
@@ -1529,7 +1529,7 @@ X-Face. So fire up some image manipulation program (say
 Gimp), open the image you want to include, cut out the
 relevant part, reduce color depth to 1 bit, resize to
 48*48 and save as bitmap. Now you should get the compface
-package from 
+package from
 @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}.
 and create the actual X-face by saying
 
@@ -1539,7 +1539,7 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted
 @end example
 @noindent
 
-If you can't use compface, there's an online X-face converter at 
+If you can't use compface, there's an online X-face converter at
 @uref{http://www.dairiki.org/xface/}.
 If you use MS Windows, you could also use the WinFace program from
 @uref{http://www.xs4all.nl/~walterln/winface/}.
@@ -1668,7 +1668,7 @@ by saying:
 @noindent
 
 in ~/.gnus.el.  If you use Gnus 5.9 or earlier, you can use this
-instead (works for newer versions as well): 
+instead (works for newer versions as well):
 
 @example
 (eval-after-load "message"
@@ -1961,12 +1961,12 @@ receives the mail you write from Gnus and sends them
 when you're online.
 
 Let's talk about Unix systems first: For the news part,
-the easiest solution is a small nntp server like 
+the easiest solution is a small nntp server like
 @uref{http://www.leafnode.org/, Leafnode} or
 @uref{http://infa.abo.fi/~patrik/sn/, sn},
 of course you can also install a full featured news
-server like 
-@uref{http://www.isc.org/products/INN/, inn}. 
+server like
+@uref{http://www.isc.org/products/INN/, inn}.
 Then you want to fetch your Mail, popular choices
 are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail}
 and @uref{http://pyropus.ca/software/getmail/, getmail}.
@@ -1978,8 +1978,8 @@ sending part: This can be done with every MTA like
 @uref{http://www.exim.org/, exim} or
 @uref{http://www.qmail.org/, qmail}.
 
-On windows boxes I'd vote for 
-@uref{http://www.tglsoft.de/, Hamster}, 
+On windows boxes I'd vote for
+@uref{http://www.tglsoft.de/, Hamster},
 it's a small freeware, open-source program which fetches
 your mail and news from remote servers and offers them
 to Gnus (or any other mail and/or news reader) via nntp
@@ -2136,7 +2136,7 @@ Which mailing lists and newsgroups are there?
 @subsubheading Answer
 
 There's the newsgroup gnu.emacs.gnus (also available as
-@uref{http://dir.gmane.org/gmane.emacs.gnus.user, 
+@uref{http://dir.gmane.org/gmane.emacs.gnus.user,
 gmane.emacs.gnus.user}) which deals with general Gnus
 questions.  If you have questions about development versions of
 Gnus, you should better ask on the ding mailing list, see below.
@@ -2149,7 +2149,7 @@ de.comm.software.gnus.
 
 The ding mailing list (ding@@gnus.org) deals with development of
 Gnus. You can read the ding list via NNTP, too under the name
-@uref{http://dir.gmane.org/gmane.emacs.gnus.general, 
+@uref{http://dir.gmane.org/gmane.emacs.gnus.general,
 gmane.emacs.gnus.general} from news.gmane.org.
 
 @node FAQ 8-5
@@ -2160,7 +2160,7 @@ Where to report bugs?
 @subsubheading Answer
 
 Say @samp{M-x gnus-bug}, this will start
-a message to the 
+a message to the
 @email{bugs@@gnus.org, gnus bug mailing list}
 including information about your environment which make
 it easier to help you.
@@ -2237,7 +2237,7 @@ building of summary say
 
 at the bottom of your ~/.gnus.el, this will make gnus
 byte-compile things like
-gnus-summary-line-format. 
+gnus-summary-line-format.
 then you could increase the value of gc-cons-threshold
 by saying something like
 
@@ -2254,7 +2254,7 @@ recent GNU Emacs, you should say
 (setq gnus-use-correct-string-widths nil)
 @end example
 @noindent
- 
+
 in ~/.gnus.el (thanks to Jesper harder for the last
 two suggestions). Finally if you are still using 5.8.8
 or 5.9 and experience speed problems with summary
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 545306e4dc7..a3a93c6ef61 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -7665,7 +7665,7 @@ has its own article buffer.
 This implies that it's not possible to have more than one article buffer
 in a group at a time.  But sometimes you might want to display all the
 latest emails from your mother, your father, your aunt, your uncle and
-your 17 cousins to coordinate the next christmas party.
+your 17 cousins to coordinate the next Christmas party.
 
 That's where sticky articles come in handy.  A sticky article buffer
 basically is a normal article buffer, but it won't be reused when you
@@ -18001,7 +18001,7 @@ see the event's date.
   @code{gnus-diary} provides two supplemental user formats to be used in
 summary line formats.  @code{D} corresponds to a formatted time string
 for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''),
-while @code{d} corresponds to an approximative remaining time until the
+while @code{d} corresponds to an approximate remaining time until the
 next occurrence of the event (e.g. ``in 6 months, 1 week'').
 
   For example, here's how Joe's birthday is displayed in my
@@ -18105,7 +18105,7 @@ mail sending with @code{nndiary}:
 @itemize @bullet
 @item
 @code{nndiary} is a @emph{real} mail back end.  You really send real diary
-messsages for real.  This means for instance that you can give
+messages for real.  This means for instance that you can give
 appointments to anybody (provided they use Gnus and @code{nndiary}) by
 sending the diary message to them as well.
 @item
@@ -26756,7 +26756,7 @@ Sudish Joseph---innumerable bug fixes.
 Ilja Weis---@file{gnus-topic.el}.
 
 @item
-Steven L. Baur---lots and lots and lots of bugs detections and fixes.
+Steven L. Baur---lots and lots and lots of bug detection and fixes.
 
 @item
 Vladimir Alexiev---the refcard and reference booklets.
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index c7d82245973..18e11aeeeb3 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -52,7 +52,7 @@ developing GNU and promoting software freedom.''
 @node Top
 @top Newsticker
 
-@insertcopying 
+@insertcopying
 
 @end ifnottex
 
@@ -112,9 +112,9 @@ enclosed files (as delivered by podcasts, e.g.).
 Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
 (current version)} and some older screen shots:
 @uref{newsticker-1.6.png, version 1.6},
-@uref{newsticker-1.5.png, version 1.5}, 
+@uref{newsticker-1.5.png, version 1.5},
 @uref{newsticker-1.4.png, version 1.4}
-@uref{newsticker-1.3.png, version 1.3}, 
+@uref{newsticker-1.3.png, version 1.3},
 @uref{newsticker-1.0.png, version 1.0}.
 @end ifhtml
 
@@ -163,7 +163,7 @@ You can choose between two different frontends for reading headlines:
 @item Newsticker's @emph{treeview} uses separate windows for the
 feeds (in tree form), a list of headlines for the current feed, and
 the content of the current headline. Feeds can be placed into groups
-which itself can be placed in groups and so on. 
+which itself can be placed in groups and so on.
 @item Newsticker's @emph{plainview} displays all headlines in a
 single buffer, called @samp{*newsticker*}. The modeline in the
 @samp{*newsticker*} buffer informs whenever new headlines have
@@ -171,7 +171,7 @@ arrived.
 @end itemize
 In both views clicking mouse-button 2 or pressing RET on a headline
 will call @code{browse-url} to load the corresponding news story in
-your favourite web browser.
+your favorite web browser.
 
 @findex newsticker-start-ticker
 @findex newsticker-stop-ticker
@@ -205,7 +205,7 @@ and some of the most important options.
 
 @item
 @code{newsticker-retrieval} contains options that define which news
-feeds are retrieved and how this is done.  
+feeds are retrieved and how this is done.
 
 @itemize
 @item
@@ -241,7 +241,7 @@ automatically mark headlines as immortal or old.
 
 @item
 @code{newsticker-hooks} contains options for hooking other Emacs
-commands to newsticker functions. 
+commands to newsticker functions.
 @itemize
 @item
 @vindex newsticker-new-item-functions
@@ -313,5 +313,3 @@ Byte-compiling newsticker.el is recommended.
 @printindex cp
 
 @bye
-
-
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 2a3d99ca7f4..cc925906c28 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -36,7 +36,7 @@
 
 @c orgkey{key}                        A key item
 @c orgcmd{key,cmd}                    Key with command name
-@c xorgcmd{key,cmmand}                Key with command name as @itemx
+@c xorgcmd{key,command}               Key with command name as @itemx
 @c orgcmdnki{key,cmd}                 Like orgcmd, but do not index the key
 @c orgcmdtkc{text,key,cmd}            Like orgcmd,special text instead of key
 @c orgcmdkkc{key1,key2,cmd}           Two keys with one command name, use "or"
@@ -3883,7 +3883,7 @@ special faces for some of them.  This can be done using the variable
 @end lisp
 
 While using a list with face properties as shown for CANCELED @emph{should}
-work, this does not aways seem to be the case.  If necessary, define a
+work, this does not always seem to be the case.  If necessary, define a
 special face and use that.  A string is interpreted as a color.  The variable
 @code{org-faces-easy-properties} determines if that color is interpreted as a
 foreground or a background color.
@@ -5664,7 +5664,7 @@ an item:
 @orgcmd{C-c C-d,org-deadline}
 Insert @samp{DEADLINE} keyword along with a stamp.  The insertion will happen
 in the line directly following the headline.  Any CLOSED timestamp will be
-removed.  When called with a prefix arg, an existing deadline will be removed 
+removed.  When called with a prefix arg, an existing deadline will be removed
 from the entry.  Depending on the variable @code{org-log-redeadline}@footnote{with corresponding
 @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline},
 and @code{nologredeadline}}, a note will be taken when changing an existing
@@ -6216,7 +6216,7 @@ not started at exactly the right moment.
 @kindex ;
 
 Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown
-timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else.
+timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else.
 
 @code{org-timer-set-timer} prompts the user for a duration and displays a
 countdown timer in the modeline.  @code{org-timer-default-timer} sets the
@@ -6393,7 +6393,7 @@ like this:
 @node Template elements, Template expansion, Capture templates, Capture templates
 @subsubsection Template elements
 
-Now lets look at the elements of a template definition.  Each entry in
+Now let's look at the elements of a template definition.  Each entry in
 @code{org-capture-templates} is a list with the following items:
 
 @table @var
@@ -8262,7 +8262,7 @@ This is a globally available command, and also available in the agenda menu.
 @vindex org-agenda-exporter-settings
 Write the agenda view to a file.  Depending on the extension of the selected
 file name, the view will be exported as HTML (extension @file{.html} or
-@file{.htm}), Postscript (extension @file{.ps}), PDF (extension @file{.pdf}),
+@file{.htm}), PostScript (extension @file{.ps}), PDF (extension @file{.pdf}),
 and plain text (any other extension).  When called with a @kbd{C-u} prefix
 argument, immediately open the newly created file.  Use the variable
 @code{org-agenda-exporter-settings} to set options for @file{ps-print} and
@@ -8477,9 +8477,9 @@ yourself.
 If you are away from your computer, it can be very useful to have a printed
 version of some agenda views to carry around.  Org-mode can export custom
 agenda views as plain text, HTML@footnote{You need to install Hrvoje Niksic's
-@file{htmlize.el}.}, Postscript, PDF@footnote{To create PDF output, the
+@file{htmlize.el}.}, PostScript, PDF@footnote{To create PDF output, the
 ghostscript @file{ps2pdf} utility must be installed on the system.  Selecting
-a PDF file will also create the postscript file.}, and iCalendar files.  If
+a PDF file will also create the PostScript file.}, and iCalendar files.  If
 you want to do this only occasionally, use the command
 
 @table @kbd
@@ -8489,7 +8489,7 @@ you want to do this only occasionally, use the command
 @vindex org-agenda-exporter-settings
 Write the agenda view to a file.  Depending on the extension of the selected
 file name, the view will be exported as HTML (extension @file{.html} or
-@file{.htm}), Postscript (extension @file{.ps}), iCalendar (extension
+@file{.htm}), PostScript (extension @file{.ps}), iCalendar (extension
 @file{.ics}), or plain text (any other extension).  Use the variable
 @code{org-agenda-exporter-settings} to set options for @file{ps-print} and
 for @file{htmlize} to be used during export, for example
@@ -8542,7 +8542,7 @@ The extension of the file name determines the type of export.  If it is
 @file{.html}, Org-mode will use the @file{htmlize.el} package to convert
 the buffer to HTML and save it to this file name.  If the extension is
 @file{.ps}, @code{ps-print-buffer-with-faces} is used to produce
-Postscript output.  If the extension is @file{.ics}, iCalendar export is
+PostScript output.  If the extension is @file{.ics}, iCalendar export is
 run export over all files that were used to construct the agenda, and
 limit the export to entries listed in the agenda.  Any other
 extension produces a plain ASCII file.
@@ -8573,7 +8573,7 @@ set options for the export commands.  For example:
 @end lisp
 
 @noindent
-This command sets two options for the Postscript exporter, to make it
+This command sets two options for the PostScript exporter, to make it
 print in two columns in landscape format---the resulting page can be cut
 in two and then used in a paper agenda.  The remaining settings modify
 the agenda prefix to omit category and scheduling information, and
@@ -9421,7 +9421,7 @@ the web, while the XOXO format provides a solid base for exchange with a
 broad range of other applications.  @LaTeX{} export lets you use Org-mode and
 its structured editing functions to easily create @LaTeX{} files.  DocBook
 export makes it possible to convert Org files to many other formats using
-DocBook tools.  OpenDocumentText export allows seamless colloboration across
+DocBook tools.  OpenDocumentText export allows seamless collaboration across
 organizational boundaries.  For project management you can create gantt and
 resource charts by using TaskJuggler export.  To incorporate entries with
 associated times like deadlines or appointments into a desktop calendar
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 9cb7a637a05..0de12577b2d 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -57,18 +57,18 @@ and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
 
 @ifnottex
-@insertcopying 
+@insertcopying
 @end ifnottex
 
 @menu
 * Overview::                    What PGG is.
 * Prerequisites::               Complicated stuff you may have to do.
 * How to use::                  Getting started quickly.
-* Architecture::                
-* Parsing OpenPGP packets::     
+* Architecture::
+* Parsing OpenPGP packets::
 * GNU Free Documentation License:: The license for this documentation.
-* Function Index::              
-* Variable Index::              
+* Function Index::
+* Variable Index::
 @end menu
 
 @node Overview
@@ -137,10 +137,10 @@ list autoload setting for desired functions as follows.
 @end lisp
 
 @menu
-* User Commands::               
-* Selecting an implementation::  
-* Caching passphrase::          
-* Default user identity::       
+* User Commands::
+* Selecting an implementation::
+* Caching passphrase::
+* Default user identity::
 @end menu
 
 @node User Commands
@@ -358,13 +358,13 @@ singleton object wrapped with the luna object system.
 
 Since PGG was designed for accessing and developing PGP functionality,
 the architecture had to be designed not just for interoperability but
-also for extensiblity.  In this chapter we explore the architecture
+also for extensibility.  In this chapter we explore the architecture
 while finding out how to write the PGG back end.
 
 @menu
-* Initializing::                
-* Back end methods::             
-* Getting output::              
+* Initializing::
+* Back end methods::
+* Getting output::
 @end menu
 
 @node Initializing
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 8853192af04..37ccc4045be 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -56,7 +56,7 @@ developing GNU and promoting software freedom.''
 @top Supercite
 @comment  node-name,  next,  previous,  up
 
-@insertcopying 
+@insertcopying
 
 The manual is divided
 into the following chapters.
@@ -1877,7 +1877,7 @@ been continuously added through the comments and suggestions of the
 Supercite mailing list participants.
 
 With version 3, Supercite underwent an almost complete rewrite,
-benefitting in a number of ways, including vast improvements in the
+benefiting in a number of ways, including vast improvements in the
 speed of performance, a big reduction in size of the code and in the use
 of Emacs resources, and a much cleaner and flexible internal
 architecture.  Most of this work was internal and not of very great
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index b17f1ab7e93..7a363523aa6 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -382,7 +382,7 @@ them yourself.
 @deffn Option semanticdb-project-roots
 The value of this variable is a list of directories (strings) that are
 project roots.  All subdirectories of a project root are considered
-part of the same project.  This variable can be overriden by
+part of the same project.  This variable can be overridden by
 @code{semanticdb-project-root-functions}.
 @end deffn
 
@@ -608,7 +608,7 @@ of parsing.  The default is @code{t}.
 @node Debugging Idle Time Issues
 @subsection Debugging Idle Time Issues
 
-If you see an error signalled during idle time, it could be an
+If you see an error signaled during idle time, it could be an
 indication of a more serious issue elsewhere.  It is not enough to
 enable @code{debug-on-error}, because the idle scheduler inhibits the
 debugger.  Instead, use the following commands to debug the error:
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index f3f11d29f17..ad6159feb1a 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -306,7 +306,7 @@ Files associated with tags.  Goto-tag, file for include, and file for
 a prototype.
 
 @item semantic-tag-ls.el
-Language dependant features of a tag, such as parent calculation, slot
+Language dependent features of a tag, such as parent calculation, slot
 protection, and other states like abstract, virtual, static, and leaf.
 
 @item semantic-dep.el
@@ -349,7 +349,7 @@ This file also provides support for @code{semanticdb-minor-mode},
 which automatically associates files with tables in databases so that
 tags are @emph{saved} while a buffer is not in memory.
 
-The database and tables both also provide applicate cache information,
+The database and tables both also provide applicable cache information,
 and cache flushing system.  The semanticdb search routines use caches
 to save datastructures that are complex to calculate.
 
@@ -606,7 +606,7 @@ Emacs Lisp.  It is an LALR parser suitable for complex languages.
 @c LocalWords: concat concocting const constantness ctxt Decl defcustom
 @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir
 @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum
-@c LocalWords: eq Exp EXPANDFULL expresssion fn foo func funcall
+@c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall
 @c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd
 @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam
 @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a4e06ab22f1..0accc6fac43 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1575,7 +1575,7 @@ password handling. Consider @command{ssh-agent} for @option{ssh}-like
 methods, or @command{pageant} for @option{plink}-like methods.
 
 However, if you cannot apply such native password handling,
-@value{tramp} offers altenatives.
+@value{tramp} offers alternatives.
 
 
 @anchor{Using an authentication file}