From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 22 Jun 2009 21:40:24 +0000 (+0000)
Subject: * trampver.texi: Update release number.  Set default value of
X-Git-Tag: emacs-pretest-23.1.90~2463
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6b951bbeedef393203aebfc66c6e432d4ba0c4b;p=emacs.git

* trampver.texi: Update release number.  Set default value of
`emacsgvfs'.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e2798c192cc..b21f93e8cb4 100644
--- 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 7644a4aa264..2777a5c2597 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.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