summaryrefslogtreecommitdiff
path: root/doc/misc/trampver.texi
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2014-11-08 10:07:24 +0100
committerMichael Albinus <michael.albinus@gmx.de>2014-11-08 10:07:24 +0100
commit89be8b92a6678ca14cf8f48bdb905542f3b58b9e (patch)
treee22d8e00c2e0180fc8b080acbe73ee531b84da27 /doc/misc/trampver.texi
parentb03f9b583cf80b765cc41c095cb6c2ee04e19f40 (diff)
downloademacs-89be8b92a6678ca14cf8f48bdb905542f3b58b9e.tar.gz
Backport Tramp changes from trunk.
* tramp.texi (Inline methods): Remove restriction on "telnet". Recommend sharing ssh connections for "plink". (External methods): Remove "sftp". Merge "pscp" and "psftp" descriptions. Recommend sharing ssh connections. Add "nc" method. (GVFS based methods): Add "sftp". (Customizing Completion, External packages, Issues): Use @dots{}. (Remote shell setup): Explain, how to change command line arguments of remote "nc" listener. * trampver.texi: Update release number.
Diffstat (limited to 'doc/misc/trampver.texi')
-rw-r--r--doc/misc/trampver.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 3b66239f284..cfcb6640183 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -5,10 +5,10 @@
@c Copyright (C) 2003-2014 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 In the Tramp GIT, 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.2.9-24.4
+@set trampver 2.2.11-pre
@c Other flags from configuration
@set instprefix /usr/local