merge trunk

2 files changed, 5 insertions, 5 deletions

diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index ee385f4dd75..61f8027e9a2 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -627,7 +627,9 @@ following headers:
 
 1) The leading envelope From line.
 2) Message-ID (get it from /var/log/mailman/vette).
-3) X-Debbugs-Envelope-To: submit
+3) X-Debbugs-Envelope-To: xxx
+For a new report, xxx = submit; for a control message, xxx = control;
+for a reply to bug#123, xxx = 123
 
 Then pipe it to receive as above.
 
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 53d568dd628..6db5bb7d05c 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -201,15 +201,11 @@ nontrivial changes to the build process.
      operating in some other language environment.
 
         etc/tutorials/TUTORIAL.ja
-        etc/tutorials/TUTORIAL.ko
         leim/quail/cyril-jis.el
         leim/quail/hanja-jis.el
-        leim/quail/hanja.el
-        leim/quail/hanja3.el
         leim/quail/japanese.el
         leim/quail/py-punct.el
         leim/quail/pypunct-b5.el
-        leim/quail/symbol-ksc.el
         lisp/international/ja-dic-cnv.el
         lisp/international/ja-dic-utl.el
         lisp/international/kinsoku.el
@@ -219,6 +215,8 @@ nontrivial changes to the build process.
         lisp/language/japanese.el
         lisp/term/x-win.el
 
+ * utf-8-emacs
+
      These files contain characters that cannot be encoded in UTF-8.
 
         leim/quail/tibetan.el