X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/dcd812be6a39c9290339bfaba48e64d65713168b..ad80bf1720695dd104924238bcbb8e03c48af737:/doc/misc/efaq-w32.texi

diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 255621bf9a..314aa8db36 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -17,7 +17,7 @@ Answers to Frequently asked Questions about using Emacs on Microsoft Windows.
 @documentlanguage en
 
 @copying
-Copyright @copyright{} 2008, 2010-2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2010-2014 Free Software Foundation, Inc.
 
 @quotation
 This list of frequently asked questions about GNU Emacs on MS Windows
@@ -71,6 +71,10 @@ At time of writing, the latest version of GNU Emacs is version @value{EMACSVER}.
 @c Links to ftp.gnu.org are given as http links, since Windows ftp clients
 @c are notoriously bad at handling firewalls etc.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @contents
 
 @menu
@@ -1353,7 +1357,7 @@ you can use @code{setbuf} and @code{setvbuf} to manipulate
 the buffering semantics.
 
 Some programs handle this by having an explicit flag to control their
-buffering behaviour, typically @option{-i} for interactive.  Other
+buffering behavior, typically @option{-i} for interactive.  Other
 programs manage to detect that they are running under Emacs, by
 using @samp{getenv("emacs")} internally.
 
@@ -1460,7 +1464,7 @@ default shell in Emacs, you can place the following in your init file:
   (setq comint-eol-on-send t)
   (setq w32-quote-process-args ?\")
 
-(setq shell-mode-hook 'my-shell-setup)
+(add-hook 'shell-mode-hook 'my-shell-setup)
 @end example
 
 If you find that you are having trouble with Emacs tracking drive
@@ -1770,22 +1774,14 @@ methods to use in @code{tramp-default-method} or
 openssh
 @itemize
 @item @code{scp} Uses scp for copying, ssh for shell operations.
-@item @code{scp1} scp with forced SSH protocol version 1
-@item @code{scp2} scp with forced SSH protocol version 2
 @item @code{ssh} Uses ssh with encoding on stdin/stdout for file transfer.
-@item @code{ssh1} ssh with forced SSH protocol version 1
-@item @code{ssh2} ssh with forced SSH protocol version 2
 @end itemize
 
 @item
 PuTTY
 @itemize
 @item @code{pscp} Uses pscp for copying, plink for shell operations.
-@item @code{pscp1} pscp, with forced SSH protocol version 1
-@item @code{pscp2} pscp, with forced SSH protocol version 2
 @item @code{plink} Uses plink with encoding on stdin/stdout for file transfer.
-@item @code{plink1} plink with forced SSH protocol version 1
-@item @code{plink2} plink with forced SSH protocol version 2
 @end itemize
 @end itemize