Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1097

2 files changed, 2 insertions, 1 deletions

diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index 2ec29252d47..399d5ec8237 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -2923,6 +2923,7 @@ Return nil if no complete line has arrived."
           imap-open-1
           imap-open
           imap-opened
+          imap-ping-server
           imap-authenticate
           imap-close
           imap-capability
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 8c588a11451..de82ae7473d 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -61,7 +61,7 @@
 
 (defun netrc-parse (file)
   (interactive "fFile to Parse: ")
-  "Parse FILE and return an list of all entries in the file."
+  "Parse FILE and return a list of all entries in the file."
   (when (file-exists-p file)
     (with-temp-buffer
       (let ((tokens '("machine" "default" "login"