From d904ccee53ca84b2dc7b2d23a75686577f110523 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 20 Mar 2018 08:50:39 +0100 Subject: [PATCH 1/2] Fix issues from cleanup in feb Signed-off-by: Joas Schilling --- admin_manual/contents.rst | 1 - admin_manual/installation/source_installation.rst | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index 04e37ac88..265a8905d 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -15,5 +15,4 @@ Table of contents configuration_database/index configuration_mimetypes/index maintenance/index - operations/index issues/index diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index a0d2ed87b..d40a7b8ae 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -16,7 +16,6 @@ archive `_. * :ref:`snaps_label` * :ref:`prerequisites_label` * :ref:`ubuntu_installation_label` -* :ref:`binlog_format_label` * :ref:`apache_configuration_label` * :ref:`pretty_urls_label` * :ref:`enabling_ssl_label` @@ -49,7 +48,7 @@ For complete instructions and downloads see: - https://www.techandme.se/nextcloud-vm/ .. note:: You can install the VM on OSes other than Windows as long as -your hypervisor can mount OVA, VMDK, or VHD VM formats. + your hypervisor can mount OVA, VMDK, or VHD VM formats. .. _snaps_label: @@ -484,6 +483,3 @@ Other Web servers `Other HTTP servers (Nextcloud) `_ - - - From c7055af2d140ec8222c24d9d4492ac428d94b72a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 20 Mar 2018 08:58:40 +0100 Subject: [PATCH 2/2] Fix link markup Signed-off-by: Joas Schilling --- admin_manual/installation/deployment_recommendations.rst | 2 +- admin_manual/installation/system_requirements.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin_manual/installation/deployment_recommendations.rst b/admin_manual/installation/deployment_recommendations.rst index 44af7cf80..595d8ae0c 100644 --- a/admin_manual/installation/deployment_recommendations.rst +++ b/admin_manual/installation/deployment_recommendations.rst @@ -2,4 +2,4 @@ Deployment recommendations ========================== -Find up-to-date deployment recommendations for enterprises in our `customer portal. ` +Find up-to-date deployment recommendations for enterprises in our `customer portal `_. diff --git a/admin_manual/installation/system_requirements.rst b/admin_manual/installation/system_requirements.rst index ce68c310e..3fba53f69 100644 --- a/admin_manual/installation/system_requirements.rst +++ b/admin_manual/installation/system_requirements.rst @@ -19,7 +19,7 @@ For best performance, stability, and functionality, recommendations are: * PHP 7.0, 7.1 or 7.2. * Apache 2.4 with mod_php -For a Nextcloud installation with efficient and reliable scaling over ~100 users, see the `deployment recommendations ` +For a Nextcloud installation with efficient and reliable scaling over ~100 users, see the `deployment recommendations `_. Working platforms ----------------- @@ -27,7 +27,7 @@ Working platforms * Server: GNU/Linux (Debian 8 (Jessie), 9 (Stretch), SUSE Linux Enterprise Server 11 SP3 & 12, openSUSE LEAP 42.1 or newer, Red Hat Enterprise Linux/CentOS 6.5 and 7 (7 is 64-bit only), Ubuntu 14.04 (Trusty) LTS, 16.04 (Xenial) LTS, 18.04 (Bionic) LTS) * Web server: Apache 2.4 (mod_php, php-fpm) or Nginx (php-fpm) * Databases: MySQL or MariaDB 5.5+; PostgreSQL 9, 10; Oracle 11g (currently only possible - as part of an `enterprise subscription `) + as part of an `enterprise subscription `_) * PHP 5.6, 7.0, 7.1 or 7.2 required * Hypervisors: Hyper-V, VMware ESX, Xen or KVM * Desktop: Windows 7+, Mac OS X 10.7+ (64-bit only), Linux (CentOS 6.5, 7 - 64-bit only), @@ -37,8 +37,8 @@ Working platforms See :doc:`source_installation` for minimum software versions for installing -Nextcloud. If you encounter problems, visit the `home user forums ` -or `enterprise support portal ` +Nextcloud. If you encounter problems, visit the `home user forums `_ +or `enterprise support portal `_. Database requirements for MySQL / MariaDB -----------------------------------------