From c0bd00409bd94841e0bb7a1eabe499698ee40069 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 10 Nov 2014 17:28:16 +0100 Subject: [PATCH] =doc Fix wrong rst format --- akka-docs/rst/java/futures.rst | 2 +- akka-docs/rst/java/lambda-persistence.rst | 4 ++-- akka-docs/rst/java/persistence.rst | 4 ++-- akka-docs/rst/java/typed-actors.rst | 2 +- akka-docs/rst/scala/persistence.rst | 4 ++-- akka-docs/rst/scala/typed-actors.rst | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/akka-docs/rst/java/futures.rst b/akka-docs/rst/java/futures.rst index 988dc45614..e3067c9571 100644 --- a/akka-docs/rst/java/futures.rst +++ b/akka-docs/rst/java/futures.rst @@ -172,7 +172,7 @@ To better explain what happened in the example, ``Future.sequence`` is taking th and turning it into a ``Future>``. We can then use ``map`` to work with the ``Iterable`` directly, and we aggregate the sum of the ``Iterable``. -The ``traverse`` method is similar to ``sequence``, but it takes a sequence of ``A``s and applies a function from ``A`` to ``Future`` +The ``traverse`` method is similar to ``sequence``, but it takes a sequence of ``A`` and applies a function from ``A`` to ``Future`` and returns a ``Future>``, enabling parallel ``map`` over the sequence, if you use ``Futures.future`` to create the ``Future``. .. includecode:: code/docs/future/FutureDocTest.java diff --git a/akka-docs/rst/java/lambda-persistence.rst b/akka-docs/rst/java/lambda-persistence.rst index 9ae494a483..669c4588be 100644 --- a/akka-docs/rst/java/lambda-persistence.rst +++ b/akka-docs/rst/java/lambda-persistence.rst @@ -408,8 +408,8 @@ the persistent actor will resend these before sending any other messages. Deliver also requires a function to pass the ``deliveryId`` into the message. A ``deliveryId`` is required to acknowledge receipt of a message, and is also used in playback, when the actor is recovering so that messages received can be correctly acknowledged. -A function can be created to map your own ``messageId`` with ``deliveryId``s, which may come from your own domain model. -This function must keep track of which ``messageId``s have been acknowledged. +A function can be created to map your own ``messageId`` to ``deliveryId``, which may come from your own domain model. +This function must keep track of which ``messageId`` have been acknowledged. Alternatively, the Persistence module provides a default sequence number implementation which can also be used as the ``deliveryId`` for messages. The default sequence increases monotonically, without gaps. diff --git a/akka-docs/rst/java/persistence.rst b/akka-docs/rst/java/persistence.rst index 7f1326ff4f..e728e15f4c 100644 --- a/akka-docs/rst/java/persistence.rst +++ b/akka-docs/rst/java/persistence.rst @@ -414,8 +414,8 @@ the persistent actor will resend these before sending any other messages. Deliver also requires a function to pass the ``deliveryId`` into the message. A ``deliveryId`` is required to acknowledge receipt of a message, and is also used in playback, when the actor is recovering so that messages received can be correctly acknowledged. -A function can be created to map your own ``messageId`` with ``deliveryId``s, which may come from your own domain model. -This function must keep track of which ``messageId``s have been acknowledged. +A function can be created to map your own ``messageId`` to ``deliveryId``, which may come from your own domain model. +This function must keep track of which ``messageId`` have been acknowledged. Alternatively, the Persistence module provides a default sequence number implementation which can also be used as the ``deliveryId`` for messages. The default sequence increases monotonically, without gaps. diff --git a/akka-docs/rst/java/typed-actors.rst b/akka-docs/rst/java/typed-actors.rst index d8af78ecc9..8abb1fe1e3 100644 --- a/akka-docs/rst/java/typed-actors.rst +++ b/akka-docs/rst/java/typed-actors.rst @@ -192,7 +192,7 @@ Receive arbitrary messages -------------------------- If your implementation class of your TypedActor extends ``akka.actor.TypedActor.Receiver``, -all messages that are not ``MethodCall``s will be passed into the ``onReceive``-method. +all messages that are not ``MethodCall`` instances will be passed into the ``onReceive``-method. This allows you to react to DeathWatch ``Terminated``-messages and other types of messages, e.g. when interfacing with untyped actors. diff --git a/akka-docs/rst/scala/persistence.rst b/akka-docs/rst/scala/persistence.rst index 09f9050b28..0db7cc772f 100644 --- a/akka-docs/rst/scala/persistence.rst +++ b/akka-docs/rst/scala/persistence.rst @@ -412,8 +412,8 @@ the persistent actor will resend these before sending any other messages. Deliver also requires a function to pass the ``deliveryId`` into the message. A ``deliveryId`` is required to acknowledge receipt of a message, and is also used in playback, when the actor is recovering so that messages received can be correctly acknowledged. -A function can be created to map your own ``messageId`` with ``deliveryId``s, which may come from your own domain model. -This function must keep track of which ``messageId``s have been acknowledged. +A function can be created to map your own ``messageId`` to ``deliveryId``, which may come from your own domain model. +This function must keep track of which ``messageId`` have been acknowledged. Alternatively, the Persistence module provides a default sequence number implementation which can also be used as the ``deliveryId`` for messages. The default sequence increases monotonically, without gaps. diff --git a/akka-docs/rst/scala/typed-actors.rst b/akka-docs/rst/scala/typed-actors.rst index b560db2b72..dee903400f 100644 --- a/akka-docs/rst/scala/typed-actors.rst +++ b/akka-docs/rst/scala/typed-actors.rst @@ -184,7 +184,7 @@ Receive arbitrary messages -------------------------- If your implementation class of your TypedActor extends ``akka.actor.TypedActor.Receiver``, -all messages that are not ``MethodCall``s will be passed into the ``onReceive``-method. +all messages that are not ``MethodCall`` instances will be passed into the ``onReceive``-method. This allows you to react to DeathWatch ``Terminated``-messages and other types of messages, e.g. when interfacing with untyped actors.