2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index eec2478b162..5f283b44ee0 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * erc.el (erc-startup-file-list): Fix typo in docstring.
+
 2007-06-06  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-show-channel-key-p): Fix typo in docstring.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 72442de9f95..d6875ffc4af 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -842,7 +842,7 @@ See `erc-server-flood-margin' for other flood-related parameters.")
 The first existent and readable one will get executed.
 
 If the filename ends with `.el' it is presumed to be an Emacs Lisp
-script and it gets (load)ed.  Otherwise is is treated as a bunch of
+script and it gets (load)ed.  Otherwise it is treated as a bunch of
 regular IRC commands."
   :group 'erc-scripts
   :type '(repeat file))