Merge from mainline.

10 files changed, 71 insertions, 30 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 471d57ed11b..3d39b108049 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,36 @@
+2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Score File Format): Fix typo.
+
+2010-01-18  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ada-mode.texi (Project File Overview): Fix typo.
+
+2010-01-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * semantic.texi: Add Richard Y. Kim credit.
+
+        * eieio.texi (Making New Objects): Fix typo (Bug#5406).
+
+2010-01-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Add GNU Emacs 23 and
+        SXEmacs 22 to the supported systems.  New item for hung ssh sessions.
+
+2010-01-17  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi (Reporting Bugs): Don't mention format of repository.
+
+        * woman.texi (Bugs): Make "Emacs repository" less specific,
+        and the URL for same more specific.
+
+        * faq.texi (Latest version of Emacs): The repository is now Bazaar.
+
+2010-01-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * ede.texi (ede-step-project, ede-proj-target):
+        * tramp.texi (Remote processes): Fix typos.
+
 2010-01-16  Mario Lang  <mlang@delysid.org>
 
         * ede.texi (ede-target):
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index af5dc310a58..86d63e5ed9b 100644
--- a/doc/misc/ada-mode.texi
+++ b/doc/misc/ada-mode.texi
@@ -396,7 +396,7 @@ src_dir=/Projects/my_project/src_1
 src_dir=/Projects/my_project/src_2
 @end example
 
-Some variables (like @code{src_dir}) are lists; multiple occurances
+Some variables (like @code{src_dir}) are lists; multiple occurrences
 are concatenated.
 
 There must be no space between the variable name and ``='', and no
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index f0fa97cbe16..8d2d0495ec7 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -35269,7 +35269,7 @@ to work on these, please send a message (using @kbd{M-x report-calc-bug})
 so any efforts can be coordinated.
 
 The latest version of Calc is available from Savannah, in the Emacs
-CVS tree.  See @uref{http://savannah.gnu.org/projects/emacs}.
+repository.  See @uref{http://savannah.gnu.org/projects/emacs}.
 
 @c [summary]
 @node Summary, Key Index, Reporting Bugs, Top
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index bfeef343f09..a40553362bd 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1728,7 +1728,7 @@ The variable GNUSTEP_INSTALLATION_DOMAIN is set at this value.
 Type: @code{(or null list)} @*
 Default Value: @code{(quote ("GNUmakefile.preamble"))}
 
-The auxilliary makefile for additional variables.
+The auxiliary makefile for additional variables.
 Included just before the specific target files.
 @refill
 
@@ -1736,7 +1736,7 @@ Included just before the specific target files.
 Type: @code{(or null list)} @*
 Default Value: @code{(quote ("GNUmakefile.postamble"))}
 
-The auxilliary makefile for additional rules.
+The auxiliary makefile for additional rules.
 Included just after the specific target files.
 @refill
 
@@ -2083,7 +2083,7 @@ Relative to the path of the project it belongs to.
 Type: @code{list} @*
 Default Value: @code{nil}
 
-Auxilliary source files included in this target.
+Auxiliary source files included in this target.
 Each of these is considered equivalent to a source file, but it is not
 distributed, and each should have a corresponding rule to build it.
 @refill
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 06ff1677f0f..8b70d16f998 100755
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -645,7 +645,7 @@ function of @code{:initform}.
 @comment  node-name,  next,  previous,  up
 @chapter Making New Objects
 
-Suppose we have defined a simple class is defined, such as:
+Suppose we have a simple class is defined, such as:
 
 @example
 (defclass record ()
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index d04e8e76b5e..a7fb67745bf 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1008,9 +1008,7 @@ conventions}).
 @cindex Latest version of Emacs
 @cindex Development, Emacs
 @cindex Repository, Emacs
-@cindex CVS repository, Emacs
-@cindex Arch repository, Emacs
-@cindex Git repository, Emacs
+@cindex Bazaar repository, Emacs
 
 Emacs @value{VER} is the current version as of this writing.  A version
 number with two components (e.g. @samp{22.1}) indicates a released
@@ -1020,9 +1018,8 @@ version (e.g. @samp{23.0.50} is what will eventually become @samp{23.1}).
 Emacs is under active development, hosted at
 @uref{http://savannah.gnu.org/projects/emacs/, Savannah}.  The source
 code can be retrieved anonymously following the
-@uref{http://savannah.gnu.org/cvs/?group=emacs, instructions}.
-The primary repository is CVS, but Arch and Git mirrors are also
-available.
+@uref{http://savannah.gnu.org/bzr/?group=emacs, instructions}.
+The repository is GNU Bazaar.
 
 Because Emacs undergoes many changes before a release, the version
 number of a development version is not especially meaningful.  It is
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a33a91ba6f1..75720a94da1 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21803,7 +21803,7 @@ not be loaded, even though they would normally be so, for some reason or
 other.
 
 @item eval
-The value of this entry will be @code{eval}el.  This element will be
+The value of this entry will be @code{eval}ed.  This element will be
 ignored when handling global score files.
 
 @item read-only
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index c4aa4b81419..bf618b9e09d 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -1,7 +1,7 @@
 \input texinfo
 @setfilename ../../info/semantic
 @set TITLE  Semantic Manual
-@set AUTHOR Eric M. Ludlam and David Ponce
+@set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim
 @settitle @value{TITLE}
 
 @c *************************************************************************
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 02e079b8ad5..a01eda22c12 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2562,7 +2562,7 @@ hosts.  Example:
 @end example
 
 You will see the buffer @file{*Async Shell Command*}, containing the
-continous output of the @command{tail} command.
+continuous output of the @command{tail} command.
 
 
 @subsection Running eshell on a remote host
@@ -2749,9 +2749,8 @@ There is also a Savannah project page.
 @item
 Which systems does it work on?
 
-The package has been used successfully on GNU Emacs 21, GNU Emacs 22
-and XEmacs 21 (starting with 21.4).  Gateway methods are supported for
-GNU Emacs 22 only.
+The package has been used successfully on GNU Emacs 21, GNU Emacs 22,
+GNU Emacs 23, XEmacs 21 (starting with 21.4), and SXEmacs 22.
 
 The package was intended to work on Unix, and it really expects a
 Unix-like system on the remote end (except the @option{smb} method),
@@ -2762,12 +2761,6 @@ There is some informations on @value{tramp} on NT at the following URL;
 many thanks to Joe Stoy for providing the information:
 @uref{ftp://ftp.comlab.ox.ac.uk/tmp/Joe.Stoy/}
 
-@c The link is broken.  I've contacted Tom for clarification.  Michael.
-@ignore
-The above mostly contains patches to old ssh versions; Tom Roche has a
-Web page with instructions:
-@uref{http://www4.ncsu.edu/~tlroche/plinkTramp.html}
-@end ignore
 
 @item
 How could I speed up @value{tramp}?
@@ -2838,7 +2831,6 @@ the following command:
 [ $TERM = "dumb" ] && unsetopt zle && PS1='$ '
 @end example
 
-
 @item
 @value{tramp} doesn't transfer strings with more than 500 characters
 correctly
@@ -2870,6 +2862,25 @@ checksum.
 
 
 @item
+@value{tramp} does not recognize hung @command{ssh} sessions
+
+When your network connection is down, @command{ssh} sessions might
+hang.  @value{tramp} cannot detect it safely, because it still sees a
+running @command{ssh} process.  Timeouts cannot be used as well,
+because it cannot be predicted, how long a remote command will last,
+for example when copying very large files.
+
+Therefore, you must configure the @command{ssh} process to die
+in such a case.  The following entry in @file{~/.ssh/config} would do
+the job:
+
+@example
+Host *
+     ServerAliveInterval 5
+@end example
+
+
+@item
 File name completion does not work with @value{tramp}
 
 When you log in to the remote machine, do you see the output of
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 2077f4844a5..c2de5d88b58 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -4,7 +4,7 @@
 @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
 @c FIXME
 @c Manual last updated:
-@set UPDATED Time-stamp: <2009-02-16 09:25:50 karl>
+@set UPDATED Time-stamp: <Sat 16-Jan-2010 19:18:43 gm on grasmoor>
 @c Software version:
 @set VERSION 0.54 (beta)
 @afourpaper
@@ -18,8 +18,8 @@
 This file documents WoMan: A program to browse Unix manual pages `W.O.
 (without) man'.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009, 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1319,8 +1319,8 @@ inelegantly, then please
 
 @enumerate
 @item
-try the latest version of @file{woman.el} from the Emacs CVS repository
-on @uref{http://savannah.gnu.org/}.  If it still fails, please
+try the latest version of @file{woman.el} from the Emacs repository
+on @uref{http://savannah.gnu.org/projects/emacs/}.  If it still fails, please
 
 @item
 send a bug report to @email{bug-gnu-emacs@@gnu.org} and to