1 files changed, 9 insertions, 29 deletions
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 436679613a1..70938179b7a 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -2,13 +2,13 @@
 @c texi/trampver.texi.  Generated from trampver.texi.in by configure.
 
 @c This is part of the Emacs manual.
-@c Copyright (C) 2003-2015 Free Software Foundation, Inc.
+@c Copyright (C) 2003-2016 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
 @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.13.25.1
+@set trampver 2.3.0-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -16,54 +16,34 @@
 @set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
-@set tramp @sc{tramp}
+@set tramp @sc{Tramp}
 
 @c Whether or not describe GVFS integration.
 @ifclear noemacsgvfs
 @set emacsgvfs
 @end ifclear
 
-@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
+@c Some flags which define the remote file name syntax.
+@ifclear unified
+@ifclear separate
+@set unified
 @end ifclear
 @end ifclear
 
-@c Emacs values.
-@ifset emacs
-@set emacsname          Emacs
-@set emacsdir           emacs
-@set ftppackagename     Ange-FTP
+@ifset unified
 @set prefix             /
 @set prefixhop
 @set postfix            :
 @set postfixhop         :
 @set ipv6prefix         [
 @set ipv6postfix        ]
-@set emacsothername     XEmacs
-@set emacsotherdir      xemacs
-@set emacsotherfilename tramp-xemacs.html
 @end ifset
 
-@c XEmacs counterparts.
-@ifset xemacs
-@set emacsname          XEmacs
-@set emacsdir           xemacs
-@set ftppackagename     EFS
+@ifset separate
 @set prefix             /[
 @set prefixhop          [
 @set postfix            ]
 @set postfixhop         /
 @set ipv6prefix
 @set ipv6postfix
-@set emacsothername     Emacs
-@set emacsotherdir      emacs
-@set emacsotherfilename tramp-emacs.html
 @end ifset