Large update

mail.org

@@ -20,7 +20,7 @@ http://isync.sourceforge.net/
 Create Both
 # Save the synchronization state files in the relevant directory
 SyncState *
-# Permanently remove all messages [on the Master/Slave] marked for deletion.
+# Permanently remove all messages [on the Far/Near] marked for deletion.
 Expunge Both
 #+END_SRC
 
@@ -44,24 +44,24 @@ Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/Inbox
 
 Channel gmail-Home
-Master :gmail-remote:"INBOX"
-Slave :gmail-local:Inbox
+Far :gmail-remote:INBOX
+Near :gmail-local:Inbox
 
 Channel gmail-Drafts
-Master :gmail-remote:"[Gmail]/Drafts"
-Slave :gmail-local:Drafts
+Far :gmail-remote:"[Gmail]/Drafts"
+Near :gmail-local:Drafts
 
 Channel gmail-Sent
-Master :gmail-remote:"[Gmail]/Sent Mail"
-Slave :gmail-local:Sent
+Far :gmail-remote:"[Gmail]/Sent Mail"
+Near :gmail-local:Sent
 
 Channel gmail-Trash
-Master :gmail-remote:"[Gmail]/Trash"
-Slave :gmail-local:Trash
+Far :gmail-remote:"[Gmail]/Trash"
+Near :gmail-local:Trash
 
 Channel gmail-All
-Master :gmail-remote:"[Gmail]/All Mail"
-Slave :gmail-local:Archive
+Far :gmail-remote:"[Gmail]/All Mail"
+Near :gmail-local:Archive
 #+END_SRC
 
 #+BEGIN_SRC conf
@@ -69,8 +69,8 @@ Slave :gmail-local:Archive
 # the remote and local names for all the folders we want to exclude (except
 # "INBOX", which is special-cased, it would seem).
 Channel gmail
-Master :gmail-remote:
-Slave :gmail-local:
+Far :gmail-remote:
+Near :gmail-local:
 # Exclude everything under the internal [Gmail] folder, except the interesting folders
 Patterns *
 Patterns !INBOX
@@ -86,10 +86,10 @@ Patterns !Starred
 #+BEGIN_SRC conf
 # For doing a quick sync of just the INBOX with `mbsync gmail-download`.
 Channel gmail-download
-Master :gmail-remote:"INBOX"
-Slave :gmail-local:Inbox
-Create Slave
-Expunge Slave
+Far :gmail-remote:INBOX
+Near :gmail-local:Inbox
+Create Near
+Expunge Near
 Sync Pull
 #+END_SRC
 
@@ -112,39 +112,39 @@ Path ~/.mail/esrf/
 Inbox ~/.mail/esrf/Inbox
 
 Channel esrf-Home
-Master :esrf-remote:"Inbox"
-Slave :esrf-local:Inbox
+Far :esrf-remote:INBOX
+Near :esrf-local:Inbox
 
 Channel esrf-Drafts
-Master :esrf-remote:"Drafts"
-Slave :esrf-local:Drafts
+Far :esrf-remote:Drafts
+Near :esrf-local:Drafts
 
 Channel esrf-Archive
-Master :esrf-remote:"Archive"
-Slave :esrf-local:Archive
+Far :esrf-remote:Archive
+Near :esrf-local:Archive
 
 Channel esrf-Sent
-Master :esrf-remote:"Sent"
-Slave :esrf-local:Sent
+Far :esrf-remote:Sent
+Near :esrf-local:Sent
 
 Channel esrf-Trash
-Master :esrf-remote:"Trash"
-Slave :esrf-local:Trash
+Far :esrf-remote:Trash
+Near :esrf-local:Trash
 #+END_SRC
 
 #+BEGIN_SRC conf
 Channel esrf
-Master :esrf-remote:
-Slave :esrf-local:
+Far :esrf-remote:
+Near :esrf-local:
 #+END_SRC
 
 For doing a quick sync of just the INBOX with `mbsync esrf-download`.
 #+BEGIN_SRC conf
 Channel esrf-download
-Master :esrf-remote:"INBOX"
-Slave :esrf-local:Inbox
-Create Slave
-Expunge Slave
+Far :esrf-remote:INBOX
+Near :esrf-local:Inbox
+Create Near
+Expunge Near
 Sync Pull
 #+END_SRC
 
@@ -167,39 +167,39 @@ Path ~/.mail/ulg/
 Inbox ~/.mail/ulg/Inbox
 
 Channel ulg-Home
-Master :ulg-remote:"Inbox"
-Slave :ulg-local:Inbox
+Far :ulg-remote:INBOX
+Near :ulg-local:Inbox
 
 Channel ulg-Drafts
-Master :ulg-remote:"Drafts"
-Slave :ulg-local:Drafts
+Far :ulg-remote:Drafts
+Near :ulg-local:Drafts
 
 Channel ulg-Archive
-Master :ulg-remote:"Archive"
-Slave :ulg-local:Archive
+Far :ulg-remote:Archive
+Near :ulg-local:Archive
 
 Channel ulg-Sent
-Master :ulg-remote:"Sent"
-Slave :ulg-local:Sent
+Far :ulg-remote:Sent
+Near :ulg-local:Sent
 
 Channel ulg-Trash
-Master :ulg-remote:"Trash"
-Slave :ulg-local:Trash
+Far :ulg-remote:Trash
+Near :ulg-local:Trash
 #+END_SRC
 
 #+BEGIN_SRC conf
 Channel ulg
-Master :ulg-remote:
-Slave :ulg-local:
+Far :ulg-remote:
+Near :ulg-local:
 #+END_SRC
 
 For doing a quick sync of just the INBOX with `mbsync ulg-download`.
 #+BEGIN_SRC conf
 Channel ulg-download
-Master :ulg-remote:"Inbox"
-Slave :ulg-local:Inbox
-Create Slave
-Expunge Slave
+Far :ulg-remote:INBOX
+Near :ulg-local:Inbox
+Create Near
+Expunge Near
 Sync Pull
 #+END_SRC
 
@@ -222,39 +222,39 @@ Path ~/.mail/uliege/
 Inbox ~/.mail/uliege/Inbox
 
 Channel uliege-Home
-Master :uliege-remote:"Inbox"
-Slave :uliege-local:Inbox
+Far :uliege-remote:INBOX
+Near :uliege-local:Inbox
 
 Channel uliege-Drafts
-Master :uliege-remote:"Drafts"
-Slave :uliege-local:Drafts
+Far :uliege-remote:Drafts
+Near :uliege-local:Drafts
 
 Channel uliege-Archive
-Master :uliege-remote:"Archive"
-Slave :uliege-local:Archive
+Far :uliege-remote:Archive
+Near :uliege-local:Archive
 
 Channel uliege-Sent
-Master :uliege-remote:"Sent"
-Slave :uliege-local:Sent
+Far :uliege-remote:Sent
+Near :uliege-local:Sent
 
 Channel uliege-Trash
-Master :uliege-remote:"Trash"
-Slave :uliege-local:Trash
+Far :uliege-remote:Trash
+Near :uliege-local:Trash
 #+END_SRC
 
 #+BEGIN_SRC conf
 Channel uliege
-Master :uliege-remote:
-Slave :uliege-local:
+Far :uliege-remote:
+Near :uliege-local:
 #+END_SRC
 
 For doing a quick sync of just the INBOX with `mbsync uliege-download`.
 #+BEGIN_SRC conf
 Channel uliege-download
-Master :uliege-remote:"Inbox"
-Slave :uliege-local:Inbox
-Create Slave
-Expunge Slave
+Far :uliege-remote:INBOX
+Near :uliege-local:Inbox
+Create Near
+Expunge Near
 Sync Pull
 #+END_SRC