Merge pull request #2127 from nextcloud/backport/2125/stable18

[stable18] fixes requested by check annotations
This commit is contained in:
Sascha Wiswedel 2020-06-03 21:25:20 +02:00 committed by GitHub
commit 7b087dd77f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 17 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

@ -45,7 +45,7 @@ intentionally. This allows to set up special cron jobs on your server with the k
granularity, instead of relying on the Nextcloud cron feature which is not very flexible
on scheduling.
To implement the samples mentioned above, the following three entries are necessary::
To implement the samples mentioned above, the following three entries are necessary:
# crontab -u www-data -e
0 * * * * php -f /var/www/nextcloud/occ activity:send-mails hourly

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.