mbsync config: update some config keys & alignment fix

1 files changed, 23 insertions, 23 deletions

diff --git a/.mbsyncrc b/.mbsyncrc
index a881c29a..995f5df0 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -2,10 +2,10 @@
 
 # ---- defaults
 
-Create           Slave
+Create           Near
 # FastMail always expunges server-side.  mbsync author says this is a
 # really bad idea.  Let's just have mbsync expunge client-side.
-Expunge          Slave
+Expunge          Near
 SyncState        *
 
 # ---- stores
@@ -16,7 +16,7 @@ Inbox            ~/.fmail/inbox
 # Flatten          .
 
 # Trash option doesn't seem to work.  Setting Trash to trash and
-# Expunge to Slave makes deleted mail get moved into the trash folder,
+# Expunge to Near  makes deleted mail get moved into the trash folder,
 # but it is left marked as deleted so it the FastMail IMAP server
 # won't add it to the folder, however many times mbsync tries to put
 # it there.  So just unbind deletion in mutt for now.
@@ -41,22 +41,22 @@ Account          fastmail
 # ---- mailboxes
 
 Channel          fmaili
-Master           :fmimap:INBOX
-Slave            :fmmaildir:
+Far              :fmimap:INBOX
+Near             :fmmaildir:
 
 Channel          fmails
-Master           :fmimap:"Sent Items"
-Slave            :fmmaildir:sent
+Far              :fmimap:"Sent Items"
+Near             :fmmaildir:sent
 
 # if I find myself wanting to separate listservs into different
 # folders within Lists/ on the server side (unlikely because I am
 # using notmuch), something like this should allow downloading all of
 # them without the INBOX.Lists prefix:
 
-# Channel fmaill
-#   Master :fmimap:Lists/
-#   Slave :fmmaildir:
-#   Patterns * !INBOX
+# Channel        fmaill
+# Far            :fmimap:Lists/
+# Near           :fmmaildir:
+# Patterns       * !INBOX
 
 # So long as I'm using a mail provider that supports Sieve, can install this
 # to deliver all mail which has a List-Id into a separate Lists folder.  The
@@ -85,29 +85,29 @@ Slave            :fmmaildir:sent
 #    }
 
 # Channel          lists
-# Master           :fmimap:Lists
-# Slave            :fmmaildir:lists
+# Far              :fmimap:Lists
+# Near             :fmmaildir:lists
 
 Channel          fmailt
-Master           :fmimap:Trash
-Slave            :fmmaildir:trash
+Far              :fmimap:Trash
+Near             :fmmaildir:trash
 
 Channel          fmailj
-Master           :fmimap:"Junk Mail"
-Slave            :fmmaildir:junk
+Far              :fmimap:"Junk Mail"
+Near             :fmmaildir:junk
 
 Channel          spamtraining
-Master           :fmimap:Training/Spam
-Slave            :fmmaildir:spam
+Far              :fmimap:Training/Spam
+Near             :fmmaildir:spam
 
 Channel          hamtraining
-Master           :fmimap:Training/Ham
-Slave            :fmmaildir:ham
+Far              :fmimap:Training/Ham
+Near             :fmmaildir:ham
 
 # notes from tablet computer / smartphone
 Channel          notes
-Master           :fmimap:Notes
-Slave            :fmmaildir:notes
+Far              :fmimap:Notes
+Near             :fmmaildir:notes
 
 Group            fastmail
 Channel          fmaili