Merge from trunk.

4 files changed, 17 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 794771e24d3..8e5efc4f87d 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * mini.texi (Minibuffer File): Insert a reference to Tramp for
+        remote file name completion.  (Bug#9197)
+
 2011-07-28  Eli Zaretskii  <eliz@gnu.org>
 
         * mule.texi (Bidirectional Editing): Document the fact that
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index ce0d396fd0d..da1e88ab331 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -125,6 +125,10 @@ file names, change the variable @code{insert-default-directory} to
 Nonetheless, relative file name arguments are still interpreted based
 on the same default directory.
 
+  For rules how to read remote file names in the minibuffer, see
+@ref{Filename completion, file name completion,, tramp}, in the Tramp
+manual.
+
 @node Minibuffer Edit
 @section Editing in the Minibuffer
 
@@ -491,7 +495,7 @@ argument (@code{previous-history-element}).
 Move to the next item in the minibuffer history
 (@code{next-history-element}).
 @item M-r @var{regexp} @key{RET}
-Move to an earlier item in the minibuffer history that 
+Move to an earlier item in the minibuffer history that
 matches @var{regexp} (@code{previous-matching-history-element}).
 @item M-s @var{regexp} @key{RET}
 Move to a later item in the minibuffer history that matches
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 75e39104dcb..967f457f3c4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.2.
+
+        * trampver.texi: Update release number.
+
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org.texi (Using the mapping API): mention 'region as a possible
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 6a245f9c28d..043217a6c9e 100644
--- 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.2-pre
+@set trampver 2.2.2
 
 @c Other flags from configuration
 @set instprefix /usr/local