From 254a49f49eadc6b870fdca447533ba09004a28b2 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 19 Feb 2018 19:41:15 +0100 Subject: [PATCH] ; Add changes in tramp.texi which were conflicted in merge from emacs-26 --- doc/misc/tramp.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 0dd82c582c2..d91c4a9bb3e 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -2245,12 +2245,12 @@ Some older versions of Cygwin's @command{ssh} work with the @option{sshx} access method. Consult Cygwin's FAQ at @uref{https://cygwin.com/faq/} for details. -@cindex cygwin and fakecygpty -@cindex fakecygpty and cygwin +@cindex cygwin and @command{fakecygpty} +@cindex @command{fakecygpty} and cygwin On @uref{https://www.emacswiki.org/emacs/SshWithNTEmacs, the Emacs -Wiki} it is explained how to use the helper program @code{fakecygpty} -to fix this problem. +Wiki} it is explained how to use the helper program +@command{fakecygpty} to fix this problem. @cindex method @option{scpx} with cygwin @cindex @option{scpx} method with cygwin @@ -2264,7 +2264,7 @@ for a host named @code{c}. A workaround: write a wrapper script for @option{scp} to convert Windows file names to Cygwin file names. -@cindex cygwin and ssh-agent +@cindex cygwin and @command{ssh-agent} @cindex @env{SSH_AUTH_SOCK} and emacs on ms windows When using the @command{ssh-agent} on MS Windows for password-less -- 2.39.2