 * Replace "delimet" with "delimit" globally
 * Replace "explicite" with "explicit" globally
 * Replace "instead of" with "instead" where there was nothing after "of"
 * Audit use of comma before interrogative pronoun, "that", or "which"
 * Minor word order, spelling, wording changes

? _darcs
? cvs.log.out
? index.html
? proofreading0.patch
Index: ChangeLog
===================================================================
RCS file: /sources/tramp/tramp/ChangeLog,v
retrieving revision 1.193
diff -u -r1.193 ChangeLog
--- ChangeLog	27 Dec 2010 10:45:26 -0000	1.193
+++ ChangeLog	2 Feb 2011 22:20:08 -0000
@@ -604,7 +604,7 @@
 
 	* INSTALL: Explain new option `--with-contrib'.  Remove
 	description for explicit use of "contrib" directory.  Remove
-	examples where EMACS environment variable is set explicitely; this
+	examples where EMACS environment variable is set explicitly; this
 	can cause confusion.
 
 	* Makefile.in: Don't check for $(USE_CONTRIB) any longer.
Index: Makefile.in
===================================================================
RCS file: /sources/tramp/tramp/Makefile.in,v
retrieving revision 2.58
diff -u -r2.58 Makefile.in
--- Makefile.in	26 Jan 2011 09:43:33 -0000	2.58
+++ Makefile.in	2 Feb 2011 22:20:08 -0000
@@ -61,7 +61,7 @@
 # texi/trampver.texi.
 EMACS_TEXI_FILES = texi/tramp.texi
 
-# XEmacs Tramp package has the same filesystem structure like Tramp
+# XEmacs Tramp package has the same filesystem structure as Tramp
 # itself.  Furthermore, it doesn't take *.el and *.texi only.  So one
 # target is sufficient.  ChangeLog is copied to ChangeLog.upstream,
 # lisp/trampver.el and texi/trampver.texi are copied, too.
@@ -137,7 +137,7 @@
 	cvs tag -F V-$(VERSION)
 
 # Depends on configure in order to run autoconf.  All files
-# which shall be produced on customer host, should be removed.
+# which shall be produced on customer host should be removed.
 MANIFEST: configure distclean
 	find . \( -name CVS    -prune \)		\
 	    -o \( -name info   -prune \)		\
Index: README
===================================================================
RCS file: /sources/tramp/tramp/README,v
retrieving revision 2.6
diff -u -r2.6 README
--- README	1 Jul 2007 18:31:32 -0000	2.6
+++ README	2 Feb 2011 22:20:08 -0000
@@ -20,11 +20,11 @@
 Makefile.XEmacs         What the XEmacs package maintainer uses to build
                         Tramp.
 README                  This file.
-README-CVS              For the brave ones, who want to get the latest
-                        developper sources.
-aclocal.m4              Macros used by autoconf generating the
+README-CVS              For the brave ones who want to get the latest
+                        developer sources.
+aclocal.m4              Macros used by autoconf for generating the
                         configure script.
-configure.ac            Input for autoconf generating the configure script.
+configure.ac            Input for autoconf for generating the configure script.
 package-info.in         Used for the XEmacs package.
 
 All other files in this directory are generated by either autoconf,
Index: README-CVS
===================================================================
RCS file: /sources/tramp/tramp/README-CVS,v
retrieving revision 1.3
diff -u -r1.3 README-CVS
--- README-CVS	6 Jun 2004 11:29:48 -0000	1.3
+++ README-CVS	2 Feb 2011 22:20:08 -0000
@@ -3,13 +3,14 @@
                      Tramp CVS usage instructions
 
 The Tramp version number is in the `AC_INIT' macro in `configure.ac',
-everywhere else it is generated from.  You should update this version
-number whenever you make a release.  After that, you need to call
-`make configure' (or `autoconf --trace=AC_INIT' if you've cleaned up
-the Makefile).  The version number looks like "X.Y.Z" where X is the
-major revision, Y is the minor revision, and Z is a patch level.
+everywhere else it is generated from this macro.  You should update
+this version number whenever you make a release.  After that, you need
+to call `make configure' (or `autoconf --trace=AC_INIT' if you've
+cleaned up the Makefile).  The version number looks like "X.Y.Z" where
+X is the major revision, Y is the minor revision, and Z is a patch
+level.
 
-Tramp versions, which are not released yet, have a version number
+Tramp versions which are not released yet have a version number
 "X.Y.Z-pre" in CVS, with Z being the next patch level to be released.
 
 Together with each version "X.Y.Z" there should be a CVS tag "V-X-Y-Z"
@@ -26,6 +27,7 @@
 
 Tramp exists in three incarnations.  The CVS tree on Savannah is the
 main version, but there is also a copy in XEmacs and a copy in the
-Emacs CVS.
+Emacs distribution.  Typically, these downstream versions are based
+on, or identical to, an earlier stable version from Savannah.
 
 TODO: explain how to get the main version into XEmacs and into Emacs.
Index: aclocal.m4
===================================================================
RCS file: /sources/tramp/tramp/aclocal.m4,v
retrieving revision 2.38
diff -u -r2.38 aclocal.m4
--- aclocal.m4	26 Jan 2011 09:43:33 -0000	2.38
+++ aclocal.m4	2 Feb 2011 22:20:08 -0000
@@ -102,7 +102,7 @@
   AC_MSG_RESULT($EMACS_INFO)
   AC_SUBST(EMACS_INFO)
 
-  dnl Check gvfs support. It is assumed, that D-Bus bindings are sufficient.
+  dnl Check gvfs support. It is assumed that D-Bus bindings are sufficient.
   AC_MSG_CHECKING([for $EMACS gvfs support])
   AC_EMACS_LISP(
     gvfsp,
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.960
diff -u -r2.960 ChangeLog
--- lisp/ChangeLog	10 Jan 2011 20:49:37 -0000	2.960
+++ lisp/ChangeLog	2 Feb 2011 22:20:08 -0000
@@ -778,7 +778,7 @@
 	defuns.
 	(with-tramp-dbus-call-method): Format trace message.
 	(tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
-	Implement backup call, when operation on local files fails.  Use
+	Implement backup call when operation on local files fails.  Use
 	progress reporter.  Flush properties of changed files.
 	(tramp-gvfs-handle-make-directory): Make more traces.
 	(tramp-gvfs-url-file-name): Hexify file name in url.
@@ -1182,7 +1182,7 @@
 	* tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
 	setting the modes by `ignore-errors'.  It might fail, for example
 	if the file is not owned by the user but the group.
-	(tramp-handle-write-region): Ensure, that `tmpfile' is always readable.
+	(tramp-handle-write-region): Ensure that `tmpfile' is always readable.
 
 2010-02-18  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -1253,7 +1253,7 @@
 	(tramp-check-for-regexp): Use (forward-line 1).
 	(tramp-open-connection-setup-interactive-shell): Handle "=" in
 	variable values properly.
-	(tramp-find-inline-encoding): Raise an error, when no encoding is
+	(tramp-find-inline-encoding): Raise an error when no encoding is
 	found.
 	(tramp-wait-for-output): Remove spurious " ^H" sequences, sent by
 	busybox.
@@ -1337,7 +1337,7 @@
 
 	* tramp.el (tramp-echo-mark-marker-length): New defconst.
 	(tramp-echo-mark, tramp-echoed-echo-mark-regexp): Use it.
-	(tramp-check-for-regexp): Check also, when an echoing shell stops
+	(tramp-check-for-regexp): Check also when an echoing shell stops
 	to echo sent commands.
 
 2009-12-09  Michael Albinus  <michael.albinus@gmx.de>
@@ -1953,7 +1953,7 @@
 
 2009-08-02  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.el (tramp-handle-insert-file-contents): Optimize, when BEG
+	* tramp.el (tramp-handle-insert-file-contents): Optimize when BEG
 	or END is non-nil.
 	(tramp-handle-vc-registered): Use `tramp-cache-inhibit-cache'.
 	(tramp-get-debug-buffer): Change `outline-regexp' according to new
@@ -2019,7 +2019,7 @@
 2009-06-30  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.el (tramp-do-copy-or-rename-file-directly): Handle also
-	the 'rename case, when setting file modes.  (Bug#3712)
+	the 'rename case when setting file modes.  (Bug#3712)
 	(tramp-default-file-modes) Remove execute permissions.
 
 	* tramp-gvfs.el (tramp-gvfs-methods): Add "synce" method.
@@ -2175,7 +2175,7 @@
 
 2009-03-22  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.el (top): Catch `tramp-loading', when a loading of a
+	* tramp.el (top): Catch `tramp-loading' when a loading of a
 	package fails.
 	(tramp-end-of-output): Remove newlines, and add "$" at the end.
 	(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
@@ -2183,7 +2183,7 @@
 	(tramp-wait-for-output): Remove handling of newlines.
 
 	* tramp-gvfs.el (top): Add methods to `tramp-methods' after
-	loading only.  Throw `tramp-loading', when GVFS daemon does not run.
+	loading only.  Throw `tramp-loading' when GVFS daemon does not run.
 
 2009-03-17  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -2237,7 +2237,7 @@
 
 2009-02-11  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp-gvfs.el (top): Don't raise an error, when "org.bluez" is
+	* tramp-gvfs.el (top): Don't raise an error when "org.bluez" is
 	not answering.  Add completion function only when "org.bluez" is
 	reachable.
 	(tramp-gvfs-maybe-open-connection): Set "started" property.
@@ -2326,7 +2326,7 @@
 
 2008-12-04  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.el (top): Write a message, when loading Tramp.
+	* tramp.el (top): Write a message when loading Tramp.
 
 	* tramp-cache.el (tramp-dump-connection-properties): Polish the
 	check, whether to dump the data.
@@ -2344,7 +2344,7 @@
 	(tramp-find-inline-encoding): Don't raise an error but a warning,
 	when no inline encoding is found.
 	(tramp-get-remote-coding): Check for a symbol.  The negative check
-	for a string fails, when there is an empty string.
+	for a string fails when there is an empty string.
 
 2008-11-16  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -2687,7 +2687,7 @@
 	* tramp.el (tramp-end-of-output): Add `tramp-rsh-end-of-line' into
 	the regexp.
 	(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
-	Don't send `tramp-rsh-end-of-line' additionally, when setting the
+	Don't send `tramp-rsh-end-of-line' additionally when setting the
 	prompt.
 	(tramp-wait-for-output): Distinguish different prompt formats.
 	(tramp-get-test-nt-command): Don't check for "\n" in the prompt.
@@ -3151,7 +3151,7 @@
 
 2007-08-14  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.el (top): Require cl.el, when `copy-tree' is not available
+	* tramp.el (top): Require cl.el when `copy-tree' is not available
 	otherwise.
 
 2007-08-07  Michael Albinus  <michael.albinus@gmx.de>
@@ -3379,7 +3379,7 @@
 	(tramp-dissect-file-name): Apply `vector' instead of
 	`make-tramp-file-name'.
 	(tramp-do-copy-or-rename-file-out-of-band): Aset 3rd index instead
-	of 4th, when setting localname.
+	of 4th when setting localname.
 	(tramp-compute-multi-hops): Aset 2nd index instead of 3rd, when
 	setting host.
 
@@ -3459,8 +3459,8 @@
 2007-03-31  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.el (top): Don't require 'tramp-cache, it results in an
-	endless loop.  Autoload needed functions instead of.  Declare
-	needed gateway symbols, when tramp-gw cannot be loaded.
+	endless loop.  Autoload needed functions instead.  Declare
+	needed gateway symbols when tramp-gw cannot be loaded.
 	(with-parsed-tramp-file-name): Simplify `edebug-form-spec'.
 	(with-file-property, with-connection-property): New defmacros,
 	moved from tramp-cache.  This was necessary, because macros cannot
@@ -4170,7 +4170,7 @@
 	(start-process-shell-command)
 	(tramp-advice-call-process-shell-command): New defadvices.
 	(tramp-advice-start-process, tramp-advice-call-process): Don't
-	apply parameter lists explicitely.
+	apply parameter lists explicitly.
 
 2006-05-24  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -4684,9 +4684,9 @@
 	(tramp-set-remote-path): Add debug message.
 	(tramp-enter-password): Don't erase the buffer, not necessary.
 	(tramp-open-connection-setup-interactive-shell): Don't (un)set
-	explicitely "TERM", "HISTFILE", "HISTSIZE" "MAIL" "MAILCHECK"
+	explicitly "TERM", "HISTFILE", "HISTSIZE" "MAIL" "MAILCHECK"
 	"MAILPATH" "CDPATH" "LC_TIME".  Set
-	`tramp-remote-process-environment' instead of.
+	`tramp-remote-process-environment' instead.
 	(tramp-barf-unless-okay): Remove SUBSHELL (always nil) and SIGNAL
 	(always 'file-error).  Change all callees.
 	(tramp-send-string): Apply `delete-region' instead of
@@ -4924,7 +4924,7 @@
 	At least it doesn't hurt.
 	(tramp-find-executable): "which(1)" doesn't return a correct error
 	code in some implementations.  Use the number of words it returns
-	as indication instead of.
+	as indication instead.
 	(tramp-send-string): Trace all chunk sendings.  It might be huge
 	for large files, but trace level 10 should be an exception.
 	Remove the sleep, it's not necessary (and disturbs accept process
@@ -5009,7 +5009,7 @@
 	(tramp-handle-file-accessible-directory-p): Remove function.
 	(tramp-file-name-handler-alist): Remove entry for
 	`file-accessible-directory-p'.  Due to caching it doesn't make
-	sense to call the test commands explicitely.
+	sense to call the test commands explicitly.
 	(tramp-handle-file-exists-p): Format-string must be given now.
 	(tramp-handle-file-attributes-with-stat): Don't use hard-coded
 	"stat" command.
@@ -5195,7 +5195,7 @@
 	unset buffer's modtime does not need to be based on
 	`tramp-buffer-file-attributes'.  Suggested by RMS.
 	(tramp-send-command): Simplify.
-	(tramp-make-tramp-file-name): At least method and host delimeter
+	(tramp-make-tramp-file-name): At least method and host delimiter
 	must exist.
 
 	* tramp-smb.el: Remove defvar of `last-coding-system-used' in the
@@ -5786,7 +5786,7 @@
 	(tramp-dissect-multi-file-name, tramp-make-tramp-multi-file-name):
 	Removed.
 	(tramp-methods): Remove all `tramp-connection-function'
-	parameters.  Expand `tramp-login-args' parameters instead of.
+	parameters.  Expand `tramp-login-args' parameters instead.
 	Remove "multi" method.
 	(tramp-default-proxies-alist): New defcustom.
 	(tramp-maybe-open-connection): Completely rewritten.
@@ -5810,7 +5810,7 @@
 	* tramp.el (tramp-handle-verify-visited-file-modtime): If file
 	does not exist, say it is not modified if and only if that agrees
 	with the buffer's record.
-	(tramp-handle-write-region): Pass modtime explicitely to
+	(tramp-handle-write-region): Pass modtime explicitly to
 	`set-visited-file-modtime', because filename can be different
 	from (buffer-file-name) if `file-precious-flag' is set.
 	All changes suggested by Luc Teirlinck <teirllm@auburn.edu>.
@@ -6245,7 +6245,7 @@
 2004-01-06  Michael Albinus  <Michael.Albinus@alcatel.de>
 
 	* tramp.el (tramp-completion-mode): Make test for XEmacs
-	explicitely.  `event-to-character' can exists in Emacs packages
+	explicitly.  `event-to-character' can exists in Emacs packages
 	too.  Reported by Matt Swift <swift@alum.mit.edu>.
 
 2004-01-05  Michael Albinus  <Michael.Albinus@alcatel.de>
@@ -6273,7 +6273,7 @@
 
 	* tramp-efs.el (top): Add all XEmacs download sites to
 	`tramp-default-method-alist'.  The existing settings should be
-	sufficient already, but it's better to make it explicitely.
+	sufficient already, but it's better to make it explicitly.
 	(tramp-efs-method-given, tramp-efs-method-regexp): New variables.
 	(tramp-efs-path-regexp, tramp-efs-path-format-string)
 	(tramp-efs-path-format-without-user)
@@ -7125,7 +7125,7 @@
 	(tramp-smb-read-file-entry): Reads share names as well now.
 	(tramp-smb-send-command): Erases always buffer.
 	(tramp-smb-maybe-open-connection): Check for being alive is
-	removed.  Instead of, `process-status' is applied.  Erasing the
+	removed.  Instead, `process-status' is applied.  Erasing the
 	buffer is removed, because it disturbs exited processes if just
 	the share names should be retrieved.
 	(tramp-open-connection-smb): Renamed to
@@ -7422,7 +7422,7 @@
 	* tramp.el (tramp-methods, tramp-completion-function-alist):
 	Rename "scp1-old", "scp2-old", "ssh1-old", "ssh2-old" to
 	"*_old". There have been problems in method name completion,
-	because "-" is a word delimeter for partial completion mode.
+	because "-" is a word delimiter for partial completion mode.
 	(tramp-completion-function-alist): Set
 	`tramp-completion-function-alist-ssh' as completion function for
 	"fcp".
Index: lisp/tramp-cache.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-cache.el,v
retrieving revision 2.66
diff -u -r2.66 tramp-cache.el
--- lisp/tramp-cache.el	26 Jan 2011 09:43:33 -0000	2.66
+++ lisp/tramp-cache.el	2 Feb 2011 22:20:08 -0000
@@ -33,7 +33,7 @@
 ;; - localname is NIL.  This are reusable properties.  Examples:
 ;;   "remote-shell" identifies the POSIX shell to be called on the
 ;;   remote host, or "perl" is the command to be called on the remote
-;;   host, when starting a Perl script.  These properties are saved in
+;;   host when starting a Perl script.  These properties are saved in
 ;;   the file `tramp-persistency-file-name'.
 ;;
 ;; - localname is a string.  This are temporary properties, which are
Index: lisp/tramp-compat.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-compat.el,v
retrieving revision 2.39
diff -u -r2.39 tramp-compat.el
--- lisp/tramp-compat.el	26 Jan 2011 09:43:33 -0000	2.39
+++ lisp/tramp-compat.el	2 Feb 2011 22:20:08 -0000
@@ -156,7 +156,7 @@
 	   'set-file-times filename time)))))
 
   ;; We currently use "[" and "]" in the filename format for IPv6
-  ;; hosts of GNU Emacs.  This means, that Emacs wants to expand
+  ;; hosts of GNU Emacs.  This means that Emacs wants to expand
   ;; wildcards if `find-file-wildcards' is non-nil, and then barfs
   ;; because no expansion could be found.  We detect this situation
   ;; and do something really awful: we have `file-expand-wildcards'
Index: lisp/tramp-efs.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-efs.el,v
retrieving revision 2.26
diff -u -r2.26 tramp-efs.el
--- lisp/tramp-efs.el	26 Jan 2011 09:43:33 -0000	2.26
+++ lisp/tramp-efs.el	2 Feb 2011 22:20:08 -0000
@@ -145,7 +145,7 @@
 
   ;; Add all XEmacs download sites to `tramp-default-method-alist'.
   ;; The settings above should be sufficient, but it's better to make
-  ;; it explicitely.
+  ;; it explicitly.
   (when (listp package-get-download-sites)
     (mapcar (lambda (x)
 	      (when (listp x)
Index: lisp/tramp-gvfs.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-gvfs.el,v
retrieving revision 1.48
diff -u -r1.48 tramp-gvfs.el
--- lisp/tramp-gvfs.el	26 Jan 2011 09:43:33 -0000	1.48
+++ lisp/tramp-gvfs.el	2 Feb 2011 22:20:08 -0000
@@ -1212,14 +1212,14 @@
 	;; Enable auth-sorce and password-cache.
 	(tramp-set-connection-property vec "first-password-request" t)
 
-	;; There will be a callback of "askPassword", when a password is
+	;; There will be a callback of "askPassword" when a password is
 	;; needed.
 	(dbus-register-method
 	 :session dbus-service-emacs object-path
 	 tramp-gvfs-interface-mountoperation "askPassword"
 	 'tramp-gvfs-handler-askpassword)
 
-	;; There could be a callback of "askQuestion", when adding fingerprint.
+	;; There could be a callback of "askQuestion" when adding fingerprint.
 	(dbus-register-method
 	 :session dbus-service-emacs object-path
 	 tramp-gvfs-interface-mountoperation "askQuestion"
@@ -1426,7 +1426,7 @@
 ;;; TODO:
 
 ;; * Host name completion via smb-server or smb-network.
-;; * Check, how two shares of the same SMB server can be mounted in
+;; * Check how two shares of the same SMB server can be mounted in
 ;;   parallel.
 ;; * Apply SDP on bluetooth devices, in order to filter out obex
 ;;   capability.
Index: lisp/tramp-imap.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-imap.el,v
retrieving revision 1.25
diff -u -r1.25 tramp-imap.el
--- lisp/tramp-imap.el	26 Jan 2011 09:43:33 -0000	1.25
+++ lisp/tramp-imap.el	2 Feb 2011 22:20:08 -0000
@@ -265,7 +265,7 @@
 		      filename newname)
 
 	;; We just make a local copy of FILENAME, and write it then to
-	;; NEWNAME.  This must be optimized, when both files are
+	;; NEWNAME.  This must be optimized when both files are
 	;; located on the same IMAP server.
 	(with-temp-buffer
 	  (if (and t1 t2)
Index: lisp/tramp-sh.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-sh.el,v
retrieving revision 2.21
diff -u -r2.21 tramp-sh.el
--- lisp/tramp-sh.el	26 Jan 2011 09:43:33 -0000	2.21
+++ lisp/tramp-sh.el	2 Feb 2011 22:20:09 -0000
@@ -66,7 +66,7 @@
   :group 'tramp
   :type 'string)
 
-;; ksh on OpenBSD 4.5 requires, that $PS1 contains a `#' character for
+;; ksh on OpenBSD 4.5 requires that $PS1 contains a `#' character for
 ;; root users.  It uses the `$' character for other users.  In order
 ;; to guarantee a proper prompt, we use "#$" for the prompt.
 
@@ -507,7 +507,7 @@
 which might have been set in the init files like ~/.profile.
 
 Special handling is applied to the PATH environment, which should
-not be set here. Instead of, it should be set via `tramp-remote-path'."
+not be set here. Instead, it should be set via `tramp-remote-path'."
   :group 'tramp
   :type '(repeat string))
 
@@ -2207,7 +2207,7 @@
     (with-parsed-tramp-file-name (if t1 filename newname) nil
       (if (and t1 t2)
 
-	  ;; Both are Tramp files.  We shall optimize it, when the
+	  ;; Both are Tramp files.  We shall optimize it when the
 	  ;; methods for filename and newname are the same.
 	  (let* ((dir-flag (file-directory-p filename))
 		 (tmpfile (tramp-compat-make-temp-file localname dir-flag)))
@@ -2403,7 +2403,7 @@
     (tramp-send-command
      v
      (format "rm -rf %s" (tramp-shell-quote-argument localname))
-     ;; Don't read the output, do it explicitely.
+     ;; Don't read the output, do it explicitly.
      nil t)
     ;; Wait for the remote system to return to us...
     ;; This might take a while, allow it plenty of time.
@@ -3148,7 +3148,7 @@
 	  ;; filename does not exist (eq modes nil) it has been
 	  ;; renamed to the backup file.  This case `save-buffer'
 	  ;; handles permissions.
-	  ;; Ensure, that it is still readable.
+	  ;; Ensure that it is still readable.
 	  (when modes
 	    (set-file-modes
 	     tmpfile
@@ -3294,7 +3294,7 @@
 	(when (or (eq visit t) (stringp visit))
           (let ((file-attr (file-attributes filename)))
             (set-visited-file-modtime
-             ;; We must pass modtime explicitely, because filename can
+             ;; We must pass modtime explicitly, because filename can
              ;; be different from (buffer-file-name), f.e. if
              ;; `file-precious-flag' is set.
              (nth 5 file-attr))
@@ -3401,7 +3401,7 @@
       (with-parsed-tramp-file-name filename nil
 	(cond
 	 ;; That's what we want: file names, for which checks are
-	 ;; applied.  We assume, that VC uses only `file-exists-p' and
+	 ;; applied.  We assume that VC uses only `file-exists-p' and
 	 ;; `file-readable-p' checks; otherwise we must extend the
 	 ;; list.  We do not perform any action, but return nil, in
 	 ;; order to keep `vc-registered' running.
@@ -4301,7 +4301,7 @@
 		     ;; it is just a prefix for the ControlPath option
 		     ;; of ssh; the real temporary file has another
 		     ;; name, and it is created and protected by ssh.
-		     ;; It is also removed by ssh, when the connection
+		     ;; It is also removed by ssh when the connection
 		     ;; is closed.
 		     (tmpfile
 		      (tramp-set-connection-property
@@ -5072,7 +5072,7 @@
 ;; * It makes me wonder if tramp couldn't fall back to ssh when scp
 ;;   isn't on the remote host.  (Mark A. Hershberger)
 ;; * Use lsh instead of ssh.  (Alfred M. Szmidt)
-;; * Optimize out-of-band copying, when both methods are scp-like (not
+;; * Optimize out-of-band copying when both methods are scp-like (not
 ;;   rsync).
 ;; * Keep a second connection open for out-of-band methods like scp or
 ;;   rsync.
Index: lisp/tramp-smb.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-smb.el,v
retrieving revision 2.136
diff -u -r2.136 tramp-smb.el
--- lisp/tramp-smb.el	26 Jan 2011 09:43:33 -0000	2.136
+++ lisp/tramp-smb.el	2 Feb 2011 22:20:09 -0000
@@ -1036,17 +1036,17 @@
 ;; \s-\{2,2}                              - leading spaces
 ;; \S-\(.*\S-\)\s-*                       - file name, 30 chars, left bound
 ;; \s-+[ADHRSV]*                          - permissions, 7 chars, right bound
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; \s-+[0-9]+                             - size, 8 chars, right bound
-;; \s-\{2,2\}                             - space delimeter
+;; \s-\{2,2\}                             - space delimiter
 ;; \w\{3,3\}                              - weekday
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; \w\{3,3\}                              - month
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [ 12][0-9]                             - day
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time
-;; \s-                                    - space delimeter
+;; \s-                                    - space delimiter
 ;; [0-9]\{4,4\}                           - year
 ;;
 ;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html)
Index: lisp/tramp-util.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp-util.el,v
retrieving revision 2.70
diff -u -r2.70 tramp-util.el
--- lisp/tramp-util.el	26 Jan 2011 09:43:34 -0000	2.70
+++ lisp/tramp-util.el	2 Feb 2011 22:20:09 -0000
@@ -36,7 +36,7 @@
 ;; name handler.  The idea is that such a handler is called when
 ;; `default-directory' matches a regexp in `file-name-handler-alist'.
 ;; This would allow to run commands on remote hosts.  The disadvantage
-;; is, that commands which should run locally anyway, would also run
+;; is that commands which should run locally anyway would also run
 ;; remotely, like the commands called by `gnus'.  This implementation
 ;; is an experimental one as proof of concept, it will change after
 ;; discussion with (X)Emacs maintainers.
Index: lisp/tramp.el
===================================================================
RCS file: /sources/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.831
diff -u -r2.831 tramp.el
--- lisp/tramp.el	26 Jan 2011 09:43:34 -0000	2.831
+++ lisp/tramp.el	2 Feb 2011 22:20:09 -0000
@@ -660,12 +660,12 @@
 	((equal tramp-syntax 'sep) "/")
 	((equal tramp-syntax 'url) "://")
 	(t (error "Wrong `tramp-syntax' defined")))
-  "*String matching delimeter between method and user or host names.
+  "*String matching delimiter between method and user or host names.
 Used in `tramp-make-tramp-file-name'.")
 
 (defconst tramp-postfix-method-regexp
   (regexp-quote tramp-postfix-method-format)
-  "*Regexp matching delimeter between method and user or host names.
+  "*Regexp matching delimiter between method and user or host names.
 Derived from `tramp-postfix-method-format'.")
 
 (defconst tramp-user-regexp "[^:/ \t]+"
@@ -673,12 +673,12 @@
 
 ;;;###tramp-autoload
 (defconst tramp-prefix-domain-format "%"
-  "*String matching delimeter between user and domain names.")
+  "*String matching delimiter between user and domain names.")
 
 ;;;###tramp-autoload
 (defconst tramp-prefix-domain-regexp
   (regexp-quote tramp-prefix-domain-format)
-  "*Regexp matching delimeter between user and domain names.
+  "*Regexp matching delimiter between user and domain names.
 Derived from `tramp-prefix-domain-format'.")
 
 (defconst tramp-domain-regexp "[-a-zA-Z0-9_.]+"
@@ -691,12 +691,12 @@
   "*Regexp matching user names with domain names.")
 
 (defconst tramp-postfix-user-format "@"
-  "*String matching delimeter between user and host names.
+  "*String matching delimiter between user and host names.
 Used in `tramp-make-tramp-file-name'.")
 
 (defconst tramp-postfix-user-regexp
   (regexp-quote tramp-postfix-user-format)
-  "*Regexp matching delimeter between user and host names.
+  "*Regexp matching delimiter between user and host names.
 Derived from `tramp-postfix-user-format'.")
 
 (defconst tramp-host-regexp "[a-zA-Z0-9_.-]+"
@@ -740,11 +740,11 @@
 	((equal tramp-syntax 'sep) "#")
 	((equal tramp-syntax 'url) ":")
 	(t (error "Wrong `tramp-syntax' defined")))
-  "*String matching delimeter between host names and port numbers.")
+  "*String matching delimiter between host names and port numbers.")
 
 (defconst tramp-prefix-port-regexp
   (regexp-quote tramp-prefix-port-format)
-  "*Regexp matching delimeter between host names and port numbers.
+  "*Regexp matching delimiter between host names and port numbers.
 Derived from `tramp-prefix-port-format'.")
 
 (defconst tramp-port-regexp "[0-9]+"
@@ -761,12 +761,12 @@
 	((equal tramp-syntax 'sep) "]")
 	((equal tramp-syntax 'url) "")
 	(t (error "Wrong `tramp-syntax' defined")))
-  "*String matching delimeter between host names and localnames.
+  "*String matching delimiter between host names and localnames.
 Used in `tramp-make-tramp-file-name'.")
 
 (defconst tramp-postfix-host-regexp
   (regexp-quote tramp-postfix-host-format)
-  "*Regexp matching delimeter between host names and localnames.
+  "*Regexp matching delimiter between host names and localnames.
 Derived from `tramp-postfix-host-format'.")
 
 (defconst tramp-localname-regexp ".*$"
@@ -1861,7 +1861,7 @@
 		(condition-case err
 		    (apply foreign operation args)
 
-		  ;; Trace, that somebody has interrupted the operation.
+		  ;; Trace that somebody has interrupted the operation.
 		  (quit
 		   (let (tramp-message-show-message)
 		     (tramp-message
@@ -2319,7 +2319,7 @@
 	(vector method user host localname)))))
 
 ;; This function returns all possible method completions, adding the
-;; trailing method delimeter.
+;; trailing method delimiter.
 (defun tramp-get-completion-methods (partial-method)
   "Returns all method completions for PARTIAL-METHOD."
   (mapcar
@@ -2937,7 +2937,7 @@
 (defun tramp-handle-substitute-in-file-name (filename)
   "Like `substitute-in-file-name' for Tramp files.
 \"//\" and \"/~\" substitute only in the local filename part.
-If the URL Tramp syntax is chosen, \"//\" as method delimeter and \"/~\" at
+If the URL Tramp syntax is chosen, \"//\" as method delimiter and \"/~\" at
 beginning of local filename are not substituted."
   ;; First, we must replace environment variables.
   (setq filename (tramp-replace-environment-variables filename))
Index: texi/ChangeLog
===================================================================
RCS file: /sources/tramp/tramp/texi/ChangeLog,v
retrieving revision 2.306
diff -u -r2.306 ChangeLog
--- texi/ChangeLog	26 Jan 2011 09:43:34 -0000	2.306
+++ texi/ChangeLog	2 Feb 2011 22:20:09 -0000
@@ -154,7 +154,7 @@
 
 2009-08-18  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.texi (Filename completion): Precise, that partial
+	* tramp.texi (Filename completion): Precise that partial
 	completion must be activated in ~/.emacs.
 
 2009-08-07  Michael Albinus  <michael.albinus@gmx.de>
@@ -264,7 +264,7 @@
 
 2008-04-28  Michael Albinus  <michael.albinus@gmx.de>
 
-	* tramp.texi (Frequently Asked Questions): Explain, how to disable
+	* tramp.texi (Frequently Asked Questions): Explain how to disable
 	Tramp via `tramp-mode'.
 
 2008-04-06  Ulrich Mueller  <ulm@gentoo.org>
@@ -455,7 +455,7 @@
 2007-04-23  Michael Albinus  <michael.albinus@gmx.de>
 
 	* tramp.texi (Default user): Declare `tramp-default-user' as
-	obsolete.  Explain how to use `tramp-default-user-alist' instead of.
+	obsolete.  Explain how to use `tramp-default-user-alist' instead.
 
 2007-04-22  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -902,7 +902,7 @@
 	Version 2.1.1 released.
 
 	* tramp.texi (Inline methods): Correct wrong (outdated) index
-	"km".  Say, that the port specification is also available for
+	"km".  Say that the port specification is also available for
 	"plink".
 	(External transfer methods): Add "sftp" and "psftp" methods.
 
@@ -910,7 +910,7 @@
 
 	* tramp.texi (all): Exchange nil by @code{nil} where not done
 	already.
-	(Inline methods): Say explicitely, that the host name part is
+	(Inline methods): Say explicitly that the host name part is
 	ignored for the su and sudo methods.
 	(Default User): Give an example for user name mismatch if the
 	connection method has an own configuration.  Show solution.
@@ -1015,7 +1015,7 @@
 	* trampinst.texi (Installation, Installation parameters)
 	(Load paths): Explain new option `--with-contrib'.  Remove
 	description for explicit use of "contrib" directory.  Remove
-	examples where EMACS environment variable is set explicitely; this
+	examples where EMACS environment variable is set explicitly; this
 	can cause confusion.
 
 2004-03-08  Michael Albinus  <Michael.Albinus@alcatel.de>
@@ -1245,7 +1245,7 @@
 	for texi2dvi.
 
 	* tramp.texi (top-level): Move installation related entries to
-	trampinst.texi.  Apply respective macros instead of, in case flag
+	trampinst.texi.  Apply respective macros instead, in case flag
 	`tramp-inst' is set.
 	Move all (X)Emacs related flags to trampver.texi.in.
 
@@ -1393,7 +1393,7 @@
 
 	* tramp.texi (External transfer methods): Note added for `smb'
 	method that's not implemented for Emacsen running locally under MS
-	Windows.  UNC file names shall be used instead of.
+	Windows.  UNC file names shall be used instead.
 
 2002-11-22  Michael Albinus  <Michael.Albinus@alcatel.de>
 
Index: texi/tramp.texi
===================================================================
RCS file: /sources/tramp/tramp/texi/tramp.texi,v
retrieving revision 2.264
diff -u -r2.264 tramp.texi
--- texi/tramp.texi	26 Jan 2011 09:43:34 -0000	2.264
+++ texi/tramp.texi	2 Feb 2011 22:20:09 -0000
@@ -956,7 +956,7 @@
 @cindex method ftp
 @cindex ftp method
 
-This is not a native @value{tramp} method.  Instead of, it forwards all
+This is not a native @value{tramp} method.  Instead, it forwards all
 requests to @value{ftppackagename}.
 @ifset xemacs
 This works only for unified filenames, see @ref{Issues}.
@@ -971,20 +971,20 @@
 @command{smbclient} command on different Unices in order to connect to
 an SMB server.  An SMB server might be a Samba (or CIFS) server on
 another UNIX host or, more interesting, a host running MS Windows.  So
-far, it is tested towards MS Windows NT, MS Windows 2000, and MS
+far, it is tested against MS Windows NT, MS Windows 2000, and MS
 Windows XP.
 
 The first directory in the localname must be a share name on the remote
-host.  Remember, that the @code{$} character in which default shares
+host.  Remember that the @code{$} character, in which default shares
 usually end, must be written @code{$$} due to environment variable
 substitution in file names.  If no share name is given (i.e. remote
 directory @code{/}), all available shares are listed.
 
-Since authorization is done on share level, you will be prompted
-always for a password if you access another share on the same host.
+Since authorization is done on share level, you will always be
+prompted for a password if you access another share on the same host.
 This can be suppressed by @ref{Password handling}.
 
-MS Windows uses for authorization both a user name and a domain name.
+For authorization, MS Windows uses both a user name and a domain name.
 Because of this, the @value{tramp} syntax has been extended: you can
 specify a user name which looks like @code{user%domain} (the real user
 name, then a percent sign, then the domain name).  So, to connect to
@@ -1008,7 +1008,7 @@
 The @option{smb} method supports the @samp{-p} argument.
 
 @strong{Please note:} If @value{emacsname} runs locally under MS
-Windows, this method isn't available.  Instead of, you can use UNC
+Windows, this method isn't available.  Instead, you can use UNC
 file names like @file{//melancholia/daniel$$/.emacs}.  The only
 disadvantage is that there's no possibility to specify another user
 name.
@@ -1022,7 +1022,7 @@
 @cindex imaps method
 
 Accessing an IMAP mailbox is intended to save files there as encrypted
-message.  It could be used in case there are no other remote file
+messages.  It could be used in case there are no other remote file
 storages available.
 
 @value{tramp} supports both @option{imap} and @option{imaps} methods.
@@ -1030,7 +1030,7 @@
 
 Both methods support the port number specification.
 
-Note, that special handling is needed for declaring a passphrase for
+Note that special handling is needed for declaring a passphrase for
 encryption / decryption of the messages (@pxref{Using an
 authentication file}).
 
@@ -1048,7 +1048,7 @@
 The connection methods described in this section are based on GVFS
 @uref{http://en.wikipedia.org/wiki/GVFS}.  Via GVFS, the remote
 filesystem is mounted locally through FUSE.  @value{tramp} uses
-internally this local mounted directory.
+this local mounted directory internally.
 
 The communication with GVFS is implemented via D-Bus messages.
 Therefore, your @value{emacsname} must have D-Bus integration,
@@ -1073,7 +1073,7 @@
 @cindex obex method
 
 OBEX is an FTP-like access protocol for simple devices, like cell
-phones.  Until now @value{tramp} supports only OBEX over Bluetooth.
+phones.  For the time being, @value{tramp} only supports OBEX over Bluetooth.
 
 
 @item @option{synce}
@@ -1082,11 +1082,11 @@
 
 The @option{synce} method allows communication with Windows Mobile
 devices.  Beside GVFS for mounting remote files and directories via
-FUSE, it needs also the SYNCE-GVFS plugin.
+FUSE, it also needs the SYNCE-GVFS plugin.
 @end table
 
 @defopt tramp-gvfs-methods
-This customer option, a list, defines the external methods, which
+This customer option, a list, defines the external methods which
 shall be used with GVFS.  Per default, these are @option{dav},
 @option{davs}, @option{obex} and @option{synce}.  Other possible
 values are @option{ftp}, @option{sftp} and @option{smb}.
@@ -1105,10 +1105,10 @@
 Therefore, they can be used for proxy host declarations
 (@pxref{Multi-hops}) only.
 
-A gateway method must come always along with a method who supports
+A gateway method must always come along with a method which supports
 port setting.  This is because @value{tramp} targets the accompanied
 method to @file{localhost#random_port}, from where the firewall or
-proxy server is accessed to.
+proxy server is accessed.
 
 Gateway methods support user name and password declarations.  These
 are used to authenticate towards the corresponding firewall or proxy
@@ -1711,7 +1711,7 @@
 When @value{tramp} detects a changed operating system version on a
 remote host (via the command @command{uname -sr}), it flushes all
 connection related information for this host, and opens the
-connection, again.
+connection again.
 
 
 @node Remote Programs
@@ -1766,7 +1766,7 @@
 @end lisp
 
 Another possibility is to reuse the path settings of your remote
-account, when you log in.  Usually, these settings are overwritten,
+account when you log in.  Usually, these settings are overwritten,
 because they might not be useful for @value{tramp}.  The place holder
 @code{tramp-own-remote-path} preserves these settings.  You can
 activate it via
@@ -2426,8 +2426,8 @@
 @value{tramp} uses for analysis of completion, offer user names, those user
 names will be taken into account as well.
 
-Remote machines, which have been visited in the past and kept
-persistently (@pxref{Connection caching}), will be offered too.
+Remote machines which have been visited in the past and kept
+persistently (@pxref{Connection caching}) will be offered too.
 
 Once the remote machine identification is completed, it comes to
 filename completion on the remote host.  This works pretty much like
@@ -2467,8 +2467,8 @@
 
 A remote directory might have changed its contents out of
 @value{emacsname} control, for example by creation or deletion of
-files by other processes.  Therefore, during filename completion the
-remote directory contents is reread regularly in order to detect such
+files by other processes.  Therefore, during filename completion, the
+remote directory contents are reread regularly in order to detect such
 changes, which would be invisible otherwise (@pxref{Connection caching}).
 
 @defopt tramp-completion-reread-directory-timeout
@@ -2491,7 +2491,7 @@
 @code{start-file-process}, is not supported.
 
 @code{process-file} and @code{start-file-process} work on the remote
-host, when the variable @code{default-directory} is remote:
+host when the variable @code{default-directory} is remote:
 
 @lisp
 (let ((default-directory "/ssh:remote.host:"))
@@ -2802,7 +2802,7 @@
 the remote host as well as the remote files are cached for reuse.  The
 information about remote hosts is kept in the file specified in
 @code{tramp-persistency-file-name}.  Keep this file.  If you are
-confident, that files on remote hosts are not changed out of
+confident that files on remote hosts are not changed out of
 @value{emacsname}' control, set @code{remote-file-name-inhibit-cache}
 to @code{nil}.
 
@@ -2834,7 +2834,7 @@
 Unknown characters in the prompt
 
 @value{tramp} needs to recognize the prompt on the remote machine
-after execution any command.  This is not possible, when the prompt
+after execution any command.  This is not possible when the prompt
 contains unknown characters like escape sequences for coloring.  This
 should be avoided on the remote side.  @xref{Remote shell setup}. for
 setting the regular expression detecting the prompt.
@@ -2906,7 +2906,7 @@
 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,
+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
@@ -3116,7 +3116,7 @@
 The file name left to type would be
 @kbd{C-x C-f @trampfn{, , news.my.domain, /opt/news/etc}}.
 
-Note, that there are some useful settings already.  Accessing your
+Note that there are some useful settings already.  Accessing your
 local host as @samp{root} user, is possible just by @kbd{C-x C-f
 @trampfn{su, , ,}}.
 
@@ -3148,7 +3148,7 @@
 @end lisp
 
 Then you need simply to type @kbd{C-x C-f $xy @key{RET}}, and here you
-are.  The disadvantage is, that you cannot edit the file name, because
+are.  The disadvantage is that you cannot edit the file name, because
 environment variables are not expanded during editing in the
 minibuffer.
 
@@ -3320,7 +3320,7 @@
 
 Then you can create a BBDB entry via @kbd{M-x bbdb-create-ftp-site}.
 Because BBDB is not prepared for @value{tramp} syntax, you must
-specify a method together with the user name, when needed. Example:
+specify a method together with the user name when needed. Example:
 
 @example
 @kbd{M-x bbdb-create-ftp-site @key{RET}}
@@ -3337,7 +3337,7 @@
 
 @end enumerate
 
-I would like to thank all @value{tramp} users, who have contributed to
+I would like to thank all @value{tramp} users who have contributed to
 the different recipes!
 
 
@@ -3360,7 +3360,7 @@
 (server-start)
 @end lisp
 
-Make sure, that the result of @code{(system-name)} can be resolved on
+Make sure that the result of @code{(system-name)} can be resolved on
 your local host; otherwise you might use a hard coded IP address.
 
 The resulting file @file{~/.emacs.d/server/server} must be copied to
@@ -3494,7 +3494,7 @@
 it has seen so far.
 
 This is a performance degradation, because the lost file attributes
-must be recomputed, when needed again.  In cases the caller of
+must be recomputed when needed again.  In cases the caller of
 @code{process-file} knows that there are no file attribute changes, it
 shall let-bind the variable @code{process-file-side-effects} to
 @code{nil}.  @value{tramp} wouldn't flush the file attributes cache then.
Index: texi/trampinst.texi
===================================================================
RCS file: /sources/tramp/tramp/texi/trampinst.texi,v
retrieving revision 2.20
diff -u -r2.20 trampinst.texi
--- texi/trampinst.texi	26 Jan 2011 09:43:34 -0000	2.20
+++ texi/trampinst.texi	2 Feb 2011 22:20:09 -0000
@@ -15,7 +15,7 @@
 @value{emacsname} is a relatively easy process, at least compared
 to rebuilding your machine from scratch. ;)
 
-Seriously though, the installation should be a fairly simple matter.
+Seriously, though, the installation should be a fairly simple matter.
 The easiest way to proceed is as follows:
 
 @itemize @bullet
@@ -35,7 +35,7 @@
 @command{./configure --with-contrib} to configure Tramp for your
 system.
 
-Running `configure' takes awhile.  While running, it prints some
+Running `configure' takes a while.  While running, it prints some
 messages telling which features it is checking for.
 
 @item
