Merge from emacs-24

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

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 2e136017039f8504c3f008c4b3f32d873243668f..f048f75372c650bf30f6682e1c73cf9542cf1ac5 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1,6 +1,6 @@
 \input texinfo   @c -*- mode: texinfo; -*-
 @c %**start of header
-@setfilename ../../info/efaq
+@setfilename ../../info/efaq.info
 @settitle GNU Emacs FAQ
 @documentencoding UTF-8
 @c %**end of header
@@ -1944,7 +1944,7 @@ automatically scrolls the display horizontally when point moves off the
 left or right edge of the window.
 
 Note that this is overridden by the variable
-@code{truncate-partial-width-windows} if that variable is non-nil
+@code{truncate-partial-width-windows} if that variable is non-@code{nil}
 and the current buffer is not full-frame width.
 
 In Emacs 20, use @code{hscroll-mode}.
@@ -3264,8 +3264,8 @@ archive sites that make GNU software available.
 
 First of all, you should check to make sure that the package isn't
 already available.  For example, typing @kbd{M-x apropos @key{RET}
-wordstar @key{RET}} lists all functions and variables containing the
-string @samp{wordstar}.
+python @key{RET}} lists all functions and variables containing the
+string @samp{python}.
 
 It is also possible that the package is on your system, but has not been
 loaded.  To see which packages are available for loading, look through