Merge pull request #11252 from mrtumnus/patch-1

user_manual/groupware/sync_thunderbird.rst

@@ -8,29 +8,33 @@ Synchronizing with Thunderbird
 Recommended method
 ------------------
 
-Since Thunderbird 102, the CardDAV protocol is natively supported.
+Since Thunderbird 102, the CardDAV & CalDAV protocols are natively supported.
 
-To enable it:
+Contacts
+~~~~~~~~
 
-* On the address book view, click the down arrow near "**New Address Book**" and choose "**Add CardDAV Address Book**".
-* In the next window, type your **user name** and **URL of your server**.
-* The next window will ask for your username and password for this account.
-* The previous window will be refreshed and ask you which address books you wish to sync.
-* Choose and then click **Continue**.
+
+#. On the address book view, click the down arrow near **New Address Book** and choose **Add CardDAV Address Book**.
+#. In the next window, type your **Username** and **Location** (Server URL).
+#. The next window will ask for your username and password for this account.
+#. The previous window will be refreshed and ask you which address books you wish to sync.
+#. Choose and then click **Continue**.
 
 If you later want to add a new address book, you can redo all of those steps and only the books not already synchronized will be suggested.
 
-For calendars, the CalDAV protocol is also natively supported.
 
-To enable it:
+Calendars
+~~~~~~~~~
 
-* Click on "**+**" near Agendas on the agendas page.
-* Choose "**On the network**" on the next window.
-* Type your "**user name**" and "**Url of the server**", then click on "Find Calendars".
-* Choose which agendas you want to add and click "**Subscribe**"
+#. Go to the calendar view in Thunderbird and select the **New Calendar...** button at the bottom of the left side panel.
+#. Choose **On the network**:
 
-Same thing here, if you later want to add more calendars, just redo the procedure.
+   .. image:: ../images/new_calendar.png
+
+#. Type your **Username** and **Location** (Server URL), then click on **Find Calendars**.
+#. Choose which calendars you want to add and click **Subscribe**
 
+Same thing here, if you later want to add more calendars, just redo the procedure.
 
 Alternative: Using the TbSync addon
 -----------------------------------
@@ -42,13 +46,13 @@ For this method, you need to have two add-ons installed:
 
 When they are installed, go to **Extras**/**Synchronization settings (TbSync)** if you are on Windows, or **Edit/Synchronization settings (TbSync)** if on Linux, then:
 
-* In the account manager choose "**Add account** / **CalDAV / CardDAV account**"
-* In the next window, go with the default called **Automatic configuration** and click **next**
-* Enter an **account name** (which you can freely choose), a **user name**, a **password**, the **URL of your server**, and click **next**
-* In the next window, TbSync should have auto-discovered the CalDAV and CardDAV addresses. When it has, click **Finish**
-* Check the **Enable and synchronize this account** box. TbSync will now discover all address books and calendars your account has access to on the server
-* Check the box next to each calendar and address book you want to have synchronized, set how often you want them to be synchronized, and push the button **synchronize now**
-* After the first successful synchronization is complete, you can close the window.
+#. In the account manager choose **Add new account** > **CalDAV & CardDAV**
+#. In the next window, go with the default called **Automatic Configuration** and click **Next**
+#. Enter an **Account name** (which you can freely choose), a **User name**, a **Password**, the **Server URL**, and click **Next**
+#. In the next window, TbSync should have auto-discovered the CalDAV and CardDAV addresses. When it has, click **Finish**
+#. Check the **Enable and synchronize this account** box. TbSync will now discover all address books and calendars your account has access to on the server
+#. Check the box next to each calendar and address book you want to have synchronized, set how often you want them to be synchronized, and push the button **synchronize now**
+#. After the first successful synchronization is complete, you can close the window.
 
 Henceforth, TbSync will do the work for you. You are done with the basic configuration and can skip the next sections unless you need a more advanced address book.
 
@@ -76,23 +80,3 @@ Alternative: Using the CardBook add-on (Contacts only)
 #. When you are finished, CardBook synchronizes your address books. You can always trigger a synchronization manually by clicking "Synchronize" in the top left corner of CardBook:
 
    .. image:: ../images/synchronize_cardbook.png
-
-
-The old method: Manually subscribing to calendars
--------------------------------------------------
-
-This method is only needed if you don't want to install TBSync.
-
-#. Go to your Nextcloud Calendar and click on the 3 dots menu for the calendar that you want to synchronize which will display a URL that looks something like this:
-
-   ``https://cloud.nextcloud.com/remote.php/dav/calendars/daniel/personal/``
-
-#. Go to the calendar view in Thunderbird and right-click in the calendar menu to the left (where the names of the calendars are) to add a **New Calendar**.
-
-#. Choose **On the Network**:
-
-   .. image:: ../images/new_calendar.png
-
-#. Choose **CalDAV** and fill in the missing information:
-
-   .. image:: ../images/CalDAV_calendar.png