summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/FOR-RELEASE4
-rw-r--r--man/ChangeLog1
2 files changed, 3 insertions, 2 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 3b7eb8c4560..f45c5819466 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,5 +1,8 @@
Tasks needed before the next release.
+* UPDATE COPYRIGHTS (Happy New Year :-)
+
+
* TO BE DONE SHORTLY BEFORE RELEASE
** Check for widow and orphan lines in manuals;
@@ -8,7 +11,6 @@ make sure all the pages really look ok in the manual as formatted.
** Check for text in manuals that assumes current version is 21.
** Update AUTHORS.
-[Done 2006-10-03]
** Regenerate the postscript files of the reference cards in etc.
diff --git a/man/ChangeLog b/man/ChangeLog
index 1404658209e..6d2dfc2fbc7 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -53,7 +53,6 @@
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
->>>>>>> 1.1170
2006-12-27 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (Windows Keyboard): Mention widespread Windows bindings,