* trampver.texi: Update release number. Set default value of

`emacsgvfs'.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e2798c192ccfbe9806b46e416e23742e08490b61..b21f93e8cb4b928c0520112d6303c8d5a8b052a9 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,20 @@
+2009-06-22  Michael Albinus  <michael.albinus@gmx.de>
+
+       Sync with Tramp 2.1.16.
+
+       * tramp.texi (History): Add GVFS support.
+       (External methods): Precise `rsync' description.  Add `dav', `davs' and
+       `obex' methods.  Add 'tramp-gvfs-methods' option.
+       (Multi-hops): Cells of `tramp-default-proxies-alist' can also be Lisp
+       forms.
+       (Remote Programs): Introduce `tramp-own-remote-path'.
+       (Remote processes): New subsection "Running remote programs that create
+       local X11 windows".
+       (Frequently Asked Questions): Improve code for disabling vc.
+
+       * trampver.texi: Update release number.  Set default value of
+       `emacsgvfs'.
+
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.1.

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 7644a4aa26460a81869da8ccf346eaa6f4e85dd5..2777a5c2597ce09ba832ef2f38f27c1662186c10 100644 (file)
--- 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.15
+@set trampver 2.1.16
 
 @c Other flags from configuration
 @set instprefix /usr/local
@@ -24,6 +24,11 @@
 @set emacsgw
 @end ifclear
 
+@c Whether or not describe GVFS integration.
+@ifclear noemacsgvfs
+@set emacsgvfs
+@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