Merge branch '4.0' into 4.1

README.md

@@ -34,7 +34,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an
  * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
  * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
  * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
- * [Forums](http://silverstripe.org/forums)
+ * [Forums](https://forum.silverstripe.org/)
  * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
  * [License](./LICENSE)
 	

SUPPORT.md

@@ -0,0 +1,23 @@
+# Support
+
+The issue tracker is reserved for reporting bugs and we don't provide support through it. Support tickets opened via the issue tracker will be closed.
+
+If you require support there are two types of support available: community support and commercial support.
+
+## Community support
+
+Community support is provided by members of our open source community and is provided out of their good will. Please be kind, polite and corteous to those that try to help you; you may wish to refer to our [code of conduct](docs/en/05_Contributing/10_Code_of_conduct.md).
+
+You can find support via:
+
+- [Forum](https://forum.silverstripe.com)
+- [Slack](https://silverstripe.org/slack)
+- [Stack Overflow (remember to tag as silverstripe)](http://stackoverflow.com/questions/tagged/silverstripe)
+
+For more information please see our [community page](http://www.silverstripe.org/community/#introduction).
+
+## Commercial support
+
+If you require a higher level of support with an SLA, you may want to consider commercial support provided by SilverStripe Ltd, a Professional Partner or another SilverStripe agency.
+
+Please see the [SilverStripe Developer Directory](https://www.silverstripe.org/community/developer-and-partner-directory/) for more information.

docs/en/02_Developer_Guides/08_Performance/01_Caching.md

@@ -202,10 +202,11 @@ SilverStripe\Core\Injector\Injector:
     class: 'Memcached'
     calls:
       - [ addServer, [ 'localhost', 11211 ] ]
-  SilverStripe\Core\Cache\CacheFactory:
+  MemcachedCacheFactory:
     class: 'SilverStripe\Core\Cache\MemcachedCacheFactory'
     constructor:
-      client: '%$MemcachedClient
+      client: '%$MemcachedClient'
+  SilverStripe\Core\Cache\CacheFactory: '%$MemcachedCacheFactory'
 ```
 
 ## Additional Caches