Merge from trunk.

24 files changed, 177 insertions, 164 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index af8d38a077f..924f3501bfa 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,18 @@
+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.
@@ -62,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
@@ -300,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.
@@ -2294,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..0eb20d01324 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
+as a word fragment (or ``substring''); part of a word between two
 underscores or word boundary.
 
 For example:
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 2e66c78a3cb..ecf4c7e47b2 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -156,7 +156,7 @@ the point is normally left after that skeleton is inserted (@pxref{Using
 Skeletons}).  The point (@pxref{(emacs)Point}) is left at the next
 interesting spot in the skeleton instead.
 
-  A negative prefix means to do something similar with that many precedingly
+  A negative prefix means to do something similar with that many previously
 marked interregions (@pxref{(emacs)Mark}).  In the simplest case, if you type
 @kbd{M--} just before issuing the skeleton command, that will wrap the
 skeleton around the current region, just like a positive argument would have
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 5a1ee872a2b..56f6b64c20b 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -10666,7 +10666,7 @@ and displayed in any radix just like integers and fractions.  Since a
 float that is entered in a radix other that 10 will be converted to
 decimal, the number that Calc stores may not be exactly the number that
 was entered, it will be the closest decimal approximation given the
-current precison.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
+current precision.  The notation @samp{@var{radix}#@var{ddd}.@var{ddd}}
 is a floating-point number whose digits are in the specified radix.
 Note that the @samp{.}  is more aptly referred to as a ``radix point''
 than as a decimal point in this case.  The number @samp{8#123.4567} is
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..88b068ccd5b 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -332,7 +332,7 @@ Example:
 @code{method}, @code{signal}, and @code{property} elements.  Unlike
 properties, which can change their values during lifetime of a D-Bus
 object, annotations are static.  Often they are used for code
-generators of D-Bus langugae bindings.  Example:
+generators of D-Bus language bindings.  Example:
 
 @example
 <annotation name="de.berlios.Pinot.GetStatistics" value="pinotDBus"/>
@@ -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/dired-x.texi b/doc/misc/dired-x.texi
index 99530e6356d..a026c63e25b 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -476,7 +476,7 @@ in your @code{dired-mode-hook}.
 This Dired-X feature is obsolete as of Emacs 24.1.  The standard Emacs
 directory local variables mechanism (@pxref{Directory
 Variables,,,emacs,The Gnu Emacs manual}) replaces it.  For an example of
-the new mechanims, @pxref{Omitting Variables}.
+the new mechanisms, @pxref{Omitting Variables}.
 
 When Dired visits a directory, it looks for a file whose name is the
 value of variable @code{dired-local-variables-file} (default: @file{.dired}).
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..b0090f0fb84 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -61,7 +61,7 @@ developing GNU and promoting software freedom.''
 @node Top, What is Eshell?, (dir), (dir)
 @top Eshell
 
-Eshell is a shell-like command interpretor
+Eshell is a shell-like command interpreter
 implemented in Emacs Lisp.  It invokes no external processes except for
 those requested by the user.  It is intended to be a functional
 replacement for command shells such as @command{bash}, @command{zsh},
@@ -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-news.texi b/doc/misc/gnus-news.texi
index 62c1663508b..94984e5d3c3 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -107,7 +107,7 @@ EasyPG is included in Emacs 23 and available separately as well.
 @itemize @bullet
 
 @item
-Symbols like @code{gcc-self} now has the same presedence rules in
+Symbols like @code{gcc-self} now has the same precedence rules in
 @code{gnus-parameters} as other ``real'' variables: The last match
 wins instead of the first match.
 
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 545306e4dc7..3bfa5a89e79 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
@@ -21228,7 +21228,7 @@ features (inspired by the Google search input language):
 AND, OR, and NOT are supported, and parentheses can be used to control
 operator precedence, e.g. (emacs OR xemacs) AND linux. Note that
 operators must be written with all capital letters to be
-recognised. Also preceding a term with a - sign is equivalent to NOT
+recognized. Also preceding a term with a - sign is equivalent to NOT
 term.
 
 @item Automatic AND queries
@@ -21273,7 +21273,7 @@ Gmane queries follow a simple query language:
 AND, OR, NOT (or AND NOT), and XOR are supported, and brackets can be
 used to control operator precedence, e.g. (emacs OR xemacs) AND linux.
 Note that operators must be written with all capital letters to be
-recognised.
+recognized.
 
 @item Required and excluded terms
 + and - can be used to require or exclude terms, e.g. football -american
@@ -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.
@@ -30030,7 +30030,7 @@ this:
 @subsection Score File Syntax
 
 Score files are meant to be easily parseable, but yet extremely
-mallable.  It was decided that something that had the same read syntax
+malleable.  It was decided that something that had the same read syntax
 as an Emacs Lisp list would fit that spec.
 
 Here's a typical score file:
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 48d0028e452..4d828f69bbd 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2120,7 +2120,7 @@ follows this line--} by default.
 
 @item message-directory
 @vindex message-directory
-Directory used by many mailey things.  The default is @file{~/Mail/}.
+Directory used by many mailish things.  The default is @file{~/Mail/}.
 All other mail file variables are derived from @code{message-directory}.
 
 @item message-auto-save-directory
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..34a4ba4f8f3 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
@@ -15533,7 +15533,7 @@ chapter about publishing.
 @i{Jambunathan K} contributed the OpenDocumentText exporter.
 @item
 @i{Sebastien Vauban} reported many issues with LaTeX and BEAMER export and
-enabled source code highlighling in Gnus.
+enabled source code highlighting in Gnus.
 @item
 @i{Stefan Vollmar} organized a video-recorded talk at the
 Max-Planck-Institute for Neurology.  He also inspired the creation of a
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 f6cf7a07ae8..55b60937fb6 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -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.
 
@@ -421,7 +421,7 @@ local variables, and tag lists in scope for various reasons, such as
 C++ using statements.
 
 @item semanticdb-typecache.el
-The typecache is part of @code{semanticdb}, but is used primarilly by
+The typecache is part of @code{semanticdb}, but is used primarily by
 the analyzer to look up datatypes and complex names.  The typecache is
 bound across source files and builds a master lookup table for data
 type names.
@@ -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..e6b0f4fa235 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}
@@ -3180,7 +3180,7 @@ names:
  '("^/xy" . "@trampfn{ssh, news, news.my.domain, /opt/news/etc/}"))
 @end lisp
 
-This shortens the file openening command to @kbd{C-x C-f /xy
+This shortens the file opening command to @kbd{C-x C-f /xy
 @key{RET}}.  The disadvantage is, again, that you cannot edit the file
 name, because the expansion happens after entering the file name only.