Merge branch 'master' into 'master'

Update DAVdroid links and text

See merge request fdroid/fdroiddata!2606

metadata/at.bitfire.davdroid.txt

@@ -1,28 +1,26 @@
 Categories:Internet
 License:GPL-3.0
-Web Site:https://davdroid.bitfire.at/
-Source Code:https://davdroid.bitfire.at/source/
+Web Site:https://www.davdroid.com/
+Source Code:https://www.davdroid.com/source/
 Issue Tracker:https://davdroid.bitfire.at/forums/
-Changelog:https://gitlab.com/bitfireAT/davdroid/tags
-Donate:https://davdroid.bitfire.at/donate/
+Changelog:https://forums.bitfire.at/category/4/davdroid?tag=announcement
+Donate:https://www.davdroid.com/donate/
 FlattrID:2100160
 Bitcoin:1KSCy7RHztKuhW9fLLaUYqdwdC2iwbejZU
 
 Auto Name:DAVdroid
-Summary:Sync contacts and calendars
+Summary:Sync contacts, calendars and tasks with CalDAV/CardDAV
 Description:
-DAVdroid is a CalDAV/CardDAV synchronisation adapter for Android 4+ devices.
+DAVdroid is a CalDAV/CardDAV management and synchronization app for Android.
+which integrates natively with Android calendar/contact apps.
 
-Use it with your own server (like [https://owncloud.org/ ownCloud]/
-[https://nextcloud.com/ Nextcloud], [http://baikal-server.com/ Baïkal],
-[http://www.davical.org/ DAViCal] or [http://radicale.org/ radiCALe]) or with a
-trusted hoster to keep your contacts and events under your control.
-
-Integrates natively in Android calendar/contact apps. See homepage for
-configuration details, including info about self-signed certificates.
+Use it with your own server or with a trusted hoster to keep your contacts,
+events and tasks under your control.
 
 For a comparison of server software, see the [https://wiki.debian.org/Groupware
-Debian wiki].
+Debian wiki]. Examples (alphabetical order): [http://baikal-server.com/ Baïkal],
+[http://www.davical.org/ DAViCal], [https://nextcloud.com/ Nextcloud],
+[https://owncloud.org/ ownCloud], [http://radicale.org/ Radicale])
 .
 
 Repo Type:git