Merge from trunk.

[bpt/emacs.git] / doc / misc / trampver.texi

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index ff5641f..31d3ac0 100644 (file)
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,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.2.1-pre
+@set trampver 2.2.3-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -63,7 +63,7 @@
 @set postfixhop         /
 @set ipv6prefix
 @set ipv6postfix
-@set emacsothername     GNU Emacs
+@set emacsothername     Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
 @end ifset