From 2ba2354f59a38bde00549f221a242c6be1715008 Mon Sep 17 00:00:00 2001 From: RealRancor Date: Thu, 12 May 2016 08:23:30 +0200 Subject: [PATCH] Add more notes that Oracle is ES only. --- .../linux_database_configuration.rst | 2 +- admin_manual/configuration_server/occ_command.rst | 8 ++++---- admin_manual/installation/command_line_installation.rst | 4 ++-- admin_manual/installation/installation_wizard.rst | 8 ++++---- admin_manual/installation/system_requirements.rst | 2 +- user_manual/files/access_webgui.rst | 2 +- user_manual/files/file_drop.rst | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 10f581d69..b7feeb020 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -6,7 +6,7 @@ ownCloud requires a database in which administrative data is stored. The followi * `MySQL `_ / `MariaDB `_ * `PostgreSQL `_ -* `Oracle `_ +* `Oracle `_ (ownCloud Enterprise edition only) The MySQL or MariaDB databases are the recommended database engines. diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index 693022065..57dcf365e 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -908,8 +908,8 @@ Remove a certificate:: .. _shibboleth_label: -Shibboleth Modes (Enterprise only) ----------------------------------- +Shibboleth Modes (Enterprise Edition only) +------------------------------------------ .. note:: This command is only available when the "Shibboleth user backend" app @@ -1169,10 +1169,10 @@ This example completes the installation:: Supported databases are:: - - sqlite (SQLite3 - Community Edition Only) + - sqlite (SQLite3 - ownCloud Community edition only) - mysql (MySQL/MariaDB) - pgsql (PostgreSQL) - - oci (Oracle) + - oci (Oracle - ownCloud Enterprise edition only) .. _command_line_upgrade_label: diff --git a/admin_manual/installation/command_line_installation.rst b/admin_manual/installation/command_line_installation.rst index e3c6ebf93..61ff5259e 100644 --- a/admin_manual/installation/command_line_installation.rst +++ b/admin_manual/installation/command_line_installation.rst @@ -33,10 +33,10 @@ a PHP fatal error message. Supported databases are:: - - sqlite (SQLite3 - Server Edition Only) + - sqlite (SQLite3 - ownCloud Community edition only) - mysql (MySQL/MariaDB) - pgsql (PostgreSQL) - - oci (Oracle) + - oci (Oracle - ownCloud Enterprise edition only) See :ref:`command_line_installation_label` for more information. diff --git a/admin_manual/installation/installation_wizard.rst b/admin_manual/installation/installation_wizard.rst index e176dd04f..3cacf8b0d 100644 --- a/admin_manual/installation/installation_wizard.rst +++ b/admin_manual/installation/installation_wizard.rst @@ -57,10 +57,10 @@ and must be owned by your HTTP user (see Database Choice --------------- -SQLite is the default database for ownCloud Server (it is not available and not -supported in the Enterprise edition), and it is good only for testing and -lightweight single-user setups without client synchronization. Supported -databases are MySQL, MariaDB, Oracle 11g, and PostgreSQL, and we recommend +SQLite is the default database for ownCloud Server (it is not available and not supported +in the ownCloud Enterprise edition), and it is good only for testing and lightweight single-user +setups without client synchronization. Supported databases are MySQL, MariaDB, +Oracle 11g (ownCloud Enterprise edition only), and PostgreSQL, and we recommend :doc:`MySQL/MariaDB `. Your database and PHP connectors must be installed before you run the Installation Wizard. When you install ownCloud from packages all the necessary dependencies will be satisfied (see diff --git a/admin_manual/installation/system_requirements.rst b/admin_manual/installation/system_requirements.rst index 78a14d883..2a1407ea4 100644 --- a/admin_manual/installation/system_requirements.rst +++ b/admin_manual/installation/system_requirements.rst @@ -26,7 +26,7 @@ Supported Platforms Red Hat Enterprise Linux/Centos 6.5 and 7 (7 is 64-bit only), Ubuntu 12.04 LTS, 14.04 LTS, 14.10) * Web server: Apache 2 with mod_php -* Databases: MySQL/MariaDB 5.5+; Oracle 11g; PostgreSQL +* Databases: MySQL/MariaDB 5.5+; Oracle 11g (ownCloud Enterprise edition only); 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 diff --git a/user_manual/files/access_webgui.rst b/user_manual/files/access_webgui.rst index ea15fd003..51e923f81 100644 --- a/user_manual/files/access_webgui.rst +++ b/user_manual/files/access_webgui.rst @@ -126,7 +126,7 @@ Public link shares are marked with a chain link. Un-shared folders are blank. .. figure:: ../images/files_page-5.png :alt: Share status icons. -If your ownCloud server is the Enterprise Subscription, you may also have access +If your ownCloud server is the Enterprise edition, you may also have access to Sharepoint and Windows Network Drive file shares. These have special status icons. An icon with a red plugin and background means you have to enter a login to get access to the share. diff --git a/user_manual/files/file_drop.rst b/user_manual/files/file_drop.rst index 7ac950d1a..e0764161b 100644 --- a/user_manual/files/file_drop.rst +++ b/user_manual/files/file_drop.rst @@ -1,8 +1,8 @@ -================================== -Making Anonymous Uploads (ES Only) -================================== +========================================== +Making Anonymous Uploads (Enterprise Only) +========================================== -If your ownCloud administrator (Enterprise Subscription only) has enabled the +If your ownCloud administrator (Enterprise edition only) has enabled the Files Drop application, you may create your own special upload directory so that other people can upload files to you without having to log in to the server, and without being an ownCloud user. They will not be allowed to see the contents of