From 927d265c78bd070727d602a39ecabd9386f7c3c3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 Sep 2016 09:28:22 +0200 Subject: [PATCH 1/2] Disable anti virus until we have a proper version --- admin_manual/configuration_server/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst index 364dd663f..ff77fd628 100644 --- a/admin_manual/configuration_server/index.rst +++ b/admin_manual/configuration_server/index.rst @@ -8,7 +8,6 @@ Nextcloud Server Configuration security_setup_warnings occ_command activity_configuration - antivirus_configuration caching_configuration background_jobs_configuration config_sample_php_parameters @@ -25,3 +24,5 @@ Nextcloud Server Configuration automatic_configuration oc_server_tuning theming + + .. Intentional disabled antivirus_configuration From 388342e95c28d5299afd17706ee8d1aa27545a4a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 Sep 2016 11:15:56 +0200 Subject: [PATCH 2/2] More minor fixes --- admin_manual/configuration_server/activity_configuration.rst | 4 ++-- admin_manual/issues/general_troubleshooting.rst | 5 +++-- admin_manual/maintenance/upgrade.rst | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin_manual/configuration_server/activity_configuration.rst b/admin_manual/configuration_server/activity_configuration.rst index bfc11fa9b..dbbb034de 100644 --- a/admin_manual/configuration_server/activity_configuration.rst +++ b/admin_manual/configuration_server/activity_configuration.rst @@ -19,7 +19,7 @@ The Activity App is shipped and enabled by default. If it is not enabled simply go to your Nextcloud Apps page to enable it. Configuring your Nextcloud for the Activity App ----------------------------------------------- +----------------------------------------------- To configure your Nextcloud to send out e-mail notifications a working :doc:`email_configuration` is mandatory. @@ -29,4 +29,4 @@ Furthermore it is recommended to configure the background job ``Webcron`` or There is also a configuration option ``activity_expire_days`` available in your ``config.php`` (See :doc:`config_sample_php_parameters`) which allows -you to clean-up older activies from the database. \ No newline at end of file +you to clean-up older activies from the database. diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst index c64adc344..cf827317f 100644 --- a/admin_manual/issues/general_troubleshooting.rst +++ b/admin_manual/issues/general_troubleshooting.rst @@ -6,8 +6,7 @@ If you have trouble installing, configuring or maintaining Nextcloud, please refer to our community support channels: * `The Nextcloud Forums`_ - -.. note:: The Nextcloud forums have a `FAQ page`_ where each topic corresponds + The Nextcloud forums have a `FAQ page`_ where each topic corresponds to typical mistakes or frequently occurring issues * `The Nextcloud forums`_ @@ -35,6 +34,8 @@ configuration report with the :ref:`occ config command `, with passwords automatically obscured. .. _the Nextcloud Forums: https://help.nextcloud.com +.. _FAQ page: https://help.nextcloud.com/c/faq +.. _bugtracker: https://github.com/nextcloud/server/issues .. _webchat: http://webchat.freenode.net/?channels=nextcloud https://docs.nextcloud.org/server/10/developer_manual/bugtracker/index.html .. TODO ON RELEASE: Update version number above on release diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 2315859b6..26004c738 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -11,7 +11,7 @@ There are three ways to upgrade your Nextcloud server: release channels. (It is not available and not supported on the Enterprise edition.) * :doc:`Manually upgrading ` with the Nextcloud ``.tar`` archive - from `https://nextcloud.com/install/`_. + from our `Download page `_. * Manually upgrading is also an option for users on shared hosting; download and unpack the Nextcloud tarball to your PC. Delete your existing Nextcloud files, except ``data/`` and ``config/`` files, on your hosting account. Then