Merge from trunk.

[gnu-emacs] / lisp / play / fortune.el

diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 55b0a564fef1d3f890d0c1d45b964d85557ec3d3..61de49aadf0a7b363957134f31c6c6a80e833d8b 100644 (file)
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -1,6 +1,6 @@
 ;;; fortune.el --- use fortune to create signatures
 
-;; Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <Holger.Schauer@gmx.de>
 ;; Keywords: games utils mail
@@ -52,7 +52,7 @@
 ;;       (lambda ()
 ;;          (define-key gnus-article-mode-map "i" 'fortune-from-region)))
 ;; which allows marking a region and then pressing "i" so that the marked
-;; region will be automatically added to my favourite fortune-file.
+;; region will be automatically added to my favorite fortune-file.
 
 ;;; Code: