* notes/unicode: ja-dic.el is now UTF-8.

[gnu-emacs] / admin / notes / copyright

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 39eb003a07dd4860d56fc6237550088303174395..3a404b69678a79f8ffe604df488bbc872aba7fa0 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2011  Free Software Foundation, Inc.
+Copyright (C) 2007-2013 Free Software Foundation, Inc.

 See the end of the file for license conditions.
 
 
 See the end of the file for license conditions.
 
 


@@ -24,9 +24,8 @@ the file.
 
 2. When installing code written by someone else, the ChangeLog entry
 should be in the name of the author of the code, not the person who
 
 2. When installing code written by someone else, the ChangeLog entry
 should be in the name of the author of the code, not the person who

-installs it.  I think it is helpful to put the author (if not yourself)
-in the commit log as well (you can also use bzr commit's "--author"
-option); and to not install any of your own changes in the same commit.
+installs it.  Also use bzr commit's "--author" option.
+Do not install any of your own changes in the same commit.

 
 3. With images, add the legal info to a README file in the directory
 containing the image.
 
 3. With images, add the legal info to a README file in the directory
 containing the image.


@@ -143,7 +142,7 @@ m4/*.m4
 lib/Makefile.in
  - copyright FSF, with MIT-like license
 
 lib/Makefile.in
  - copyright FSF, with MIT-like license
 

-install-sh
+build-aux/install-sh

  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
 etc/refcards/*.tex
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
 etc/refcards/*.tex


@@ -381,7 +380,7 @@ Makefile.in does now.
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
 
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
 

-src/ndir.h
+nt/inc/dirent.h

   - see comments below. This file is OK to be released with Emacs
   22, but we may want to revisit it afterwards.
 
   - see comments below. This file is OK to be released with Emacs
   22, but we may want to revisit it afterwards.
 


@@ -430,7 +429,7 @@ admin/check-doc-strings
   File says it's in the public domain, but that might not make it so.
 
 etc/e/eterm-color.ti
   File says it's in the public domain, but that might not make it so.
 
 etc/e/eterm-color.ti

-src/ndir.h
+nt/inc/dirent.h

   On legal advice from Matt Norwood, the following comment was added
   to these files in Feb/Mar 2007:
 
   On legal advice from Matt Norwood, the following comment was added
   to these files in Feb/Mar 2007:
 


@@ -545,16 +544,17 @@ of writing) GPL >= 2. rms says may as well leave the licenses of these
 alone (may import them from Gnulib again). These are:
 
     Gnulib:
 alone (may import them from Gnulib again). These are:
 
     Gnulib:

-    arg-nonnull.h
-    c++defs.h
-    compile
-    config.guess
-    config.sub
-    depcomp
+    build-aux/compile
+    build-aux/config.guess
+    build-aux/config.sub
+    build-aux/depcomp
+    build-aux/missing
+    build-aux/move-if-change
+    build-aux/snippet/_Noreturn.h
+    build-aux/snippet/arg-nonnull.h
+    build-aux/snippet/c++defs.h
+    build-aux/snippet/warn-on-use.h

     doc/man/texinfo.tex
     doc/man/texinfo.tex

-    missing
-    move-if-change
-    warn-on-use.h

     lib/*.[ch]
     lib/gnulib.mk
     src/gmalloc.c
     lib/*.[ch]
     lib/gnulib.mk
     src/gmalloc.c