diff options
| -rw-r--r-- | CHANGELOG.txt | 3 | ||||
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | includes/form.inc | 2 | ||||
| -rw-r--r-- | sites/all/libraries/README.txt | 2 | ||||
| -rw-r--r-- | sites/all/modules/README.txt | 3 |
5 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 04cff8646..ddb62c75c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ +Drupal 7.40, xxxx-xx-xx (development version) +----------------------- + Drupal 7.39, 2015-08-19 ----------------------- - Fixed security issues (multiple vulnerabilities). See SA-CORE-2015-003. diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index e14626ca4..efddf006a 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.39'); +define('VERSION', '7.40-dev'); /** * Core API compatibility. diff --git a/includes/form.inc b/includes/form.inc index f7671bed6..f1691adf3 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -4484,7 +4484,7 @@ function element_validate_number($element, &$form_state) { * * Sample callback_batch_finished(): * @code - * function batch_test_finished($success, $results, $operations) { + * function my_finished_callback($success, $results, $operations) { * // The 'success' parameter means no fatal PHP errors were detected. All * // other error management should be handled using 'results'. * if ($success) { diff --git a/sites/all/libraries/README.txt b/sites/all/libraries/README.txt index d027ec24f..de5d58573 100644 --- a/sites/all/libraries/README.txt +++ b/sites/all/libraries/README.txt @@ -1,2 +1,2 @@ This directory should be used to place downloaded and custom libraries (such as -Javascript libraries) which are used by contributed or custom modules. +JavaScript libraries) which are used by contributed or custom modules. diff --git a/sites/all/modules/README.txt b/sites/all/modules/README.txt index c72b43e4f..6d019e762 100644 --- a/sites/all/modules/README.txt +++ b/sites/all/modules/README.txt @@ -6,7 +6,8 @@ Drupal community may be downloaded at http://drupal.org/project/modules. It is safe to organize modules into subdirectories, such as "contrib" for contributed modules, and "custom" for custom modules. Note that if you move a module to a subdirectory after it has been enabled, you may need to clear the -Drupal cache so that it can be found. +Drupal cache so that it can be found. (Alternatively, you can disable the +module before moving it and then re-enable it after the move.) In multisite configuration, modules found in this directory are available to all sites. Alternatively, the sites/your_site_name/modules directory pattern may |