From b5f593a82e63883564653ca78bc685de0d631a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Piotrowski?= Date: Sun, 9 Feb 2014 00:42:13 +0100 Subject: [PATCH] =doc Typed actors chapter improvement *Scala version: Added package tag `` around scala.None and .Some[_]; Added "[_]" after scala.Some statement; Removed japi part, because its a Scala documentation version; *Java version Fixed wrong path to japi.Option.Some and None Added package tag `` Removed scala packages (i know about implicit conversion, but i think it mght be beter) --- akka-docs/rst/java/typed-actors.rst | 4 ++-- akka-docs/rst/scala/typed-actors.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-docs/rst/java/typed-actors.rst b/akka-docs/rst/java/typed-actors.rst index 9f58f0afe2..2027299f47 100644 --- a/akka-docs/rst/java/typed-actors.rst +++ b/akka-docs/rst/java/typed-actors.rst @@ -103,8 +103,8 @@ Methods returning: * ``void`` will be dispatched with ``fire-and-forget`` semantics, exactly like ``ActorRef.tell`` * ``scala.concurrent.Future`` will use ``send-request-reply`` semantics, exactly like ``ActorRef.ask`` - * ``scala.Option`` or ``akka.japi.Option`` will use ``send-request-reply`` semantics, but *will* block to wait for an answer, - and return None if no answer was produced within the timeout, or scala.Some/akka.japi.Some containing the result otherwise. + * ``akka.japi.Option`` will use ``send-request-reply`` semantics, but *will* block to wait for an answer, + and return ``akka.japi.Option.None`` if no answer was produced within the timeout, or ``akka.japi.Option.Some`` containing the result otherwise. Any exception that was thrown during this call will be rethrown. * Any other type of value will use ``send-request-reply`` semantics, but *will* block to wait for an answer, throwing ``java.util.concurrent.TimeoutException`` if there was a timeout or rethrow any exception that was thrown during this call. diff --git a/akka-docs/rst/scala/typed-actors.rst b/akka-docs/rst/scala/typed-actors.rst index 0bdf0f7e39..ede566971f 100644 --- a/akka-docs/rst/scala/typed-actors.rst +++ b/akka-docs/rst/scala/typed-actors.rst @@ -90,8 +90,8 @@ Methods returning: * ``Unit`` will be dispatched with ``fire-and-forget`` semantics, exactly like ``ActorRef.tell`` * ``scala.concurrent.Future[_]`` will use ``send-request-reply`` semantics, exactly like ``ActorRef.ask`` - * ``scala.Option[_]`` or ``akka.japi.Option`` will use ``send-request-reply`` semantics, but *will* block to wait for an answer, - and return None if no answer was produced within the timeout, or scala.Some/akka.japi.Some containing the result otherwise. + * ``scala.Option[_]`` will use ``send-request-reply`` semantics, but *will* block to wait for an answer, + and return ``scala.None`` if no answer was produced within the timeout, or ``scala.Some[_]`` containing the result otherwise. Any exception that was thrown during this call will be rethrown. * Any other type of value will use ``send-request-reply`` semantics, but *will* block to wait for an answer, throwing ``java.util.concurrent.TimeoutException`` if there was a timeout or rethrow any exception that was thrown during this call.