[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1a2c896 3/3: Merge branch 'master' of git.savannah.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 1a2c896 3/3: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Mon, 1 Jul 2019 22:19:35 -0400 (EDT) |
branch: master
commit 1a2c896aedc4a615b3c6102624326891a0481461
Merge: 0f83034 23d0620
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
doc/misc/tramp.texi | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index df8ae6f..9efc86e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -402,12 +402,15 @@ $ autoconf
@end group
@end example
-
+@ifset installchapter
@c Installation chapter is necessary only in case of standalone
@c installation.
-@ifset installchapter
@include trampinst.texi
@end ifset
+@ifclear installchapter
+See the file @file{INSTALL} in that directory for further information
+how to install @value{tramp}.
+@end ifclear
@node Quick Start Guide
@@ -3269,10 +3272,13 @@ This command flushes all connection related objects.
@option{vec} is
the internal representation of a remote connection. When called
interactively, this command lists active remote connections in the
minibuffer. Each connection is of the format
-@file{@trampfn{method,user@@host,}}. Flushing remote connections also
-cleans the password cache (@pxref{Password handling}), file cache,
-connection cache (@pxref{Connection caching}), recentf cache
-(@pxref{File Conveniences, , , emacs}), and connection buffers.
+@file{@trampfn{method,user@@host,}}.
+
+Flushing remote connections also cleans the password cache
+(@pxref{Password handling}), file cache, connection cache
+(@pxref{Connection caching}), and recentf cache (@pxref{File
+Conveniences, , , emacs}). It also deletes session timers
+(@pxref{Predefined connection information}) and connection buffers.
@end deffn
@deffn Command tramp-cleanup-this-connection
@@ -3290,7 +3296,7 @@ proxy definitions (@pxref{Ad-hoc multi-hops}).
@deffn Command tramp-cleanup-all-buffers
Just as for @code{tramp-cleanup-all-connections}, all remote
connections and ad-hoc proxy definition are cleaned up in addition to
-killing buffers related to that remote connection.
+killing all buffers related to remote connections.
@end deffn