Merge from emacs-23 branch

[gnu-emacs] / lisp / obsolete / options.el

diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 1b475e9e98bbedf4de334e53c564f1ac6638b607..7c1c3552e2db7eb12c90c693da34f87f8ffd2b30 100644 (file)
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1985, 2001-2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
+;; Obsolete-since: 22.1
 
 ;; This file is part of GNU Emacs.
 
@@ -21,8 +22,6 @@
 
 ;;; Commentary:
 
-;; This file has been obsolete since Emacs 22.1.
-
 ;; This code provides functions to list and edit the values of all global
 ;; option variables known to loaded Emacs Lisp code.  There are two entry
 ;; points, `list-options' and `edit' options'.  The latter enters a major