diff --git a/admin_manual/configuration_database/db_conversion.rst b/admin_manual/configuration_database/db_conversion.rst index c85f33f18..a0973016b 100644 --- a/admin_manual/configuration_database/db_conversion.rst +++ b/admin_manual/configuration_database/db_conversion.rst @@ -7,7 +7,7 @@ PostgreSQL database with the ownCloud command line tool. SQLite is good for testing and simple single-user ownCloud servers, but it does not scale for multiple-user production users. -.. note:: ownCloud Enterprise Subscription does not support SQLite. +.. note:: ownCloud Enterprise edition does not support SQLite. Run the conversion ------------------ diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 7255b62c6..10f581d69 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -13,7 +13,9 @@ The MySQL or MariaDB databases are the recommended database engines. Requirements ------------ -Choosing to use MySQL / MariaDB, PostgreSQL, or Oracle (ownCloud Enterprise Subscription only) as your database requires that you install and set up the server software first. +Choosing to use MySQL / MariaDB, PostgreSQL, or Oracle (ownCloud Enterprise +edition only) as your database requires that you install and set up the server +software first. (Oracle users, see :doc:`../enterprise_installation/oracle_db_configuration`.) .. note:: The steps for configuring a third party database are beyond the scope of this document. Please refer to the documentation for your specific database choice for instructions. diff --git a/admin_manual/contents.rst b/admin_manual/contents.rst index f8e03bca7..f12f62c31 100644 --- a/admin_manual/contents.rst +++ b/admin_manual/contents.rst @@ -18,8 +18,8 @@ Table of Contents operations/index issues/index -Enterprise Subscription Only ----------------------------- +Enterprise Edition Only +----------------------- .. toctree:: :maxdepth: 3 diff --git a/admin_manual/enterprise_clients/index.rst b/admin_manual/enterprise_clients/index.rst index b5431386b..b2cb22c08 100644 --- a/admin_manual/enterprise_clients/index.rst +++ b/admin_manual/enterprise_clients/index.rst @@ -1,6 +1,6 @@ -=========================================== -Creating Branded ownCloud Clients (ES only) -=========================================== +=================================================== +Creating Branded ownCloud Clients (Enterprise only) +=================================================== .. toctree:: :maxdepth: 3 diff --git a/admin_manual/enterprise_external_storage/index.rst b/admin_manual/enterprise_external_storage/index.rst index 7af525196..a134bbdae 100644 --- a/admin_manual/enterprise_external_storage/index.rst +++ b/admin_manual/enterprise_external_storage/index.rst @@ -1,6 +1,6 @@ -========================== -External Storage (ES only) -========================== +================================== +External Storage (Enterprise only) +================================== .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_external_storage/jive_configuration.rst b/admin_manual/enterprise_external_storage/jive_configuration.rst index 22a508e88..5e0e390db 100644 --- a/admin_manual/enterprise_external_storage/jive_configuration.rst +++ b/admin_manual/enterprise_external_storage/jive_configuration.rst @@ -8,7 +8,7 @@ Jive Integration The Jive application allows Jive users to access files stored in Jive from a mobile device, tablet, or desktop client. Users have complete access -through ownCloud Enterprise Subscription to upload, edit or download their files. +through ownCloud Enterprise edition to upload, edit or download their files. Jive can be configured as a data storage location for ownCloud, which means files saved in Jive appear in folders within ownCloud. Jive remains the system diff --git a/admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst b/admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst index cc0021d9f..6d6098611 100644 --- a/admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst +++ b/admin_manual/enterprise_external_storage/s3_swift_as_primary_object_store_configuration.rst @@ -2,7 +2,7 @@ Configuring S3 and OpenStack Swift Objects as Primary Storage ============================================================= -In ownCloud Enterprise Subscription, you can configure S3 objects as primary +In ownCloud Enterprise edition, you can configure S3 objects as primary storage. This replaces the default ownCloud ``owncloud/data`` directory. You may still need to keep the ``owncloud/data`` directory for these reasons: diff --git a/admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst b/admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst index 612f294a0..299d53299 100644 --- a/admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst +++ b/admin_manual/enterprise_external_storage/sharepoint-integration_configuration.rst @@ -2,7 +2,7 @@ Configuring SharePoint Integration ================================== -Native SharePoint support has been added to the ownCloud Enterprise Subscription as a +Native SharePoint support has been added to the ownCloud Enterprise edition as a secondary storage location for SharePoint 2007, 2010 and 2013. When this is enabled, users can access and sync all of their SharePoint content via ownCloud, whether in the desktop sync, mobile or Web interfaces. Updated files are diff --git a/admin_manual/enterprise_file_management/files_drop.rst b/admin_manual/enterprise_file_management/files_drop.rst index 82fce5af8..e8c911f39 100644 --- a/admin_manual/enterprise_file_management/files_drop.rst +++ b/admin_manual/enterprise_file_management/files_drop.rst @@ -1,6 +1,6 @@ -==================================================== -Enabling Anonymous Uploads with Files Drop (ES Only) -==================================================== +============================================================ +Enabling Anonymous Uploads with Files Drop (Enterprise Only) +============================================================ The Files Drop application, introduced in ownCloud 8.0.3 Enterprise Subscription, allows anyone to upload files with the click of a button to the diff --git a/admin_manual/enterprise_file_management/files_tagging.rst b/admin_manual/enterprise_file_management/files_tagging.rst index e4bc957f3..ec5a47e1e 100644 --- a/admin_manual/enterprise_file_management/files_tagging.rst +++ b/admin_manual/enterprise_file_management/files_tagging.rst @@ -1,6 +1,6 @@ -===================================================== -Advanced File Tagging With the Workflow App (ES only) -===================================================== +============================================================= +Advanced File Tagging With the Workflow App (Enterprise only) +============================================================= New in ownCloud 9.0, the Workflow App provides advanced management of file tagging. The app has three parts: Tag Manager, Automatic Tagging, and Retention. diff --git a/admin_manual/enterprise_file_management/index.rst b/admin_manual/enterprise_file_management/index.rst index 15c7e25c2..5c3f860ad 100644 --- a/admin_manual/enterprise_file_management/index.rst +++ b/admin_manual/enterprise_file_management/index.rst @@ -1,6 +1,6 @@ -==================================== -Enterprise File Management (ES Only) -==================================== +============================================ +Enterprise File Management (Enterprise Only) +============================================ .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_firewall/file_firewall.rst b/admin_manual/enterprise_firewall/file_firewall.rst index 6274eb4e5..8fe823eb1 100644 --- a/admin_manual/enterprise_firewall/file_firewall.rst +++ b/admin_manual/enterprise_firewall/file_firewall.rst @@ -1,6 +1,6 @@ -======================= -File Firewall (ES only) -======================= +=============================== +File Firewall (Enterprise only) +=============================== The File Firewall GUI enables you to create and manage firewall rule sets from your ownCloud admin page. The File Firewall gives you finer-grained control of diff --git a/admin_manual/enterprise_firewall/index.rst b/admin_manual/enterprise_firewall/index.rst index 1a192ffb0..a7d724f5c 100644 --- a/admin_manual/enterprise_firewall/index.rst +++ b/admin_manual/enterprise_firewall/index.rst @@ -1,6 +1,6 @@ -============================= -Enterprise Firewall (ES only) -============================= +===================================== +Enterprise Firewall (Enterprise only) +===================================== .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_installation/index.rst b/admin_manual/enterprise_installation/index.rst index 2f7b9717b..5c66b3b4c 100644 --- a/admin_manual/enterprise_installation/index.rst +++ b/admin_manual/enterprise_installation/index.rst @@ -1,6 +1,6 @@ -============================================== -Enterprise Subscription Installation (ES Only) -============================================== +=============================== +Enterprise Edition Installation +=============================== .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_installation/license_keys_installation.rst b/admin_manual/enterprise_installation/license_keys_installation.rst index 8d0562e18..68e7f5312 100644 --- a/admin_manual/enterprise_installation/license_keys_installation.rst +++ b/admin_manual/enterprise_installation/license_keys_installation.rst @@ -5,24 +5,27 @@ License Keys Introduction ------------ -You'll need to install a license key to use ownCloud 8 Enterprise Subscription. There are two types of license keys: one is a free -30-day trial key. The other is a full license key for Enterprise Subscription customers. +You'll need to install a license key to use ownCloud Enterprise Edition. There +are two types of license keys: one is a free 30-day trial key. The other is a +full license key for Enterprise customers. -You can `download and try ownCloud 8 Enterprise Subscription for 30 days for free `_, which -auto-generates a free 30-day key. When this key expires your ownCloud installation is not removed, so when -you become an Enterprise Subscription customer you can enter your new key to regain access. See -`How to Buy ownCloud `_ for sales and contact information. +You can `download and try ownCloud Enterprise for 30 days for free +`_, which auto-generates a free 30-day key. When +this key expires your ownCloud installation is not removed, so when you become +an Enterprise customer you can enter your new key to regain access. See `How to +Buy ownCloud `_ for sales and +contact information. Configuration ------------- -Once you get your Enterprise Subscription license key, it needs to be copied to your ownCloud configuration file, +Once you get your Enterprise license key, it needs to be copied to your +ownCloud configuration file, ``config/config.php`` file like this example:: 'license-key' => 'test-20150101-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-YYYYYY’, -Each running instance of ownCloud requires a license key. Keys will -work across upgrades without issue, so new keys will not be required when you upgrade your -ownCloud Enterprise Subscription to a new version. - +Each running instance of ownCloud requires a license key. Keys will work across +upgrades without issue, so new keys will not be required when you upgrade your +ownCloud Enterprise to a new version. diff --git a/admin_manual/enterprise_installation/linux_installation.rst b/admin_manual/enterprise_installation/linux_installation.rst index 3eb7c87b3..cde540fc2 100644 --- a/admin_manual/enterprise_installation/linux_installation.rst +++ b/admin_manual/enterprise_installation/linux_installation.rst @@ -1,10 +1,10 @@ -======================================================= -Installing & Upgrading ownCloud Enterprise Subscription -======================================================= +================================================== +Installing & Upgrading ownCloud Enterprise Edition +================================================== The recommended method for installing and maintaining your ownCloud Enterprise -Subscription is with your Linux package manager. Configure your package manager -to use the ownCloud Enterprise Subscription repository, import the signing key, +edition is with your Linux package manager. Configure your package manager +to use the ownCloud Enterprise repository, import the signing key, and then install and update ownCloud packages like any other software package. Please refer to the ``README - ownCloud Package Installation.txt`` document in your account at `Customer.owncloud.com @@ -15,7 +15,7 @@ After you have completed your initial installation of ownCloud as detailed in the README, follow the instructions in :doc:`../installation/installation_wizard` to finish setting up ownCloud. -To upgrade your Enterprise Subscription, refer to +To upgrade your Enterprise server, refer to :doc:`../maintenance/upgrade`. Manual Installation diff --git a/admin_manual/enterprise_installation/supported_apps_installation.rst b/admin_manual/enterprise_installation/supported_apps_installation.rst index 919d44760..a25f39b20 100644 --- a/admin_manual/enterprise_installation/supported_apps_installation.rst +++ b/admin_manual/enterprise_installation/supported_apps_installation.rst @@ -1,6 +1,6 @@ -=============================================== -Supported ownCloud Enterprise Subscription Apps -=============================================== +========================================== +Supported ownCloud Enterprise Edition Apps +========================================== See :doc:`../installation/apps_supported` for a list of supported apps. diff --git a/admin_manual/enterprise_logging/index.rst b/admin_manual/enterprise_logging/index.rst index b257ebdeb..1d8461b38 100644 --- a/admin_manual/enterprise_logging/index.rst +++ b/admin_manual/enterprise_logging/index.rst @@ -1,6 +1,6 @@ -================================= -Enterprise Logging Apps (ES only) -================================= +======================================== +Enterprise Logging Apps (Enteprise only) +======================================== .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_server_branding/enterprise_server_branding.rst b/admin_manual/enterprise_server_branding/enterprise_server_branding.rst index b5ed26f6e..10799e30b 100644 --- a/admin_manual/enterprise_server_branding/enterprise_server_branding.rst +++ b/admin_manual/enterprise_server_branding/enterprise_server_branding.rst @@ -1,12 +1,12 @@ -================================= -Custom Theming ownCloud (ES only) -================================= +========================================= +Custom Theming ownCloud (Enterprise only) +========================================= Overview -------- ownBrander is an ownCloud build service that is exclusive to Enterprise -subscription customers for creating branded ownCloud clients and servers. You +edition customers for creating branded ownCloud clients and servers. You may brand your ownCloud server using ownBrander to easily build a custom theme, using your own logo and artwork. ownCloud has always been theme-able, but it was a manual process that required editing CSS and PHP files. Now Enterprise diff --git a/admin_manual/enterprise_server_branding/index.rst b/admin_manual/enterprise_server_branding/index.rst index 2520a6c3e..59c1fe0d1 100644 --- a/admin_manual/enterprise_server_branding/index.rst +++ b/admin_manual/enterprise_server_branding/index.rst @@ -1,6 +1,6 @@ -==================================== -Enterprise Server Branding (ES only) -==================================== +============================================ +Enterprise Server Branding (Enterprise only) +============================================ .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_user_management/index.rst b/admin_manual/enterprise_user_management/index.rst index 7032ab785..dd58233e9 100644 --- a/admin_manual/enterprise_user_management/index.rst +++ b/admin_manual/enterprise_user_management/index.rst @@ -1,6 +1,6 @@ -========================= -User Management (ES only) -========================= +================================= +User Management (Enterprise only) +================================= .. toctree:: :maxdepth: 2 diff --git a/admin_manual/enterprise_user_management/user_auth_shibboleth.rst b/admin_manual/enterprise_user_management/user_auth_shibboleth.rst index b5e63d152..fa067bc3f 100644 --- a/admin_manual/enterprise_user_management/user_auth_shibboleth.rst +++ b/admin_manual/enterprise_user_management/user_auth_shibboleth.rst @@ -1,6 +1,6 @@ -===================================================== -Shibboleth Integration (Enterprise Subscription only) -===================================================== +======================================== +Shibboleth Integration (Enterprise only) +======================================== Introduction ------------ diff --git a/admin_manual/index.rst b/admin_manual/index.rst index 002f5d78b..041413eeb 100644 --- a/admin_manual/index.rst +++ b/admin_manual/index.rst @@ -20,8 +20,8 @@ ownCloud server is available in three editions: * The free community-supported Server. This is the core server for all editions. * The Standard Subscription for customers who want paid support for the core Server, without Enterprise applications. -* The Enterprise Subscription replaces the Enterprise Edition. This - includes the core Server, Enterprise apps and support. +* The Enterprise Subscription provides paid support for the Enterprise Edition. + This includes the core Server and Enterprise apps. See :doc:`../whats_new_admin` for more information on the different ownCloud editions. diff --git a/admin_manual/installation/apps_management_installation.rst b/admin_manual/installation/apps_management_installation.rst index 1b0601991..95b666ce4 100644 --- a/admin_manual/installation/apps_management_installation.rst +++ b/admin_manual/installation/apps_management_installation.rst @@ -8,7 +8,7 @@ applications. Supported Apps -------------- -See :doc:`apps_supported` for a list of supported Server and Enterprise Subscription apps. +See :doc:`apps_supported` for a list of supported Enterprise edition apps. Viewing Enabled Apps -------------------- diff --git a/admin_manual/installation/linux_installation.rst b/admin_manual/installation/linux_installation.rst index 793baa820..1bf908de0 100644 --- a/admin_manual/installation/linux_installation.rst +++ b/admin_manual/installation/linux_installation.rst @@ -70,11 +70,11 @@ If you wish to track a specific major release, such as 8.2 or 9.0, then use that repo. That way you won't accidentally find yourself looking at an upgrade to the next major release before you're ready. -Installing ownCloud Enterprise Subscription -------------------------------------------- +Installing ownCloud Enterprise Edition +-------------------------------------- See :doc:`../enterprise_installation/linux_installation` for instructions on -installing ownCloud Enterprise Subscription. +installing ownCloud Enterprise edition. Downgrading Not Supported ------------------------- diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index a1aa79bed..68a1c043a 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -7,7 +7,7 @@ preferred method (see :doc:`linux_installation`). These are maintained by ownCloud engineers, and you can use your package manager to keep your ownCloud server up-to-date. -.. note:: Enterprise Subscription customers should refer to +.. note:: Enterprise customers should refer to :doc:`../enterprise_installation/linux_installation` If there are no packages for your Linux distribution, or you prefer installing diff --git a/admin_manual/issues/general_troubleshooting.rst b/admin_manual/issues/general_troubleshooting.rst index 6fce0e2c7..b4eab9eb4 100644 --- a/admin_manual/issues/general_troubleshooting.rst +++ b/admin_manual/issues/general_troubleshooting.rst @@ -20,7 +20,7 @@ back for the help you get. This is the only way to keep a community like ownCloud healthy and sustainable! If you are using ownCloud in a business or otherwise large scale deployment, -note that ownCloud Inc. offers the `Enterprise Subscription`_ with commercial +note that ownCloud Inc. offers the `Enterprise Edition`_ with commercial support options. Bugs @@ -38,7 +38,7 @@ If you can't find a solution, please use our `bugtracker`_. .. _the ownCloud User mailing list: https://mailman.owncloud.org/mailman/listinfo/user .. _webchat: http://webchat.freenode.net/?channels=owncloud -.. _Enterprise Subscription: https://owncloud.com/lp/community-or-enterprise/ +.. _Enterprise Edition: https://owncloud.com/lp/community-or-enterprise/ .. _bugtracker: https://doc.owncloud.org/server/9.0/developer_manual/bugtracker/index.html .. TODO ON RELEASE: Update version number above on release diff --git a/admin_manual/maintenance/update.rst b/admin_manual/maintenance/update.rst index 0dfe18690..acff90342 100644 --- a/admin_manual/maintenance/update.rst +++ b/admin_manual/maintenance/update.rst @@ -11,7 +11,7 @@ and data, and it automates updating New in 9.0, the Updater app has :ref:`command-line options `. .. note:: The Updater app is **not enabled and not supported** in ownCloud - Enterprise Subscription. + Enterprise edition. The Updater app is **not included** in the `Linux packages on our Open Build Service