Merge branch 'w33_MDL-41112_m26_cachedist' of https://github.com/skodak/moodle

diff --cc config-dist.php
index 8c3b733,e6eb1cd..0b2a9b1
--- 1/config-dist.php
--- 2/config-dist.php
+++ b/config-dist.php
@@@ -464,12 -483,12 +464,12 @@@ $CFG->admin = 'admin'
  // $CFG->debugusers = '2';
  //
  // Prevent theme caching
- // $CFG->themerev = -1; // NOT FOR PRODUCTION SERVERS!
+ // $CFG->themedesignermode = true; // NOT FOR PRODUCTION SERVERS!
  //
  // Prevent JS caching
- // $CFG->jsrev = -1; // NOT FOR PRODUCTION SERVERS!
+ // $CFG->cachejs = false; // NOT FOR PRODUCTION SERVERS!
  //
 -// Prevent core_string_manager on-disk cache
 +// Prevent core_string_manager application caching
  // $CFG->langstringcache = false; // NOT FOR PRODUCTION SERVERS!
  //
  // When working with production data on test servers, no emails or other messages