Merge pull request #923 from nextcloud/groupware-sync

Groupware Clients Part 1

user_manual/pim/calendar.rst

@@ -1,6 +1,3 @@
 ======================
 Using the calendar app
 ======================
-
-The Calendar app is not enabled by default in Nextcloud |version| and needs to
-be enabled separately. 

user_manual/pim/index.rst

@@ -1,10 +1,15 @@
-===================
-Contacts & calendar
-===================
+=========
+Groupware
+=========
 
-The Contacts, Calendar, and Mail apps are not included in Nextcloud 10.
-You may easily install them by clicking the Enable button on
-their respective Apps > Productivity entries.
+Nextcloud Groupware is a bundle of apps which is consisting of an **Mail**-client
+(IMAP/POP3) and a **Calendar** and **Contacts** server (CalDAV/CardDAV) with the
+respective web interfaces.
+
+We complete those productivity tools with **Deck**, a project management tool
+which allows you to create Kanban-style task boards and share them with your team.
+
+You can find out more about Nextcloud Groupware `on our website <https://nextcloud.com/groupware/>`_.
 
 .. toctree::
    :maxdepth: 1
@@ -18,4 +23,3 @@ their respective Apps > Productivity entries.
    sync_kde
    sync_windows10
    troubleshooting
-

user_manual/pim/sync_android.rst

@@ -1,22 +1,19 @@
-===================
-Synchronize Android
-===================
+==========================
+Synchronizing with Android
+==========================
 
-Address book and Calendar
--------------------------
+Contacts and Calendar
+---------------------
 
-#. Install DAVdroid (possibly through F-Droid)
+#. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device.
 #. Create a new account ("+" button)
 #. Select "Connexion with URL and username"
-#. For URL, type ``https://www.yournextcloud.com/remote.php/dav``
+#. For URL, type ``https://sub.example.com/remote.php/dav``
 #. Then your Nextcloud credentials
 #. Click ``Connect``
-#. Important: Enter your email address as DAVdroid account name (mandatory if you want to be able to send calendar invitation)
+#. Important: Enter your email address as DAVx⁵ account name (mandatory if you want to be able to send calendar invitation)
 #. Chose the option ``Groups are categories for each of the contacts``
 #. Select the data you want to sync
 #. Chose the Address book and calendar you want to show in your dedicated Android apps
 
-You should now find your contacts in the address book of your Android. If it's still not working, have a look at the `Troubleshooting Contacts & Calendar`_ guides.
-
-.. _Troubleshooting Contacts & Calendar: https://docs.nextcloud.org/server/14/admin_manual/issues/index.html#troubleshooting-contacts-calendar
-.. TODO ON RELEASE: Update version number above on release
+You should now find your contacts in the contacts-app of your Android.

user_manual/pim/sync_ios.rst

@@ -1,6 +1,6 @@
-=============================
-iOS - synchronize iPhone/iPad
-=============================
+======================
+Synchronizing with iOS
+======================
 
 Calendar
 --------
@@ -27,8 +27,8 @@ Calendar
 Your calendar will now be visible in the Calendar application
 
 
-Address book
-------------
+Contacts
+--------
 
 #. Open the settings application.
 #. Select Mail, Contacts, Calendars.

user_manual/pim/sync_kde.rst

@@ -1,6 +1,6 @@
-=======================================
+==========================
 Synchronizing with KDE PIM
-=======================================
+==========================
 
 KOrganizer and KAddressbook can synchronize data with a Nextcloud server.
 

user_manual/pim/sync_osx.rst

@@ -2,16 +2,50 @@
 Synchronizing with macOS
 ========================
 
-With Nextcloud 14+ and its CalDAV-backend, syncing your Calendars with your macOS-device is easy.
+Setup your Accounts
+-------------------
 
-To use Nextcloud with macOS Calendar you will need to use the following steps:
+In the following steps you will add your server resources for **CalDAV** (Calendar) 
+and **CardDAV** (Contacts) to your Nextcloud.
 
-1. Open the Calendar-app in your Nextcloud (https://cloud.example.com/apps/calendar)
-2. Navigate into the app-settings (lower left corner) and copy the iOS/macOS CalDAV address provided there
-3. Open the system preferences of your macOS-device
-4. Navigate to "Online-Accounts"
-5. Click on "Add another account..." and click on "CalDAV-Account"
-6. Select "Manually" as Account-Type and type in your username or email-address of your Nextcloud-instance as username, and your app-password/token or password as password.
-7. Paste the previous copied (step 2) iOS/macOS CalDAV address into the server address field and click on "Login".
+1. Open the **system preferences** of your macOS device
 
-You can now select, with which applications you want to use this CalDAV resource. In the most cases, this will be "Calendar", sometimes you may also want to use it for your Tasks and reminders.
+2. Navigate to **Internet Accounts**
+
+.. figure:: /images/macos_1.png
+
+3. Click on **Add Other Account...** and click on **CalDAV Account** for Calendar
+   or **CardDAV Account** for Contacts.
+
+.. figure:: /images/macos_2.png
+
+.. note:: You can not setup Calendar/Contacts together. You need to setup them
+          in **separate accounts**.
+
+4. Select **Advanced** as Account-Type and type in your respective credentials:
+
+   **Username**: Your Nextcloud username or email
+   **Password**: Your generated App-password/token (`App-password/token <https://docs.nextcloud.com/server/stable/user_manual/session_management.html#managing-devices>`_)
+   **Server Address**: URL of your Nextcloud server (e.g. https://cloud.example.com)
+   **Server Path:** /remote.php/dav/principals/users/[your_username]
+   **Port:** 443
+   **Use SSL:** Yes
+
+.. figure:: /images/macos_3.png
+
+5. Click on **Sign In**.
+
+**For CalDAV (Calendar):** You can now select, with which applications you want
+to use this resource. In the most cases, this will be the "Calendar" application,
+sometimes you may also want to use it for your **Tasks and reminders**.
+
+.. figures:: /images/macos_4.png
+
+Troubleshooting
+---------------
+
+- macOS does **not** support syncing CalDAV/CardDAV over non-encrypted **http://**
+  connections. Make sure you have https:// enabled and configured on server- and
+  client-side.
+
+- **Self-signed certificates** need to be properly set up in the macOS keychain.

user_manual/pim/sync_thunderbird.rst

@@ -1,9 +1,9 @@
-==================================================
-Thunderbird - synchronize addressbook and calendar
-==================================================
+==============================
+Synchronizing with Thunderbird
+==============================
 
-Addressbook
------------
+Contacts
+--------
 
 As someone who is new to Nextcloud and new to CardBook here is what you need in excruciating pithy detail to make this work:
 
@@ -35,11 +35,11 @@ https://cloud.nextcloud.com/remote.php/dav/addressbooks/users/daniel/Thunderbird
 .. image:: ../images/addressbook_name.png
 
 5. Once installed, synchronize your addressbook by clicking "Synchronize" in the top left corner of CardBook.
-You'll see your address book populate from Nextcloud! 
+You'll see your address book populate from Nextcloud!
 
 .. image:: ../images/synchronize_cardbook.png
 
-The rest of the details of dealing with Thunderbird CardBook are left to the reader... 
+The rest of the details of dealing with Thunderbird CardBook are left to the reader...
 
 Calendar
 --------
@@ -62,4 +62,4 @@ https://cloud.nextcloud.com/remote.php/dav/calendars/daniel/personal/
 
 .. image:: ../images/CalDAV_calendar.png
 
-The rest of the details of dealing with Thunderbird Calendar are left to the reader... 
+The rest of the details of dealing with Thunderbird Calendar are left to the reader...

user_manual/pim/sync_windows10.rst

@@ -1,11 +1,14 @@
-======================================
-Synchronizing with Windows 10 Calendar
-======================================
+=============================
+Synchronizing with Windows 10
+=============================
+
+Calendar
+--------
 
 1. In your browser, navigate to the Nextcloud Calendar app. Under "Settings & import", copy the "iOS/macOS CalDAV Address" into your clipboard.
 
 2. Launch the Windows 10 Calendar app. Then, click the settings icon (gear icon) and select "Manage accounts".
- 
+
 3. Click "Add account" and choose "iCloud".
 
 4. Enter an email, username and password. None of this information has to be valid-it will all be changed in the upcoming steps.
@@ -24,7 +27,7 @@ After following all these steps, your Nextcloud calendar should synchronize. If
 
 **NOTE: You will not be able to synchronize your calendar if you have two-factor authentication enabled. Follow the steps below to get an app password that can be used with the Calendar client app:**
 
-1. Log into Nextcloud. Click on your user icon, then click on "settings".  
+1. Log into Nextcloud. Click on your user icon, then click on "settings".
 
 2. Click on "Security", then locate a button labeled "Generate app password". Next to this button, enter "Windows 10 Calendar app". Then, click the button and copy and paste the password. Use this password instead of your Nextcloud password for Step 8.
 

user_manual/pim/troubleshooting.rst

@@ -1,17 +0,0 @@
-===============
-Troubleshooting
-===============
-
-BlackBerry OS 10.2
-------------------
-
-BlackBerry OS up to 10.2.2102 does not accept a URL with protocol ``https://`` 
-in front of the server address. It will always tell you that it cannot login on 
-your server. So instead of writing::
-
-    https://example.com/remote.php/dav/principals/users/USERNAME/
-    
-in the server address field, you have to write::
-
-    example.com/remote.php/dav/principals/users/USERNAME/
-