From 1e3a9c509f55b1c53168a1844e6976871116eed8 Mon Sep 17 00:00:00 2001 From: Sascha Wiswedel Date: Wed, 3 Jun 2020 13:42:26 +0200 Subject: [PATCH 1/4] fixes requested by check annotations Signed-off-by: Sascha Wiswedel --- admin_manual/apps_management.rst | 2 +- user_manual/files/deleted_file_management.rst | 3 +-- user_manual/files/quota.rst | 3 +-- user_manual/pim/contacts.rst | 19 ++++++++----------- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/admin_manual/apps_management.rst b/admin_manual/apps_management.rst index ed66d456b..40c5c462e 100644 --- a/admin_manual/apps_management.rst +++ b/admin_manual/apps_management.rst @@ -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 `_. diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index 2e37cc601..30ce27e13 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -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 -`_ for more details. \ No newline at end of file +to override the storage space management. See `admin documentation `_ for more details. \ No newline at end of file diff --git a/user_manual/files/quota.rst b/user_manual/files/quota.rst index 618c429d8..74b2845bd 100644 --- a/user_manual/files/quota.rst +++ b/user_manual/files/quota.rst @@ -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 -`_ for more details. +to override the storage space management. See `admin documentation `_ for more details. When version control is enabled, the older file versions are not counted against quotas. diff --git a/user_manual/pim/contacts.rst b/user_manual/pim/contacts.rst index 5a3b87207..ac63007de 100644 --- a/user_manual/pim/contacts.rst +++ b/user_manual/pim/contacts.rst @@ -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. From 0fb222216aff12dd7e2a467b0ef652f96c675aad Mon Sep 17 00:00:00 2001 From: Sascha Wiswedel Date: Wed, 3 Jun 2020 13:45:40 +0200 Subject: [PATCH 2/4] fixup Signed-off-by: Sascha Wiswedel --- user_manual/files/deleted_file_management.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_manual/files/deleted_file_management.rst b/user_manual/files/deleted_file_management.rst index 30ce27e13..89f5f509c 100644 --- a/user_manual/files/deleted_file_management.rst +++ b/user_manual/files/deleted_file_management.rst @@ -56,4 +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 `_ for more details. \ No newline at end of file + to override the storage space management. See `admin documentation `_ for more details. \ No newline at end of file From 9ad48f251b9cdf37f2c7a8f59ed5b0d55b2a4529 Mon Sep 17 00:00:00 2001 From: Sascha Wiswedel Date: Wed, 3 Jun 2020 13:47:57 +0200 Subject: [PATCH 3/4] fixup 2 Signed-off-by: Sascha Wiswedel --- user_manual/files/quota.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_manual/files/quota.rst b/user_manual/files/quota.rst index 74b2845bd..50e37403d 100644 --- a/user_manual/files/quota.rst +++ b/user_manual/files/quota.rst @@ -30,7 +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 `_ for more details. + to override the storage space management. See `admin documentation `_ for more details. When version control is enabled, the older file versions are not counted against quotas. From c18040c85dcdc0428272757d5e326277cccc6ae1 Mon Sep 17 00:00:00 2001 From: Sascha Wiswedel Date: Wed, 3 Jun 2020 15:27:30 +0200 Subject: [PATCH 4/4] manual backport Signed-off-by: Sascha Wiswedel --- admin_manual/configuration_server/activity_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration_server/activity_configuration.rst b/admin_manual/configuration_server/activity_configuration.rst index 341b07e81..823525c81 100644 --- a/admin_manual/configuration_server/activity_configuration.rst +++ b/admin_manual/configuration_server/activity_configuration.rst @@ -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