[Emacs-diffs] Changes to emacs/man/gnus.texi

[Miles Bader]

Index: emacs/man/gnus.texi
diff -c emacs/man/gnus.texi:1.60 emacs/man/gnus.texi:1.61
*** emacs/man/gnus.texi:1.60    Fri Sep 30 03:03:53 2005
--- emacs/man/gnus.texi Sat Oct 15 00:20:57 2005
***************
*** 683,689 ****
  * Ultimate::                    The Ultimate Bulletin Board systems.
  * Web Archive::                 Reading mailing list archived on web.
  * RSS::                         Reading RDF site summary.
! * Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
  
  @acronym{IMAP}
  
--- 683,689 ----
  * Ultimate::                    The Ultimate Bulletin Board systems.
  * Web Archive::                 Reading mailing list archived on web.
  * RSS::                         Reading RDF site summary.
! * Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
  
  @acronym{IMAP}
  
***************
*** 8569,8576 ****
  can use include:
  
  @table @code
! @item w3
! Use Emacs/w3.
  
  @item w3m
  Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
--- 8569,8576 ----
  can use include:
  
  @table @code
! @item W3
! Use Emacs/W3.
  
  @item w3m
  Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
***************
*** 15093,15100 ****
  before it will be expired, or the symbol @code{never} to specify that
  articles should never be expired.  If this parameter is not set,
  @code{nnmaildir} falls back to the usual
! @code{nnmail-expiry-wait}(@code{-function}) variables (overrideable by
! the @code{expiry-wait}(@code{-function}) group parameters.  If you
  wanted a value of 3 days, you could use something like @code{[(* 3 24
  60 60)]}; @code{nnmaildir} will evaluate the form and use the result.
  An article's age is measured starting from the article file's
--- 15093,15101 ----
  before it will be expired, or the symbol @code{never} to specify that
  articles should never be expired.  If this parameter is not set,
  @code{nnmaildir} falls back to the usual
! @code{nnmail-expiry-wait}(@code{-function}) variables (the
! @code{expiry-wait} group parameter overrides @code{nnmail-expiry-wait}
! and makes @code{nnmail-expiry-wait-function} ineffective).  If you
  wanted a value of 3 days, you could use something like @code{[(* 3 24
  60 60)]}; @code{nnmaildir} will evaluate the form and use the result.
  An article's age is measured starting from the article file's
***************
*** 15117,15124 ****
  you use the vector form, the first element is evaluated once for each
  article.  So that form can refer to
  @code{nnmaildir-article-file-name}, etc., to decide where to put the
! article.  @emph{If this parameter is not set, @code{nnmaildir} does
! not fall back to the @code{expiry-target} group parameter or the
  @code{nnmail-expiry-target} variable.}
  
  @item read-only
--- 15118,15125 ----
  you use the vector form, the first element is evaluated once for each
  article.  So that form can refer to
  @code{nnmaildir-article-file-name}, etc., to decide where to put the
! article.  @emph{Even if this parameter is not set, @code{nnmaildir}
! does not fall back to the @code{expiry-target} group parameter or the
  @code{nnmail-expiry-target} variable.}
  
  @item read-only
***************
*** 15534,15543 ****
  * Ultimate::                    The Ultimate Bulletin Board systems.
  * Web Archive::                 Reading mailing list archived on web.
  * RSS::                         Reading RDF site summary.
! * Customizing w3::              Doing stuff to Emacs/w3 from Gnus.
  @end menu
  
! All the web sources require Emacs/w3 and the url library to work.
  
  The main caveat with all these web sources is that they probably won't
  work for a very long time.  Gleaning information from the @acronym{HTML} data
--- 15535,15545 ----
  * Ultimate::                    The Ultimate Bulletin Board systems.
  * Web Archive::                 Reading mailing list archived on web.
  * RSS::                         Reading RDF site summary.
! * Customizing W3::              Doing stuff to Emacs/W3 from Gnus.
  @end menu
  
! All the web sources require Emacs/W3 and the url library or those
! alternatives to work.
  
  The main caveat with all these web sources is that they probably won't
  work for a very long time.  Gleaning information from the @acronym{HTML} data
***************
*** 15624,15631 ****
  community.  Since @code{nnweb} washes the ads off all the articles, one
  might think that the providers might be somewhat miffed.  We'll see.
  
! You must have the @code{url} and @code{w3} package installed to be able
! to use @code{nnweb}.
  
  Virtual server variables:
  
--- 15626,15634 ----
  community.  Since @code{nnweb} washes the ads off all the articles, one
  might think that the providers might be somewhat miffed.  We'll see.
  
! You must have the @code{url} and @code{W3} package or those alternatives
! (try @code{customize-group} on the @samp{mm-url} variable group)
! installed to be able to use @code{nnweb}.
  
  Virtual server variables:
  
***************
*** 15845,15853 ****
  text by default.  It is also used by default for address@hidden
  group names.
  
! @kindex G R (Summary)
! Use @kbd{G R} from the summary buffer to subscribe to a feed---you will
! be prompted for the location, the title and the description of the feed.
  The title, which allows any characters, will be used for the group name
  and the name of the group data file.  The description can be omitted.
  
--- 15848,15856 ----
  text by default.  It is also used by default for address@hidden
  group names.
  
! @kindex G R (Group)
! Use @kbd{G R} from the group buffer to subscribe to a feed---you will be
! prompted for the location, the title and the description of the feed.
  The title, which allows any characters, will be used for the group name
  and the name of the group data file.  The description can be omitted.
  
***************
*** 15940,15957 ****
  (add-to-list 'nnmail-extra-headers nnrss-url-field)
  @end lisp
  
! @node Customizing w3
! @subsection Customizing w3
! @cindex w3
  @cindex html
  @cindex url
  @cindex Netscape
  
! Gnus uses the url library to fetch web pages and Emacs/w3 to display web
! pages.  Emacs/w3 is documented in its own manual, but there are some
! things that may be more relevant for Gnus users.
  
! For instance, a common question is how to make Emacs/w3 follow links
  using the @code{browse-url} functions (which will call some external web
  browser like Netscape).  Here's one way:
  
--- 15943,15961 ----
  (add-to-list 'nnmail-extra-headers nnrss-url-field)
  @end lisp
  
! @node Customizing W3
! @subsection Customizing W3
! @cindex W3
  @cindex html
  @cindex url
  @cindex Netscape
  
! Gnus uses the url library to fetch web pages and Emacs/W3 (or those
! alternatives) to display web pages.  Emacs/W3 is documented in its own
! manual, but there are some things that may be more relevant for Gnus
! users.
  
! For instance, a common question is how to make Emacs/W3 follow links
  using the @code{browse-url} functions (which will call some external web
  browser like Netscape).  Here's one way:
  
***************
*** 15966,15972 ****
          (w3-fetch-orig url target)))))
  @end lisp
  
! Put that in your @file{.emacs} file, and hitting links in w3-rendered
  @acronym{HTML} in the Gnus article buffers will use @code{browse-url} to
  follow the link.
  
--- 15970,15976 ----
          (w3-fetch-orig url target)))))
  @end lisp
  
! Put that in your @file{.emacs} file, and hitting links in W3-rendered
  @acronym{HTML} in the Gnus article buffers will use @code{browse-url} to
  follow the link.
  
***************
*** 16559,16565 ****
  @cindex namespaces
  
  The @acronym{IMAP} protocol has a concept called namespaces, described
! by the following text in the RFC:
  
  @display
  5.1.2.  Mailbox Namespace Naming Convention
--- 16563,16569 ----
  @cindex namespaces
  
  The @acronym{IMAP} protocol has a concept called namespaces, described
! by the following text in the RFC2060:
  
  @display
  5.1.2.  Mailbox Namespace Naming Convention
***************
*** 16891,16924 ****
  
  @item article-begin
  This setting has to be present in all document type definitions.  It
! says what the beginning of each article looks like.
  
  @item head-begin-function
  If present, this should be a function that moves point to the head of
! the article.
  
! @item nndoc-head-begin
! If present, this should be a regexp that matches the head of the
! article.
! 
! @item nndoc-head-end
  This should match the end of the head of the article.  It defaults to
  @samp{^$}---the empty line.
  
  @item body-begin-function
  If present, this function should move point to the beginning of the body
! of the article.
  
! @item body-begin
! This should match the beginning of the body of the article.  It defaults
! to @samp{^\n}.
  
  @item body-end-function
  If present, this function should move point to the end of the body of
! the article.
  
! @item body-end
! If present, this should match the end of the body of the article.
  
  @item file-end
  If present, this should match the end of the file.  All text after this
--- 16895,16942 ----
  
  @item article-begin
  This setting has to be present in all document type definitions.  It
! says what the beginning of each article looks like.  To do more
! complicated things that cannot be dealt with a simple regexp, you can
! use @code{article-begin-function} instead of this.
! 
! @item article-begin-function
! If present, this should be a function that moves point to the beginning
! of each article.  This setting overrides @code{article-begin}.
! 
! @item head-begin
! If present, this should be a regexp that matches the head of the
! article.  To do more complicated things that cannot be dealt with a
! simple regexp, you can use @code{head-begin-function} instead of this.
  
  @item head-begin-function
  If present, this should be a function that moves point to the head of
! the article.  This setting overrides @code{head-begin}.
  
! @item head-end
  This should match the end of the head of the article.  It defaults to
  @samp{^$}---the empty line.
  
+ @item body-begin
+ This should match the beginning of the body of the article.  It defaults
+ to @samp{^\n}.  To do more complicated things that cannot be dealt with
+ a simple regexp, you can use @code{body-begin-function} instead of this.
+ 
  @item body-begin-function
  If present, this function should move point to the beginning of the body
! of the article.  This setting overrides @code{body-begin}.
  
! @item body-end
! If present, this should match the end of the body of the article.  To do
! more complicated things that cannot be dealt with a simple regexp, you
! can use @code{body-end-function} instead of this.
  
  @item body-end-function
  If present, this function should move point to the end of the body of
! the article.  This setting overrides @code{body-end}.
  
! @item file-begin
! If present, this should match the beginning of the file.  All text
! before this regexp will be totally ignored.
  
  @item file-end
  If present, this should match the end of the file.  All text after this
***************
*** 16949,16954 ****
--- 16967,16985 ----
  expected to generate a nice head for the article in question.  It is
  called when requesting the headers of all articles.
  
+ @item generate-article-function
+ If present, this function is called to generate an entire article that
+ Gnus can understand.  It is called with the article number as a
+ parameter when requesting all articles.
+ 
+ @item dissection-function
+ If present, this function is called to dissect a document by itself,
+ overriding @code{first-article}, @code{article-begin},
+ @code{article-begin-function}, @code{head-begin},
+ @code{head-begin-function}, @code{head-end}, @code{body-begin},
+ @code{body-begin-function}, @code{body-end}, @code{body-end-function},
+ @code{file-begin}, and @code{file-end}.
+ 
  @end table
  
  Let's look at the most complicated example I can come up with---standard
***************
*** 24388,24394 ****
  whatever packages the Gnus XEmacs package requires.  The current
  requirements are @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
  @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
! @samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{w3},
  @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto}, and @samp{sasl}.
  
  
--- 24419,24425 ----
  whatever packages the Gnus XEmacs package requires.  The current
  requirements are @samp{gnus}, @samp{mail-lib}, @samp{xemacs-base},
  @samp{eterm}, @samp{sh-script}, @samp{net-utils}, @samp{os-utils},
! @samp{dired}, @samp{mh-e}, @samp{sieve}, @samp{ps-print}, @samp{W3},
  @samp{pgg}, @samp{mailcrypt}, @samp{ecrypto}, and @samp{sasl}.