# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1172636258 0
# Node ID 9f4ddf81fa26c28fcc477c67dba4b71bcfc0583c
# Parent  40be809ca22121090aaa9a354ae896b8650a0379
*** empty log message ***

diff -r 40be809ca221 -r 9f4ddf81fa26 admin/notes/copyright
--- a/admin/notes/copyright	Wed Feb 28 04:12:39 2007 +0000
+++ b/admin/notes/copyright	Wed Feb 28 04:17:38 2007 +0000
@@ -139,6 +139,12 @@
 etc/emacs.csh
   - keep simple license for this simple file
 
+etc/future-bug
+ - doesn't need a humourless disclaimer, because Karl Fogel says we
+ can consider it part of Emacs, and he has a blanker disclaimer for
+ Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug",
+ 2007028)
+
 etc/letter.pbm,letter.xpm
   - trivial, no notice needed.
 <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
@@ -164,6 +170,8 @@
 leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
 pinyin.map, ziranma.cin
   - leave the copyright alone.
+Note that pinyin.map, ziranma.cin (and hence the generated
+leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later.
 
 leim/SKK-DIC/SKK-JISYO.L
 ja-dic/ja-dic.el
@@ -214,6 +222,11 @@
 rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider
 it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib."
 
+Leave these files under GPLv1 or later.
+[Note that lwlib.c and xlwmenu.c were installed in 1994 under GPLv2 or
+later, but I reverted them to GPLv1 or later which I think is right
+for the original lwlib/.] FIXME was this right?
+
 FSF copyrights should only appear in files which have undergone
 non-trivial cumulative changes from the original versions in the Lucid
 Widget Library. NB this means that if you make non-trivial changes to
@@ -512,6 +525,10 @@
 Done: TUTORIAL.eo
 
 
+lwlib/*
+  should it be under GPLv1 or later, or v2 or later?
+
+
 
 This file is part of GNU Emacs.
 
diff -r 40be809ca221 -r 9f4ddf81fa26 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 28 04:12:39 2007 +0000
+++ b/lisp/ChangeLog	Wed Feb 28 04:17:38 2007 +0000
@@ -1,3 +1,8 @@
+2007-02-28  Glenn Morris  <rgm@gnu.org>
+
+	* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in
+	the menus case.
+
 2007-02-28  Chong Yidong  <cyd@stupidchicken.com>
 
 	* net/tramp.el (tramp-file-name-handler): Inhibit modification