*** empty log message ***

2 files changed, 40 insertions, 16 deletions

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 1aa354f03ac..1f536595f13 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -25,6 +25,30 @@ a file is auto-generated (eg ldefs-boot.el) from another one in the
 CVS, then it does not really matter about adding a copyright statement
 to the generated file.
 
+However, here is a quote from Matt Norwood (Software Freedom Law
+Center) that suggests we should revise the above policy about trivial
+files:
+
+    If FSF has a strong policy reason notices off of files it
+    considers "trivial", this will take a lot more bookkeeping; it
+    also runs the risk of these "trivial" files later growing into
+    non-trivial files, and being in the tree without any record of
+    authorship. All in all, I think it's a better policy to attach the
+    notice and let future authors decide if something is trivial when
+    they want to reuse it elsewhere.
+    [...]
+    In general, copyright law will step back and look at the overall "work"
+    consisting of all the assembled components working together as a system;
+    it will apply protection and permissions to this system, not to its
+    subcomponents. If parts of it are recombined into another system, it
+    will consider the protections and permissions for each of the source
+    components only in order to assess the overall status of the work again.
+    The assessment of whether a set of components is entitled to copyright
+    protection is the degree to which they display "creativity": not as
+    atomic units, but as parts of a system working in concert. Thus, several
+    "trivial" components working together in some coherent system might be
+    protectible.
+
 The years in the copyright notice should be updated every year (see
 file "years" in this directory). The PS versions of refcards etc
 should display copyright notices (an exception to the rule about
@@ -290,6 +314,9 @@ src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
 isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, umips.h, usg5-4-2.h
   - all these (not obviously trivial) files are missing copyrights.
   rms: "I should talk about these with Matthew Norwood."
+The current legal advice seems to be that we should attach FSF
+copyright and GPL for the time being, then review post-release. But it
+is still under discussion.
 
 
 This file is part of GNU Emacs.
diff --git a/etc/images/README b/etc/images/README
index 48db127896c..71e187befa6 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -28,7 +28,7 @@ part of Emacs, but distributed and used by Emacs.
 
 * From GTK+ 2.x:
 
-    close.xpm copy.xpm cut.xpm find-replace.xpm help.xpm home.xpm
+    close.xpm copy.xpm cut.xpm help.xpm home.xpm
     index.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm paste.xpm
     preferences.xpm print.xpm refresh.xpm right-arrow.xpm save.xpm
     saveas.xpm search.xpm sort-ascending.xpm sort-descending.xpm
@@ -37,24 +37,14 @@ part of Emacs, but distributed and used by Emacs.
     back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
     diropen.xpm is file-manager.png from Gnome hicolor theme.
 
-    low-color/[back-arrow.xpm copy.xpm cut.xpm fwd-arrow.xpm help.xpm
-    home.xpm index.xpm jump-to.xpm left-arrow.xpm new.xpm
-    next-node.xpm open.xpm paste.xpm preferences.xpm prev-node.xpm
-    print.xpm right-arrow.xpm save.xpm saveas.xpm search.xpm spell.xpm
-    undo.xpm up-arrow.xpm up-node.xpm]
-
 * From GNOME 2.x:
 
     attach.xpm connect.xpm contact.xpm data-save.xpm delete.xpm
-    describe.xpm disconnect.xpm exit.xpm gnus/toggle-subscription.xpm
-    lock-broken.xpm lock-ok.xpm lock.xpm mail/compose.xpm
-    mail/copy.xpm mail/flag-for-followup.xpm mail/forward.xpm
-    mail/inbox.xpm mail/move.xpm mail/not-spam.xpm mail/outbox.xpm
-    mail/preview.xpm redo.xpm mail/reply-all.xpm mail/reply.xpm
-    mail/save-draft.xpm mail/save.xpm search-replace.xpm mail/send.xpm mail/spam.xpm
-    next-page.xpm refresh.xpm separator.xpm sort-ascending.xpm
-    sort-column-ascending.xpm sort-criteria.xpm sort-descending.xpm
-    sort-row-ascending.xpm zoom-in.xpm zoom-out.xpm 
+    describe.xpm disconnect.xpm exit.xpm lock-broken.xpm lock-ok.xpm
+    lock.xpm redo.xpm search-replace.xpm next-page.xpm refresh.xpm
+    separator.xpm sort-ascending.xpm sort-column-ascending.xpm
+    sort-criteria.xpm sort-descending.xpm sort-row-ascending.xpm
+    zoom-in.xpm zoom-out.xpm 
 
     cancel.xpm is a slightly modified stock_stop.
     show.xpm is a slightly modified stock_new.    
@@ -62,3 +52,10 @@ part of Emacs, but distributed and used by Emacs.
     next-node.xpm and prev-node.xpm are from gthumb version 2.0 (part of
     GNOME 2.x) where they are called next-image-24.png and prev-image-24.png.
     up-node.xpm is just next-node.xpm rotated 90 degrees.
+
+    Some icons in the mail/ and gnus/ subdirectories are also taken
+    from this source (see their separate README files).
+
+The images in the low-color/ subdirectory are low-color versions of
+the files of the same name in this directory, and are subject to the
+same conditions.