Synch to No Gnus 200409020953.

diff --git a/GNUS-NEWS b/GNUS-NEWS
index edd6eed..9cf36e9 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -9,13 +9,28 @@ For older news, see Gnus info node "New Features".
 \f
 * Changes in No Gnus
 
-./gnus-news.texi:23: Cross reference to nonexistent node `RSS' (perhaps incorrect sectioning?).
-This file contains a list of news features Gnus.  It is supposed to be
-included in `gnus.texi'.  `GNUS-NEWS' is automatically generated from this
-file (see `gnus-news.el').
+** Upgrading from previous (stable) version if you have used No Gnus.
+
+If you have tried No Gnus (the unstable Gnus branch leading to this
+release) but went back to a stable version, be careful when upgrading
+to this version.  In particular, you will probably want to remove the
+`~/News/marks' directory (perhaps selectively), so that flags are
+read from your `~/.newsrc.eld' instead of from the stale marks file,
+where this release will store flags for nntp.  See a later entry for
+more information about nntp marks.  Note that downgrading isn't safe
+in general.
+
+** The nntp back end store article marks in `~/News/marks'.
+
+The directory can be changed using the (customizable) variable
+`nntp-marks-directory', and marks can be disabled using the (backend)
+variable `nntp-marks-is-evil'.  The advantage of this is that you can
+copy `~/News/marks' (using rsync, scp or whatever) to another Gnus
+installation, and it will realize what articles you have read and
+marked.  The data in `~/News/marks' has priority over the same data
+in `~/.newsrc.eld'.
 
 ** You can import and export your RSS subscriptions from OPML files.
-*Note RSS::.
 
 ** The option `mm-fill-flowed' can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5b01d66..3d046d0 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-02  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-news.texi: Comment out comment stuff.
+       Don't use xref's, GNUS-NEWS look wrong.
+       Add nntp marks stuff.
+       Add (copied from Oort Gnus GNUS-NEWS).
+
+       * Makefile.in (GNUS-NEWS): Move to "..".
+
 2004-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * infohack.el: Support @copying and @insertcopying for Emacs 21.3

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 6174220..a86cdb2 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -77,10 +77,10 @@ most: texi2latex.elc latex latexps
 # Files included in gnus.texi
 gnus.texi: gnus-faq.texi gnus-news.texi
 
-# FIXME: Target should be in parent directory.  A cvs commit script could
-# automatically create it.
+# FIXME: A cvs commit script could automatically create it.
 GNUS-NEWS:     gnus-news.texi
        $(EMACSCOMP) -l $(srcdir)/gnus-news.el -f batch-gnus-news $< $@
+       mv $@ ../$@
 
 dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi sieve.dvi
 

diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi
index d05e1d8..de92c7b 100644 (file)
--- a/texi/gnus-news.texi
+++ b/texi/gnus-news.texi
@@ -12,17 +12,38 @@
 @c    under the above conditions, provided also that they
 @c    carry prominent notices stating who last changed them.
 
-This file contains a list of news features Gnus.  It is supposed to be
-included in `gnus.texi'.  `GNUS-NEWS' is automatically generated from
-this file (see `gnus-news.el').
+@c This file contains a list of news features Gnus.  It is supposed to be
+@c included in `gnus.texi'.  `GNUS-NEWS' is automatically generated from
+@c this file (see `gnus-news.el').
 
 @itemize @bullet
 
+@item Upgrading from previous (stable) version if you have used No Gnus.
+
+If you have tried No Gnus (the unstable Gnus branch leading to this
+release) but went back to a stable version, be careful when upgrading
+to this version.  In particular, you will probably want to remove the
+@file{~/News/marks} directory (perhaps selectively), so that flags are
+read from your @file{~/.newsrc.eld} instead of from the stale marks
+file, where this release will store flags for nntp.  See a later entry
+for more information about nntp marks.  Note that downgrading isn't
+safe in general.
+
+@item The nntp back end store article marks in @file{~/News/marks}.
+
+The directory can be changed using the (customizable) variable
+@code{nntp-marks-directory}, and marks can be disabled using the
+(backend) variable @code{nntp-marks-is-evil}.  The advantage of this
+is that you can copy @file{~/News/marks} (using rsync, scp or
+whatever) to another Gnus installation, and it will realize what
+articles you have read and marked.  The data in @file{~/News/marks}
+has priority over the same data in @file{~/.newsrc.eld}.
+
 @item
 You can import and export your @acronym{RSS} subscriptions from
-@acronym{OPML} files.  @xref{RSS}.
+@acronym{OPML} files.
 
-@item 
+@item
 The option @code{mm-fill-flowed} can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending
 inline @acronym{PGP} signed messages.