From 2761465d3bde7e326ffd3cb2c9bb480144f5a72d Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Tue, 28 May 2019 16:46:35 +0200 Subject: typo fixes --- interimap.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'interimap.md') diff --git a/interimap.md b/interimap.md index 4744170..387850a 100644 --- a/interimap.md +++ b/interimap.md @@ -47,7 +47,7 @@ with the [RFC 7162] (sec. 6) amendments, and works as follows: 2. Propagate these changes onto the other server: get the corresponding UIDs from the database, then: - a. issue an `UID STORE` command, followed by `UID EXPUNGE`, to + a. issue a `UID STORE` command, followed by `UID EXPUNGE`, to remove messages that have not already been deleted on both servers; and b. issue some `UID STORE` commands to propagate flag updates (send @@ -62,9 +62,9 @@ with the [RFC 7162] (sec. 6) amendments, and works as follows: Otherwise, update the `HIGHESTMODSEQ` value in the database. 3. Process new messages (if the current `UIDNEXT` value of the mailbox - differs from the one found in the database) by issuing an `UID - FETCH` command; process each received message on-the-fly by issuing - an `APPEND` command with the message's `RFC822` body, `FLAGS` and + differs from the one found in the database) by issuing a `UID FETCH` + command; process each received message on-the-fly by issuing an + `APPEND` command with the message's `RFC822` body, `FLAGS` and `INTERNALDATE`. Repeat this step if the server received new messages in the meantime. Otherwise, update the `UIDNEXT` value in the database. @@ -111,8 +111,8 @@ other than the default [`QRESYNC`][RFC 7162]-based synchronization. existing UID; and 3/ ensure that both flag lists match. Any message found on a server but not in the database is replicated - on the other server (which in the worst case, might lead to a - message duplicate). + on the other server (which in the worst case, might yield a message + duplicate). Flag conflicts are solved by updating each message to the union of both lists. @@ -224,7 +224,7 @@ Valid options are: to the `perso/` sub-hierarchy on the local server. This is useful for synchronizing multiple remote servers against different namespaces belonging to the same local IMAP server (using a - different InterIMAP instance for each local namespace ↔ remote + different `interimap` instance for each local namespace ↔ remote synchronization). (Note that if the reference name is not a level of mailbox hierarchy @@ -281,10 +281,10 @@ Valid options are: : One of `imap`, `imaps` or `tunnel`. `type=imap` and `type=imaps` are respectively used for IMAP and IMAP - over SSL/TLS connections over a INET socket. + over SSL/TLS connections over an INET socket. `type=tunnel` causes `interimap` to create an unnamed pair of connected sockets for interprocess communication with a *command* - instead of a opening a network socket. + instead of opening a network socket. Note that specifying `type=tunnel` in the `[remote]` section makes the default *database* to be `localhost.db`. (Default: `imaps`.) @@ -316,7 +316,7 @@ Valid options are: protocol][RFC 3501] on its standard output, and understand it on its standard input. The value is passed to `` `/bin/sh -c` `` if it contains shell metacharacters; otherwise it is split into words and - the list is passed to `execvp`(3). + the resulting list is passed to `execvp`(3). *STARTTLS* @@ -376,9 +376,8 @@ Valid options are: Attempting to connect to a server with a non-matching certificate SPKI fingerprint causes `interimap` to abort the connection during the SSL/TLS handshake. - - You can use the following command to compute the SHA-256 digest of - certificate's Subject Public Key Info. + The following command can be used to compute the SHA-256 digest of a + certificate's Subject Public Key Info: openssl x509 -in /path/to/server/certificate.pem -pubkey \ | openssl pkey -pubin -outform DER \ -- cgit v1.2.3