Synch to No Gnus 200411162151.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5e41f3b..ee68133 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-16  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (NNTP): Mention nntp-marks-is-evil and
+       nntp-marks-directory, from Romain Francoise
+       <romain@orebokech.com>.
+
 2004-11-14  Magnus Henoch  <mange@freemail.hu>
 
        * gnus.texi (Hashcash): New default value of

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 242a198..f38c2a8 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12192,6 +12192,15 @@ 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-shell-prompt
 \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
+
+@item nntp-marks-is-evil
+@vindex nntp-marks-is-evil
+\e$BHs\e(B-@code{nil} \e$B$@$C$?$i!"$3$N%P%C%/%(%s%I$O\e(B @sc{marks} \e$B%U%!%$%k$rL5;k$7$^\e(B
+\e$B$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
+
+@item nntp-marks-directory
+@vindex nntp-marks-directory
+@acronym{NNTP} \e$B%0%k!<%W$N\e(B @sc{marks} \e$B$,3JG<$5$l$k%G%#%l%/%H%j$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

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2a688e3..ebbf2a1 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12964,6 +12964,15 @@ login name.  This works for Solaris @code{telnet}, for instance.
 Regexp matching the shell prompt on the intermediate host.  The default
 is @samp{bash\\|\$ *\r?$\\|> *\r?}.
 
+@item nntp-marks-is-evil
+@vindex nntp-marks-is-evil
+If non-@code{nil}, this back end will ignore any @sc{marks} files.  The
+default is @code{nil}.
+
+@item nntp-marks-directory
+@vindex nntp-marks-directory
+The directory where @sc{marks} for nntp groups will be stored.
+
 @end table
 
 Note that you may want to change the value for @code{nntp-end-of-line}