Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-62

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-616
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-620
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-622
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-625
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-626
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-627
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-628
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-629
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-630
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-631
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-632
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-633
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-54
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-56
   Update from CVS: Add lisp/legacy-gnus-agent.el

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-57
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-58
   Update from CVS

6 files changed, 86 insertions, 26 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 8aec01712ef..f70d49f9e29 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,43 @@
+2004-10-21  Jay Belanger  <belanger@truman.edu>
+        * calc.texi (Algebraic-Style Calculations): Removed a comment.
+
+2004-10-19  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (info): Change order of arguments to makeinfo.
+
+2004-10-19  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar.texi (iCalendar): Update for package changes.
+
+2004-10-18  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * calc.texi (Reporting Bugs): Double up `@'.
+
+2004-10-18  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Reporting Bugs):  Changed the address that bugs
+        should be sent to. 
+        
+2004-10-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (New Features): Add 5.11.
+
+        * message.texi (Resending): Remove wrong default value.
+
+        * gnus.texi (Mail Source Specifiers): Describe possible problems
+        of `pop3-leave-mail-on-server'.  Add `pop3-movemail' and
+        `pop3-leave-mail-on-server' to the index.
+
+2004-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.texi (Canceling News): Add how to set a password.
+
+2004-10-12  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Help Commands):  Changed the descriptions of
+        calc-describe-function and calc-describe-variable to match their
+        current behavior. 
+
 2004-10-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-faq.texi ([5.9]): Improve code for reply-in-news.
@@ -154,6 +194,16 @@
         * display.texi (Display Custom): Add `overflow-newline-into-fringe',
         `indicate-buffer-boundaries' and `default-indicate-buffer-boundaries'.
 
+2004-09-22  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Vectors as Lists): Added a warning that the tutorial
+        might be hidden during part of the session.
+
+2004-09-20  Jay Belanger  <belanger@truman.edu>
+
+        * calc.texi (Notations Used in This Manual): Put in an earlier
+        mention that DEL could be called Backspace.
+        
 2004-09-20  Richard M. Stallman  <rms@gnu.org>
 
         * custom.texi (Hooks): Explain using setq to clear out a hook.
diff --git a/man/calc.texi b/man/calc.texi
index a77ba4eb266..e1fdea44dd0 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -2038,8 +2038,7 @@ though regular numeric keys still use RPN numeric entry.  There is also
 a ``total algebraic mode,'' started by typing @kbd{m t}, in which all
 normal keys begin algebraic entry.  You must then use the @key{META} key
 to type Calc commands:  @kbd{M-m t} to get back out of total algebraic
-mode, @kbd{M-q} to quit, etc.  Total algebraic mode is not supported
-under Emacs 19.)
+mode, @kbd{M-q} to quit, etc.)
 
 If you're still in algebraic mode, press @kbd{m a} again to turn it off.
 
@@ -34286,11 +34285,10 @@ press @kbd{M-# t} to begin.
 @appendix Reporting Bugs
 
 @noindent
-If you find a bug in Calc, send e-mail to Colin Walters,
+If you find a bug in Calc, send e-mail to Jay Belanger,
 
 @example
-walters@@debian.org           @r{or}
-walters@@verbum.org
+belanger@@truman.edu
 @end example
 
 @noindent
diff --git a/man/calendar.texi b/man/calendar.texi
index 45b3ed318b3..8ebe7c4b3d7 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -1402,21 +1402,19 @@ progress, so usage may evolve in future.
 
   To activate the package, use @code{(require 'icalendar)}.
 
-@findex icalendar-extract-ical-from-buffer
-  The command @code{icalendar-extract-ical-from-buffer} extracts
+@findex icalendar-import-buffer
+  The command @code{icalendar-import-buffer} extracts
 iCalendar data from the current buffer and adds it to your (default)
 diary file.  This function is also suitable for automatic extraction of
 iCalendar data; for example with the Rmail mail client one could use:
 
 @example
-(add-hook 'rmail-show-message-hook 'icalendar-extract-ical-from-buffer)
+(add-hook 'rmail-show-message-hook 'icalendar-import-buffer)
 @end example
 
 @findex icalendar-import-file
-  The command @code{icalendar-import-file} imports an iCalendar file.
-@strong{Caution:} the contents of the target diary file are
-@emph{deleted} by default!  It is highly recommended to use a dedicated
-diary file for importing.  For example:
+  The command @code{icalendar-import-file} imports an iCalendar file
+and adds the results to an Emacs diary file.  For example:
 
 @example
 (icalendar-import-file "/here/is/calendar.ics" "/there/goes/ical-diary")
@@ -1424,13 +1422,14 @@ diary file for importing.  For example:
 
 @noindent
 You can use an @code{#include} directive to add the import file contents
-to the diary.  @xref{Fancy Diary Display,,, elisp, The Emacs Lisp
-Reference Manual}.
-
-@findex icalendar-convert-diary-to-ical
-  The command @code{icalendar-convert-diary-to-ical} exports an Emacs
-diary file to iCalendar format.  @strong{Caution:} the contents of the
-target file are @emph{deleted} by default!
+to the main diary file, if these are distinct.  @xref{Fancy Diary
+Display,,, elisp, The Emacs Lisp Reference Manual}.
+
+@findex icalendar-export-file, icalendar-export-region
+  Use @code{icalendar-export-file} to interactively export an entire
+Emacs diary file to iCalendar format.  To export only a part of a diary
+file, mark the relevant area, and call @code{icalendar-export-region}.
+In both cases the result is appended to the target file.
 
 
 @node Daylight Savings
diff --git a/man/gnus.texi b/man/gnus.texi
index a62e9bcf149..ca9045bf5b9 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -885,7 +885,7 @@ New Features
 * Red Gnus::                    Third time best---Gnus 5.4/5.5.
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
-* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10.
+* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
 
 Customization
 
@@ -13538,10 +13538,16 @@ and says what authentication scheme to use.  The default is
 
 @end table
 
+@vindex pop3-movemail
+@vindex pop3-leave-mail-on-server
 If the @code{:program} and @code{:function} keywords aren't specified,
 @code{pop3-movemail} will be used.  If the
 @code{pop3-leave-mail-on-server} is non-@code{nil} the mail is to be
-left on the POP server after fetching.
+left on the @acronym{POP} server after fetching when using
+@code{pop3-movemail}.  Note that POP servers maintain no state
+information between sessions, so what the client believes is there and
+what is actually there may not match up.  If they do not, then the whole
+thing can fall apart and leave you with a corrupt mailbox.
 
 Here are some examples.  Fetch from the default @acronym{POP} server,
 using the default user name, and default fetcher:
@@ -25050,7 +25056,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * Red Gnus::                    Third time best---Gnus 5.4/5.5.
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
-* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10.
+* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 09f314dbf47..241d50be956 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -125,9 +125,11 @@ dvi: $(DVI_TARGETS)
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
+# Some Windows ports of makeinfo seem to require -o to come before the
+# texi filename, contrary to GNU standards.
 
 $(infodir)/info: $(INFOSOURCES)
-        $(MAKEINFO) --no-split info.texi -o $@
+        $(MAKEINFO) --no-split -o $@ info.texi
 
 info.dvi: $(INFOSOURCES)
         $(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
diff --git a/man/message.texi b/man/message.texi
index 6a52698ddb5..b4e20f84d80 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -224,7 +224,13 @@ only you can cancel your own messages, which is nice.  The downside
 is that if you lose your @file{.emacs} file (which is where Gnus
 stores the secret cancel lock password (which is generated
 automatically the first time you use this feature)), you won't be
-able to cancel your message.
+able to cancel your message.  If you want to manage a password yourself,
+you can put something like the following in your @file{~/.gnus.el} file:
+
+@lisp
+(setq canlock-password "geheimnis"
+      canlock-password-for-verify canlock-password)
+@end lisp
 
 Whether to insert the header or not is controlled by the
 @code{message-insert-canlock} variable.
@@ -309,8 +315,7 @@ and resend the message in the current buffer to that address.
 
 @vindex message-ignored-resent-headers
 Headers that match the @code{message-ignored-resent-headers} regexp will
-be removed before sending the message.  The default is
-@samp{^Return-receipt}.
+be removed before sending the message.
 
 
 @node Bouncing