Merge from trunk.

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

diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index ed1603b890afe7a63c3793d43292760676d1ff79..b8b2f53097d3683237b1f988ef7c82f684b3a204 100644 (file)
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -1,8 +1,7 @@
 ;;; bruce.el --- bruce phrase utility for overloading the Communications -*- no-byte-compile: t -*-
 ;;; Decency Act snoops, if any.
 
-;; Copyright (C) 1988, 1993, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 1993, 1997, 2001-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
@@ -111,7 +110,7 @@
   :group 'games)
 
 (defcustom bruce-phrases-file "~/bruce.lines"
-  "Keep your favourite phrases here."
+  "Keep your favorite phrases here."
   :type 'file
   :group 'bruce)
 
@@ -146,5 +145,4 @@
 
 (provide 'bruce)
 
-;; arch-tag: b83ded51-4ccb-41ef-8bd6-3b521e81dd9b
 ;;; bruce.el ends here