diff --git a/core/UPDATE.txt b/core/UPDATE.txt index ebc4e82..ef80bd92 100644 --- a/core/UPDATE.txt +++ b/core/UPDATE.txt @@ -64,7 +64,27 @@ following the instructions in the INTRODUCTION section at the top of this file: Enable the "Put site into maintenance mode" checkbox and save the configuration. -3. Remove the 'core' and 'vendor' directories. Also remove all of the files +3. Determine if your project is managed by Composer. + + On a typical Unix/Linux command line, this can be determined by running the + following command (replace /PATH/TO with the appropriate location for your + system): + + /PATH/TO/composer info drupal/core + + If this is successful, your project is managed by Composer. + + If you don't have Composer installed or access to the command line, you can + check the contents of composer.json. If "drupal/core" is present in the + "require" section of your composer.json file, then the project is managed by + Composer. + + If the project is not managed by Composer, follow the steps under "UPDATING + CODE WITHOUT COMPOSER", otherwise go to "UPDATING CODE WITH COMPOSER". + +UPDATING CODE WITHOUT COMPOSER +------------------------------ +1. Remove the 'core' and 'vendor' directories. Also remove all of the files in the top-level directory, except any that you added manually. If you made modifications to files like .htaccess, composer.json, or @@ -94,7 +114,7 @@ following the instructions in the INTRODUCTION section at the top of this file: this page you can scroll down or use the filter to find your version and its release notes. -4. Download the latest Drupal 8.x.x release from https://www.drupal.org to a +2. Download the latest Drupal 8.x.x release from https://www.drupal.org to a directory outside of your web root. Extract the archive and copy the files into your Drupal directory. @@ -110,13 +130,46 @@ following the instructions in the INTRODUCTION section at the top of this file: cp -R drupal-x.y.z/* drupal-x.y.z/.htaccess /path/to/your/installation If you do not have command line access to your server, download the archive - from https://www.drupal.org using your web browser, extract it, and then use - an FTP client to upload the files to your web root. + from https://www.drupal.org using your web browser and extract it locally. + +3. Re-apply any modifications to files such as .htaccess or robots.txt. + + If you have changes to composer.json it is recommended that you re-install + the dependencies instead of applying the changes by hand. For example, on a + typical Unix/Linux command line, to reinstall the Address module and its + dependencies run (replace /PATH/TO with the appropriate location for your + system): + + /PATH/TO/composer require drupal/address -5. Re-apply any modifications to files such as .htaccess, composer.json, or - robots.txt. + If you do not have command line access to your server, you will need to run + the Composer commands locally. -6. Run update.php by visiting http://www.example.com/update.php (replace +4. If you did not have access to the command line, use an FTP client to upload + the files to your web root. + +5. Go to the "UPDATING THE DATABASE" section + +UPDATING CODE WITH COMPOSER +--------------------------- +1. On a typical Unix/Linux command line, run the following command from the root + directory (replace /PATH/TO with the appropriate location for your system): + + /PATH/TO/composer update drupal/core --with-dependencies + + Note, if Composer is not installed you will need to install it in order to + update Drupal. + +2. Determine if any modifications to files such as .htaccess or robots.txt and + re-apply them. The Drupal Scaffold composer plugin + (https://github.com/drupal-composer/drupal-scaffold) can help you with + excluding files you'd like to preserve always when updating Drupal. + +3. Go to the "UPDATING THE DATABASE" section + +UPDATING THE DATABASE +--------------------- +1. Run update.php by visiting http://www.example.com/update.php (replace www.example.com with your domain name). This will update the core database tables. @@ -133,12 +186,11 @@ following the instructions in the INTRODUCTION section at the top of this file: - Once the update is done, $settings['update_free_access'] must be reverted to FALSE. -7. Go to Administration > Reports > Status report. Verify that everything is +2. Go to Administration > Reports > Status report. Verify that everything is working as expected. -8. Ensure that $settings['update_free_access'] is FALSE in settings.php. +3. Ensure that $settings['update_free_access'] is FALSE in settings.php. -9. Go to Administration > Configuration > Development > Maintenance mode. +4. Go to Administration > Configuration > Development > Maintenance mode. Disable the "Put site into maintenance mode" checkbox and save the configuration. -