[Pkg-owncloud-commits] [owncloud-doc] 22/38: Emphasize not skipping major upgrades, no update app in oC EE.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-doc.

commit b1ca2200ef96dedb7b68cfa766d8be32f7aaf640
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Oct 20 20:24:45 2014 -0700

    Emphasize not skipping major upgrades, no update app in oC EE.
---
 admin_manual/maintenance/update.rst  |  5 +++--
 admin_manual/maintenance/upgrade.rst | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin_manual/maintenance/update.rst b/admin_manual/maintenance/update.rst
index e14698c..c8c0b89 100644
--- a/admin_manual/maintenance/update.rst
+++ b/admin_manual/maintenance/update.rst
@@ -21,14 +21,15 @@ manager and staying in sync with your distro updates, rather than using the
 Updater app or upgrading manually. You should still maintain regular backups 
 (see :doc:`backup`), and make a backup before every update/upgrade. 
 
-.. note:: Enterprise customers, and anyone with a large ownCloud installation 
+.. note:: If you have a large ownCloud installation you
    should not use the Updater app, in order to avoid PHP timeouts. The Updater 
    app is better for smaller installations that have less data and fewer 
    users, and for admins who do not have shell access, for example on a 
    hosted server. Larger installations should update ownCloud with their 
    Linux package managers or manually upgrade, and then complete the update 
    with the ``occ upgrade`` command, which is in the ``owncloud`` directory. 
-   Run ``occ help`` to see complete command options.    
+   Run ``occ help`` to see complete command options. ownCloud Enterprise 
+   Edition does not include the Update app.   
 
 The Updater app performs these operations:
 
diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst
index 3904de2..6ca4431 100644
--- a/admin_manual/maintenance/upgrade.rst
+++ b/admin_manual/maintenance/upgrade.rst
@@ -8,8 +8,14 @@ by the third digit of the version number. For example, 4.5.1, 5.0.17, 6.0.4 and
 version number.)
 
 Major releases are indicated by the first and second digits. So 4.5.0, 5.0.0, 
-6.0.0, and 7.0.0 are major releases. You may use the Update app for staying 
-current with new point releases, but not for upgrading to a major release. 
+6.0.0, and 7.0.0 are major releases. You may use the Updater app for staying 
+current with new point releases (Community Edition only), but not for upgrading 
+to a major release. Please see :doc:`update` for instructions on using the 
+Updater app.
+
+You cannot skip major releases; for example, upgrading from 5.0 to 7.0. This is 
+unsupported, and you'll likely experience unpredictable results. It is best to 
+install all upgrades and updates in order.
 
 .. note:: If you installed ownCloud from your Linux distribution repositories 
    using your package manager, then it is best to update/upgrade ownCloud using 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git