aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes
diff options
context:
space:
mode:
authorGlenn Morris2008-08-27 02:36:56 +0000
committerGlenn Morris2008-08-27 02:36:56 +0000
commitf11d52b507005d4f1298feecd66ef84fdd7f46f2 (patch)
tree1bbd268906bba50070f8fc06fa432707c7f39d0b /admin/notes
parentd3fe3475e362021b4518e77b6664d50782f1e9ba (diff)
downloademacs-f11d52b507005d4f1298feecd66ef84fdd7f46f2.tar.gz
emacs-f11d52b507005d4f1298feecd66ef84fdd7f46f2.zip
Some doc/ updates.
Diffstat (limited to 'admin/notes')
-rw-r--r--admin/notes/copyright18
1 files changed, 12 insertions, 6 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index f29aca7b437..ac95ad79f1c 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -230,9 +230,6 @@ lisp/play/tetris.el
230 <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html> 230 <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
231 rms: Legal advice is that we are ok and need not worry about this. 231 rms: Legal advice is that we are ok and need not worry about this.
232 232
233lispref/doclicense.texi
234man/doclicense.texi
235 - leave the copyright alone in this imported file.
236 233
237lisp/net/tramp.el 234lisp/net/tramp.el
238 - there are also copyrights in the body of the file. Update these too. 235 - there are also copyrights in the body of the file. Update these too.
@@ -307,12 +304,21 @@ originally. Although we have the legal right to switch to v2 or later,
307rms prefers that we do not do so. 304rms prefers that we do not do so.
308 305
309 306
310man/*.texi - All manuals should be under GFDL, and should include a 307doc/*/doclicense.texi
311copy of it, so that they can be distributed separately. faq.texi has 308 - leave the copyright alone in this imported file.
312a different license, for some reason no-one can remember. 309
310doc/*/*.texi - All manuals should be under GFDL (but see below), and
311should include a copy of it, so that they can be distributed
312separately. faq.texi has a different license, for some reason no-one
313can remember.
313http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html 314http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00583.html
314http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html 315http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00618.html
315 316
317doc/misc/mh-e.texi is dual-licensed (GPL and GFDL) per agreement with
318FSF (reconfirmed by rms Aug 25 2008). Discussion with
319licensing@fsf.org starting on Thu, 07 Aug 2003 with subject:
320"[gnu.org #58812] Changing license of MH-E manual"
321
316 322
317msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie. 323msdos/is_exec.c, sigaction.c - these files are copyright DJ Delorie.
318Leave the copyrights alone. Leave the Eli Zaretskii copyright in 324Leave the copyrights alone. Leave the Eli Zaretskii copyright in