aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/emacs.111
2 files changed, 9 insertions, 7 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index a01984d0bac..40b5e1757d1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12007-01-17 Romain Francoise <romain@orebokech.com>
2
3 * emacs.1: Update bug-gnu-emacs address. Remove reference to
4 info-gnu-emacs-request@prep.ai.mit.edu. Update copyrights.
5
12007-01-13 Michael Olson <mwolson@gnu.org> 62007-01-13 Michael Olson <mwolson@gnu.org>
2 7
3 * ERC-NEWS: Mention new erc-capab.el file. 8 * ERC-NEWS: Mention new erc-capab.el file.
diff --git a/etc/emacs.1 b/etc/emacs.1
index ed9de22bf33..5fe25097714 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -1,5 +1,5 @@
1.\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 1.\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
2.\" 2005, 2006 Free Software Foundation, Inc. 2.\" 2005, 2006, 2007 Free Software Foundation, Inc.
3.\" 3.\"
4.\" This file is part of GNU Emacs. 4.\" This file is part of GNU Emacs.
5.\" 5.\"
@@ -470,8 +470,7 @@ of one file by two users.
470.\" STOP DELETING HERE IF YOU'RE NOT USING X 470.\" STOP DELETING HERE IF YOU'RE NOT USING X
471.PP 471.PP
472.SH BUGS 472.SH BUGS
473There is a mailing list, bug-gnu-emacs@prep.ai.mit.edu on the internet 473There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
474(ucbvax!prep.ai.mit.edu!bug-gnu-emacs on UUCPnet), for reporting Emacs
475bugs and fixes. But before reporting something as a bug, please try 474bugs and fixes. But before reporting something as a bug, please try
476to be sure that it really is a bug, not a misunderstanding or a 475to be sure that it really is a bug, not a misunderstanding or a
477deliberate feature. We ask you to read the section ``Reporting Emacs 476deliberate feature. We ask you to read the section ``Reporting Emacs
@@ -485,9 +484,7 @@ For personal assistance, look in the SERVICE file (see above) for
485a list of people who offer it. 484a list of people who offer it.
486 485
487Please do not send anything but bug reports to this mailing list. 486Please do not send anything but bug reports to this mailing list.
488Send requests to be added to mailing lists to the special list 487For more information about Emacs mailing lists, see the
489info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP
490address). For more information about Emacs mailing lists, see the
491file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be 488file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be
492fixed if they can be isolated, so it is in your interest to report 489fixed if they can be isolated, so it is in your interest to report
493them in such a way that they can be easily reproduced. 490them in such a way that they can be easily reproduced.
@@ -537,7 +534,7 @@ Copyright
537.if t \(co 534.if t \(co
538.if n (c) 535.if n (c)
5391995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 5361995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
540 2006 Free Software Foundation, Inc. 537 2006, 2007 Free Software Foundation, Inc.
541.PP 538.PP
542Permission is granted to make and distribute verbatim copies of this 539Permission is granted to make and distribute verbatim copies of this
543document provided the copyright notice and this permission notice are 540document provided the copyright notice and this permission notice are