HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
doc
/
misc
/
faq.texi
diff --git
a/doc/misc/faq.texi
b/doc/misc/faq.texi
index
691e7bd
..
7528abc
100644
(file)
--- a/
doc/misc/faq.texi
+++ b/
doc/misc/faq.texi
@@
-11,8
+11,7
@@
@c appreciate a notice if you do).
@copying
@c appreciate a notice if you do).
@copying
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010, 2011 Free Software Foundation, Inc.@*
+Copyright @copyright{} 2001-2011 Free Software Foundation, Inc.@*
Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
Reuven M. Lerner@*
Copyright @copyright{} 1992, 1993 Steven Byrnes@*
Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
Reuven M. Lerner@*
Copyright @copyright{} 1992, 1993 Steven Byrnes@*
@@
-503,36
+502,13
@@
contain information in either the message header
unsubscribe.
@node Contacting the FSF
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}.
@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
@cindex Ordering GNU software
For details on how to order items directly from the FSF, see the
@@
-1066,11
+1042,11
@@
Emacs now supports using both X displays and ttys in the same session
@item
Emacs can be started as a daemon in the background.
@item
Emacs can be started as a daemon in the background.
-@cindex NeXT
STEP
port
+@cindex NeXT
step
port
@cindex GNUstep port
@cindex Mac OS X Cocoa
@item
@cindex GNUstep port
@cindex Mac OS X Cocoa
@item
-There is a new NeXT
STEP
port of Emacs. This supports GNUstep and Mac OS
+There is a new NeXT
step
port of Emacs. This supports GNUstep and Mac OS
X (via the Cocoa libraries). The Carbon port of Emacs, which supported
Mac OS X in Emacs 22, has been removed.
X (via the Cocoa libraries). The Carbon port of Emacs, which supported
Mac OS X in Emacs 22, has been removed.
@@
-3896,9
+3872,9
@@
command.
@cindex Function keys and modifiers
@cindex Binding modifiers and function keys
@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)
@lisp
(global-set-key [?\C-x right] 'forward-page)