Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle

diff --combined config-dist.php
index 6598ce3,cd780cf..63e7826
--- 1/config-dist.php
--- 2/config-dist.php
+++ b/config-dist.php
@@@ -213,7 -213,6 +213,7 @@@ $CFG->admin = 'admin'
  //     $CFG->xsendfilealiases = array(
  //         '/dataroot/' => $CFG->dataroot,
  //         '/cachedir/' => '/var/www/moodle/cache',    // for custom $CFG->cachedir locations
 +//         '/localcachedir/' => '/var/local/cache',    // for custom $CFG->localcachedir locations
  //         '/tempdir/'  => '/var/www/moodle/temp',     // for custom $CFG->tempdir locations
  //         '/filedir'   => '/var/www/moodle/filedir',  // for custom $CFG->filedir locations
  //     );
@@@ -354,12 -353,10 +354,12 @@@
  //
  // It is possible to specify different cache and temp directories, use local fast filesystem
  // for normal web servers. Server clusters MUST use shared filesystem for cachedir!
 +// Localcachedir is intended for server clusters, it does not have to be shared by cluster nodes.
  // The directories must not be accessible via web.
  //
 -//     $CFG->tempdir = '/var/www/moodle/temp';
 -//     $CFG->cachedir = '/var/www/moodle/cache';
 +//     $CFG->tempdir = '/var/www/moodle/temp';        // Files used during one HTTP request only.
 +//     $CFG->cachedir = '/var/www/moodle/cache';      // Directory MUST BE SHARED by all cluster nodes, locking required.
 +//     $CFG->localcachedir = '/var/local/cache';      // Intended for local node caching.
  //
  // Some filesystems such as NFS may not support file locking operations.
  // Locking resolves race conditions and is strongly recommended for production servers.
@@@ -395,7 -392,7 +395,7 @@@
  // memory limit to something higher.
  // The value for the settings should be a valid PHP memory value. e.g. 512M, 1G
  //
- //     $CFG->extramemorylimit = '1G';
+ //     $CFG->extramemorylimit = '1024M';
  //
  // Moodle 2.4 introduced a new cache API.
  // The cache API stores a configuration file within the Moodle data directory and
@@@ -634,11 -631,6 +634,11 @@@
  // Example:
  //   $CFG->behat_restart_browser_after = 7200;     // Restarts the browser session after 2 hours
  //
 +// All this page's extra Moodle settings are compared against a white list of allowed settings
 +// (the basic and behat_* ones) to avoid problems with production environments. This setting can be
 +// used to expand the default white list with an array of extra settings.
 +// Example:
 +//   $CFG->behat_extraallowedsettings = array('logsql', 'dblogerror');
  
  //=========================================================================
  // ALL DONE!  To continue installation, visit your main page with a browser