From df35611dad1b586e4b72d54aa85e5c5b3eafa636 Mon Sep 17 00:00:00 2001
From: Elliott Partridge <elliott.partridge@gmail.com>
Date: Tue, 31 Oct 2023 11:15:48 -0400
Subject: [PATCH 1/4] Update sync_thunderbird.rst

Merged out-of-date "old method" for calendar subscriptions into the current recommended method. The old method is no longer relevant.

Signed-off-by: Elliott Partridge <elliott.partridge@gmail.com>
---
 user_manual/groupware/sync_thunderbird.rst |  56 ++++++++++-----------
 user_manual/images/CalDAV_calendar.png     | Bin 24001 -> 0 bytes
 2 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 user_manual/images/CalDAV_calendar.png

diff --git a/user_manual/groupware/sync_thunderbird.rst b/user_manual/groupware/sync_thunderbird.rst
index 17ac3b0d7..c6a634ab1 100644
--- a/user_manual/groupware/sync_thunderbird.rst
+++ b/user_manual/groupware/sync_thunderbird.rst
@@ -8,26 +8,44 @@ Synchronizing with Thunderbird
 Recommended method
 ------------------
 
+Contacts
+~~~~~~~~
+
 Since Thunderbird 102, the CardDAV protocol is natively supported.
 
 To enable it:
 
-* 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 **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**.
 
 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.
 
+
+Calendars
+~~~~~~~~~
+
 For calendars, the CalDAV protocol is also natively supported.
 
 To enable it:
 
-* 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 your Nextcloud Calendar and click on the |pencil| menu for the calendar that you want to synchronize.
+
+.. |pencil| image:: ../images/pencil.png
+
+#. Copy the "**Internal link**" URL, which will look something like this:
+
+   ``https://cloud.nextcloud.com/remote.php/dav/calendars/daniel/personal/``
+
+#. 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**":
+
+   .. image:: ../images/new_calendar.png
+
+#. Type your "**Username**" and "**Location**" (URL copied above), 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.
 
@@ -76,23 +94,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
diff --git a/user_manual/images/CalDAV_calendar.png b/user_manual/images/CalDAV_calendar.png
deleted file mode 100644
index acfac9679051bb6994a1183dde8436ebc90e6ed0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24001
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%0DSlgC
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


From 854f66f5a0c3499c0ae0050e3c283e17b6f88848 Mon Sep 17 00:00:00 2001
From: root <elliott.partridge@gmail.com>
Date: Tue, 31 Oct 2023 19:01:05 +0000
Subject: [PATCH 2/4] Further improvements to sync_thunderbird.rst

- Corrected numbering of Calendars steps
- Normalized UI element references (bold only, no quotations)
- Converted TbSync steps to bulleted list

Signed-off-by: Elliott Partridge <elliott.partridge@gmail.com>
---
 user_manual/groupware/sync_thunderbird.rst | 32 ++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/user_manual/groupware/sync_thunderbird.rst b/user_manual/groupware/sync_thunderbird.rst
index c6a634ab1..9a0612847 100644
--- a/user_manual/groupware/sync_thunderbird.rst
+++ b/user_manual/groupware/sync_thunderbird.rst
@@ -15,8 +15,8 @@ Since Thunderbird 102, the CardDAV protocol is natively supported.
 
 To enable it:
 
-#. 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**.
+#. 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**.
 #. 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**.
@@ -32,23 +32,21 @@ For calendars, the CalDAV protocol is also natively supported.
 To enable it:
 
 #. Go to your Nextcloud Calendar and click on the |pencil| menu for the calendar that you want to synchronize.
-
-.. |pencil| image:: ../images/pencil.png
-
-#. Copy the "**Internal link**" URL, which will look something like this:
+#. Copy the **Internal link** URL, which will look something like this:
 
    ``https://cloud.nextcloud.com/remote.php/dav/calendars/daniel/personal/``
 
-#. 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**":
+#. 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**:
 
    .. image:: ../images/new_calendar.png
 
-#. Type your "**Username**" and "**Location**" (URL copied above), then click on "**Find Calendars**".
-#. Choose which calendars you want to add and click "**Subscribe**"
+#. Type your **Username** and **Location** (URL copied above), 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.
 
+.. |pencil| image:: ../images/pencil.png
 
 Alternative: Using the TbSync addon
 -----------------------------------
@@ -60,13 +58,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.
 

From f475ecc464fdfa3a2fcf3fa7d255efeaf67b27db Mon Sep 17 00:00:00 2001
From: Elliott Partridge <elliott.partridge@gmail.com>
Date: Tue, 31 Oct 2023 19:14:58 +0000
Subject: [PATCH 3/4] Further improvements to sync_thunderbird.rst

- Simplified Calendar subscription instructions, as only the base URL is required for calendar discovery

Signed-off-by: Elliott Partridge <elliott.partridge@gmail.com>
---
 user_manual/groupware/sync_thunderbird.rst | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/user_manual/groupware/sync_thunderbird.rst b/user_manual/groupware/sync_thunderbird.rst
index 9a0612847..dd360af09 100644
--- a/user_manual/groupware/sync_thunderbird.rst
+++ b/user_manual/groupware/sync_thunderbird.rst
@@ -31,23 +31,16 @@ For calendars, the CalDAV protocol is also natively supported.
 
 To enable it:
 
-#. Go to your Nextcloud Calendar and click on the |pencil| menu for the calendar that you want to synchronize.
-#. Copy the **Internal link** URL, which will look something like this:
-
-   ``https://cloud.nextcloud.com/remote.php/dav/calendars/daniel/personal/``
-
 #. 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**:
 
    .. image:: ../images/new_calendar.png
 
-#. Type your **Username** and **Location** (URL copied above), then click on **Find Calendars**.
+#. Type your **Username** and **Location**, 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.
 
-.. |pencil| image:: ../images/pencil.png
-
 Alternative: Using the TbSync addon
 -----------------------------------
 

From 3817f1ee28031ce20318d407ff88bd5e5e023e46 Mon Sep 17 00:00:00 2001
From: Elliott Partridge <elliott@bridgefusion.com>
Date: Wed, 1 Nov 2023 13:35:29 -0400
Subject: [PATCH 4/4] Corrections after review

- Consolidated explanatory text under 'Recommended Method' heading
- Clarified 'Location' fields

Signed-off-by: Elliott Partridge <elliott@bridgefusion.com>
---
 user_manual/groupware/sync_thunderbird.rst | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/user_manual/groupware/sync_thunderbird.rst b/user_manual/groupware/sync_thunderbird.rst
index dd360af09..46712abd2 100644
--- a/user_manual/groupware/sync_thunderbird.rst
+++ b/user_manual/groupware/sync_thunderbird.rst
@@ -8,15 +8,14 @@ Synchronizing with Thunderbird
 Recommended method
 ------------------
 
+Since Thunderbird 102, the CardDAV & CalDAV protocols are natively supported.
+
 Contacts
 ~~~~~~~~
 
-Since Thunderbird 102, the CardDAV protocol is natively supported.
-
-To enable it:
 
 #. 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**.
+#. 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**.
@@ -27,16 +26,12 @@ If you later want to add a new address book, you can redo all of those steps and
 Calendars
 ~~~~~~~~~
 
-For calendars, the CalDAV protocol is also natively supported.
-
-To enable it:
-
 #. 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**:
 
    .. image:: ../images/new_calendar.png
 
-#. Type your **Username** and **Location**, then click on **Find Calendars**.
+#. 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.