Merge from emacs--rel--22

[bpt/emacs.git] / lisp / org / org-irc.el

diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index df4c1a2..30f6479 100644 (file)
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.02b
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -88,7 +88,7 @@
 (defun org-irc-parse-link (link)
   "Parse an IRC LINK and return the attributes found.
 Parse a LINK that looks like server:port/chan/user (port, chan
-and user being optional) and return any or the port, channel or user
+and user being optional) and return any of the port, channel or user
 attributes that are found."
   (let* ((parts (split-string link "/" t))
          (len (length parts)))
@@ -252,4 +252,5 @@ default."
 (provide 'org-irc)
 
 ;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
+
 ;;; org-irc.el ends here