Synch to No Gnus 200404121015.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index de8dd7f..484a9b8 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.texi (Indirect Functions): Add
+       nntp-open-via-rlogin-and-netcat.
+
 2004-04-11  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-news.texi: Add OPML.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index f056000..5acdb97 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12141,7 +12141,7 @@ LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$
 @end lisp
 
 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
-\e$B$O!"NI$$0F$G$O$"$j$^$;$s!#\e(B
+\e$B$O!"NI$$9M$($G$O$"$j$^$;$s!#\e(B
 @end table
 
 @node Indirect Functions
@@ -12180,9 +12180,42 @@ 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
 \e$B$F2<$5$$!#\e(B
 @end table
 
+@code{nntp-end-of-line} \e$B$NCM$r\e(B @samp{\n} \e$B$KJQ99$9$kI,MW$,$"$k$G$"$m$&$3\e(B
+\e$B$H$KCm0U$7$F2<$5$$\e(B (@pxref{Common Variables})\e$B!#\e(B
+
+@item nntp-open-via-rlogin-and-netcat
+@findex nntp-open-via-rlogin-and-netcat
+\e$BK\<AE*$K$OF1$8$3$H$J$N$G$9$,!"Cf4V$N%[%9%H$+$iK\Ev$N\e(B @acronym{NNTP} \e$B%5!<\e(B
+\e$B%P!<$K@\B3$9$k$?$a$K!"\e(B@samp{telnet} \e$B$NBe$o$j$K\e(B @samp{netcat}
+(@uref{http://netcat.sourceforge.net/}) \e$B$r;H$$$^$9!#\e(B
+
+@code{nntp-open-via-rlogin-and-netcat}-\e$BMQ$NJQ?t\e(B:
+
+@table @code
+@item nntp-via-netcat-command
+@vindex nntp-via-netcat-command
+\e$BCf4V$N%[%9%H$+$iK\Ev$N\e(B @acronym{NNTP} \e$B%5!<%P!<$K@\B3$9$k$?$a$K;H$o$l$k%3\e(B
+\e$B%^%s%I$G$9!#%G%#%U%)%k%H$O\e(B @samp{nc} \e$B$G$9!#Be$o$j$K\e(B @samp{connect}
+(@uref{http://www.imasy.or.jp/~gotoh/ssh/connect.html}) \e$B$N$h$&$J!"B>$N%3\e(B
+\e$B%^%s%I$r;H$&$3$H$b$G$-$^$9!#\e(B
+
+@item nntp-via-netcat-switches
+@vindex nntp-via-netcat-switches
+@code{nntp-via-netcat-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!#\e(B
+
+@item nntp-via-rlogin-command
+\e$BCf4V$N%[%9%H$K%m%0%$%s$9$k$?$a$K;H$o$l$k%3%^%s%I$G$9!#%G%#%U%)%k%H\e(B
+\e$B$O\e(B @samp{rsh} \e$B$G$9$,!"\e(B@samp{ssh} \e$B$,?M5$$N$"$kBeBX<jCJ$G$9!#\e(B
+
+@item 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!#\e(B
+@end table
+
 @item nntp-open-via-telnet-and-telnet
 @findex nntp-open-via-telnet-and-telnet
-\e$BK\<AE*$K$OF1$8$3$H$J$N$G$9$,!"Cf4V$N%[%9%H$K@\B3$9$k$?$a\e(B
+\e$B$3$l$bK\<AE*$K$OF1$8$3$H$J$N$G$9$,!"Cf4V$N%[%9%H$K@\B3$9$k$?$a\e(B
 \e$B$K\e(B @samp{rlogin} \e$B$NBe$o$j$K\e(B @samp{telnet} \e$B$r;H$$$^$9!#\e(B
 
 @code{nntp-open-via-telnet-and-telnet}-\e$BMQ$NJQ?t\e(B:
@@ -12213,6 +12246,9 @@ 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
 \e$BCf4V$N%[%9%H$G$N%7%'%k$N%W%m%s%W%H$K9gCW$9$k@55,I=8=$G$9!#%G%#%U%)%k%H\e(B
 \e$B$O\e(B @samp{bash\\|\$ *\r?$\\|> *\r?} \e$B$G$9!#\e(B
 @end table
+
+@code{nntp-end-of-line} \e$B$NCM$r\e(B @samp{\n} \e$B$KJQ99$9$kI,MW$,$"$k$G$"$m$&$3\e(B
+\e$B$H$KCm0U$7$F2<$5$$\e(B (@pxref{Common Variables})\e$B!#\e(B
 @end table
 
 \e$B$3$l$i$O>e5-$N4X?t$,;2>H$9$kIU2CE*$JJQ?t$G$9\e(B:
@@ -12259,7 +12295,7 @@ 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-end-of-line
 @acronym{NNTP} \e$B%5!<%P!<$H$*OC$r$7$F$$$k$H$-$K9T$N=*$o$j$N0u$H$7$F;H$o$l\e(B
 \e$B$kJ8;zNs$G$9!#$3$l$O%G%#%U%)%k%H$G\e(B @samp{\r\n} \e$B$G$9$,!"AG$G$O$J$$@\B3MQ\e(B
-\e$B$N4X?t$r;H$C$F$$$k$H$-$O\e(B @samp{\n} \e$B$G$"$k$Y$-$G$9!#\e(B
+\e$B$N\e(B telnet \e$B4X?t$r;H$C$F$$$k$H$-$O\e(B @samp{\n} \e$B$G$"$k$Y$-$G$9!#\e(B
 
 @item nntp-telnet-command
 @vindex nntp-telnet-command

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 71d7d09..de86ffd 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12886,9 +12886,42 @@ the telnet command requires a pseudo-tty allocation on an intermediate
 host.
 @end table
 
+Note that you may want to change the value for @code{nntp-end-of-line}
+to @samp{\n} (@pxref{Common Variables}).
+
+@item nntp-open-via-rlogin-and-netcat
+@findex nntp-open-via-rlogin-and-netcat
+Does essentially the same, but uses @samp{netcat}
+(@uref{http://netcat.sourceforge.net/}) instead of @samp{telnet} to
+connect to the real @acronym{NNTP} server from the intermediate host.
+
+@code{nntp-open-via-rlogin-and-netcat}-specific variables:
+
+@table @code
+@item nntp-via-netcat-command
+@vindex nntp-via-netcat-command
+Command used to connect to the real @acronym{NNTP} server from the
+intermediate host.  The default is @samp{nc}.  You can also use other
+programs like @samp{connect}
+(@uref{http://www.imasy.or.jp/~gotoh/ssh/connect.html}) instead.
+
+@item nntp-via-netcat-switches
+@vindex nntp-via-netcat-switches
+List of strings to be used as the switches to the
+@code{nntp-via-telnet-command} command.  The default is @code{nil}.
+
+@item nntp-via-rlogin-command
+Command used to log in on the intermediate host.  The default is
+@samp{rsh}, but @samp{ssh} is a popular alternative.
+
+@item 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}.
+@end table
+
 @item nntp-open-via-telnet-and-telnet
 @findex nntp-open-via-telnet-and-telnet
-Does essentially the same, but uses @samp{telnet} instead of
+Does essentially also the same, but uses @samp{telnet} instead of
 @samp{rlogin} to connect to the intermediate host.
 
 @code{nntp-open-via-telnet-and-telnet}-specific variables:
@@ -12921,6 +12954,8 @@ is @samp{bash\\|\$ *\r?$\\|> *\r?}.
 
 @end table
 
+Note that you may want to change the value for @code{nntp-end-of-line}
+to @samp{\n} (@pxref{Common Variables}).
 @end table
 
 
@@ -12973,7 +13008,7 @@ not work with named ports.
 @vindex nntp-end-of-line
 String to use as end-of-line marker when talking to the @acronym{NNTP}
 server.  This is @samp{\r\n} by default, but should be @samp{\n} when
-using a non native connection function.
+using a non native telnet connection function.
 
 @item nntp-telnet-command
 @vindex nntp-telnet-command