fixes requested by check annotations

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
This commit is contained in:
Sascha Wiswedel
2020-06-03 13:42:26 +02:00
parent 5163dcc220
commit 5b7b24f18d
6 changed files with 21 additions and 30 deletions

View File

@@ -24,7 +24,7 @@ Those apps are supported and developed by Nextcloud GmbH directly and
have an **Featured**-tag. See :doc:`installation/apps_supported` for a list of supported apps.
.. note:: Your Nextcloud server needs to be able to communicate with
``https://apps.nextcloud.com`` to list and download apps. Please make sure to whitelist this target in your firewall or proxy if necessary_.
``https://apps.nextcloud.com`` to list and download apps. Please make sure to whitelist this target in your firewall or proxy if necessary.
.. note:: To get access to work-arounds, long-term-support, priority bug fixing
and custom consulting for supported apps, contact our `sales team <https://nextcloud.com/enterprise/>`_.

View File

@@ -44,7 +44,7 @@ like in normal shares when set to ``true``.
.. warning::
This config option comes with the following limitations::
This config option comes with the following limitations:
1. Users that had access to a groupfolder, share or external storage can see activities in their stream and emails that happen after they are removed until they login again
2. Users that are newly added to a groupfolder, share or external storage can not see activities in their stream nor emails that happen after they are added until they login again

View File

@@ -56,5 +56,4 @@ file is added. If the deleted files exceed the new maximum allowed space
Nextcloud will expire old deleted files until the limit is met once again.
.. note:: Your administrator may have configured the trash bin retention period
to override the storage space management. See `admin documentation
<https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.
to override the storage space management. See `admin documentation <https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.

View File

@@ -30,8 +30,7 @@ deleted files exceed 50% of quota then the oldest files are removed until the
total is below 50%.
.. note:: Your administrator may have configured the trash bin retention period
to override the storage space management. See `admin documentation
<https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.
to override the storage space management. See `admin documentation <https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#deleted-items-trash-bin>`_ for more details.
When version control is enabled, the older file versions are not counted against
quotas.

View File

@@ -38,14 +38,14 @@ Importing Virtual Contacts
To Import Contacts Using a VCF/Vcard File:
1. Find "Settings" at the bottom of the left sidebar, next to the gear button.
.. figure:: ../images/contact_bottombar.png
*Contact settings gear button*
.. figure:: ../images/contact_bottombar.png
:alt: Contact settings gear button
2. Click the gear button. The Contacts app "Import" button will appear.
.. figure:: ../images/contact_uploadbutton.png
*Contacts Upload Field*
.. figure:: ../images/contact_uploadbutton.png
:alt: Contacts Upload Field
.. note:: The Contacts app only supports import of vCards version 3.0 and 4.0.
@@ -90,14 +90,12 @@ Contact Picture
To add a picture for your new contacts, click on the upload button:
.. figure:: ../images/contact_picture.png
*Contact picture (upload button)*
:alt: Contact picture (upload button)
After you have set a contact picture, it will look like this:
.. figure:: ../images/contact_picture_set.png
*Contact picture (set)*
:alt: Contact picture (set)
If you want to upload a new one, remove it, view it in full size or download it,
click on the contacts picture for the following options to appear:
@@ -114,8 +112,7 @@ available address books, certain options for each address book, and enables you
to create new address books, simply by specifying an address books name.
.. figure:: ../images/contact_manageaddressbook.png
*Add address book in the contacts settings*
:alt: Add address book in the contacts settings
The Contacts settings is also where you can share, export and delete address
books. You will find the CardDAV URLs there.

View File

@@ -5,10 +5,8 @@ Synchronizing with Android
Files and notifications
-----------------------
1. Install the Nextcloud Android client `from F-Droid
<https://f-droid.org/de/packages/com.nextcloud.client/>`_ or `Google
Play Store
<https://play.google.com/store/apps/details?id=com.nextcloud.client>`_
1. Install the Nextcloud Android client `from F-Droid <https://f-droid.org/de/packages/com.nextcloud.client/>`_ or `Google
Play Store <https://play.google.com/store/apps/details?id=com.nextcloud.client>`_
2. Start the app. There are two ways of setting it up:
*Either*: enter
@@ -27,10 +25,9 @@ Contacts and Calendar
With the Nextcloud mobile app
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1. Install `DAVx⁵ (formerly known as DAVDroid)
<https://www.davx5.com/download/>`_ on your Android device, `from
Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or `from F-Droid
<https://f-droid.org/de/packages/at.bitfire.davdroid/>`_
1. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device,
`from Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or
`from F-Droid <https://f-droid.org/de/packages/at.bitfire.davdroid/>`_
2. In the Nextcloud mobile, go
to **Settings** / **More**, tap on "**Sync caldendars & contacts**"
3. Now, DAVx⁵ will open Nextcloud's Webflow login window, where you
@@ -38,8 +35,7 @@ With the Nextcloud mobile app
4. After this, DAVx⁵ will close and the Nextcloud app reappears. In
order to finish setup, you have to manually launch DAVx⁵ again.
5. Tap on the icon for the account DAVx⁵ has just created, when requested grant DAVx⁵ access
to your calendars and contacts, optionally install `OpenTasks
<https://play.google.com/store/apps/details?id=org.dmfs.tasks>`_ and
to your calendars and contacts, optionally install `OpenTasks <https://play.google.com/store/apps/details?id=org.dmfs.tasks>`_ and
grant DAVx⁵ access to your tasks, too.
6. When you tap the icon for the account DAVx⁵ has set up, it will
discover the available address books and calendars. Choose which
@@ -51,9 +47,9 @@ Without the Nextcloud mobile app
If you don't want to install the Nextcloud mobile app, the following
steps are required after installing DAVx⁵
1. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device, `from
Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or `from F-Droid
<https://f-droid.org/de /packages/at.bitfire.davdroid/>`_.
1. Install `DAVx⁵ (formerly known as DAVDroid) <https://www.davx5.com/download/>`_ on your Android device,
`from Google Play store <https://play.google.com/store/apps/details?id=at.bitfire.davdroid>`_ or
`from F-Droid <https://f-droid.org/de /packages/at.bitfire.davdroid/>`_.
2. Optionally install `OpenTasks <https://play.google.com/store/apps/details?id=org.dmfs.tasks>`_.
3. Create a new account ("+" button).
4. Select **Connection with URL and username**.