From b59695cc123074e42e6b40f8dfb506b39fe08fea Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Thu, 24 Sep 2015 09:16:24 -0700 Subject: [PATCH] updated system requirements Conflicts: admin_manual/installation/linux_installation.rst admin_manual/installation/system_requirements.rst --- admin_manual/installation/linux_installation.rst | 5 ++--- admin_manual/installation/system_requirements.rst | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst index 6057d759c..86961bc38 100644 --- a/admin_manual/installation/linux_installation.rst +++ b/admin_manual/installation/linux_installation.rst @@ -5,9 +5,8 @@ Preferred Linux Installation Method Installation Quick Start ------------------------ -See the :doc:`../release_notes` for the recommended ownCloud setup and -supported -platforms. +See the :doc:`system_requirements` for the recommended ownCloud setup and +supported platforms. Installing ownCloud Server (the free community edition) on Linux from the `openSUSE Build Service`_ packages is the preferred method. These are diff --git a/admin_manual/installation/system_requirements.rst b/admin_manual/installation/system_requirements.rst index a54a97bcc..cbdfc65a3 100644 --- a/admin_manual/installation/system_requirements.rst +++ b/admin_manual/installation/system_requirements.rst @@ -20,15 +20,17 @@ Supported Platforms ------------------- * Server: Linux (Debian 7, SUSE Linux Enterprise Server 11 SP3 & 12, - Red Hat Enterprise Linux/Centos 6.5 and 7, Ubuntu 12.04 LTS, 14.04 LTS, + Red Hat Enterprise Linux/Centos 6.5 and 7 (7 is 64-bit only), Ubuntu 12.04 + LTS, 14.04 LTS, 14.10) * Webserver: Apache 2 * Databases: MySQL/MariaDB 5.x; Oracle 11g; PostgreSQL * PHP 5.4 + required * Hypervisors: Hyper-V, VMware ESX, Xen, KVM * Desktop: Windows XP SP3 (EoL Q2 2015), Windows 7+, Mac OS X 10.7+ (64-bit - only), Linux (CentOS 6.5, 7, Ubuntu 12.04 LTS, 14.04 LTS, 14.10, Fedora 20, + only), Linux (CentOS 6.5, 7 (7 is 64-bit only), Ubuntu 12.04 LTS, 14.04 LTS, + 14.10, Fedora 20, 21, openSUSE 12.3, 13) * Mobile apps: iOS 7+, Android 4+ * Web browser: IE8+ (except Compatibility Mode), Firefox 14+, Chrome 18+, - Safari 5+ \ No newline at end of file + Safari 5+