# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1284072255 0
# Node ID 8fd40d3071b1cee2675447444f9f83af2779f2bb
# Parent  aead7f692ad8d9338246b5572dbc36fe9f514773# Parent  3afdbf4cdf4b5147262856a304b3df0eee3ecbf3
Merge from mainline.

diff -r aead7f692ad8 -r 8fd40d3071b1 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Thu Sep 09 06:51:50 2010 +0000
+++ b/doc/misc/ChangeLog	Thu Sep 09 22:44:15 2010 +0000
@@ -1,3 +1,9 @@
+2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi: Remove Japanese manual.  Fix typo.
+
+	* trampver.texi: Update release number.  Remove japanesemanual.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* org.texi: Restore clobbered changes (copyright years, untabify).
diff -r aead7f692ad8 -r 8fd40d3071b1 doc/misc/tramp.texi
Binary file doc/misc/tramp.texi has changed
diff -r aead7f692ad8 -r 8fd40d3071b1 doc/misc/trampver.texi
--- a/doc/misc/trampver.texi	Thu Sep 09 06:51:50 2010 +0000
+++ b/doc/misc/trampver.texi	Thu Sep 09 22:44:15 2010 +0000
@@ -9,7 +9,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.1.19
+@set trampver 2.2.0-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -56,7 +56,6 @@
 @set emacsothername     XEmacs
 @set emacsotherdir      xemacs
 @set emacsotherfilename tramp-xemacs.html
-@set japanesemanual     tramp_ja-emacs.html
 @end ifset
 
 @c XEmacs counterparts.
@@ -73,7 +72,6 @@
 @set emacsothername     GNU Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
-@set japanesemanual     tramp_ja-xemacs.html
 @end ifset
 
 @ignore
diff -r aead7f692ad8 -r 8fd40d3071b1 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 09 06:51:50 2010 +0000
+++ b/lisp/ChangeLog	Thu Sep 09 22:44:15 2010 +0000
@@ -1,3 +1,8 @@
+2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-cache.el (tramp-parse-connection-properties): Set
+	tramp-autoload cookie.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
 	* image.el (imagemagick-types-inhibit): Add :type, :version, :group.
diff -r aead7f692ad8 -r 8fd40d3071b1 lisp/net/tramp-cache.el
--- a/lisp/net/tramp-cache.el	Thu Sep 09 06:51:50 2010 +0000
+++ b/lisp/net/tramp-cache.el	Thu Sep 09 22:44:15 2010 +0000
@@ -357,6 +357,7 @@
 	     (remove-hook 'kill-emacs-hook
 			  'tramp-dump-connection-properties)))
 
+;;;###tramp-autoload
 (defun tramp-parse-connection-properties (method)
   "Return a list of (user host) tuples allowed to access for METHOD.
 This function is added always in `tramp-get-completion-function'