3 files changed, 8 insertions, 10 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d454a4a29e5..29cf98e3330 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi: Remove Japanese manual.  Fix typo.
+
+        * trampver.texi: Update release number.  Remove japanesemanual.
+
 2010-09-09  Glenn Morris  <rgm@gnu.org>
 
         * org.texi: Restore clobbered changes (copyright years, untabify).
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index b9c83be457e..604130d2606 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -16,7 +16,7 @@
 
 @include trampver.texi
 
-@c Macro for formatting a filename according to the repective syntax.
+@c Macro for formatting a filename according to the respective syntax.
 @c xxx and yyy are auxiliary macros in order to omit leading and
 @c trailing whitespace.  Not very elegant, but I don't know it better.
 
@@ -105,11 +105,6 @@ If you're using the other Emacs flavor, you should read the
 @end ifset
 
 @ifhtml
-@ifset jamanual
-This manual is also available as a @uref{@value{japanesemanual},
-Japanese translation}.
-@end ifset
-
 The latest release of @value{tramp} is available for
 @uref{ftp://ftp.gnu.org/gnu/tramp/, download}, or you may see
 @ref{Obtaining Tramp} for more details, including the CVS server
@@ -171,7 +166,6 @@ Installing @value{tramp} with your @value{emacsname}
 
 * Installation parameters::     Parameters in order to control installation.
 * Load paths::                  How to plug-in @value{tramp} into your environment.
-* Japanese manual::             Japanese manual.
 
 @end ifset
 
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 25fa4908143..107e4d70aa3 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -9,7 +9,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.1.19
+@set trampver 2.2.0-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -56,7 +56,6 @@
 @set emacsothername     XEmacs
 @set emacsotherdir      xemacs
 @set emacsotherfilename tramp-xemacs.html
-@set japanesemanual     tramp_ja-emacs.html
 @end ifset
 
 @c XEmacs counterparts.
@@ -73,7 +72,6 @@
 @set emacsothername     GNU Emacs
 @set emacsotherdir      emacs
 @set emacsotherfilename tramp-emacs.html
-@set japanesemanual     tramp_ja-xemacs.html
 @end ifset
 
 @ignore