Small faq.texi changes.

* doc/misc/faq.texi (Contacting the FSF): Mainly just refer to the web-site.
(Binding combinations of modifiers and function keys):
Let's assume people reading this are not using Emacs 18.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 32cbd6ca0d740cd00551fade1ad05a1d018a8188..7696ab4b520b0292986c1e3b8295b760247664cd 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-03  Glenn Morris  <rgm@gnu.org>
+
+       * faq.texi (Contacting the FSF): Mainly just refer to the web-site.
+       (Binding combinations of modifiers and function keys):
+       Let's assume people reading this are not using Emacs 18.
+
 2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 3c98588a7d56f542d534cd7e665e2f7077fdc22e..a9a5e4dc6eb1c0108dca201c966b5d423d1e101b 100644 (file)
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -502,36 +502,13 @@ contain information in either the message header
 unsubscribe.
 
 @node Contacting the FSF
-@section  What is the current address of the FSF?
-@cindex Snail mail address of the FSF
-@cindex Postal address of the FSF
+@section  How do I contact the FSF?
 @cindex Contracting the FSF
 @cindex Free Software Foundation, contacting
 
 For up-to-date information, see
 @uref{http://www.fsf.org/about/contact.html, the FSF contact web-page}.
-
-@table @asis
-
-@item E-mail
-info@@fsf.org
-
-@item Telephone
-+1-617-542-5942
-
-@item Fax
-+1-617-542-2652
-
-@item World Wide Web
-@uref{http://www.fsf.org/}
-
-@item Postal address
-Free Software Foundation@*
-51 Franklin Street, Fifth Floor@*
-Boston, MA 02110-1301@*
-USA@*
-
-@end table
+You can send general correspondence to @email{info@@fsf.org}.
 
 @cindex Ordering GNU software
 For details on how to order items directly from the FSF, see the
@@ -3895,9 +3872,9 @@ command.
 @cindex Function keys and modifiers
 @cindex Binding modifiers and function keys
 
-With Emacs 19 and later, you can represent modified function keys in
-vector format by adding prefixes to the function key symbol.  For
-example (from the Emacs documentation):
+You can represent modified function keys in vector format by adding
+prefixes to the function key symbol.  For example (from the Emacs
+documentation):
 
 @lisp
 (global-set-key [?\C-x right] 'forward-page)