[Emacs-diffs] /srv/bzr/emacs/trunk r103101: Small faq.texi changes.

[Glenn Morris]

------------------------------------------------------------
revno: 103101
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-02 23:37:43 -0800
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/faq.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-03 05:01:44 +0000
+++ b/doc/misc/ChangeLog        2011-02-03 07:37:43 +0000
@@ -1,3 +1,9 @@
+2011-02-03  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,

=== modified file 'doc/misc/faq.texi'
--- a/doc/misc/faq.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/faq.texi 2011-02-03 07:37:43 +0000
@@ -502,36 +502,13 @@
 unsubscribe.
 
 @node Contacting the FSF
address@hidden  What is the current address of the FSF?
address@hidden Snail mail address of the FSF
address@hidden Postal address of the FSF
address@hidden  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}.
-
address@hidden @asis
-
address@hidden E-mail
-info@@fsf.org
-
address@hidden Telephone
-+1-617-542-5942
-
address@hidden Fax
-+1-617-542-2652
-
address@hidden World Wide Web
address@hidden://www.fsf.org/}
-
address@hidden Postal address
-Free Software address@hidden
-51 Franklin Street, Fifth address@hidden
-Boston, MA address@hidden
address@hidden
-
address@hidden 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 @@
 @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)