Merge branch 'master' into wip-camel-java-docs

akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala

@@ -153,6 +153,15 @@ class RoutingSpec extends AkkaSpec(RoutingSpec.config) with DefaultTimeout with
         expectMsgType[RouterRoutees].routees.head ! Kill
       }
       expectMsgType[ActorKilledException]
+
+      //#supervision
+
+      val router2 = system.actorOf(Props.empty.withRouter(RoundRobinRouter(1).withSupervisorStrategy(escalator)))
+      router2 ! CurrentRoutees
+      EventFilter[ActorKilledException](occurrences = 2) intercept {
+        expectMsgType[RouterRoutees].routees.head ! Kill
+      }
+      expectMsgType[ActorKilledException]
     }
 
     "default to all-for-one-always-escalate strategy" in {

akka-docs/java/code/docs/serialization/SerializationDocTestBase.java

@@ -168,7 +168,7 @@ public class SerializationDocTestBase {
 
   @Test
   public void demonstrateTheProgrammaticAPI() {
-    // #programmatic
+    //#programmatic
     ActorSystem system = ActorSystem.create("example");
 
     // Get the Serialization Extension
@@ -190,7 +190,7 @@ public class SerializationDocTestBase {
     // Voilá!
     assertEquals(original, back);
 
-    // #programmatic
+    //#programmatic
     system.shutdown();
   }
 }