From 3f5f591728cae9723bee6e2a9fa4cfc7538f7a42 Mon Sep 17 00:00:00 2001
From: Nikolaus Schulz <microschulz@web.de>
Date: Sat, 3 Nov 2007 00:24:37 +0000
Subject: [PATCH] archivemail.sgml: edited and reordered 'Notes' section so
 that it looks nicer.

---
 archivemail.1    | 15 ++++++---------
 archivemail.sgml | 21 ++++++---------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/archivemail.1 b/archivemail.1
index 04cf8a3..4e9b298 100644
--- a/archivemail.1
+++ b/archivemail.1
@@ -239,7 +239,6 @@ Display brief summary information about how to run \fBarchivemail\fR\&.
 .SH "NOTES"
 .PP
 \fBarchivemail\fR requires \fBpython\fR(1) version 2.3 or later.
-.PP
 When reading an \fBmbox\fR-format mailbox, \fBarchivemail\fR will
 create a lockfile with the extension \fI\&.lock\fR so that
 procmail will not deliver to the mailbox while it is being processed. It will
@@ -250,9 +249,10 @@ mailbox while it is being read.
 \fBarchivemail\fR will always attempt to preserve the mode,
 last-access and last-modify times of the input mailbox. However, archive
 mailboxes are always created with a mode of \fB0600\fR\&.
-.PP
 If \fBarchivemail\fR finds a pre-existing archive mailbox it
 will append rather than overwrite that archive.
+\fBarchivemail\fR will refuse to operate on mailboxes that are symbolic 
+links or create tempfiles or archives in world-writable directories.
 .PP
 \fBarchivemail\fR attempts to find the delivery date of a message by
 looking for valid dates in the following headers, in order of precedence: 
@@ -264,11 +264,8 @@ will use the last-modified file timestamp on \fBMH\fR and
 \fBMaildir\fR format mailboxes, or the date on the 
 \fBFrom\fR line on \fBmbox\fR-format mailboxes.
 .PP
-The conversion from other formats to \fBmbox\fR(5) will silently overwrite existing
+A conversion from other formats to \fBmbox\fR(5) will silently overwrite existing
 \fBStatus\fR and \fBX-Status\fR message headers. 
-.PP
-\fBarchivemail\fR will refuse to operate on mailboxes that are symbolic 
-links or create tempfiles or archives in world-writable directories.
 .SS "IMAP"
 .PP
 When \fBarchivemail\fR processes an \fBIMAP\fR folder, all messages 
@@ -280,9 +277,9 @@ This does not apply, however, if you run \fBarchivemail\fR with the options
 .PP
 \fBarchivemail\fR relies on server-side searches to determine the messages
 that should be archived. 
-When matching dates, \fBIMAP\fR servers refer to server internal message 
-dates, and these may differ from both delivery time and the message's 
-\fBDate\fR header. 
+When matching message dates, \fBIMAP\fR servers refer to server internal
+message dates, and these may differ from both delivery time of a message and 
+its \fBDate\fR header. 
 Also, there exist broken servers which do not implement server side searches. 
 .SS "IMAP URLS"
 .PP
diff --git a/archivemail.sgml b/archivemail.sgml
index 14c95cf..e1f5d43 100644
--- a/archivemail.sgml
+++ b/archivemail.sgml
@@ -379,9 +379,6 @@ Display brief summary information about how to run <Command/archivemail/.
 <Title>Notes</Title>
 <Para>
 <Command/archivemail/ requires &python; version 2.3 or later.
-</Para>
-
-<Para>
 When reading an <application/mbox/-format mailbox, <command/archivemail/ will
 create a lockfile with the extension <filename>.lock</filename> so that
 procmail will not deliver to the mailbox while it is being processed. It will
@@ -394,11 +391,10 @@ mailbox while it is being read.
 <Command/archivemail/ will always attempt to preserve the mode,
 last-access and last-modify times of the input mailbox. However, archive
 mailboxes are always created with a mode of <application/0600/.
-</Para>
-
-<Para>
 If <Command/archivemail/ finds a pre-existing archive mailbox it
 will append rather than overwrite that archive.
+<Command/archivemail/ will refuse to operate on mailboxes that are symbolic 
+links or create tempfiles or archives in world-writable directories.
 </Para>
 
 <Para>
@@ -414,15 +410,10 @@ will use the last-modified file timestamp on <application/MH/ and
 </Para>
 
 <Para>
-    The conversion from other formats to &mbox; will silently overwrite existing
+    A conversion from other formats to &mbox; will silently overwrite existing
     <application/Status/ and <application/X-Status/ message headers. 
 </Para>
 
-<Para>
-<Command/archivemail/ will refuse to operate on mailboxes that are symbolic 
-links or create tempfiles or archives in world-writable directories.
-</Para>
-
 <RefSect2>
 <Title><acronym/IMAP/</Title>
 <Para>
@@ -436,9 +427,9 @@ This does not apply, however, if you run <command/archivemail/ with the options
 <Para>
 <command/archivemail/ relies on server-side searches to determine the messages
 that should be archived. 
-When matching dates, <application/IMAP/ servers refer to server internal message 
-dates, and these may differ from both delivery time and the message's 
-<application/Date/ header. 
+When matching message dates, <application/IMAP/ servers refer to server internal
+message dates, and these may differ from both delivery time of a message and 
+its <application/Date/ header. 
 Also, there exist broken servers which do not implement server side searches. 
 </Para>
 <RefSect3><Title><acronym/IMAP/ <acronym/URLs/</Title>