Merge from trunk.

3 files changed, 11 insertions, 8 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 26e3de63808..80a66be3fa4 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -151,7 +151,7 @@ TUTORIAL.zh
 abbrevs.texi      
 ack.texi          
 anti.texi
-arevert-xtra.texi
+arevert-xtra.texi cyd
 basic.texi        cyd
 buffers.texi      
 building.texi     
@@ -162,12 +162,12 @@ commands.texi     cyd
 custom.texi       
 dired.texi        
 dired-xtra.texi
-display.texi      
+display.texi      cyd
 emacs.texi        
 emacs-xtra.texi
 emerge-xtra.texi
 entering.texi     cyd
-files.texi        
+files.texi        cyd
 fixit.texi        
 fortran-xtra.texi 
 frames.texi       
@@ -175,7 +175,7 @@ glossary.texi
 help.texi         cyd
 indent.texi       
 killing.texi      cyd
-kmacro.texi       
+kmacro.texi       cyd
 macos.texi        
 maintaining.texi  
 major.texi        
@@ -191,7 +191,7 @@ programs.texi
 regs.texi         cyd
 rmail.texi        
 screen.texi       cyd
-search.texi       
+search.texi       cyd
 sending.texi      
 text.texi         
 trouble.texi      
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index 2c3749244fb..2e954570ce8 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -1,3 +1,7 @@
+If installing changes written by someone else, make the ChangeLog
+entry in their name, not yours.
+
+
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
   There is no need to make change log entries for files such as NEWS,
   MAINTAINERS, and FOR-RELEASE.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index f4d22f9b270..0ad99900779 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -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
-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.