typofix, spelling

7 files changed, 32 insertions, 30 deletions

diff --git a/Changelog b/Changelog
index b9c7df2..43fbf8f 100644
--- a/Changelog
+++ b/Changelog
@@ -7,7 +7,7 @@ interimap (0.5.5) upstream;
    versions.
  * libinterimap: deprecate SSL_protocols, obsoleted by new settings
    SSL_protocol_{min,max}.  Using the libssl interface simplifies our
-   protocol black/whilelist greatly; this only allows simple min/max
+   protocol black/whitelist greatly; this only allows simple min/max
    bounds, but holes are arguably not very useful here.  Using the new
    settings bumps the required libssl version to 1.1.0.
  + `make release`: also bump libinterimap version and pin it in 'use'
@@ -54,7 +54,7 @@ interimap (0.5.4) upstream;
 
 interimap (0.5.3) upstream;
 
- * libinterimap: SSL_fingerprint now supports a space-separate list of
+ * libinterimap: SSL_fingerprint now supports a space-separated list of
    digests to pin, and succeeds if, and only if, the peer certificate
    SPKI matches one of the pinned digest values.  Specifying multiple
    digest values can key useful in key rollover scenarios and/or when
@@ -103,7 +103,7 @@ interimap (0.5) upstream;
    (regardless of the hierarchy delimiter in use).
 
  Other changes:
- * interimap: the space-speparated list of names and/or patterns in
+ * interimap: the space-separated list of names and/or patterns in
    'list-mailbox' can now contain C-style escape sequences (backslash
    and hexadecimal escape).
  * interimap: fail when two non-INBOX LIST replies return different
@@ -111,7 +111,7 @@ interimap (0.5) upstream;
    happen if mailboxes from different namespaces are being listed.  The
    workaround here is to run a new interimap instance for each
    namespace.
- * libinterimap: in tunnel mode, use a socketpair rather than two pipes
+ * libinterimap: in tunnel mode, use a socket pair rather than two pipes
    for IPC between the interimap and the IMAP server.  Also, use
    SOCK_CLOEXEC to save an fcntl() call when setting the close-on-exec
    flag on the socket.
@@ -174,7 +174,7 @@ interimap (0.5) upstream;
  - libinterimap: use directories relative to $HOME for the XDG
    environment variables default values.  Previously getpwuid() was
    called to determine the user's home directory, while the XDG
-   specification explicitely mentions $HOME.  Conveniently our docs
+   specification explicitly mentions $HOME.  Conveniently our docs
    always mentioned ~/, which on POSIX-compliant systems expands to the
    value of the variable HOME.  (Cf. Shell and Utilities volume of
    POSIX.1-2017, sec. 2.6.1.)
@@ -188,7 +188,7 @@ interimap (0.5) upstream;
  - libinterimap: push_flag_updates(): ignore UIDs for which no untagged
    FETCH response was received.
  - libinterimap: push_flag_updates(): don't ignores received updates (by
-   another client) to a superset of the desigred flag list.
+   another client) to a superset of the desired flag list.
  - libinterimap: avoid sending large UID EXPUNGE|FETCH|STORE commands as
    they might exceed the server's max acceptable command size; these
    commands are now split into multiple (sequential) commands when their
@@ -198,7 +198,7 @@ interimap (0.5) upstream;
    This is a also a workaround for a bug in Dovecot 2.3.4:
    https://dovecot.org/pipermail/dovecot/2019-November/117522.html
  - interimap: for the reason explained above, limit number of messages
-   to 128 per APPEND command (only on servers advertizing MULTIAPPEND,
+   to 128 per APPEND command (only on servers advertising MULTIAPPEND,
    for other servers the number remains 1).
  - interimap: gracefully ignore messages with a NIL RFC822 attribute.
  - pullimap: treat messages with a NIL RFC822 attribute as empty.
diff --git a/doc/getting-started.md b/doc/getting-started.md
index 83d3ba9..74fc8da 100644
--- a/doc/getting-started.md
+++ b/doc/getting-started.md
@@ -20,7 +20,7 @@ format][mbox]).  Local mail clients usually access it directly.  They
 also often maintain their own cache in order to speed up message header
 listing and searches.
 
-While most bidirectional synchronisation software (such as [OfflineIMAP])
+While most bidirectional synchronization software (such as [OfflineIMAP])
 are able to handle a mail storage in Maildir format, *InterIMAP is
 not*.  Instead, InterIMAP needs an [IMAP4rev1] server on *both* peers
 to synchronize.  This may sound like a severe limitation at first, but by
diff --git a/doc/interimap.1.md b/doc/interimap.1.md
index 9b14a49..2310cb3 100644
--- a/doc/interimap.1.md
+++ b/doc/interimap.1.md
@@ -249,7 +249,7 @@ Valid options are:
     Two wildcards are available, and passed verbatim to the IMAP server:
     a ‘\*’ character matches zero or more characters, while a ‘%’
     character matches zero or more characters up to the hierarchy
-    delimiter.  Hardcoding the hierarchy delimiter in this setting is
+    delimiter.  Hard-coding the hierarchy delimiter in this setting is
     not advised because the server might silently change it at some
     point. A null character should be used instead.  For instance, if
     *list-mailbox* is set `"foo\x00bar"` then, assuming the hierarchy
@@ -309,7 +309,7 @@ Valid options are:
     `type=imap` and `type=imaps` are respectively used for IMAP and IMAP
     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*
+    connected sockets for inter-process communication with a *command*
     instead of opening a network socket.
     Note that specifying `type=tunnel` in the `[remote]` section makes
     the default *database* to be `localhost.db`.
@@ -383,13 +383,14 @@ Valid options are:
 
 *SSL_protocols*
 
-:   A space-separated list of SSL protocols to explicitly enable or
-    disable (if prefixed with an exclamation mark `!`.  Known protocols
-    are `SSLv2`, `SSLv3`, `TLSv1`, `TLSv1.1`, `TLSv1.2`, and `TLSv1.3`.
+:   Space-separated list of SSL/TLS protocol versions to explicitly
+    enable (or disable if prefixed with an exclamation mark `!`).  Known
+    protocols are `SSLv2`, `SSLv3`, `TLSv1`, `TLSv1.1`, `TLSv1.2`, and
+    `TLSv1.3`.
     Enabling a protocol is a short-hand for disabling all other
     protocols.
 
-    *Deprecacted*: Use *SSL_protocol_min* and/or *SSL_protocol_max*
+    *DEPRECATED*: Use *SSL_protocol_min* and/or *SSL_protocol_max*
     instead.
 
 *SSL_protocol_min*, *SSL_protocol_max*
@@ -398,7 +399,7 @@ Valid options are:
     connection.  Accepted values are `SSLv3`, `TLSv1`, `TLSv1.1`,
     `TLSv1.2`, and `TLSv1.3`.
 
-*SSL_cipher_list*
+*SSL_cipherlist*
 
 :   The cipher list to send to the server.  Although the server
     determines which cipher suite is used, it should take the first
@@ -428,7 +429,7 @@ Valid options are:
 
 *SSL_verify*
 
-:   Whether to 1/ verify the server certificate chain, and 2/ match its
+:   Whether to 1/ verify the server certificate chain; and 2/ match its
     Subject Alternative Name (SAN) or Subject CommonName (CN) against
     the value of the *host* option.
     (Default: `YES`.)
diff --git a/doc/pullimap.1.md b/doc/pullimap.1.md
index 028cbaa..cf6ec52 100644
--- a/doc/pullimap.1.md
+++ b/doc/pullimap.1.md
@@ -106,14 +106,14 @@ Valid options are:
 
 *deliver-ehlo*
 
-:   Hostname to use in `EHLO` or `LHLO` commands.
+:   Name to use in `EHLO` or `LHLO` commands.
     (Default: `localhost.localdomain`.)
 
 *deliver-rcpt*
 
 :   Message recipient.  Note that the local part needs to quoted if it
     contains special characters; see [RFC 5321] for details.
-    (Default: the username associated with the effective uid of the
+    (Default: the username associated with the effective user ID of the
     `pullimap` process.)
 
 *purge-after*
@@ -123,7 +123,7 @@ Valid options are:
     `SEARCH` criterion ignoring time and timezone.)
     If *purge-after* is set to `0` then messages are deleted immediately
     after delivery.  Otherwise `pullimap` issues an IMAP `SEARCH` (or
-    extended `SEARCH` on servers advertizing the [`ESEARCH`][RFC 4731]
+    extended `SEARCH` on servers advertising the [`ESEARCH`][RFC 4731]
     capability) command to list old messages; if `--idle` is set then
     the `SEARCH` command is issued again every 12 hours.
 
@@ -133,7 +133,7 @@ Valid options are:
     `type=imap` and `type=imaps` are respectively used for IMAP and IMAP
     over SSL/TLS connections over an INET socket.
     `type=tunnel` causes `pullimap` to create an unnamed pair of
-    connected sockets for interprocess communication with a *command*
+    connected sockets for inter-process communication with a *command*
     instead of opening a network socket.
     (Default: `imaps`.)
 
@@ -202,13 +202,14 @@ Valid options are:
 
 *SSL_protocols*
 
-:   A space-separated list of SSL protocols to explicitly enable or
-    disable (if prefixed with an exclamation mark `!`.  Known protocols
-    are `SSLv2`, `SSLv3`, `TLSv1`, `TLSv1.1`, `TLSv1.2`, and `TLSv1.3`.
+:   Space-separated list of SSL/TLS protocol versions to explicitly
+    enable (or disable if prefixed with an exclamation mark `!`).  Known
+    protocols are `SSLv2`, `SSLv3`, `TLSv1`, `TLSv1.1`, `TLSv1.2`, and
+    `TLSv1.3`.
     Enabling a protocol is a short-hand for disabling all other
     protocols.
 
-    *Deprecacted*: Use *SSL_protocol_min* and/or *SSL_protocol_max*
+    *DEPRECATED*: Use *SSL_protocol_min* and/or *SSL_protocol_max*
     instead.
 
 *SSL_protocol_min*, *SSL_protocol_max*
@@ -217,7 +218,7 @@ Valid options are:
     connection.  Accepted values are `SSLv3`, `TLSv1`, `TLSv1.1`,
     `TLSv1.2`, and `TLSv1.3`.
 
-*SSL_cipher_list*
+*SSL_cipherlist*
 
 :   The cipher list to send to the server.  Although the server
     determines which cipher suite is used, it should take the first
@@ -247,7 +248,7 @@ Valid options are:
 
 *SSL_verify*
 
-:   Whether to 1/ verify the server certificate chain, and 2/ match its
+:   Whether to 1/ verify the server certificate chain; and 2/ match its
     Subject Alternative Name (SAN) or Subject CommonName (CN) against
     the value of the *host* option.
     (Default: `YES`.)
@@ -330,7 +331,7 @@ In more details, `pullimap` works as follows:
     to terminate it gracefully.
 
  3. Issue a `UID STORE` command to mark all retrieved messages (and
-    stalled UIDs found in the *statefile* after the eigth byte) as
+    stalled UIDs found in the *statefile* after the eighth byte) as
     `\Seen`.
 
  4. Update the *statefile* with the new UIDNEXT value (bytes 5-8).
diff --git a/interimap b/interimap
index 68cb60b..67651d4 100755
--- a/interimap
+++ b/interimap
@@ -286,7 +286,7 @@ sub list_mailboxes($) {
             my ($m) = sort keys %$delims;
             $imap->{delimiter} = delete $delims->{$m};
         } else {
-            # didn't get a non-INBOX LIST reply so we need to explicitely query
+            # didn't get a non-INBOX LIST reply so we need to explicitly query
             # the hierarchy delimiter
             get_delimiter($name, $imap, $ref);
         }
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 49ea343..2e36d6e 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -1371,7 +1371,7 @@ sub push_flag_updates($$@) {
             $modified->{$uid} //= [ 0, undef ];
         } elsif (defined (my $m = $modified->{$uid})) {
             # received an untagged FETCH response, remove from the list of pending changes
-            # if the flag list was up to date (either implicitely or explicitely)
+            # if the flag list was up to date (either implicitely or explicitly)
             if (!defined $m->[1] or $m->[1] eq $flags) {
                 delete $modified->{$uid};
                 push @ok, $uid;
diff --git a/tests/preauth-plaintext/t b/tests/preauth-plaintext/t
index 427d57b..bc287dd 100644
--- a/tests/preauth-plaintext/t
+++ b/tests/preauth-plaintext/t
@@ -10,7 +10,7 @@ grep -Fx 'remote: ERROR: PREAUTH greeting on plaintext connection? MiTM in actio
 ! grep '^remote: C: ' <"$STDERR" || error "wrote command in MiTM'ed PREAUTH connection!"
 
 
-# Ignore the warning when STARTTLS is explicitely disabled
+# Ignore the warning when STARTTLS is explicitly disabled
 echo "STARTTLS = NO" >>"$XDG_CONFIG_HOME/interimap/config"
 interimap --debug || true