aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorKenichi Handa2010-01-13 10:33:19 +0900
committerKenichi Handa2010-01-13 10:33:19 +0900
commitd1bf28dc12ef1a0f3cecbf78f38795db27b38574 (patch)
treef7030cdefb9d5d8423619e7d70273ae98c011821 /etc
parentdc954cb273234237b615b93b6368d4adbdea31c4 (diff)
parentca22a44072c65a233af5b4c12256dc5fd266cb85 (diff)
downloademacs-d1bf28dc12ef1a0f3cecbf78f38795db27b38574.tar.gz
emacs-d1bf28dc12ef1a0f3cecbf78f38795db27b38574.zip
merge trunk
Diffstat (limited to 'etc')
-rw-r--r--etc/CONTRIBUTE8
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/NEWS4
3 files changed, 10 insertions, 7 deletions
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 2807a58cae1..1ae0a690018 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,4 +1,4 @@
1Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 1Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
2See end for license conditions. 2See end for license conditions.
3 3
4 4
@@ -73,7 +73,7 @@ Every patch must have several pieces of information before we
73can properly evaluate it. 73can properly evaluate it.
74 74
75When you have all these pieces, bundle them up in a mail message and 75When you have all these pieces, bundle them up in a mail message and
76send it to emacs-pretest-bug@gnu.org or emacs-devel@gnu.org. 76send it to bug-gnu-emacs@gnu.org or emacs-devel@gnu.org.
77 77
78All subsequent discussion should also be sent to the mailing list. 78All subsequent discussion should also be sent to the mailing list.
79 79
@@ -149,9 +149,7 @@ giving you write access to the CVS repository.
149 149
150Discussion about Emacs development takes place on emacs-devel@gnu.org. 150Discussion about Emacs development takes place on emacs-devel@gnu.org.
151 151
152Bug reports for released versions are sent to bug-gnu-emacs@gnu.org. 152Bug reports are sent to bug-gnu-emacs@gnu.org.
153
154Bug reports for development versions are sent to emacs-pretest-bug@gnu.org.
155 153
156You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs. 154You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs.
157 155
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 176076f066a..d2ee1bd034c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12010-01-12 Glenn Morris <rgm@gnu.org>
2
3 * CONTRIBUTE, NEWS: Use bug-gnu-emacs rather than emacs-pretest-bug
4 for bug reports for development versions.
5
12010-01-01 Juanma Barranquero <lekktu@gmail.com> 62010-01-01 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * NEWS: Fix typos. 8 * NEWS: Fix typos.
diff --git a/etc/NEWS b/etc/NEWS
index a4e44f065c4..3b4faf099ce 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,9 +1,9 @@
1GNU Emacs NEWS -- history of user-visible changes. 1GNU Emacs NEWS -- history of user-visible changes.
2 2
3Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. 3Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6Please send Emacs bug reports to emacs-pretest-bug@gnu.org. 6Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
7If possible, use M-x report-emacs-bug. 7If possible, use M-x report-emacs-bug.
8 8
9This file is about changes in Emacs version 23. 9This file is about changes in Emacs version 23.