From 77270a316427b9d9089fb0f8d693f920a135d094 Mon Sep 17 00:00:00 2001 From: BobKircher <22474026+BobKircher@users.noreply.github.com> Date: Fri, 23 Aug 2019 10:58:07 +0200 Subject: [PATCH 1/2] Bring manual up to date with ios12 iOS documentation was updated with respect to SSL requirements starting with iOS 12. Signed-off-by: BobKircher <22474026+bobkircher@users.noreply.github.com> --- user_manual/pim/sync_ios.rst | 38 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/user_manual/pim/sync_ios.rst b/user_manual/pim/sync_ios.rst index 73908bb09..d061198b4 100644 --- a/user_manual/pim/sync_ios.rst +++ b/user_manual/pim/sync_ios.rst @@ -6,52 +6,40 @@ Calendar -------- #. Open the settings application. -#. Select Mail, Contacts, Calendars. +#. Select Passwords and Accounts. #. Select Add Account. #. Select Other as account type. #. Select Add CalDAV account. -#. For server, type ``example.com/remote.php/dav/principals/users/USERNAME/`` +#. For server, type ``example.com`` #. Enter your user name and password. #. Select Next. -#. If your server does not support SSL, a warning will be displayed. - Select Continue. -#. If the iPhone is unable to verify the account information perform the - following steps: - - - Select OK. - - Select advanced settings. - - If your server does not support SSL, make sure Use SSL is set to OFF. - - Change port to 80. - - Go back to account information and hit Save. Your calendar will now be visible in the Calendar application +.. note:: Beginning with iOS 12 an SSL encryption is necessary. Therefore do **not** disable **SSL** + (For this reason a certificate is required at your domain, https://letsencrypt.org/ will do) + Contacts -------- #. Open the settings application. -#. Select Mail, Contacts, Calendars. +#. Select Passwords and Accounts. #. Select Add Account. #. Select Other as account type. #. Select Add CardDAV account. -#. For server, type ``example.com/remote.php/dav/principals/users/USERNAME/`` +#. For server, type ``example.com`` #. Enter your user name and password. #. Select Next. -#. If your server does not support SSL, a warning will be displayed. - Select Continue. -#. If the iPhone is unable to verify the account information perform the - following: - - - Select OK. - - Select advanced settings. - - If your server does not support SSL, make sure Use SSL is set to OFF. - - Change port to 80. - - Go back to account information and hit Save. You should now find your contacts in the address book of your iPhone. + +.. note:: Beginning with iOS 12 an SSL encryption is necessary. Therefore do **not** disable **SSL** + (For this reason a certificate is required at your domain, https://letsencrypt.org/ will do) + + If it's still not working, have a look at the `Troubleshooting Contacts & Calendar`_ guide. -.. _Troubleshooting Contacts & Calendar: https://docs.nextcloud.org/server/14/admin_manual/issues/index.html#troubleshooting-contacts-calendar +.. _Troubleshooting Contacts & Calendar: https://docs.nextcloud.org/server/16/admin_manual/issues/index.html#troubleshooting-contacts-calendar .. TODO ON RELEASE: Update version number above on release From a0df5309bf5f998c6f2c6995cecf01f46c25b921 Mon Sep 17 00:00:00 2001 From: BobKircher <22474026+BobKircher@users.noreply.github.com> Date: Sat, 24 Aug 2019 14:36:01 +0200 Subject: [PATCH 2/2] Update user_manual/pim/sync_ios.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BobKircher <22474026+bobkircher@users.noreply.github.com> 14:35 24.08.2019 Co-Authored-By: John Molakvoæ --- user_manual/pim/sync_ios.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_manual/pim/sync_ios.rst b/user_manual/pim/sync_ios.rst index d061198b4..6892da48a 100644 --- a/user_manual/pim/sync_ios.rst +++ b/user_manual/pim/sync_ios.rst @@ -41,5 +41,5 @@ You should now find your contacts in the address book of your iPhone. If it's still not working, have a look at the `Troubleshooting Contacts & Calendar`_ guide. -.. _Troubleshooting Contacts & Calendar: https://docs.nextcloud.org/server/16/admin_manual/issues/index.html#troubleshooting-contacts-calendar +.. _Troubleshooting Contacts & Calendar: https://docs.nextcloud.org/server/stable/admin_manual/issues/index.html#troubleshooting-contacts-calendar .. TODO ON RELEASE: Update version number above on release