Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab38920..141c554 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-05  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * nntp.el (nntp-via-rlogin-command-switches): Doc fix.
+       (nntp-open-via-rlogin-and-telnet): Ditto.
+
 2002-07-02  Didier Verna  <didier@xemacs.org>
 
        * nnmail.el (nnmail-split-methods): fix custom type.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 6efb0a1..047b8a5 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -140,9 +140,10 @@ The default is \"rsh\", but \"ssh\" is a popular alternative.")
 
 (defvoo nntp-via-rlogin-command-switches nil
   "*Switches given to the rlogin command `nntp-via-rlogin-command'.
-Set this to (\"-t\") if you use \"ssh\" for `nntp-via-rlogin-command' and
-the telnet command requires a pseudo-tty allocation on an intermediate
-host.")
+If you use \"ssh\" for `nntp-via-rlogin-command', you may set this to
+\(\"-C\") in order to compress all data connections, otherwise set this
+to \(\"-t\") or (\"-C\" \"-t\") if the telnet command requires a pseudo-tty
+allocation on an intermediate host.")
 
 (defvoo nntp-via-telnet-command "telnet"
   "*Telnet command used to connect to an intermediate host.
@@ -1670,6 +1671,7 @@ from there.
 Please refer to the following variables to customize the connection:
 - `nntp-pre-command',
 - `nntp-via-rlogin-command',
+- `nntp-via-rlogin-command-switches',
 - `nntp-via-user-name',
 - `nntp-via-address',
 - `nntp-telnet-command',

diff --git a/texi/ChangeLog b/texi/ChangeLog
index c710173..97e127c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (NNTP): Doc fix.
+
 2002-07-02  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.texi (Washing Mail): Document the shortcoming of

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index e1d8e19..5a3290b 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11488,9 +11488,10 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 @vindex nntp-via-rlogin-command-switches
 @code{nntp-via-rlogin-command} \e$B$N%3%^%s%I$N%9%$%C%A$H$7$F;H$o$l$kJ8;zNs\e(B
 \e$B$N%j%9%H$G$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#$b\e(B
-\e$B$7\e(B @samp{ssh} \e$B$r\e(B @code{nntp-via-rlogin-command} \e$B$NCM$H$7$F;H$$!"$+$DCf4V\e(B
-\e$B$N%[%9%H$G\e(B telnet \e$B%3%^%s%I$,5?;wC<Kv$rI,MW$H$9$k$J$i$P!"$3$l\e(B
-\e$B$r\e(B @samp{("-t")} \e$B$K$7$F2<$5$$!#\e(B
+\e$B$7\e(B @samp{ssh} \e$B$r\e(B @code{nntp-via-rlogin-command} \e$B$NCM$H$7$F;H$&$J$i$P!"%G!<\e(B
+\e$B%?@\B3$r05=L$9$k$?$a$K\e(B @samp{("-C")} \e$B$r;H$&$3$H$,$G$-$^$9!#$"$k$$$O!"$b\e(B
+\e$B$7Cf4V$N%[%9%H$G\e(B telnet \e$B%3%^%s%I$,5?;wC<Kv$rI,MW$H$9$k$J$i$P!"$3$l\e(B
+\e$B$r\e(B @samp{("-t")} \e$B$^$?$O\e(B @samp{("-C" "-t")} \e$B$K$7$F2<$5$$!#\e(B
 @end table
 
 @item nntp-open-via-telnet-and-telnet

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 380c50d..1f5c11a 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12015,10 +12015,11 @@ Command used to log in on the intermediate host.  The default is
 @item nntp-via-rlogin-command-switches
 @vindex nntp-via-rlogin-command-switches
 List of strings to be used as the switches to
-@code{nntp-via-rlogin-command}.  The default is @code{nil}.  Set this to
-@samp{("-t")} if you use @samp{ssh} for @code{nntp-via-rlogin-command}
-and the telnet command requires a pseudo-tty allocation on an
-intermediate host.
+@code{nntp-via-rlogin-command}.  The default is @code{nil}.  If you use
+@samp{ssh} for `nntp-via-rlogin-command', you may set this to
+@samp{("-C")} in order to compress all data connections, otherwise set
+this to @samp{("-t")} or @samp{("-C" "-t")} if the telnet command
+requires a pseudo-tty allocation on an intermediate host.
 @end table
 
 @item nntp-open-via-telnet-and-telnet