Sync changes from upstream ERC

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ecc782fb895..bcb66cd1b67 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-18  Exal de Jesus Garcia Carrillo  <exal@gmx.de>
+
+        * erc.texi (Special-Features): Fix small typo.
+
 2007-09-14  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Filename Syntax): Provide links to "Inline methods"
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 3ff8fce9471..fa5790f1527 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -393,7 +393,7 @@ buffers in Emacs.  We call these ``query buffers''.
 
 @item highlighting
 
-Some occurences of words can be highlighted, which makes it easier to
+Some occurrences of words can be highlighted, which makes it easier to
 track different kinds of conversations.
 
 @item notification