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

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>

akka-docs/scala/actors.rst

@@ -331,6 +331,13 @@ Messages are sent to an Actor through one of the following methods.
 
 Message ordering is guaranteed on a per-sender basis.
 
+.. note::
+
+    There are performance implications of using ``ask`` since something needs to
+    keep track of when it times out, there needs to be something that bridges
+    a ``Promise`` into an ``ActorRef`` and it also needs to be reachable through
+    remoting. So always prefer ``tell`` for performance, and only ``ask`` if you must.
+
 Tell: Fire-forget
 -----------------
 

akka-docs/scala/serialization.rst

@@ -107,6 +107,23 @@ you might want to know how to serialize and deserialize them properly, here's th
 .. includecode:: code/akka/docs/serialization/SerializationDocSpec.scala
    :include: imports,actorref-serializer
 
+Deep serialization of Actors
+----------------------------
+
+The current recommended approach to do deep serialization of internal actor state is to use Event Sourcing,
+for more reading on the topic, see these examples:
+
+`Martin Krasser on EventSourcing Part1 <http://krasserm.blogspot.com/2011/11/building-event-sourced-web-application.html>`_
+
+`Martin Krasser on EventSourcing Part2 <http://krasserm.blogspot.com/2012/01/building-event-sourced-web-application.html>`_
+
+
+.. note::
+
+    Built-in API support for persisting Actors will come in a later release, see the roadmap for more info:
+
+    `Akka 2.0 roadmap <https://docs.google.com/a/typesafe.com/document/d/18W9-fKs55wiFNjXL9q50PYOnR7-nnsImzJqHOPPbM4E>`_
+
 A Word About Java Serialization
 ===============================