Update instructions for upgrading from ownCloud 10.11

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

admin_manual/maintenance/manual_upgrade.rst

@@ -48,31 +48,34 @@ Always start by making a fresh backup and disabling all 3rd party apps.
    backed-up/old ``nextcloud/apps/`` folder. If you find 3rd party apps in the
    old folder that needs to be in the new/upgraded instance, simply copy them over
    and ensure the permissions are set up as shown below.
+
+10. If you have additional apps folders like for example ``nextcloud/apps-extras`` or ``nextcloud/apps-external``,
+    make sure to also transfer/keep these in the upgraded folder.
 
-10. If you are using 3rd party theme make sure to copy it from your ``themes/``
+11. If you are using 3rd party theme make sure to copy it from your ``themes/``
     directory to your new one. It is possible you will have to make some
     modifications to it after the upgrade.
 
-11. Adjust file ownership and permissions::
+12. Adjust file ownership and permissions::
 
      chown -R www-data:www-data nextcloud
      find nextcloud/ -type d -exec chmod 750 {} \;
      find nextcloud/ -type f -exec chmod 640 {} \;
 
-12. Restart your Web server.
+13. Restart your Web server.
 
-13. Now launch the upgrade from the command line using ``occ``, like this 
+14. Now launch the upgrade from the command line using ``occ``, like this 
     example on Ubuntu Linux::
     
      sudo -u www-data php occ upgrade
      
     (!) this MUST be executed from within your nextcloud installation directory
 
-14. The upgrade operation takes a few minutes to a few hours, depending on the 
+15. The upgrade operation takes a few minutes to a few hours, depending on the 
     size of your installation. When it is finished you will see a success 
     message, or an error message that will tell where it went wrong.
 
-15. Re-enable the nextcloud cron-job. (See step 4 above.)
+16. Re-enable the nextcloud cron-job. (See step 4 above.)
 
      crontab -u www-data -e
 

admin_manual/maintenance/migrating_owncloud.rst

@@ -15,20 +15,11 @@ See the table below for a version map, where migrating is easily possible:
 +-------------------+------------------------------+
 | ownCloud          | Nextcloud                    |
 +===================+==============================+
-| 10.0.5 or later   | 20.0.x (but at least 20.0.5) |
-+-------------------+------------------------------+
-| 10.0.1 - 10.0.5   | 12.0.x (but at least 12.0.1) |
-+-------------------+------------------------------+
-| 10.0.0            | 12.0.0                       |
-+-------------------+------------------------------+
-| 9.1.x             | 10.0.x                       |
-+-------------------+------------------------------+
-| 9.0.x             | 10.0.x                       |
+| 10.11.x           | 25.0.x (but at least 25.0.2) |
 +-------------------+------------------------------+
-| 9.0.x             | 9.0.x                        |
+| 10.0.5 or later   | 20.0.x (but at least 20.0.5) |
 +-------------------+------------------------------+
 
-
 .. note:: While we understand, that you want to migrate as soon as possible,
           we also don't want to put your data at risk. Since we never know
           what ownCloud changes in a future release, we only allow migrations
@@ -54,3 +45,8 @@ See the table below for a version map, where migrating is easily possible:
 6. Use the :doc:`Nextcloud built-in updater<update>` to update your instance to the newest version.
 
 7. Make sure to also verify the "Security & setup warnings" in the "Overview" section on the settings page.
+
+8. In some cases, apps installed from the ownCloud Market might have been disabled as incompatible
+   (ex: calendar and contacts), so you should reinstall the Nextcloud ones using
+   ``occ app:enable calendar``, ``occ app:enable contacts``, etc
+