From 00046572dd02c33674af70dd8ad47cb54eb881cd Mon Sep 17 00:00:00 2001 From: Zhang Huangbin Date: Mon, 14 Mar 2016 11:16:18 +0800 Subject: [PATCH] Typo. --- convert.sh | 1 + en_US/mua/_summary.md | 10 +++---- en_US/mua/activesync.android.md | 40 +++++++++++++--------------- en_US/mua/activesync.bb10.md | 40 +++++++++++++--------------- en_US/mua/activesync.ios.md | 40 +++++++++++++--------------- en_US/mua/activesync.outlook.md | 40 +++++++++++++--------------- en_US/mua/sogo.macosx.contacts.md | 39 +++++++++++++-------------- en_US/mua/sogo.macosx.icalendar.md | 39 +++++++++++++-------------- en_US/upgrade/1-iredmail.releases.md | 5 ++-- en_US/upgrade/3-iredapd.releases.md | 10 +++---- html/activesync.android.html | 26 +++++++----------- html/activesync.bb10.html | 26 +++++++----------- html/activesync.ios.html | 26 +++++++----------- html/activesync.outlook.html | 26 +++++++----------- html/index.html | 13 +++++---- html/iredapd.releases.html | 15 ++++++----- html/iredmail.releases.html | 11 +++++--- html/sogo.macosx.contacts.html | 29 ++++++++------------ html/sogo.macosx.icalendar.html | 29 ++++++++------------ 19 files changed, 204 insertions(+), 261 deletions(-) diff --git a/convert.sh b/convert.sh index 99a9212a..efeec9dc 100755 --- a/convert.sh +++ b/convert.sh @@ -105,6 +105,7 @@ for lang in ${all_languages}; do echo -e "### ${_chapter_title}" >> ${INDEX_MD} if [ -f ${_summary_md} ]; then + echo '' >> ${INDEX_MD} cat ${_summary_md} >> ${INDEX_MD} # Insert an empty line to not mess up other formats like list. diff --git a/en_US/mua/_summary.md b/en_US/mua/_summary.md index ece3db71..326f68ed 100644 --- a/en_US/mua/_summary.md +++ b/en_US/mua/_summary.md @@ -1,5 +1,5 @@ -> POP3 service: port 110 over TLS (recommended), or port 995 with SSL. - -> IMAP service: port 143 over TLS (recommended), or port 993 with SSL. - -> SMTP service: port 587 over TLS. +!!! note "Quick MUA Settings" + + * POP3 service: port 110 over TLS (recommended), or port 995 with SSL. + * IMAP service: port 143 over TLS (recommended), or port 993 with SSL. + * SMTP service: port 587 over TLS. diff --git a/en_US/mua/activesync.android.md b/en_US/mua/activesync.android.md index 0c438686..a1d2a783 100644 --- a/en_US/mua/activesync.android.md +++ b/en_US/mua/activesync.android.md @@ -1,27 +1,23 @@ # Exchange ActiveSync: Setup Android devices -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> * Android devices. Tested with OS v4.0. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/mua/activesync.bb10.md b/en_US/mua/activesync.bb10.md index 33047e63..433894b0 100644 --- a/en_US/mua/activesync.bb10.md +++ b/en_US/mua/activesync.bb10.md @@ -1,27 +1,23 @@ # Exchange ActiveSync: Setup BlackBerry 10 devices -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> * Android devices. Tested with OS v4.0. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/mua/activesync.ios.md b/en_US/mua/activesync.ios.md index a11b38b1..9da7556a 100644 --- a/en_US/mua/activesync.ios.md +++ b/en_US/mua/activesync.ios.md @@ -1,27 +1,23 @@ # Exchange ActiveSync: Setup iOS devices -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> * Android devices. Tested with OS v4.0. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/mua/activesync.outlook.md b/en_US/mua/activesync.outlook.md index 575c901b..f2ecb561 100644 --- a/en_US/mua/activesync.outlook.md +++ b/en_US/mua/activesync.outlook.md @@ -1,27 +1,23 @@ # Exchange ActiveSync: Setup Outlook 2013 for Windows -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> * Android devices. Tested with OS v4.0. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/mua/sogo.macosx.contacts.md b/en_US/mua/sogo.macosx.contacts.md index c39061f2..397ee001 100644 --- a/en_US/mua/sogo.macosx.contacts.md +++ b/en_US/mua/sogo.macosx.contacts.md @@ -1,26 +1,23 @@ # Mac OS X: Add contact service (CardDAV) in Contacts.app -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail-0.9.0 doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/mua/sogo.macosx.icalendar.md b/en_US/mua/sogo.macosx.icalendar.md index 007dfa67..0dc69190 100644 --- a/en_US/mua/sogo.macosx.icalendar.md +++ b/en_US/mua/sogo.macosx.icalendar.md @@ -1,26 +1,23 @@ # Mac OS X: Add calendar (CalDAV) and task (Reminders) service in iCalendar.app -> Important notes: -> -> * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS -> (Exchange Web Service)__. -> -> * Outlook 2013 for Windows works well with EAS. -> -> * Below mobile devices works well with EAS, they will sync mails, calendars, -> contacts, tasks, memos/notes. -> -> * BlackBerry 10 devices -> * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. -> -> * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. -> * Outlook 2010 for Windows supports MAPI. -> * iRedMail-0.9.0 doesn't integrate [OpenChange](http://www.openchange.org) and -> [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware -> in iRedMail doesn't provide full support for Microsoft Outlook clients, -> Mac OS X Mail.app and all iOS devices, don't try to add your mail account -> as an `Exchange` account in these mail clients. You have to add separate -> POP3/IMAP account, caldav/carddav account instead. +!!! note "Important Notes" + + * SOGo provides __EAS (Exchange ActiveSync)__ support, but not __EWS + (Exchange Web Service)__. + * Outlook 2013 for Windows works well with EAS. + * Below mobile devices works well with EAS, they will sync mails, calendars, + contacts, tasks, memos/notes. + * BlackBerry 10 devices + * iOS devices (iPad, iPhone). Tested with iOS 8.1.3. + * Android devices. Tested with OS v4.0. + * Apple Mail.app, and Outlook for Mac support EWS. But not EAS. + * Outlook 2010 for Windows supports MAPI. + * iRedMail doesn't integrate [OpenChange](http://www.openchange.org) and + [Samba4](http://www.samba.org) for native MAPI support, so SOGo groupware + in iRedMail doesn't provide full support for Microsoft Outlook clients, + Mac OS X Mail.app and all iOS devices, don't try to add your mail account + as an `Exchange` account in these mail clients. You have to add separate + POP3/IMAP account, caldav/carddav account instead. ## Requirements diff --git a/en_US/upgrade/1-iredmail.releases.md b/en_US/upgrade/1-iredmail.releases.md index 01c90f2d..6bf1a915 100644 --- a/en_US/upgrade/1-iredmail.releases.md +++ b/en_US/upgrade/1-iredmail.releases.md @@ -2,9 +2,10 @@ [TOC] -> iRedMail source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredmail/overview). +!!! note -> Download the [latest iRedMail stable release](../download.html). + * iRedMail source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredmail/src). + * Download the [latest iRedMail stable release](../download.html). ### Why keep your iRedMail server up to date diff --git a/en_US/upgrade/3-iredapd.releases.md b/en_US/upgrade/3-iredapd.releases.md index ecf9c889..afdcd156 100644 --- a/en_US/upgrade/3-iredapd.releases.md +++ b/en_US/upgrade/3-iredapd.releases.md @@ -1,11 +1,11 @@ # iRedAPD (Postfix Access Policy Daemon) release notes and upgrade tutorials -> iRedAPD source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredapd/). +!!! note: -> Download the [latest iRedAPD stable release](https://bitbucket.org/zhb/iredapd/downloads). - -> If you want to develop your own plugin for iRedAPD, please read document -> [README_PLUGINS.md](https://bitbucket.org/zhb/iredapd/src/default/README_PLUGINS.md) in iRedAPD source code. + * iRedAPD source code is hosted on [BitBucket](https://bitbucket.org/zhb/iredapd/). + * Download the [latest iRedAPD stable release](https://bitbucket.org/zhb/iredapd/downloads). + * If you want to develop your own plugin for iRedAPD, please read document + [README_PLUGINS.md](https://bitbucket.org/zhb/iredapd/src/default/README_PLUGINS.md) in iRedAPD source code. ## Upgrade iRedAPD diff --git a/html/activesync.android.html b/html/activesync.android.html index b2825518..73a7dd56 100644 --- a/html/activesync.android.html +++ b/html/activesync.android.html @@ -9,28 +9,20 @@

Exchange ActiveSync: Setup Android devices

-
-

Important notes:

-
+

Requirements