From 6a7759f12d919daed8a6d9b45fce9815db9cb323 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Sat, 6 Sep 2014 15:54:56 -0700 Subject: [PATCH] Markup and typo corrections --- admin_manual/maintenance/update.rst | 16 +++++++++------- admin_manual/maintenance/upgrade.rst | 7 +++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/admin_manual/maintenance/update.rst b/admin_manual/maintenance/update.rst index 63f9c64d1..b7005d9f4 100644 --- a/admin_manual/maintenance/update.rst +++ b/admin_manual/maintenance/update.rst @@ -9,7 +9,7 @@ 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. The Updater app is not for upgrades; -please see foo for instructions on upgrading to a major release. +please see :doc:`upgrade` for instructions on upgrading to a major release. .. note:: If you installed ownCloud from your Linux distribution repositories using your package manager, then it is best to update/upgrade ownCloud using @@ -25,7 +25,8 @@ instance by default, which you can easily confirm by looking on your Apps page. The Updater app performs these operations: * Creates a ``backup`` directory under your ownCloud data directory -* Extracts updated package content into the ``backup/packageVersion`` directory +* Download and xtracts updated package content into the + ``backup/packageVersion`` directory * Makes a copy of your current ownCloud instance, except for your data directory, to ``backup/currentVersion-randomstring`` * Moves all directories except ``data``, ``config`` and ``themes`` from the @@ -71,13 +72,14 @@ steps: .. figure:: ../images/updater-6.png 8. It works for a few minutes, and when it's finished displays a success - message, which disappears after a short time. Refresh your Admin page to - verify your new version number. - + message, which disappears after a short time. + .. figure:: ../images/updater-7.png -If the Update app fails, then you must update manually. See foo doc to learn -how to upgrade manually. +Refresh your Admin page to verify your new version number. + +If the Update app fails, then you must update manually. See :doc:`upgrade` to +learn how to upgrade manually. diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index 0fdcca2fb..b96b981f2 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -22,9 +22,8 @@ Manual Upgrade Procedure ------------------------ Start by putting your server in maintenance mode. Do this by entering your -``config.php`` file and changing `` "maintenance" => false,`` to `` -"maintenance" => true,``. This kicks out any logged-in users, and prevents new -logins. +``config.php`` file and changing ``'maintenance' => false,`` to ``'maintenance' +=> true,``. This kicks out any logged-in users, and prevents new logins. 1. Ensure that you are running the latest point release of your current major ownCloud version. @@ -109,7 +108,7 @@ or command line method as follows: ownCloud to your new ownCloud version. 10. If you keep your ``data/`` directory in your ``owncloud/`` directory, copy - it from your old version of ownCloud to the ``owncloud/``directory of your + it from your old version of ownCloud to the ``owncloud/`` directory of your new ownCloud version. If you keep it outside of ``owncloud/`` then you don't have to do anything with it.