Merge branch 'master' into wip-fix-futures-√

2012-01-31 16:10:14 +01:00 · 2012-01-31 16:10:14 +01:00 · 8cd033bb17
commit 8cd033bb17
parent aa1c7ea9b9 4c2a44ec7a
40 changed files with 5042 additions and 645 deletions
--- a/akka-docs/java/extending-akka.rst
+++ b/akka-docs/java/extending-akka.rst
@ -54,6 +54,12 @@ Loading from Configuration
 To be able to load extensions from your Akka configuration you must add FQCNs of implementations of either ``ExtensionId`` or ``ExtensionIdProvider``
 in the "akka.extensions" section of the config you provide to your ``ActorSystem``.

+::
+
+    akka {
+      extensions = ["akka.docs.extension.ExtensionDocTestBase.CountExtension"]
+    }
+
 Applicability
 =============