Merge from emacs--rel--22

[bpt/emacs.git] / man / trampver.texi

diff --git a/man/trampver.texi b/man/trampver.texi
index 87b1dc8..877488c 100644 (file)
--- a/man/trampver.texi
+++ b/man/trampver.texi
@@ -4,19 +4,23 @@
 @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.0.47
+@set trampver 2.1.10
 
 @c Other flags from configuration
-@set prefix /usr/local
+@set instprefix /usr/local
 @set lispdir /usr/local/share/emacs/site-lisp
-@set infodir /usr/local/info
+@set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
 @set tramp @sc{tramp}
 
+@c Whether or not describe gateway methods.
+@ifclear noemacsgw
+@set emacsgw
+@end ifclear
+
 @c Some flags which make the text independent on the (X)Emacs flavor.
 @c "emacs" resp "xemacs" are set in the Makefile.  Default is "emacs".
-
 @ifclear emacs
 @ifclear xemacs
 @set emacs
@@ -25,14 +29,13 @@
 
 @c Emacs values.
 @ifset emacs
-@set emacsname          Emacs
+@set emacsname          GNU Emacs
 @set emacsdir           emacs
 @set ftppackagename     Ange-FTP
 @set prefix             /
-@set prefixsinglehop
+@set prefixhop
 @set postfix            :
-@set postfixsinglehop   :
-@set postfixmultihop    :
+@set postfixhop         :
 @set emacsothername     XEmacs
 @set emacsotherdir      xemacs
 @set emacsotherfilename tramp-xemacs.html
@@ -45,11 +48,10 @@
 @set emacsdir           xemacs
 @set ftppackagename     EFS
 @set prefix             /[
-@set prefixsinglehop    [
+@set prefixhop          [
 @set postfix            ]
-@set postfixsinglehop   /
-@set postfixmultihop    :
-@set emacsothername     Emacs
+@set postfixhop         /
+@set emacsothername     GNU Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
 @set japanesemanual     tramp_ja-xemacs.html