From 3608299a1c699a10df60be6ed6c34dbe6cdd4e2f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 Sep 2016 09:28:22 +0200 Subject: [PATCH] Some minor fixes to the docs --- .../configuration_server/activity_configuration.rst | 4 ++-- admin_manual/contents.rst | 1 - admin_manual/index.rst | 2 +- admin_manual/issues/general_troubleshooting.rst | 5 +++-- admin_manual/maintenance/upgrade.rst | 2 +- admin_manual/release_notes.rst | 2 +- admin_manual/whats_new_admin.rst | 7 ------- 7 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 admin_manual/whats_new_admin.rst 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/contents.rst b/admin_manual/contents.rst index e26fea67b..ce77bdcaf 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -7,7 +7,6 @@ Table of Contents index release_notes - whats_new_admin installation/index configuration_server/index configuration_user/index diff --git a/admin_manual/index.rst b/admin_manual/index.rst index 2618d145f..1fbb96ddd 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -19,7 +19,7 @@ Nextcloud server is available: * As a free, full featured community-supported server, with all enterprise features. * Or with full enterprise support, including phone and email access to Nextcloud developers. -See :doc:`../whats_new_admin` for more information on the different Nextcloud +See :doc:`../release_notes` for more information on the different Nextcloud editions. Nextcloud Videos and Blogs diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst index ce37992a7..9802bf6eb 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/11/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 diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst index 2b2e62652..7f3829ab0 100644 --- a/admin_manual/release_notes.rst +++ b/admin_manual/release_notes.rst @@ -3,7 +3,7 @@ Nextcloud |version| Release Notes ================================= -Changes in 10 +Changes in 11 ------------- tbd diff --git a/admin_manual/whats_new_admin.rst b/admin_manual/whats_new_admin.rst deleted file mode 100644 index fac61c1e9..000000000 --- a/admin_manual/whats_new_admin.rst +++ /dev/null @@ -1,7 +0,0 @@ -============================================ -What's New for Admins in Nextcloud |version| -============================================ - -See the `Nextcloud 10 Features page -`_ on Github for a -comprehensive list of new features and updates.