Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

2007-07-24  Glenn Morris  <rgm@gnu.org>

   * lisp/calendar/cal-tex.el (cal-tex-holidays, cal-tex-diary)
   (cal-tex-rules, cal-tex-buffer, cal-tex-24)
   (cal-tex-cursor-month-landscape, cal-tex-cursor-month)
   (cal-tex-cursor-week, cal-tex-cursor-week2)
   (cal-tex-cursor-week-iso, cal-tex-week-hours)
   (cal-tex-cursor-week-monday, cal-tex-weekly4-box)
   (cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
   (cal-tex-cursor-filofax-daily, cal-tex-daily-page): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828

diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 82c0d90dea7de08f6a25bb9a0e1212b311b89ed1..1faa71efec93b946dff0b6111c3a752068b9416f 100644 (file)
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,