Update copyright year to 2015

[gnu-emacs] / doc / misc / efaq-w32.texi

diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 2ef6e99c6ac252df4dcb5ced141a021a24589943..9691a731123153c116d9f1bd95469584cebd027a 100644 (file)
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -1,5 +1,5 @@
 \input texinfo    @c -*-coding:utf-8 -*-
-@setfilename efaq-w32
+@setfilename ../../info/efaq-w32.info
 @settitle GNU Emacs FAQ For MS Windows
 @setchapternewpage odd
 @syncodeindex pg cp
@@ -17,7 +17,7 @@ Answers to Frequently asked Questions about using Emacs on Microsoft Windows.
 @documentlanguage en
 
 @copying
-Copyright @copyright{} 2008, 2010-2014 Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2010-2015 Free Software Foundation, Inc.
 
 @quotation
 This list of frequently asked questions about GNU Emacs on MS Windows
@@ -176,7 +176,7 @@ The latest source is available from
 distributed as a compressed tar file, digitally signed by the maintainer
 who made the release.
 
-@cindex Bzr, getting Emacs
+@cindex getting Emacs
 @cindex latest development version of Emacs
 @cindex Emacs Development
 The development version of Emacs is available from
@@ -199,8 +199,8 @@ of GNU @command{rm} and @command{cp}, as the Windows native
 equivalents are not consistent between versions.  GNU texinfo will be
 required to build the manuals.  @xref{Other useful ports}.
 
-After unpacking the source, or checking out of Bzr, be sure to read the
-instructions in @file{nt/README} and @file{nt/INSTALL}.
+After unpacking the source, or checking out of the repository, be sure
+to read the instructions in @file{nt/README} and @file{nt/INSTALL}.
 
 @node Debugging
 @section How do I use a debugger on Emacs?
@@ -1176,8 +1176,8 @@ Place the following in your init file:
 @cindex font menu, adding fonts
 @vindex w32-fixed-font-alist
 
-If you have set w32-use-w32-font-dialog to nil, you can add fonts to
-the font menu by changing `w32-fixed-font-alist'.  For example:
+If you have set w32-use-w32-font-dialog to @code{nil}, you can add fonts to
+the font menu by changing @code{w32-fixed-font-alist}.  For example:
 
 @example
 (setq w32-fixed-font-alist
@@ -1464,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
@@ -1664,8 +1664,8 @@ smtpmail is loaded, then you'll need to change
 @code{smtpmail-smtp-server}.
 
 If you are experiencing problems with sending large messages, check
-the value of the variable @code{smtpmail-debug-info}. If it is non-nil, you
-should set it to @code{nil}:
+the value of the variable @code{smtpmail-debug-info}. If it is
+non-@code{nil}, you should set it to @code{nil}:
 
 @node Incoming mail with Rmail
 @subsection Incoming mail with Rmail and POP3
@@ -1781,8 +1781,6 @@ openssh
 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.
 @end itemize
 @end itemize