Merge branch 'master' into debian

1 files changed, 5 insertions, 5 deletions

diff --git a/imapsync.1 b/imapsync.1
index 7a996a9..af753b3 100644
--- a/imapsync.1
+++ b/imapsync.1
@@ -47,7 +47,7 @@ messages with UID<$UIDNEXT.
 Propagate these changes onto the other server: get the corresponding
 UIDs from the database, then a/ issue an UID STORE + UID EXPUNGE command
 to remove messages that have not already been deleted on both servers,
-and /b issue UID STORE commands to propagate flag updates (send a single
+and b/ issue UID STORE commands to propagate flag updates (send a single
 command for each flag list in order the reduce the number of round
 trips).
 (Conflicts may occur if the metadata of a message has been updated on
@@ -55,7 +55,7 @@ both servers with different flag lists; in that case \fBimapsync\fR
 issues a warning and updates the message on each server with the union
 of both flag lists.)
 Repeat this step if the server sent some updates in the meantime.
-Otherwise, update the HIGHESTMODSEQ values in the database.
+Otherwise, update the HIGHESTMODSEQ value in the database.
 
 .IP \n+[step].
 Process new messages (if the current UIDNEXT value differ from the one
@@ -63,7 +63,7 @@ found in the database) by issuing an UID FETCH command and for each
 message RFC822 body received, issue an APPEND command to the other
 server on\-the\-fly.
 Repeat this step if the server received new messages in the meantime.
-Otherwise, update the UIDNEXT values in the database.
+Otherwise, update the UIDNEXT value in the database.
 Go back to step 2 if the server sent some updates in the meantime.
 
 .IP \n+[step].
@@ -257,7 +257,7 @@ on its standard output, and understand it on its standard input.
 
 .TP
 .I STARTTLS
-Whether to use the \(lqSTARTTLS\(rq directive to upgrade a secure
+Whether to use the \(lqSTARTTLS\(rq directive to upgrade to a secure
 connection.  Setting this to \(lqYES\(rq for a server not advertising
 the \(lqSTARTTLS\(rq capability causes \fBimapsync\fR to immediately
 abort the connection.
@@ -312,7 +312,7 @@ empty database will duplicate each message due to the absence of
 local/remote UID association.
 .IP \[bu]
 \fBimapsync\fR is single threaded and doesn't use IMAP command
-pipelining.  Synchronization could be boosted by sending independent
+pipelining.  Synchronization could be boosted up by sending independent
 commands (such as the initial LIST/STATUS command) to each server in
 parallel, and for a given server, by sending independent commands (such
 as flag updates) in a pipeline.