Merge from trunkpending

1 files changed, 4 insertions, 4 deletions

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 7528abca58d..5b7bb7ec9ce 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -11,7 +11,7 @@
 @c appreciate a notice if you do).
 
 @copying
-Copyright @copyright{} 2001-2011 Free Software Foundation, Inc.@*
+Copyright @copyright{} 2001-2012 Free Software Foundation, Inc.@*
 Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
 Reuven M. Lerner@*
 Copyright @copyright{} 1992, 1993 Steven Byrnes@*
@@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point.
 
 @ifnottex
 @insertcopying
-@end ifnottex 
+@end ifnottex
 
 @menu
 * FAQ notation::
@@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope.
 There has never been a copyright infringement case involving the GPL to
 set any precedents.  Although legal actions have been brought against
 companies for violating the terms of the GPL, so far all have been
-settled out of court (in favour of the plaintiffs).  Please take any
+settled out of court (in favor of the plaintiffs).  Please take any
 discussion regarding this issue to the newsgroup
 @uref{news:gnu.misc.discuss}, which was created to hold the extensive
 flame wars on the subject.
@@ -627,7 +627,7 @@ translations of the reference card into several languages; look for
 files named @file{etc/refcards/@var{lang}-refcard.*}, where @var{lang}
 is a two-letter code of the language.  For example, the German version
 of the reference card is in the files @file{etc/refcards/de-refcard.tex}
-and @file{etc/recards/de-refcard.pdf}.
+and @file{etc/refcards/de-refcard.pdf}.
 
 @item
 There are many other commands in Emacs for getting help and