From e0b1591ba7bf3e36524d367261430162fa1fffac Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 25 Aug 2011 11:38:49 -0400 Subject: [PATCH] Rearrange manual chapters to group mail, rmail, and gnus together. * sending.texi (Sending Mail): * rmail.texi (Rmail): * misc.texi (Gnus, Document View): * dired.texi (Dired): * emacs.texi: Group the mail, rmail, and gnus chapters together. --- doc/emacs/ChangeLog | 8 ++++ doc/emacs/dired.texi | 2 +- doc/emacs/emacs.texi | 101 ++++++++++++++++++++--------------------- doc/emacs/misc.texi | 4 +- doc/emacs/rmail.texi | 2 +- doc/emacs/sending.texi | 2 +- 6 files changed, 63 insertions(+), 56 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 6874ef75ef8..0cdf29d7fca 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2011-08-25 Chong Yidong + + * sending.texi (Sending Mail): + * rmail.texi (Rmail): + * misc.texi (Gnus, Document View): + * dired.texi (Dired): + * emacs.texi: Group the mail, rmail, and gnus chapters together. + 2011-08-07 Juri Linkov * dired.texi (Operating on Files): Rewrite according to the fact diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 80ccd1d10f9..d536547e293 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -2,7 +2,7 @@ @c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2011 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. -@node Dired, Calendar/Diary, Rmail, Top +@node Dired @chapter Dired, the Directory Editor @c This node is referenced in the tutorial. When renaming or deleting @c it, the tutorial needs to be adjusted. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index e8fb42db0bb..533c290cea5 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -195,14 +195,13 @@ Advanced Features the number of characters you must type. @c AFAICS, the tex stuff generates its own index and does not use this one. @ifnottex -* Picture Mode:: Editing pictures made up of characters using - the quarter-plane screen model. +* Picture Mode:: Editing pictures made up of text characters. @end ifnottex +* Dired:: Directory and file manager. +* Calendar/Diary:: Calendar and diary facilities. +* Document View:: Viewing PDF, PS and DVI files. * Sending Mail:: Sending mail in Emacs. * Rmail:: Reading mail in Emacs. -* Dired:: You can "edit" a directory to manage files in it. -* Calendar/Diary:: The calendar and diary facilities. -* Document View:: Viewing PDF, PS and DVI files. * Gnus:: A flexible mail and news reader. * Shell:: Executing shell commands from Emacs. * Emacs Server:: Using Emacs as an editing server. @@ -885,52 +884,6 @@ Editing Pictures * Rectangles in Picture:: Clearing and superimposing rectangles. @end ifnottex -Sending Mail - -* Mail Format:: Format of the mail being composed. -* Mail Headers:: Details of some standard mail header fields. -* Mail Aliases:: Abbreviating and grouping mail addresses. -* Mail Commands:: Special commands for editing mail being composed. -* Mail Signature:: Adding a signature to every message. -* Mail Amusements:: Distracting the NSA; adding fortune messages. -* Mail Methods:: Using alternative mail-composition methods. - -Mail Commands - -* Mail Sending:: Commands to send the message. -* Header Editing:: Commands to move to header fields and edit them. -* Citing Mail:: Quoting a message you are replying to. -* Mail Misc:: Attachments, spell checking, etc. - -Reading Mail with Rmail - -* Rmail Basics:: Basic concepts of Rmail, and simple use. -* Rmail Scrolling:: Scrolling through a message. -* Rmail Motion:: Moving to another message. -* Rmail Deletion:: Deleting and expunging messages. -* Rmail Inbox:: How mail gets into the Rmail file. -* Rmail Files:: Using multiple Rmail files. -* Rmail Output:: Copying message out to files. -* Rmail Labels:: Classifying messages by labeling them. -* Rmail Attributes:: Certain standard labels, called attributes. -* Rmail Reply:: Sending replies to messages you are viewing. -* Rmail Summary:: Summaries show brief info on many messages. -* Rmail Sorting:: Sorting messages in Rmail. -* Rmail Display:: How Rmail displays a message; customization. -* Rmail Coding:: How Rmail handles decoding character sets. -* Rmail Editing:: Editing message text and headers in Rmail. -* Rmail Digest:: Extracting the messages from a digest message. -* Rmail Rot13:: Reading messages encoded in the rot13 code. -* Movemail:: More details of fetching new mail. -* Remote Mailboxes:: Retrieving mail from remote mailboxes. -* Other Mailbox Formats:: Retrieving mail from local mailboxes in - various formats. - -Summaries - -* Rmail Make Summary:: Making various sorts of summaries. -* Rmail Summary Edit:: Manipulating messages from the summary. - Dired, the Directory Editor * Dired Enter:: How to invoke Dired. @@ -1014,6 +967,52 @@ Document Viewing * Slicing:: Specifying which part of pages should be displayed. * Conversion:: Influencing and triggering conversion. +Sending Mail + +* Mail Format:: Format of the mail being composed. +* Mail Headers:: Details of some standard mail header fields. +* Mail Aliases:: Abbreviating and grouping mail addresses. +* Mail Commands:: Special commands for editing mail being composed. +* Mail Signature:: Adding a signature to every message. +* Mail Amusements:: Distracting the NSA; adding fortune messages. +* Mail Methods:: Using alternative mail-composition methods. + +Mail Commands + +* Mail Sending:: Commands to send the message. +* Header Editing:: Commands to move to header fields and edit them. +* Citing Mail:: Quoting a message you are replying to. +* Mail Misc:: Attachments, spell checking, etc. + +Reading Mail with Rmail + +* Rmail Basics:: Basic concepts of Rmail, and simple use. +* Rmail Scrolling:: Scrolling through a message. +* Rmail Motion:: Moving to another message. +* Rmail Deletion:: Deleting and expunging messages. +* Rmail Inbox:: How mail gets into the Rmail file. +* Rmail Files:: Using multiple Rmail files. +* Rmail Output:: Copying message out to files. +* Rmail Labels:: Classifying messages by labeling them. +* Rmail Attributes:: Certain standard labels, called attributes. +* Rmail Reply:: Sending replies to messages you are viewing. +* Rmail Summary:: Summaries show brief info on many messages. +* Rmail Sorting:: Sorting messages in Rmail. +* Rmail Display:: How Rmail displays a message; customization. +* Rmail Coding:: How Rmail handles decoding character sets. +* Rmail Editing:: Editing message text and headers in Rmail. +* Rmail Digest:: Extracting the messages from a digest message. +* Rmail Rot13:: Reading messages encoded in the rot13 code. +* Movemail:: More details of fetching new mail. +* Remote Mailboxes:: Retrieving mail from remote mailboxes. +* Other Mailbox Formats:: Retrieving mail from local mailboxes in + various formats. + +Rmail Summaries + +* Rmail Make Summary:: Making various sorts of summaries. +* Rmail Summary Edit:: Manipulating messages from the summary. + Gnus * Buffers of Gnus:: The group, summary, and article buffers. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 426610e65b9..16b5b0bd6ee 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -20,7 +20,7 @@ other editors, and various diversions and amusements. @raisesections @end ifnottex -@node Document View, Gnus, Calendar/Diary, Top +@node Document View, Sending Mail, Calendar/Diary, Top @section Document Viewing @cindex DVI file @cindex PDF file @@ -200,7 +200,7 @@ the DocView buffer. (@code{doc-view-shrink}) need to reconvert the document at the new size. The current page is converted first. -@node Gnus, Shell, Document View, Top +@node Gnus, Shell, Rmail, Top @section Gnus @cindex Gnus @cindex reading netnews diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index ad22ae921e0..97459f02937 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -2,7 +2,7 @@ @c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. -@node Rmail, Dired, Sending Mail, Top +@node Rmail, Gnus, Sending Mail, Top @chapter Reading Mail with Rmail @cindex Rmail @cindex reading mail diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 02857459cc1..10251cc39ae 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -2,7 +2,7 @@ @c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2011 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. -@node Sending Mail +@node Sending Mail, Rmail, Document View, Top @chapter Sending Mail @cindex sending mail @cindex mail -- 2.39.2