diff --git a/user_manual/pim/calendar.rst b/user_manual/pim/calendar.rst index 5aa02033c..7272ee556 100644 --- a/user_manual/pim/calendar.rst +++ b/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. diff --git a/user_manual/pim/index.rst b/user_manual/pim/index.rst index a720c3e72..cab2fd961 100644 --- a/user_manual/pim/index.rst +++ b/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 `_. .. toctree:: :maxdepth: 1 @@ -18,4 +23,3 @@ their respective Apps > Productivity entries. sync_kde sync_windows10 troubleshooting - diff --git a/user_manual/pim/sync_android.rst b/user_manual/pim/sync_android.rst index caaac1b5c..f99a371c8 100644 --- a/user_manual/pim/sync_android.rst +++ b/user_manual/pim/sync_android.rst @@ -1,11 +1,11 @@ -=================== -Synchronize Android -=================== +========================== +Synchronizing with Android +========================== -Address book and Calendar -------------------------- +Contacts and Calendar +--------------------- -#. Install DAVdroid (possibly through F-Droid) +#. Install `DAVdroid `_ 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`` @@ -16,7 +16,4 @@ Address book and Calendar #. 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 address book of your Android. diff --git a/user_manual/pim/sync_ios.rst b/user_manual/pim/sync_ios.rst index 2b21d50d6..3f9e9a639 100644 --- a/user_manual/pim/sync_ios.rst +++ b/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. diff --git a/user_manual/pim/sync_kde.rst b/user_manual/pim/sync_kde.rst index d9feb69bb..c4de58d4e 100644 --- a/user_manual/pim/sync_kde.rst +++ b/user_manual/pim/sync_kde.rst @@ -1,6 +1,6 @@ -======================================= +========================== Synchronizing with KDE PIM -======================================= +========================== KOrganizer and KAddressbook can synchronize data with a Nextcloud server. diff --git a/user_manual/pim/sync_osx.rst b/user_manual/pim/sync_osx.rst index 5ef14bb14..9d5f620ba 100644 --- a/user_manual/pim/sync_osx.rst +++ b/user_manual/pim/sync_osx.rst @@ -2,6 +2,9 @@ Synchronizing with macOS ======================== +Calendar +-------- + With Nextcloud 14+ and its CalDAV-backend, syncing your Calendars with your macOS-device is easy. To use Nextcloud with macOS Calendar you will need to use the following steps: @@ -15,3 +18,6 @@ To use Nextcloud with macOS Calendar you will need to use the following steps: 7. Paste the previous copied (step 2) iOS/macOS CalDAV address into the server address field and click on "Login". 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. + +Contacts +-------- diff --git a/user_manual/pim/sync_thunderbird.rst b/user_manual/pim/sync_thunderbird.rst index 2dbfc20f7..372121144 100644 --- a/user_manual/pim/sync_thunderbird.rst +++ b/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... diff --git a/user_manual/pim/sync_windows10.rst b/user_manual/pim/sync_windows10.rst index 92671cc01..ad63489fb 100644 --- a/user_manual/pim/sync_windows10.rst +++ b/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. diff --git a/user_manual/pim/troubleshooting.rst b/user_manual/pim/troubleshooting.rst deleted file mode 100644 index 3f870468b..000000000 --- a/user_manual/pim/troubleshooting.rst +++ /dev/null @@ -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/ - \ No newline at end of file