Merge with master

akka-docs/scala/actors.rst

@@ -51,6 +51,16 @@ be able to handle unknown messages then you need to have a default case as in
 the example above. Otherwise an ``akka.actor.UnhandledMessage(message, sender, recipient)`` will be
 published to the ``ActorSystem``'s ``EventStream``.
 
+The result of the :meth:`receive` method is a partial function object, which is
+stored within the actor as its “initial behavior”, see `Become/Unbecome`_ for
+further information on changing the behavior of an actor after its
+construction. 
+
+.. note::
+   The initial behavior of an Actor is extracted prior to constructor is run,
+   so if you want to base your initial behavior on member state, you should
+   use ``become`` in the constructor.
+
 Creating Actors with default constructor
 ----------------------------------------
 

akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala

@@ -6,7 +6,7 @@ package docs.routing
 import akka.routing.RoundRobinRouter
 import akka.actor.{ ActorRef, Props, Actor, ActorSystem }
 import akka.routing.DefaultResizer
-import akka.routing.RemoteRouterConfig
+import akka.remote.routing.RemoteRouterConfig
 
 case class Message1(nbr: Int)
 

akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala

@@ -104,7 +104,7 @@ package docs.serialization {
         actor {
           serializers {
             java = "akka.serialization.JavaSerializer"
-            proto = "akka.serialization.ProtobufSerializer"
+            proto = "akka.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }
         }
@@ -122,7 +122,7 @@ package docs.serialization {
         actor {
           serializers {
             java = "akka.serialization.JavaSerializer"
-            proto = "akka.serialization.ProtobufSerializer"
+            proto = "akka.remote.serialization.ProtobufSerializer"
             myown = "docs.serialization.MyOwnSerializer"
           }