aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-02-16 15:52:43 +0100
committerMichael Albinus2014-02-16 15:52:43 +0100
commitd34a353cfd51b01d00a9036240fb607bc502b8dc (patch)
treea7747c1bfb73c836bd54166f6530059f3fa1a155
parent62901354fda05c9a05543eecae4aaffb1c31985b (diff)
downloademacs-d34a353cfd51b01d00a9036240fb607bc502b8dc.tar.gz
emacs-d34a353cfd51b01d00a9036240fb607bc502b8dc.zip
* efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/efaq-w32.texi2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 50c6f26ac16..a238483772d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12014-02-16 Michael Albinus <michael.albinus@gmx.de>
2
3 * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2.
4
12014-02-14 Jay Belanger <jay.p.belanger@gmail.com> 52014-02-14 Jay Belanger <jay.p.belanger@gmail.com>
2 6
3 * calc.texi (Single-Variable Statistics): Remove mention of 7 * calc.texi (Single-Variable Statistics): Remove mention of
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 2ef6e99c6ac..17f1af61200 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1781,8 +1781,6 @@ openssh
1781PuTTY 1781PuTTY
1782@itemize 1782@itemize
1783@item @code{pscp} Uses pscp for copying, plink for shell operations. 1783@item @code{pscp} Uses pscp for copying, plink for shell operations.
1784@item @code{pscp1} pscp, with forced SSH protocol version 1
1785@item @code{pscp2} pscp, with forced SSH protocol version 2
1786@item @code{plink} Uses plink with encoding on stdin/stdout for file transfer. 1784@item @code{plink} Uses plink with encoding on stdin/stdout for file transfer.
1787@end itemize 1785@end itemize
1788@end itemize 1786@end itemize