Merge branch 'master' of github.com:jboner/akka

akka-docs/scala/actors.rst

@@ -60,12 +60,6 @@ Creating Actors
 
 .. includecode:: code/ActorDocSpec.scala#creating-actorOf
 
-Normally you would want to import the ``actorOf`` method like this:
-
-.. includecode:: code/ActorDocSpec.scala#creating-imported
-
-to avoid prefixing it with ``Actor`` every time you use it.
-
 The call to ``actorOf`` returns an instance of ``ActorRef``. This is a handle to
 the ``Actor`` instance which you can use to interact with the ``Actor``. The
 ``ActorRef`` is immutable and has a one to one relationship with the Actor it

akka-docs/scala/remote-actors.rst

@@ -666,7 +666,6 @@ Message Serialization
 
 All messages that are sent to remote actors needs to be serialized to binary format to be able to travel over the wire to the remote node. This is done by letting your messages extend one of the traits in the 'akka.serialization.Serializable' object. If the messages don't implement any specific serialization trait then the runtime will try to use standard Java serialization.
 
-Here are some examples, but full documentation can be found in the :ref:`serialization-scala`.
 
 Scala JSON
 ^^^^^^^^^^