diff --git a/USAGE.md b/USAGE.md index 4cfb2c35..fcf0f697 100644 --- a/USAGE.md +++ b/USAGE.md @@ -36,20 +36,20 @@ ``` * Articles will be ordered automatically, if you want to specify the order, - prepend a digit number and `-` in article files, script `convert.sh` will + prepend a digit number and `-` in article file name, script `convert.sh` will remove this prefix during converting Markdown source file to HTML file. e.g. `1-file1.md`, `2-file2.md`. * If you don't want to show an article in index page, prepend `0-` in its - file name as shown above. + file name like below. ``` - chapter_name_x/ |- _title.md + |- 0-hidden_article.md # This article will not be displayed on index page |- 1-article-a.md # This article will be displayed as first one on index page |- 2-article-b.md # 2nd article on index page |- 3-article-c.md # 3rd article on index page ... - |- 0-hidden_article.md # This article will not be displayed on index page ``` * The first line in article file will be used as article title (string `# ` diff --git a/en_US/mua/3-sogo.macosx.contacts.md b/en_US/mua/3-sogo.macosx.contacts.md index 397ee001..78403c43 100644 --- a/en_US/mua/3-sogo.macosx.contacts.md +++ b/en_US/mua/3-sogo.macosx.contacts.md @@ -33,22 +33,25 @@ 2: Click `Internet Accounts`: -![](./images/sogo/macosx.internet.accounts.png) +![](./images/sogo/macosx.internet.accounts.png){: width="700px" } 3: on right panel, click `Add Other Account` at the bottom -![](./images/sogo/macosx.add.other.account.png) +![](./images/sogo/macosx.add.other.account.png){: width="700px" } 4: choose `Add a CardDAV account` in popup window -![](./images/sogo/macosx.choose.account.type.carddav.png) +![](./images/sogo/macosx.choose.account.type.carddav.png){: width="700px" } -5: Fill up the form with your server address and email account credential +5: Choose `Advanced` in the `Account Type` drop-down menu, then fill up the + form with your server address and email account credential * User Name: `your full email address` * Password: `password of your email account` -* Server Address: `https://[server name or IP address]/SOGo/dav/[your full email address]` +* Server Address: `your server name`. For example, `mail.iredmail.org`. +* Server Path: `/SOGo/dav/[your full email address]` +* Port: `443`, check `Use SSL`. -![](./images/sogo/macosx.add.carddav.account.png) +![](./images/sogo/macosx.add.carddav.account.png){: width="700px" } That's all. diff --git a/en_US/mua/3-sogo.macosx.icalendar.md b/en_US/mua/3-sogo.macosx.icalendar.md index 0dc69190..819c1ae8 100644 --- a/en_US/mua/3-sogo.macosx.icalendar.md +++ b/en_US/mua/3-sogo.macosx.icalendar.md @@ -37,11 +37,11 @@ 3: on right panel, click `Add Other Account` at the bottom -![](./images/sogo/macosx.add.other.account.png) +![](./images/sogo/macosx.add.other.account.png){: width="700px" } 4: choose `Add a CalDAV account` in popup window -![](./images/sogo/macosx.choose.account.type.caldav.png) +![](./images/sogo/macosx.choose.account.type.caldav.png){: width="700px" } 5: Fill up the form with your server address and email account credential @@ -53,11 +53,11 @@ * Port: `443` * Use SSL: checked -![](./images/sogo/macosx.add.caldav.account.png) +![](./images/sogo/macosx.add.caldav.account.png){: width="700px" } 6: Click `Create` button to create account. You can also enable Reminders (task service) if you want. -![](./images/sogo/macosx.add.reminder.png) +![](./images/sogo/macosx.add.reminder.png){: width="700px" } That's all. diff --git a/html/images/sogo/macosx.add.caldav.account.png b/html/images/sogo/macosx.add.caldav.account.png index db5c2cdb..d215109e 100644 Binary files a/html/images/sogo/macosx.add.caldav.account.png and b/html/images/sogo/macosx.add.caldav.account.png differ diff --git a/html/images/sogo/macosx.add.carddav.account.png b/html/images/sogo/macosx.add.carddav.account.png index 96562885..3bc82e98 100644 Binary files a/html/images/sogo/macosx.add.carddav.account.png and b/html/images/sogo/macosx.add.carddav.account.png differ diff --git a/html/images/sogo/macosx.choose.account.type.caldav.png b/html/images/sogo/macosx.choose.account.type.caldav.png index e660cdd2..8f159728 100644 Binary files a/html/images/sogo/macosx.choose.account.type.caldav.png and b/html/images/sogo/macosx.choose.account.type.caldav.png differ diff --git a/html/images/sogo/macosx.choose.account.type.carddav.png b/html/images/sogo/macosx.choose.account.type.carddav.png index 64b15b17..6456dbe2 100644 Binary files a/html/images/sogo/macosx.choose.account.type.carddav.png and b/html/images/sogo/macosx.choose.account.type.carddav.png differ diff --git a/html/sogo.macosx.contacts.html b/html/sogo.macosx.contacts.html index 55babd6b..a877574d 100644 --- a/html/sogo.macosx.contacts.html +++ b/html/sogo.macosx.contacts.html @@ -49,18 +49,21 @@

1: Open application System Preferences:

2: Click Internet Accounts:

-

+

3: on right panel, click Add Other Account at the bottom

-

+

4: choose Add a CardDAV account in popup window

-

-

5: Fill up the form with your server address and email account credential

+

+

5: Choose Advanced in the Account Type drop-down menu, then fill up the + form with your server address and email account credential

-

+

That's all.

diff --git a/html/sogo.macosx.icalendar.html b/html/sogo.macosx.icalendar.html index dfc83590..90b5f272 100644 --- a/html/sogo.macosx.icalendar.html +++ b/html/sogo.macosx.icalendar.html @@ -51,9 +51,9 @@

2: Click Internet Accounts:

3: on right panel, click Add Other Account at the bottom

-

+

4: choose Add a CalDAV account in popup window

-

+

5: Fill up the form with your server address and email account credential

-

+

6: Click Create button to create account. You can also enable Reminders (task service) if you want.

-

+

That's all.