Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 711-712)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-199

3 files changed, 22 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3de9ca32484..b036ea11c33 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-25  Nick Roberts  <nickrob@snap.net.nz>
+
+        * make-tarball.txt: Add note about cutting the branch.
+
 2007-02-03  Eli Zaretskii  <eliz@gnu.org>
 
         * nt/makedist.bat: Change EOL format to DOS.  Don't use
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index e56c26571d9..2c6ccf95c40 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -76,7 +76,22 @@ For each step, check for possible errors.
 14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
     tell him to announce it using the announcement you prepared.  Remind
     him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
-    For a release, Richard should prepare the announcement himself,
+
+15. Shortly before the release, cut the branch with the following commands:
+
+    cvs rtag EMACS_`NUMBER'_BASE
+    cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
+
+where `NUMBER' is the major version number of the release.  This makes it
+easier to  see what changes have been applied to the branch with:
+
+    cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
+
+or merge changes back to the trunk with "cvs update -j", if necessary.
+
+After doing this, increase the version number on the trunk as per step 4.
+
+16. For a release, Richard should prepare the announcement himself,
     possibly starting from a previous announcment.
 
 # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390
diff --git a/admin/notes/copyright b/admin/notes/copyright
index d7f12bd8ad4..b366be2a2c7 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -591,8 +591,8 @@ REMOVED src/unexhp9k800.c
 
 *** These are copyright issues still to be addressed:
 
-Need an assignment from Kevin Rodgers (rms), else several changes to
-deal with.
+python.el potential legal problem
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html