Merge pull request #723 from nextcloud/bugfix/noid/build-errors

Fix build errors and markup
This commit is contained in:
Morris Jobke
2018-03-20 22:36:12 +01:00
committed by GitHub
4 changed files with 6 additions and 11 deletions

View File

@@ -15,5 +15,4 @@ Table of contents
configuration_database/index
configuration_mimetypes/index
maintenance/index
operations/index
issues/index

View File

@@ -2,4 +2,4 @@
Deployment recommendations
==========================
Find up-to-date deployment recommendations for enterprises in our `customer portal. <https://portal.nextcloud.com/article/nextcloud-deployment-recommendations-7.html>`
Find up-to-date deployment recommendations for enterprises in our `customer portal <https://portal.nextcloud.com/article/nextcloud-deployment-recommendations-7.html>`_.

View File

@@ -16,7 +16,6 @@ archive <https://nextcloud.com/install/>`_.
* :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)
<https://github.com/nextcloud/documentation/wiki/Alternate-Web-server-notes>`_

View File

@@ -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 <https://portal.nextcloud.com/article/nextcloud-deployment-recommendations-7.html>`
For a Nextcloud installation with efficient and reliable scaling over ~100 users, see the `deployment recommendations <https://portal.nextcloud.com/article/nextcloud-deployment-recommendations-7.html>`_.
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 <https://nextcloud.com/enterprise>`)
as part of an `enterprise subscription <https://nextcloud.com/enterprise>`_)
* 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 <https://help.nextcloud.com>`
or `enterprise support portal <https://portal.nextcloud.com.>`
Nextcloud. If you encounter problems, visit the `home user forums <https://help.nextcloud.com>`_
or `enterprise support portal <https://portal.nextcloud.com>`_.
Database requirements for MySQL / MariaDB
-----------------------------------------