Merge remote-tracking branch 'origin/master' into wip-improve-docs-rk

akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java

@@ -34,7 +34,7 @@ public class SchedulerDocTestBase {
   @Before
   public void setUp() {
     system = ActorSystem.create("MySystem", AkkaSpec.testConf());
-    testActor = system.actorOf(new Props().withCreator(MyUntypedActor.class));
+    testActor = system.actorOf(new Props(MyUntypedActor.class));
   }
 
   @After

akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java

@@ -100,7 +100,7 @@ public class UntypedActorDocTestBase {
   public void propsActorOf() {
     ActorSystem system = ActorSystem.create("MySystem");
     //#creating-props
-    ActorRef myActor = system.actorOf(new Props().withCreator(MyUntypedActor.class).withDispatcher("my-dispatcher"),
+    ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
         "myactor");
     //#creating-props
     myActor.tell("test");

akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java

@@ -57,9 +57,9 @@ public class DispatcherDocTestBase {
   @Test
   public void defineDispatcher() {
     //#defining-dispatcher
-    ActorRef myActor1 = system.actorOf(new Props().withCreator(MyUntypedActor.class).withDispatcher("my-dispatcher"),
+    ActorRef myActor1 = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
         "myactor1");
-    ActorRef myActor2 = system.actorOf(new Props().withCreator(MyUntypedActor.class).withDispatcher("my-dispatcher"),
+    ActorRef myActor2 = system.actorOf(new Props(MyUntypedActor.class).withDispatcher("my-dispatcher"),
         "myactor2");
     //#defining-dispatcher
   }
@@ -68,7 +68,7 @@ public class DispatcherDocTestBase {
   public void definePinnedDispatcher() {
     //#defining-pinned-dispatcher
     String name = "myactor";
-    ActorRef myActor = system.actorOf(new Props().withCreator(MyUntypedActor.class)
+    ActorRef myActor = system.actorOf(new Props(MyUntypedActor.class)
         .withDispatcher("myactor-dispatcher"), name);
     //#defining-pinned-dispatcher
   }

akka-docs/java/untyped-actors.rst

@@ -317,8 +317,9 @@ If invoked without the sender parameter the sender will be
 Ask: Send-And-Receive-Future
 ----------------------------
 
-Using ``ask`` will send a message to the receiving Actor asynchronously and
-will immediately return a :class:`Future`:
+Using ``?`` will send a message to the receiving Actor asynchronously and
+will immediately return a :class:`Future` which will be completed with
+an ``akka.actor.AskTimeoutException`` after the specified timeout:
 
 .. code-block:: java