Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com

[gnu-emacs] / lisp / textmodes / remember.el

diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index 1923ab692d8a40f829e7178c7b6ed5ceef9892df..6500160a7d3c2f0d8836283f790131d76dd8c06d 100644 (file)
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -1,6 +1,6 @@
 ;;; remember --- a mode for quickly jotting down things to remember
 
-;; Copyright (C) 1999-2001, 2003-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2001, 2003-2012  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Created: 29 Mar 1999
@@ -113,7 +113,7 @@
 ;;  - Allowing particular views of the initially amorphous data pool
 ;;    (ala the Xanadu concept).
 ;;
-;;  - Storage of the data in a manner most appopriate to that data,
+;;  - Storage of the data in a manner most appropriate to that data,
 ;;    such as keeping address-book type information in BBDB, etc.
 ;;
 ;; * Using "remember"
@@ -474,7 +474,7 @@ If this is nil, then `diary-file' will be used instead."
           (replace-match
            (let ((style (if (boundp 'calendar-date-style)
                             calendar-date-style
-                          ;; Don't complain about obsoleteness.
+                          ;; Don't complain about obsolescence.
                           (if (with-no-warnings european-calendar-style)
                               'european
                             'american))))