made information on available client and server OS's more accurate and explicit. also change some wording from and to and or

This commit is contained in:
NeverDucky 2018-04-03 15:45:39 -04:00
parent 84962f118f
commit 25d206963b

View File

@ -2045,7 +2045,7 @@
<h1><a href="#calendar_contacts" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Calendar and Contacts Sync</h1>
</div>
<div class="alert alert-warning" role="alert">
<strong>If you are currently using a calendar and contacts synchronization service like Google Sync or iCloud you should pick an alternative here.</strong>
<strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud you should pick an alternative here.</strong>
</div>
<div class="row">
<div class="col-sm-4">
@ -2054,14 +2054,14 @@
<h3 class="panel-title">Nextcloud</h3>
</div>
<div class="panel-body">
<p><img src="img/provider/Nextcloud.png" alt="Nextcloud" align="right" style="margin-left:5px;">NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server.
<p><img src="img/provider/Nextcloud.png" alt="Nextcloud" align="right" style="margin-left:5px;">NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server.
</p>
<p>
<a href="https://nextcloud.com/">
<button type="button" class="btn btn-success">Website: nextcloud.com</button>
</a>
</p>
<p>Client OS: Windows, Mac, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux.</p>
<p>Client OS: Windows, Mac, Linux, BSD, Unix, iOS, Android, Fire OS. Server OS: Linux.</p>
</div>
</div>
</div>
@ -2072,7 +2072,7 @@
<h3 class="panel-title">Email Providers</h3>
</div>
<div class="panel-body">
<p><img src="img/misc/email.png" alt="Email" align="right" style="margin-left:5px;">Many email providers also offer calendar and contacts sync services. Refer to the <a href="#email">Email Providers section</a> to choose an email provider and check if they also offer calendar and contacts sync.</p>
<p><img src="img/misc/email.png" alt="Email" align="right" style="margin-left:5px;">Many email providers also offer calendar and or contacts sync services. Refer to the <a href="#email">Email Providers section</a> to choose an email provider and check if they also offer calendar and or contacts sync.</p>
<p>
<a href="#email">
<button type="button" class="btn btn-info">Website: Email Providers section</button>
@ -2090,13 +2090,13 @@
<h3 class="panel-title">EteSync</h3>
</div>
<div class="panel-body">
<p><img src="img/provider/etesync.png" alt="EteSync" align="right" style="margin-left:5px;">EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android. It costs $14 per year to use, or you can host the server yourself for free.</p>
<p><img src="img/provider/etesync.png" alt="EteSync" align="right" style="margin-left:5px;">EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free.</p>
<p>
<a href="https://www.etesync.com/">
<button type="button" class="btn btn-warning">Website: etesync.com</button>
</a>
</p>
<p>OS: Android, Web.</p>
<p>Cient OS: Android, Web. Server OS: Linux.</p>
</div>
</div>
</div>
@ -2112,7 +2112,7 @@
</li>
<li>
<a href="#cloud">cloud backups</a> - consider regularly exporting your calendar and contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="#encrypt">encrypting</a> them).
<a href="#cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="#encrypt">encrypting</a> them).
</li>
</ul>