From: Michael Albinus <albinus@detlef>
Date: Sat, 10 Apr 2010 12:59:22 +0000 (+0200)
Subject: Synchronize with Tramp repository.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~548
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=456b348e68af37d700c399a4a645155abe19af3a;p=emacs.git

Synchronize with Tramp repository.

* tramp.texi (Auto-save and Backup): Remove reference to Emacs 21.
(Frequently Asked Questions): Adapt supported (X)Emacs versions.  Adapt
supported MS Windows versions.  Remove obsolete URL.  Use the $()
syntax, texi2dvi reports errors with the backquotes.

* trampver.texi: Update release number.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 34f285beee9..d34748cd443 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-10  Michael Albinus  <michael.albinus@gmx.de>
+
+	Synchronize with Tramp repository.
+
+	* tramp.texi (Auto-save and Backup): Remove reference to Emacs 21.
+	(Frequently Asked Questions): Adapt supported (X)Emacs versions.  Adapt
+	supported MS Windows versions.  Remove obsolete URL.  Use the $()
+	syntax, texi2dvi reports errors with the backquotes.
+
+	* trampver.texi: Update release number.
+
 2010-04-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* gnus.texi (Finding the News): Add pointers to the Server buffer
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index a01eda22c12..7a380a4e28a 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2125,10 +2125,9 @@ The backup file name of @file{@trampfn{su, root, localhost,
 
 The same problem can happen with auto-saving files.
 @ifset emacs
-Since @value{emacsname} 21, the variable
-@code{auto-save-file-name-transforms} keeps information, on which
-directory an auto-saved file should go.  By default, it is initialized
-for @value{tramp} files to the local temporary directory.
+The variable @code{auto-save-file-name-transforms} keeps information,
+on which directory an auto-saved file should go.  By default, it is
+initialized for @value{tramp} files to the local temporary directory.
 
 On some versions of @value{emacsname}, namely the version built for
 Debian GNU/Linux, the variable @code{auto-save-file-name-transforms}
@@ -2749,17 +2748,13 @@ 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,
-GNU Emacs 23, XEmacs 21 (starting with 21.4), and SXEmacs 22.
+The package has been used successfully on 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),
-but some people seemed to have some success getting it to work on MS
-Windows NT/2000/XP @value{emacsname}.
-
-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/}
+Unix-like system on the remote end (except the @option{smb} and
+@option{imap} methods), but some people seemed to have some success
+getting it to work on MS Windows XP/Vista/7 @value{emacsname}.
 
 
 @item
@@ -3339,7 +3334,7 @@ could write a script @file{emacsclient.sh}:
 
 @example
 #!/bin/sh
-emacsclient @trampfn{ssh, `whoami`, `hostname --fqdn`, $1}
+emacsclient @trampfn{ssh, $(whoami), $(hostname --fqdn), $1}
 @end example
 
 Then you must set the environment variable @code{EDITOR} pointing to
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index c8608edf6b6..d882baf9a86 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -2,14 +2,14 @@
 @c texi/trampver.texi.  Generated from trampver.texi.in by configure.
 
 @c This is part of the Emacs manual.
-@c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-@c   Free Software Foundation, Inc.
+@c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+@c   2010 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
 @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.18-23.2
+@set trampver 2.1.19-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local