*** empty log message ***

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 036efa6f00688dfb01832cd5f3d0f92d719176e1..4e85512246a587dff2a4a571ae89692807b284c5 100644 (file)
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -15,19 +15,24 @@ longer, eg the text "GNU Emacs is free software...".
 
 Summary for the impatient:
 
-1. Don't add a file to Emacs written by someone other than yourself
+1. Don't add code to Emacs written by someone other than yourself
 without thinking about the legal aspect (make sure they have an
-assignment, adjust the copyright statements in the file). NB the
-ChangeLog entry should be in the name of the author of the code, not
-the person who installs it.
+assignment, if adding a file adjust the copyright statements in the
+file). NB the ChangeLog entry should be in the name of the author of
+the code, not the person who installs it.
 
-2. With images, add the legal info to a README file in the directory
+2. When installing code written by someone else, I think it is helpful
+to: i) put the name of the author in the cvs log (as well as the
+ChangeLog); and ii) not check-in any of your own changes to the same
+file in the same commit.
+
+3. With images, add the legal info to a README file in the directory
 containing the image.
 
-3. If you add a lot of text to a previously trivial file that had no
+4. If you add a lot of text to a previously trivial file that had no
 legal notices, consider if you should add a copyright statement.
 
-4. Please don't just add an FSF copyright without checking that is the
+5. Please don't just add an FSF copyright without checking that is the
 right thing to do.