Merged from [email protected].

Patches applied:

 * [email protected]/emacs--devo--0--patch-536
   Update from CVS

 * [email protected]/emacs--devo--0--patch-537
   Update from CVS

 * [email protected]/emacs--devo--0--patch-538
   Update from CVS

 * [email protected]/emacs--devo--0--patch-539
   Update from CVS

 * [email protected]/emacs--devo--0--patch-540
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-541
   Update from CVS

 * [email protected]/emacs--devo--0--patch-542
   Update from CVS

 * [email protected]/emacs--devo--0--patch-543
   Update from CVS

 * [email protected]/emacs--devo--0--patch-544
   Update from CVS

 * [email protected]/emacs--devo--0--patch-545
   Update from CVS

 * [email protected]/emacs--devo--0--patch-546
   Update from erc--emacs--22

 * [email protected]/emacs--devo--0--patch-547
   Update from CVS

 * [email protected]/emacs--devo--0--patch-548
   Update from CVS

 * [email protected]/emacs--devo--0--patch-549
   Update from CVS

 * [email protected]/emacs--devo--0--patch-550
   Update from CVS

 * [email protected]/emacs--devo--0--patch-551
   Update from CVS

 * [email protected]/emacs--devo--0--patch-552
   Update from CVS

 * [email protected]/emacs--devo--0--patch-553
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-554
   Update from CVS

 * [email protected]/emacs--devo--0--patch-555
   erc-iswitchb: Temporarily enable iswitchb mode

 * [email protected]/emacs--devo--0--patch-556
   Update from CVS

 * [email protected]/emacs--devo--0--patch-557
   Update from CVS

 * [email protected]/emacs--devo--0--patch-558
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-559
   Update from CVS

 * [email protected]/emacs--devo--0--patch-560
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-561
   Update from CVS

 * [email protected]/emacs--devo--0--patch-562
   Update from CVS

 * [email protected]/emacs--devo--0--patch-563
   Update from CVS

 * [email protected]/emacs--devo--0--patch-564
   Update from CVS

 * [email protected]/emacs--devo--0--patch-565
   Update from CVS

 * [email protected]/emacs--devo--0--patch-566
   Update from CVS

 * [email protected]/emacs--devo--0--patch-567
   Update from CVS

 * [email protected]/emacs--devo--0--patch-568
   Update from CVS

 * [email protected]/emacs--devo--0--patch-569
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-570
   Update from CVS

 * [email protected]/emacs--devo--0--patch-571
   Update from CVS

 * [email protected]/emacs--devo--0--patch-572
   Update from CVS

 * [email protected]/emacs--devo--0--patch-573
   Update from CVS

 * [email protected]/emacs--devo--0--patch-574
   Update from CVS

 * [email protected]/emacs--devo--0--patch-575
   Update from CVS

 * [email protected]/emacs--devo--0--patch-576
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-577
   Update from CVS

 * [email protected]/emacs--devo--0--patch-578
   Update from CVS

 * [email protected]/emacs--devo--0--patch-579
   Update from CVS

 * [email protected]/emacs--devo--0--patch-580
   Update from CVS

 * [email protected]/emacs--devo--0--patch-581
   Update from CVS

 * [email protected]/emacs--devo--0--patch-582
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-583
   Update from CVS

 * [email protected]/emacs--devo--0--patch-584
   Fix admin/quick-install-emacs to work with recent versions of autoconf

 * [email protected]/gnus--rel--5.10--patch-171
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-172
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-173
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-174
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-175
   Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

 * [email protected]/gnus--rel--5.10--patch-176
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-177
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-178
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-179
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-180
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-181
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-182
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-183
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-184
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-185
   Merge from emacs--devo--0

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-590

1 files changed, 219 insertions, 0 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 1d0717880d..1404658209 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,222 @@
+2007-01-01  Richard Stallman  <[email protected]>
+
+	* commands.texi (User Input): Document keys stolen by window mangers.
+
+2006-12-31  Richard Stallman  <[email protected]>
+
+	* custom.texi (Specific Customization): Document customize-option
+	instead of customize-variable.
+
+2006-12-31  Kim F. Storm  <[email protected]>
+
+	* major.texi (Choosing Modes): Document auto-mode-case-fold.
+
+2006-12-30  Kim F. Storm  <[email protected]>
+
+	* killing.texi (CUA Bindings): Fix typo.
+
+	* xresources.texi (Table of Resources): Mention grow-only value for
+	auto-resize-tool-bars.
+
+2006-12-30  Michael Albinus  <[email protected]>
+
+	Sync with Tramp 2.0.55.
+
+	* trampver.texi: Update release number.
+
+2006-12-29  Reiner Steib  <[email protected]>
+
+	* gnus.texi (Customizing Articles): Add index entries for all
+	gnus-treat-* variables.
+
+2006-12-29  Jouni K. Sepp,Ad(Bnen  <[email protected]>
+
+	* gnus.texi (IMAP): Fix incorrect explanation of
+	nnimap-search-uids-not-since-is-evil in documentation for
+	nnimap-expunge-search-string.
+
+2006-12-27  Reiner Steib  <[email protected]>
+
+	* gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
+	spam-ifile-database.
+
+2006-12-26  Reiner Steib  <[email protected]>
+
+	* gnus.texi (Spam Package Configuration Examples): Don't encourage to
+	rebind C-s.
+
+2006-12-26  Jouni K. Sepp,Ad(Bnen  <[email protected]>
+
+	* gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
+	(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
+	"expiring mail".
+	(IMAP): Document nnimap-search-uids-not-since-is-evil and
+	nnimap-nov-is-evil.
+
+>>>>>>> 1.1170
+2006-12-27  Eli Zaretskii  <[email protected]>
+
+	* msdog.texi (Windows Keyboard): Mention widespread Windows bindings,
+	and how to get them back.
+
+2006-12-26  Richard Stallman  <[email protected]>
+
+	* calendar.texi (Holidays): Holiday listing is based on current
+	practice, but DST is not.
+
+2006-12-25  Richard Stallman  <[email protected]>
+
+	* emacs.texi (Top): Update subnode menus.
+
+	* mark.texi (Transient Mark): Fix xref.
+
+	* killing.texi (Graphical Kill): Node deleted.
+	(Killing): Add xref to Cut and Paste.
+	(CUA Bindings): Update xref.
+
+	* frames.texi (Cut and Paste): New section to hold other nodes.
+	(Mouse Commands): Node demoted.
+	(Cut/Paste Other App): Split out from Mouse Commands.
+	(Word and Line Mouse): Likewise.
+	(Secondary Selection, Clipboard): Nodes demoted.
+
+2006-12-25  Kevin Ryde  <[email protected]>
+
+	* cl.texi (Sorting Sequences): In sort*, add a little cautionary note
+	about the key procedure being used heavily.
+
+2006-12-24  Chong Yidong  <[email protected]>
+
+	* pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed
+	to t.
+	(Prerequisites): Add explanation about gpg-agent.
+
+2006-12-24  Kevin Ryde  <[email protected]>
+
+	* calendar.texi (Holidays): US daylight savings begins second Sunday
+	in March for 2007 onwards.
+	(Daylight Savings): Show new US default daylight savings rules, 2nd
+	Sun in Mar to 1st Sun in Nov, now in cal-dst.el.
+
+2006-12-23  Chong Yidong  <[email protected]>
+
+	* calendar.texi (Scroll Calendar): < and > are switched.
+
+2006-12-23  Kevin Rodgers  <[email protected]>
+
+	* killing.texi (Deletion): Describe M-\ prefix argument.
+
+2006-12-23  Richard Stallman  <[email protected]>
+
+	* search.texi (Regexp Search): Explain why forward and reverse regexp
+	search are not mirror images.
+
+2006-12-22  Kevin Ryde  <[email protected]>
+
+	* cl.texi (Sorting Sequences): Typo in sort*, example showed plain
+	"sort" instead of "sort*".
+
+2006-12-19  Richard Stallman  <[email protected]>
+
+	* calc.texi (History and Acknowledgements): Recognize that Emacs
+	now does have floating point.
+
+2006-12-19  Kim F. Storm  <[email protected]>
+
+	* major.texi (Choosing Modes): Describe match-function elements for
+	magic-mode-alist.
+
+2006-12-19  Michael Albinus  <[email protected]>
+
+	* tramp.texi (External transfer methods): Describe new method `scpc'.
+
+2006-12-18  Eli Zaretskii  <[email protected]>
+
+	* msdog.texi (Windows Keyboard): Add a footnote about "Windows" keys
+	peculiarities.
+
+2006-12-18  Richard Stallman  <[email protected]>
+
+	* abbrevs.texi (Editing Abbrevs): Fix previous change.
+
+2006-12-17  Sascha Wilde  <[email protected]>
+
+	* pgg.texi: Added short note on gpg-agent to the introduction.
+
+2006-12-17  Alan Mackenzie  <[email protected]>
+
+	* programs.texi (Left Margin Paren): Remove the bit which says
+	that CC Mode sets open-paren-in-column-0-is-defun-start to nil.
+	Discuss some of the issues of setting this option to nil.
+
+2006-12-17  Glenn Morris  <[email protected]>
+
+	* abbrevs.texi (Editing Abbrevs): Mention system abbrevs.
+
+2006-12-16  Eli Zaretskii  <[email protected]>
+
+	* msdog.texi (Windows Keyboard): Clarify `w32-recognize-altgr' effect.
+	(Windows Files): `w32-get-true-file-attributes' is only relevant for
+	NTFS volumes.
+	(ls in Lisp): `links' in `ls-lisp-verbosity' is only relevant to NTFS
+	volumes.
+
+2006-12-15  Eli Zaretskii  <[email protected]>
+
+	* text.texi (HTML Mode): Fix "C-c TAB".
+
+2006-12-13  Reiner Steib  <[email protected]>
+
+	* gnus.texi (Hiding Headers): Document that `long-to' and `many-to'
+	also applies to Cc.
+
+2006-12-12  Reiner Steib  <[email protected]>
+
+	* gnus.texi (X-Face): Clarify.  Say which programs are required on
+	Windows.
+
+2006-12-09  Richard Stallman  <[email protected]>
+
+	* misc.texi (Invoking emacsclient): Simplify TCP file text.
+
+2006-12-08  Kevin Rodgers <[email protected]>
+
+	* files.texi (Misc File Ops): Document insert-file-literally.
+
+2006-12-08  Eli Zaretskii  <[email protected]>
+
+	* cmdargs.texi (Colors): Note that --color is intended for overriding
+	the terminal defaults, not for normal invocation.
+
+	* misc.texi (Emacs Server): Improve wording.  Don't mention the
+	``server program''.  Add a cross-reference to "Init File" node.
+	(Invoking emacsclient): Add index entries.  Document both short and
+	long versions of command-line options.  Document the -f option.
+
+2006-12-08  Michael Olson  <[email protected]>
+
+	* erc.texi (Modules): Remove documentation for list module.
+
+2006-12-06  Richard Stallman  <[email protected]>
+
+	* text.texi (Outline Format): Say to set outline-regexp
+	and outline-level with major modes and file local variables.
+
+2006-12-05  Micha,Ak(Bl Cadilhac  <[email protected]>
+
+	* anti.texi (Antinews): Mention the alternative to
+	`~/.emacs_SHELLNAME', which is `~/.emacs.d/init_SHELLNAME.sh'.
+
+	* faq.texi (^M in the shell buffer): Ditto.
+
+	* misc.texi (Interactive Shell): Ditto.
+
+2006-12-04  Eli Zaretskii  <[email protected]>
+
+	* emacs.texi (Acknowledgments): Fix Arne J@o{}rgensen's name.
+
+	* ack.texi (Acknowledgments): Fix Arne J@o{}rgensen's name.
+
 2006-12-01  Eli Zaretskii  <[email protected]>
 
 	* mule.texi (Enabling Multibyte): Rephrase the confusing reference to a