diff --git a/README.txt b/README.txt index 9fc089b..566dc4e 100644 --- a/README.txt +++ b/README.txt @@ -26,7 +26,9 @@ OPTIONAL: * Enable token.module to allow token replacement in backup file names. * To Backup to Amazon S3: - Download the S3 library from http://undesigned.org.za/2007/10/22/amazon-s3-php-class - and place the file 'S3.php' in the includes directory in this module. + and place the file 'S3.php' in /sites/all/libraries/s3-php5-curl. You may + alternatively place the file in the includes directory in this module, but using the + libraries directory will keep the file from being overwritten by future updates. The stable version (0.4.0 – 20th Jul 2009) works best with Backup and Migrate. LIGHTTPD USERS: diff --git a/includes/destinations.s3.inc b/includes/destinations.s3.inc index c049806..15da37b 100644 --- a/includes/destinations.s3.inc +++ b/includes/destinations.s3.inc @@ -178,7 +178,7 @@ class backup_migrate_destination_s3 extends backup_migrate_destination_remote { return $this->s3; } } - drupal_set_message(t('Due to drupal.org code hosting policies, the S3 library needed to use an S3 destination is no longer distributed with this module. You must download the library from !link and place it in one of these locations: %locations.', array('%locations' => implode(', ', $library_paths), '!link' => l('http://undesigned.org.za/2007/10/22/amazon-s3-php-class', 'http://undesigned.org.za/2007/10/22/amazon-s3-php-class'))), 'error', FALSE); + drupal_set_message(t('Due to drupal.org code hosting policies, the S3 library needed to use an S3 destination is no longer distributed with this module. You must download the library from !link and place it in one of these locations: %locations. Using a location within the libraries directory is recommended to keep the file from being overwritten by future updates.', array('%locations' => implode(', ', $library_paths), '!link' => l('http://undesigned.org.za/2007/10/22/amazon-s3-php-class', 'http://undesigned.org.za/2007/10/22/amazon-s3-php-class'))), 'error', FALSE); return NULL; } }