Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced "Create" by "Add" when refering to accounts #32

Merged
merged 1 commit into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions accounts_collections.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Accounts and Collections
What is a DAVx⁵ account?
========================

A DAVx⁵ account represents a connection to a CalDAV/CardDAV service, which can contain address books, calendars and task lists. Most services provide both CalDAV and CardDAV together (technically, this is when both CalDAV and CardDAV can be detected from the same starting point). In this case, you need only one DAVx⁵ account. However, you can also create multiple DAVx⁵ accounts for separate CalDAV/CardDAV services.
A DAVx⁵ account represents a connection to a CalDAV/CardDAV service, which can contain address books, calendars and task lists. Most services provide both CalDAV and CardDAV together (technically, this is when both CalDAV and CardDAV can be detected from the same starting point). In this case, you need only one DAVx⁵ account. However, you can also add multiple DAVx⁵ accounts for separate CalDAV/CardDAV services.

Contacts, events and tasks must be saved to a DAVx⁵ account so that DAVx⁵ can synchronize them. **DAVx⁵ will not synchronize or otherwise touch entries that belong to other accounts (like Google or device-local accounts).**

Expand Down Expand Up @@ -48,7 +48,7 @@ When logging in by URL, DAVx⁵ asks for the *Base URL*. This can be:
- a URL that provides ``addressbook-home-set``, or
- an addressbook URL (``resourcetype: addressbook``).

So, DAVx⁵ will query the base URL for both CalDAV and CardDAV and use whatever it finds. If CalDAV and CardDAV are separated on your server and well-known URLs are not configured, you'll have to create two DAVx⁵ accounts: one for CalDAV (use the CalDAV URL as base URL) and one for CardDAV (use the CardDAV URL as base URL).
So, DAVx⁵ will query the base URL for both CalDAV and CardDAV and use whatever it finds. If CalDAV and CardDAV are separated on your server and well-known URLs are not configured, you'll have to add two DAVx⁵ accounts: one for CalDAV (use the CalDAV URL as base URL) and one for CardDAV (use the CardDAV URL as base URL).

If the URL is entered without scheme, ``https://`` will be prepended. `Use of CalDAV/CardDAV over plain HTTP is not recommended for security reasons. <https://tools.ietf.org/html/rfc6352#section-13>`_

Expand Down
4 changes: 2 additions & 2 deletions introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ How to start using DAVx⁵ on your Android device:
#. `Download <https://www.davx5.com/download>`_ and install DAVx⁵.
#. Open DAVx⁵.
#. Follow the instructions of the start screen (permissions, battery saving etc.).
#. Tap on "⊕ Create account" to create a new account.
#. Tap on "⊕ Add account" to add a new account.
#. Enter your base URL / email address and login credentials.
You can get the base URL from your service provider and/or our `list of tested services <https://www.davx5.com/tested-with/>`_.
#. Finish the steps to create the account.
#. Finish the steps to add the account.
#. Select the address books and calendars/task lists you want to synchronize so that the respective switches are enabled.
#. Force sync ("🗘 Synchronize") if you want the data to be available immediately.
#. Access your address books, events and tasks using your favorite apps (Contacts, Calendar, OpenTasks, …).
Expand Down
4 changes: 2 additions & 2 deletions managed_davx5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ These variables can be used for Managed DAVx⁵ configuration:
*false* = (default) DAVx⁵ won't change standard read-only setting.
* - max_accounts
- integer
- maximum number of accounts – no new accounts can be created when this number of accounts is reached
- maximum number of accounts – no new accounts can be added when this number of accounts is reached
* - proxy_type
- integer
- Sets the proxy type for all HTTP(S) connections. Uses ``override_proxy_host`` and ``override_proxy_port``, if applicable. |br| |br|
Expand All @@ -160,7 +160,7 @@ These variables can be used for Managed DAVx⁵ configuration:
* - default_sync_interval
- integer (number of seconds)
- initial sync interval at account creation (contacts/calendars/tasks); default value: 14400 seconds (4 hours). Only these values are eligible: 900 (15 min), 1800 (30 min), 3600 (1 h), 7200 (2 h), 14400 (4 h), 86400 (1 day). |br|
Can always be overwritten by users. Changing this value will only affect newly created accounts.
Can always be overwritten by users. Changing this value will only affect newly added accounts.
* - wifi_only
- boolean
- *true* = DAVx⁵ will only sync when a WiFi connection is active (doesn't apply to manually forced synchronization) |br|
Expand Down