Auto-commit of loaddefs files.

[gnu-emacs] / etc / ERC-NEWS

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index ec348a450f678ec920cb1e994fa36b802861cd5a..aaa497088062184b4fb86f83381cde425c5b67b2 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,8 +1,10 @@
 ERC NEWS                                                       -*- outline -*-
 
 ERC NEWS                                                       -*- outline -*-
 

-Copyright (C) 2006, 2007, 2008  Free Software Foundation, Inc.
+Copyright (C) 2006-2013 Free Software Foundation, Inc.

 See the end of the file for license conditions.
 
 See the end of the file for license conditions.
 

+* For changes after ERC 5.3, see the main Emacs NEWS file
+

 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.
 * Changes in ERC 5.3
 
 ** New function `erc-tls' is to be used for connecting to a server via TLS.


@@ -852,7 +854,7 @@ Only the macros in cl-macs.el are used.
 ** If possible, re-use channel buffers when reconnecting to a server.
 
 ** Text in ERC buffers is now read-only by default.
 ** If possible, re-use channel buffers when reconnecting to a server.
 
 ** Text in ERC buffers is now read-only by default.

-To get the previous behavior, 
+To get the previous behavior,

 
 ** Changes and additions to modules
 
 
 ** Changes and additions to modules
 


@@ -1279,8 +1281,8 @@ in XEmacs.
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
   extension modules you want to use.  This unfortunately may require

-  you to change your current erc initialisation code a bit, if you
-  have some existing customsations.  On the other hand, this change
+  you to change your current erc initialization code a bit, if you
+  have some existing customizations.  On the other hand, this change

   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
   ERC by using the customize interface, you should no longer really
   makes the configuration of extension modules a lot easier for new
   users.  In theory, you should be able to configure all aspects of
   ERC by using the customize interface, you should no longer really


@@ -1312,9 +1314,8 @@ in both directions.  This feature is currently only available in Emacs
 ** erc is switching to global-minor-modes for activation of submodules.
 
 This allows you to customize such a mode and get automatic loading of
 ** erc is switching to global-minor-modes for activation of submodules.
 
 This allows you to customize such a mode and get automatic loading of

-the module.  No longer putting a lot of require statments in .emacs.
-At least this is the long-term plan, not all modules are converted
-yet.
+the module.  No longer putting a lot of require statements in .emacs.
+At least this is the long-term plan, not all modules are converted yet.

 
 ** The most important user visible change is that you now need to activate
 erc-completion-mode, to get TAB completion.  The new completion code
 
 ** The most important user visible change is that you now need to activate
 erc-completion-mode, to get TAB completion.  The new completion code


@@ -1331,10 +1332,10 @@ the rest should be automatic.
 \f
 This file is part of GNU Emacs.
 
 \f
 This file is part of GNU Emacs.
 

-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify

 it under the terms of the GNU General Public License as published by
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.

 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -1342,8 +1343,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.