Synch to No Gnus 200404120749.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e36fb8..cb1e0d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,7 @@
        (nntp-open-via-rlogin-and-netcat): New function.
        (nntp-open-connection-function): Doc fix.
        (nntp-telnet-command): Doc fix.
+       (nntp-end-of-line): Doc fix.
        (nntp-via-rlogin-command): Doc fix.
        (nntp-via-user-name): Doc fix.
        (nntp-via-address): Doc fix.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 234865c..94fe885 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -142,8 +142,8 @@ This command is used by the `nntp-open-via-rlogin-and-netcat' method.")
 
 (defvoo nntp-end-of-line "\r\n"
   "*String to use on the end of lines when talking to the NNTP server.
-This is \"\\r\\n\" by default, but should be \"\\n\" when
-using and indirect connection method (nntp-open-via-*).")
+This is \"\\r\\n\" by default, but should be \"\\n\" when using and
+indirect telnet connection method (nntp-open-via-*-and-telnet).")
 
 (defvoo nntp-via-rlogin-command "rsh"
   "*Rlogin command used to connect to an intermediate host.