diff --git a/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala b/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala deleted file mode 100644 index 662332316a..0000000000 --- a/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala +++ /dev/null @@ -1,13 +0,0 @@ -package akka.ticket - -import org.scalatest.WordSpec -import org.scalatest.matchers.MustMatchers - -class Ticket001Spec extends WordSpec with MustMatchers { - - "An XXX" must { - "do YYY" in { - 1 must be(1) - } - } -} diff --git a/akka-docs/rst/modules/http.rst b/akka-docs/rst/additional/http.rst similarity index 91% rename from akka-docs/rst/modules/http.rst rename to akka-docs/rst/additional/http.rst index 6c52779936..a7e80aa1bf 100644 --- a/akka-docs/rst/modules/http.rst +++ b/akka-docs/rst/additional/http.rst @@ -1,7 +1,7 @@ .. _http-module: -HTTP -#### +Incomplete List of HTTP Frameworks +################################## Play ==== diff --git a/akka-docs/rst/additional/index.rst b/akka-docs/rst/additional/index.rst index 910fa500f8..74880955fb 100644 --- a/akka-docs/rst/additional/index.rst +++ b/akka-docs/rst/additional/index.rst @@ -8,3 +8,4 @@ Additional Information recipes language-bindings osgi + http diff --git a/akka-docs/rst/cluster/index.rst b/akka-docs/rst/cluster/index.rst deleted file mode 100644 index e44e8ab2e6..0000000000 --- a/akka-docs/rst/cluster/index.rst +++ /dev/null @@ -1,9 +0,0 @@ -Cluster -======= - -.. toctree:: - :maxdepth: 2 - - cluster - cluster-usage-java - cluster-usage-scala diff --git a/akka-docs/rst/cluster/cluster.rst b/akka-docs/rst/common/cluster.rst similarity index 99% rename from akka-docs/rst/cluster/cluster.rst rename to akka-docs/rst/common/cluster.rst index fd9c5116f0..2b49a04134 100644 --- a/akka-docs/rst/cluster/cluster.rst +++ b/akka-docs/rst/common/cluster.rst @@ -300,7 +300,7 @@ provide cluster elasticity. State Diagram for the Member States ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -.. image:: images/member-states.png +.. image:: ../images/member-states.png Member States diff --git a/akka-docs/rst/common/index.rst b/akka-docs/rst/common/index.rst deleted file mode 100644 index de9c7016fc..0000000000 --- a/akka-docs/rst/common/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -Common utilities -========================== - -.. toctree:: - :maxdepth: 2 - - duration - circuitbreaker diff --git a/akka-docs/rst/dev/index.rst b/akka-docs/rst/dev/index.rst index d812518288..e7bb054720 100644 --- a/akka-docs/rst/dev/index.rst +++ b/akka-docs/rst/dev/index.rst @@ -1,5 +1,5 @@ -Information for Developers -========================== +Information for Akka Developers +=============================== .. toctree:: :maxdepth: 2 diff --git a/akka-docs/rst/dev/team.rst b/akka-docs/rst/dev/team.rst index 279e2c93bd..a6ab2b7106 100644 --- a/akka-docs/rst/dev/team.rst +++ b/akka-docs/rst/dev/team.rst @@ -5,26 +5,30 @@ Team ###### -=================== ========================== ==================================== -Name Role Email -=================== ========================== ==================================== -Jonas Bonér Founder, Despot, Committer jonas AT jonasboner DOT com -Viktor Klang Project Owner viktor DOT klang AT gmail DOT com -Roland Kuhn Committer -Patrik Nordwall Committer patrik DOT nordwall AT gmail DOT com -Derek Williams Committer derek AT nebvin DOT ca -Henrik Engström Committer -Peter Vlugter Committer -Martin Krasser Committer krasserm AT googlemail DOT com +=================== ========================== +Name Role +=================== ========================== +Jonas Bonér Founder, Despot, Committer +Viktor Klang Honorary Member +Roland Kuhn Project Lead +Patrik Nordwall Core Team +Björn Antonsson Core Team +Endre Varga Core Team +Mathias Doenitz Committer +Johannes Rudolph Committer Raymond Roestenburg Committer Piotr Gabryanczyk Committer -Helena Edelson Committer helena AT helenaedelson DOT com -Debasish Ghosh Alumnus dghosh AT acm DOT org -Ross McDonald Alumnus rossajmcd AT gmail DOT com +Helena Edelson Committer +Henrik Engström Alumnus +Peter Vlugter Alumnus +Martin Krasser Alumnus +Derek Williams Alumnus +Debasish Ghosh Alumnus +Ross McDonald Alumnus Eckhart Hertzler Alumnus Mikael Högqvist Alumnus Tim Perrett Alumnus -Jeanfrancois Arcand Alumnus jfarcand AT apache DOT org +Jeanfrancois Arcand Alumnus Jan Van Besien Alumnus Michael Kober Alumnus Peter Veentjer Alumnus @@ -32,5 +36,4 @@ Irmo Manie Alumnus Heiko Seeberger Alumnus Hiram Chirino Alumnus Scott Clasen Alumnus - -=================== ========================== ==================================== \ No newline at end of file +=================== ========================== diff --git a/akka-docs/rst/experimental/index.rst b/akka-docs/rst/experimental/index.rst index a0870ed588..4d43da5b09 100644 --- a/akka-docs/rst/experimental/index.rst +++ b/akka-docs/rst/experimental/index.rst @@ -19,7 +19,6 @@ prior deprecation. .. toctree:: :maxdepth: 1 - ../cluster/index ../dev/multi-node-testing Another reason for marking a module as experimental is that it's too early diff --git a/akka-docs/rst/modules/camel-async-interact.png b/akka-docs/rst/images/camel-async-interact.png similarity index 100% rename from akka-docs/rst/modules/camel-async-interact.png rename to akka-docs/rst/images/camel-async-interact.png diff --git a/akka-docs/rst/modules/camel-async-sequence.png b/akka-docs/rst/images/camel-async-sequence.png similarity index 100% rename from akka-docs/rst/modules/camel-async-sequence.png rename to akka-docs/rst/images/camel-async-sequence.png diff --git a/akka-docs/rst/modules/camel-custom-route.png b/akka-docs/rst/images/camel-custom-route.png similarity index 100% rename from akka-docs/rst/modules/camel-custom-route.png rename to akka-docs/rst/images/camel-custom-route.png diff --git a/akka-docs/rst/modules/camel-pubsub.png b/akka-docs/rst/images/camel-pubsub.png similarity index 100% rename from akka-docs/rst/modules/camel-pubsub.png rename to akka-docs/rst/images/camel-pubsub.png diff --git a/akka-docs/rst/modules/camel-pubsub2.png b/akka-docs/rst/images/camel-pubsub2.png similarity index 100% rename from akka-docs/rst/modules/camel-pubsub2.png rename to akka-docs/rst/images/camel-pubsub2.png diff --git a/akka-docs/rst/cluster/images/member-states.png b/akka-docs/rst/images/member-states.png similarity index 100% rename from akka-docs/rst/cluster/images/member-states.png rename to akka-docs/rst/images/member-states.png diff --git a/akka-docs/rst/cluster/images/more.png b/akka-docs/rst/images/more.png similarity index 100% rename from akka-docs/rst/cluster/images/more.png rename to akka-docs/rst/images/more.png diff --git a/akka-docs/rst/cluster/images/phi1.png b/akka-docs/rst/images/phi1.png similarity index 100% rename from akka-docs/rst/cluster/images/phi1.png rename to akka-docs/rst/images/phi1.png diff --git a/akka-docs/rst/cluster/images/phi2.png b/akka-docs/rst/images/phi2.png similarity index 100% rename from akka-docs/rst/cluster/images/phi2.png rename to akka-docs/rst/images/phi2.png diff --git a/akka-docs/rst/cluster/images/phi3.png b/akka-docs/rst/images/phi3.png similarity index 100% rename from akka-docs/rst/cluster/images/phi3.png rename to akka-docs/rst/images/phi3.png diff --git a/akka-docs/rst/index.rst b/akka-docs/rst/index.rst index 57f40438fa..300ed680fc 100644 --- a/akka-docs/rst/index.rst +++ b/akka-docs/rst/index.rst @@ -2,33 +2,7 @@ Contents ======== .. toctree:: - :maxdepth: 2 - - intro/index - general/index - common/index - java/index - scala/index - modules/index - experimental/index - dev/index - project/index - additional/index - -Links -===== - -* :ref:`migration` - -* `Downloads `_ - -* `Source Code `_ - -* :ref:`scaladoc` - -* :ref:`other-doc` - -* :ref:`issue_tracking` - -* :ref:`support` + :maxdepth: 1 + java + scala diff --git a/akka-docs/rst/java.rst b/akka-docs/rst/java.rst new file mode 100644 index 0000000000..30d5edce48 --- /dev/null +++ b/akka-docs/rst/java.rst @@ -0,0 +1,20 @@ +.. _java-api: + +Java Documentation +================== + +.. toctree:: + :maxdepth: 2 + + intro/index + general/index + java/index-actors + java/index-futures + java/index-network + java/index-utilities + java/howto + experimental/index + dev/index + project/index + additional/index + diff --git a/akka-docs/rst/java/agents.rst b/akka-docs/rst/java/agents.rst index 98884bf37f..785ff92051 100644 --- a/akka-docs/rst/java/agents.rst +++ b/akka-docs/rst/java/agents.rst @@ -1,7 +1,7 @@ .. _agents-java: ############## - Agents (Java) + Agents ############## Agents in Akka are inspired by `agents in Clojure`_. diff --git a/akka-docs/rst/java/camel.rst b/akka-docs/rst/java/camel.rst index 4825e4e4a1..9c93901ce2 100644 --- a/akka-docs/rst/java/camel.rst +++ b/akka-docs/rst/java/camel.rst @@ -2,7 +2,7 @@ .. _camel-java: ############# - Camel (Java) + Camel ############# Additional Resources @@ -495,7 +495,7 @@ is then forwarded to the ``HttpTransformer`` actor which replaces all occurrence of *Akka* with *AKKA*. The transformation result is sent back the HttpConsumer which finally returns it to the browser. -.. image:: ../modules/camel-async-interact.png +.. image:: ../images/camel-async-interact.png Implementing the example actor classes and wiring them together is rather easy as shown in the following snippet. @@ -515,7 +515,7 @@ side. The following high-level sequence diagram illustrates that. .. _Jetty continuations: http://wiki.eclipse.org/Jetty/Feature/Continuations .. _Jetty's asynchronous HTTP client: http://wiki.eclipse.org/Jetty/Tutorial/HttpClient -.. image:: ../modules/camel-async-sequence.png +.. image:: ../images/camel-async-sequence.png Custom Camel route example -------------------------- @@ -524,7 +524,7 @@ This section also demonstrates the combined usage of a ``Producer`` and a ``Consumer`` actor as well as the inclusion of a custom Camel route. The following figure gives an overview. -.. image:: ../modules/camel-custom-route.png +.. image:: ../images/camel-custom-route.png * A consumer actor receives a message from an HTTP client diff --git a/akka-docs/rst/cluster/cluster-usage-java.rst b/akka-docs/rst/java/cluster-usage.rst similarity index 99% rename from akka-docs/rst/cluster/cluster-usage-java.rst rename to akka-docs/rst/java/cluster-usage.rst index e4621930c2..3abce558e3 100644 --- a/akka-docs/rst/cluster/cluster-usage-java.rst +++ b/akka-docs/rst/java/cluster-usage.rst @@ -2,7 +2,7 @@ .. _cluster_usage_java: ###################### - Cluster Usage (Java) + Cluster Usage ###################### .. note:: This module is :ref:`experimental `. This document describes how to use the features implemented so far. More features are coming in Akka Coltrane. Track progress of the Coltrane milestone in `Assembla `_ and the `Roadmap `_. @@ -322,7 +322,7 @@ order to account for network issues that sometimes occur on such platforms. The following chart illustrates how *phi* increase with increasing time since the previous heartbeat. -.. image:: images/phi1.png +.. image:: ../images/phi1.png Phi is calculated from the mean and standard deviation of historical inter arrival times. The previous chart is an example for standard deviation @@ -330,7 +330,7 @@ of 200 ms. If the heartbeats arrive with less deviation the curve becomes steepe i.e. it is possible to determine failure more quickly. The curve looks like this for a standard deviation of 100 ms. -.. image:: images/phi2.png +.. image:: ../images/phi2.png To be able to survive sudden abnormalities, such as garbage collection pauses and transient network failures the failure detector is configured with a margin, @@ -339,7 +339,7 @@ adjust the :ref:`cluster_configuration_java` of this depending on you environmen This is how the curve looks like for ``acceptable-heartbeat-pause`` configured to 3 seconds. -.. image:: images/phi3.png +.. image:: ../images/phi3.png Death watch uses the cluster failure detector for nodes in the cluster, i.e. it generates ``Terminated`` message from network failures and JVM crashes, in addition diff --git a/akka-docs/rst/java/dispatchers.rst b/akka-docs/rst/java/dispatchers.rst index 8d1888c5f4..b7088acc9b 100644 --- a/akka-docs/rst/java/dispatchers.rst +++ b/akka-docs/rst/java/dispatchers.rst @@ -1,6 +1,6 @@ .. _dispatchers-java: -Dispatchers (Java) +Dispatchers =================== An Akka ``MessageDispatcher`` is what makes Akka Actors "tick", it is the engine of the machine so to speak. diff --git a/akka-docs/rst/java/durable-mailbox.rst b/akka-docs/rst/java/durable-mailbox.rst index d2324cd9ef..e000b56454 100644 --- a/akka-docs/rst/java/durable-mailbox.rst +++ b/akka-docs/rst/java/durable-mailbox.rst @@ -2,7 +2,7 @@ .. _durable-mailboxes-java: ########################## - Durable Mailboxes (Java) + Durable Mailboxes ########################## diff --git a/akka-docs/rst/java/event-bus.rst b/akka-docs/rst/java/event-bus.rst index 625718d4b0..13694710e8 100644 --- a/akka-docs/rst/java/event-bus.rst +++ b/akka-docs/rst/java/event-bus.rst @@ -1,7 +1,7 @@ .. _event-bus-java: ################ -Event Bus (Java) +Event Bus ################ Originally conceived as a way to send messages to groups of actors, the diff --git a/akka-docs/rst/java/extending-akka.rst b/akka-docs/rst/java/extending-akka.rst index e7e21e17f9..1debfde3ba 100644 --- a/akka-docs/rst/java/extending-akka.rst +++ b/akka-docs/rst/java/extending-akka.rst @@ -1,7 +1,7 @@ .. _extending-akka-java: ######################## - Akka Extensions (Java) + Akka Extensions ######################## diff --git a/akka-docs/rst/java/fault-tolerance-sample.rst b/akka-docs/rst/java/fault-tolerance-sample.rst index 749cf7ef95..4aaadedfc3 100644 --- a/akka-docs/rst/java/fault-tolerance-sample.rst +++ b/akka-docs/rst/java/fault-tolerance-sample.rst @@ -1,6 +1,6 @@ .. _fault-tolerance-sample-java: -Diagrams of the Fault Tolerance Sample (Java) +Diagrams of the Fault Tolerance Sample ---------------------------------------------- .. image:: ../images/faulttolerancesample-normal-flow.png @@ -46,7 +46,7 @@ Step Description 15, 16 and tells the ``Counter`` to use the new ``Storage`` =========== ================================================================================== -Full Source Code of the Fault Tolerance Sample (Java) +Full Source Code of the Fault Tolerance Sample ------------------------------------------------------ .. includecode:: code/docs/actor/japi/FaultHandlingDocSample.java#all diff --git a/akka-docs/rst/java/fault-tolerance.rst b/akka-docs/rst/java/fault-tolerance.rst index 1c93bbdba3..5897c1db00 100644 --- a/akka-docs/rst/java/fault-tolerance.rst +++ b/akka-docs/rst/java/fault-tolerance.rst @@ -1,6 +1,6 @@ .. _fault-tolerance-java: -Fault Tolerance (Java) +Fault Tolerance ====================== As explained in :ref:`actor-systems` each actor is the supervisor of its diff --git a/akka-docs/rst/java/fsm.rst b/akka-docs/rst/java/fsm.rst index 582b3528f2..7bdc5bfd76 100644 --- a/akka-docs/rst/java/fsm.rst +++ b/akka-docs/rst/java/fsm.rst @@ -1,7 +1,7 @@ .. _fsm-java: ########################################### -Building Finite State Machine Actors (Java) +Building Finite State Machine Actors ########################################### diff --git a/akka-docs/rst/java/futures.rst b/akka-docs/rst/java/futures.rst index f643155bc3..9854a3635b 100644 --- a/akka-docs/rst/java/futures.rst +++ b/akka-docs/rst/java/futures.rst @@ -1,6 +1,6 @@ .. _futures-java: -Futures (Java) +Futures =============== Introduction diff --git a/akka-docs/rst/java/index-actors.rst b/akka-docs/rst/java/index-actors.rst new file mode 100644 index 0000000000..12d2887ff2 --- /dev/null +++ b/akka-docs/rst/java/index-actors.rst @@ -0,0 +1,13 @@ +Actors +====== + +.. toctree:: + :maxdepth: 2 + + untyped-actors + typed-actors + fault-tolerance + dispatchers + routing + fsm + testing diff --git a/akka-docs/rst/java/index-futures.rst b/akka-docs/rst/java/index-futures.rst new file mode 100644 index 0000000000..7768a39f41 --- /dev/null +++ b/akka-docs/rst/java/index-futures.rst @@ -0,0 +1,10 @@ +Futures and Agents +================== + +.. toctree:: + :maxdepth: 2 + + futures + stm + agents + transactors diff --git a/akka-docs/rst/java/index-network.rst b/akka-docs/rst/java/index-network.rst new file mode 100644 index 0000000000..bf57876b50 --- /dev/null +++ b/akka-docs/rst/java/index-network.rst @@ -0,0 +1,13 @@ +Networking +========== + +.. toctree:: + :maxdepth: 2 + + ../common/cluster + cluster-usage + remoting + serialization + io + zeromq + camel diff --git a/akka-docs/rst/java/index-utilities.rst b/akka-docs/rst/java/index-utilities.rst new file mode 100644 index 0000000000..3132e60d58 --- /dev/null +++ b/akka-docs/rst/java/index-utilities.rst @@ -0,0 +1,14 @@ +Utilities +========= + +.. toctree:: + :maxdepth: 2 + + event-bus + logging + scheduler + ../common/duration + ../common/circuitbreaker + extending-akka + durable-mailbox + microkernel diff --git a/akka-docs/rst/java/index.rst b/akka-docs/rst/java/index.rst deleted file mode 100644 index 2d2274b4c6..0000000000 --- a/akka-docs/rst/java/index.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. _java-api: - -Java API -========= - -.. toctree:: - :maxdepth: 2 - - untyped-actors - typed-actors - logging - event-bus - scheduler - futures - fault-tolerance - dispatchers - routing - remoting - serialization - stm - agents - transactors - io - fsm - testing - extending-akka - zeromq - microkernel - camel - durable-mailbox - howto diff --git a/akka-docs/rst/java/io.rst b/akka-docs/rst/java/io.rst index a96758ebd2..542e9d7b47 100644 --- a/akka-docs/rst/java/io.rst +++ b/akka-docs/rst/java/io.rst @@ -1,6 +1,6 @@ .. _io-java: -I/O (Java) +I/O ========== Introduction diff --git a/akka-docs/rst/java/logging.rst b/akka-docs/rst/java/logging.rst index af9e8a4a06..c4133b0f46 100644 --- a/akka-docs/rst/java/logging.rst +++ b/akka-docs/rst/java/logging.rst @@ -1,7 +1,7 @@ .. _logging-java: ################ - Logging (Java) + Logging ################ Logging in Akka is not tied to a specific logging backend. By default diff --git a/akka-docs/rst/java/microkernel.rst b/akka-docs/rst/java/microkernel.rst index 832e02ef90..7b039cdc0a 100644 --- a/akka-docs/rst/java/microkernel.rst +++ b/akka-docs/rst/java/microkernel.rst @@ -1,7 +1,7 @@ .. _microkernel-java: -Microkernel (Java) +Microkernel ================== The purpose of the Akka Microkernel is to offer a bundling mechanism so that you can distribute diff --git a/akka-docs/rst/java/remoting.rst b/akka-docs/rst/java/remoting.rst index 8c2b004f3d..046fab8e82 100644 --- a/akka-docs/rst/java/remoting.rst +++ b/akka-docs/rst/java/remoting.rst @@ -1,7 +1,7 @@ .. _remoting-java: ##################### - Remoting (Java) + Remoting ##################### For an introduction of remoting capabilities of Akka please see :ref:`remoting`. @@ -190,7 +190,7 @@ order to account for network issues that sometimes occur on such platforms. The following chart illustrates how *phi* increase with increasing time since the previous heartbeat. -.. image:: ../cluster/images/phi1.png +.. image:: ../images/phi1.png Phi is calculated from the mean and standard deviation of historical inter arrival times. The previous chart is an example for standard deviation @@ -198,7 +198,7 @@ of 200 ms. If the heartbeats arrive with less deviation the curve becomes steepe i.e. it is possible to determine failure more quickly. The curve looks like this for a standard deviation of 100 ms. -.. image:: ../cluster/images/phi2.png +.. image:: ../images/phi2.png To be able to survive sudden abnormalities, such as garbage collection pauses and transient network failures the failure detector is configured with a margin, @@ -207,7 +207,7 @@ adjust the :ref:`remote-configuration-java` of this depending on you environment This is how the curve looks like for ``acceptable-heartbeat-pause`` configured to 3 seconds. -.. image:: ../cluster/images/phi3.png +.. image:: ../images/phi3.png Serialization ^^^^^^^^^^^^^ diff --git a/akka-docs/rst/java/routing.rst b/akka-docs/rst/java/routing.rst index 1689acada8..5f994200c0 100644 --- a/akka-docs/rst/java/routing.rst +++ b/akka-docs/rst/java/routing.rst @@ -1,7 +1,7 @@ .. _routing-java: -Routing (Java) +Routing ============== A Router is an actor that receives messages and efficiently routes them to other actors, known as diff --git a/akka-docs/rst/java/scheduler.rst b/akka-docs/rst/java/scheduler.rst index 42c44443f4..bddb74b583 100644 --- a/akka-docs/rst/java/scheduler.rst +++ b/akka-docs/rst/java/scheduler.rst @@ -2,7 +2,7 @@ .. _scheduler-java: ################## - Scheduler (Java) + Scheduler ################## Sometimes the need for making things happen in the future arises, and where do diff --git a/akka-docs/rst/java/serialization.rst b/akka-docs/rst/java/serialization.rst index f58646ce4a..4e3a01e5c0 100644 --- a/akka-docs/rst/java/serialization.rst +++ b/akka-docs/rst/java/serialization.rst @@ -2,7 +2,7 @@ .. _serialization-java: ##################### - Serialization (Java) + Serialization ##################### Akka has a built-in Extension for serialization, diff --git a/akka-docs/rst/java/stm.rst b/akka-docs/rst/java/stm.rst index 0b648599ad..787e504801 100644 --- a/akka-docs/rst/java/stm.rst +++ b/akka-docs/rst/java/stm.rst @@ -2,7 +2,7 @@ .. _stm-java: ##################################### - Software Transactional Memory (Java) + Software Transactional Memory ##################################### diff --git a/akka-docs/rst/java/testing.rst b/akka-docs/rst/java/testing.rst index a9a0d40dd9..7398ca7552 100644 --- a/akka-docs/rst/java/testing.rst +++ b/akka-docs/rst/java/testing.rst @@ -1,7 +1,7 @@ .. _akka-testkit-java: ############################## -Testing Actor Systems (Java) +Testing Actor Systems ############################## As with any piece of software, automated tests are a very important part of the diff --git a/akka-docs/rst/java/transactors.rst b/akka-docs/rst/java/transactors.rst index 7b7c080ffe..f729c5f781 100644 --- a/akka-docs/rst/java/transactors.rst +++ b/akka-docs/rst/java/transactors.rst @@ -1,7 +1,7 @@ .. _transactors-java: #################### - Transactors (Java) + Transactors #################### diff --git a/akka-docs/rst/java/typed-actors.rst b/akka-docs/rst/java/typed-actors.rst index 5f1030ac88..1324e44248 100644 --- a/akka-docs/rst/java/typed-actors.rst +++ b/akka-docs/rst/java/typed-actors.rst @@ -1,4 +1,4 @@ -Typed Actors (Java) +Typed Actors =================== Akka Typed Actors is an implementation of the `Active Objects `_ pattern. diff --git a/akka-docs/rst/java/untyped-actors.rst b/akka-docs/rst/java/untyped-actors.rst index fe68e2f240..bd7b6355d3 100644 --- a/akka-docs/rst/java/untyped-actors.rst +++ b/akka-docs/rst/java/untyped-actors.rst @@ -1,7 +1,7 @@ .. _untyped-actors-java: ################ - Actors (Java) + Actors ################ diff --git a/akka-docs/rst/java/zeromq.rst b/akka-docs/rst/java/zeromq.rst index dc33a96f8e..b6f7ec22f3 100644 --- a/akka-docs/rst/java/zeromq.rst +++ b/akka-docs/rst/java/zeromq.rst @@ -2,7 +2,7 @@ .. _zeromq-java: ############### - ZeroMQ (Java) + ZeroMQ ############### diff --git a/akka-docs/rst/modules/index.rst b/akka-docs/rst/modules/index.rst deleted file mode 100644 index 90e332df06..0000000000 --- a/akka-docs/rst/modules/index.rst +++ /dev/null @@ -1,7 +0,0 @@ -Modules -======= - -.. toctree:: - :maxdepth: 2 - - http diff --git a/akka-docs/rst/project/index.rst b/akka-docs/rst/project/index.rst index b814fd07f1..216735294e 100644 --- a/akka-docs/rst/project/index.rst +++ b/akka-docs/rst/project/index.rst @@ -5,9 +5,6 @@ Project Information :maxdepth: 2 migration-guides - release-notes - scaladoc - other-doc issue-tracking licenses sponsors diff --git a/akka-docs/rst/project/issue-tracking.rst b/akka-docs/rst/project/issue-tracking.rst index 9e7e362559..2d3ab41fb2 100644 --- a/akka-docs/rst/project/issue-tracking.rst +++ b/akka-docs/rst/project/issue-tracking.rst @@ -16,7 +16,7 @@ Tickets Roadmaps ^^^^^^^^ -`The roadmap for each Akka milestone is here `_ +`The roadmap for each Akka milestone is here `_ Creating tickets @@ -30,24 +30,6 @@ Then you also need to become a "Watcher" of the Akka space. `Link to create a new ticket `__ -Thanks a lot for reporting bugs and suggesting features. +Thanks a lot for reporting bugs and suggesting features. *Please include the versions of Scala and Akka and relevant configuration files.* -Failing test ------------- - -Please submit a failing test on the following format: - -.. code-block:: scala - - import org.scalatest.WordSpec - import org.scalatest.matchers.MustMatchers - - class Ticket001Spec extends WordSpec with MustMatchers { - - "An XXX" must { - "do YYY" in { - 1 must be (1) - } - } - } diff --git a/akka-docs/rst/project/links.rst b/akka-docs/rst/project/links.rst index 842042cdec..42fb81cd20 100644 --- a/akka-docs/rst/project/links.rst +++ b/akka-docs/rst/project/links.rst @@ -35,33 +35,18 @@ Akka uses Git and is hosted at `Github `_. Releases Repository ^^^^^^^^^^^^^^^^^^^ -The Akka Maven repository can be found at http://repo.akka.io/releases/. - -Typesafe provides http://repo.typesafe.com/typesafe/releases/ that proxies -several other repositories, including akka.io. It is convenient to use the -Typesafe repository, since it includes all external dependencies of Akka. It is -a "best-effort" service, and if it is unavailable you may need to use the -underlying repositories directly. - -* http://repo.akka.io/releases/ -* http://repository.codehaus.org/ -* http://guiceyfruit.googlecode.com/svn/repo/releases/ -* http://repository.jboss.org/nexus/content/groups/public/ -* http://download.java.net/maven/2/ -* http://oss.sonatype.org/content/repositories/releases/ -* http://download.java.net/maven/glassfish/ -* http://databinder.net/repo/ - +All Akka releases are published via Sonatype to Maven Central, see +`search.maven.org +`_ Snapshots Repository ^^^^^^^^^^^^^^^^^^^^ -Nightly builds are available in http://repo.akka.io/snapshots/ and proxied through -http://repo.typesafe.com/typesafe/snapshots/ as both ``SNAPSHOT`` and +Nightly builds are available in http://repo.akka.io/snapshots/ as both ``SNAPSHOT`` and timestamped versions. For timestamped versions, pick a timestamp from -http://repo.typesafe.com/typesafe/snapshots/com/typesafe/akka/akka-actor_@binVersion@/. +http://repo.akka.io/snapshots/com/typesafe/akka/akka-actor_@binVersion@/. All Akka modules that belong to the same build have the same timestamp. sbt definition of snapshot repository @@ -69,7 +54,7 @@ sbt definition of snapshot repository Make sure that you add the repository to the sbt resolvers:: - resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/" + resolvers += "Typesafe Snapshots" at "http://repo.akka.io/snapshots/" Define the library dependencies with the timestamp as version. For example:: @@ -83,9 +68,9 @@ Make sure that you add the repository to the maven repositories in pom.xml:: - typesafe-snapshots - Typesafe Snapshots - http://repo.typesafe.com/typesafe/snapshots/ + akka-snapshots + Akka Snapshots + http://repo.akka.io/snapshots/ default diff --git a/akka-docs/rst/project/other-doc.rst b/akka-docs/rst/project/other-doc.rst deleted file mode 100644 index 7e32234934..0000000000 --- a/akka-docs/rst/project/other-doc.rst +++ /dev/null @@ -1,30 +0,0 @@ - -.. _other-doc: - -################################## - Documentation for Other Versions -################################## - - -Release Versions -================ - -2.0 ---- - -- Akka 2.0 - http://doc.akka.io/docs/akka/2.0/ (or in `PDF format `__) - -1.3.1 ------ - -- Akka 1.3.1 - http://doc.akka.io/docs/akka/1.3.1/ (or in `PDF format `__) -- Akka Modules 1.3.1 - http://doc.akka.io/docs/akka-modules/1.3.1/ (or in `PDF format `__) - - -Akka Snapshot -============= - -Automatically published documentation for the latest SNAPSHOT version of Akka can -be found here: - -- Akka - http://doc.akka.io/docs/akka/snapshot/ (or in `PDF format `__) diff --git a/akka-docs/rst/project/release-notes.rst b/akka-docs/rst/project/release-notes.rst deleted file mode 100644 index 511ae8b39d..0000000000 --- a/akka-docs/rst/project/release-notes.rst +++ /dev/null @@ -1,7 +0,0 @@ -Release Notes -============== - -Release 2.1 ------------ - -Release notes for 2.1 will be written... diff --git a/akka-docs/rst/project/scaladoc.rst b/akka-docs/rst/project/scaladoc.rst deleted file mode 100644 index b3aeed9fe3..0000000000 --- a/akka-docs/rst/project/scaladoc.rst +++ /dev/null @@ -1,29 +0,0 @@ - -.. _scaladoc: - -############## - Scaladoc API -############## - - -Release Versions -================ - -2.0 ------ - -- Akka - http://doc.akka.io/api/akka/2.0/ - - -1.3.1 ------ - -- Akka 1.3.1 - http://doc.akka.io/api/akka/1.3.1/ -- Akka Modules 1.3.1 - http://doc.akka.io/api/akka-modules/1.3.1/ - - -Akka Snapshot -============= - -Automatically published Scaladoc API for the latest SNAPSHOT version of Akka can -be found here: http://doc.akka.io/api/akka/snapshot diff --git a/akka-docs/rst/scala.rst b/akka-docs/rst/scala.rst new file mode 100644 index 0000000000..db65cea5af --- /dev/null +++ b/akka-docs/rst/scala.rst @@ -0,0 +1,20 @@ +.. _scala-api: + +Scala Documentation +=================== + +.. toctree:: + :maxdepth: 2 + + intro/index + general/index + scala/index-actors + scala/index-futures + scala/index-network + scala/index-utilities + scala/howto + experimental/index + dev/index + project/index + additional/index + diff --git a/akka-docs/rst/scala/actors.rst b/akka-docs/rst/scala/actors.rst index d83c90fa7d..16d92bd364 100644 --- a/akka-docs/rst/scala/actors.rst +++ b/akka-docs/rst/scala/actors.rst @@ -1,7 +1,7 @@ .. _actors-scala: ################ - Actors (Scala) + Actors ################ diff --git a/akka-docs/rst/scala/agents.rst b/akka-docs/rst/scala/agents.rst index 29fe8f5e23..3724b6dcd2 100644 --- a/akka-docs/rst/scala/agents.rst +++ b/akka-docs/rst/scala/agents.rst @@ -1,7 +1,7 @@ .. _agents-scala: ################ - Agents (Scala) + Agents ################ Agents in Akka are inspired by `agents in Clojure`_. diff --git a/akka-docs/rst/scala/camel.rst b/akka-docs/rst/scala/camel.rst index c556827a69..7467f310e9 100644 --- a/akka-docs/rst/scala/camel.rst +++ b/akka-docs/rst/scala/camel.rst @@ -2,7 +2,7 @@ .. _camel-scala: ############## - Camel (Scala) + Camel ############## Additional Resources @@ -489,7 +489,7 @@ is then forwarded to the ``HttpTransformer`` actor which replaces all occurrence of *Akka* with *AKKA*. The transformation result is sent back the HttpConsumer which finally returns it to the browser. -.. image:: ../modules/camel-async-interact.png +.. image:: ../images/camel-async-interact.png Implementing the example actor classes and wiring them together is rather easy as shown in the following snippet. @@ -506,7 +506,7 @@ side. The following high-level sequence diagram illustrates that. .. _Jetty continuations: http://wiki.eclipse.org/Jetty/Feature/Continuations .. _Jetty's asynchronous HTTP client: http://wiki.eclipse.org/Jetty/Tutorial/HttpClient -.. image:: ../modules/camel-async-sequence.png +.. image:: ../images/camel-async-sequence.png Custom Camel route example -------------------------- @@ -515,7 +515,7 @@ This section also demonstrates the combined usage of a ``Producer`` and a ``Consumer`` actor as well as the inclusion of a custom Camel route. The following figure gives an overview. -.. image:: ../modules/camel-custom-route.png +.. image:: ../images/camel-custom-route.png * A consumer actor receives a message from an HTTP client diff --git a/akka-docs/rst/cluster/cluster-usage-scala.rst b/akka-docs/rst/scala/cluster-usage.rst similarity index 99% rename from akka-docs/rst/cluster/cluster-usage-scala.rst rename to akka-docs/rst/scala/cluster-usage.rst index 3c3be1a4f5..6d423c155b 100644 --- a/akka-docs/rst/cluster/cluster-usage-scala.rst +++ b/akka-docs/rst/scala/cluster-usage.rst @@ -2,7 +2,7 @@ .. _cluster_usage_scala: ####################### - Cluster Usage (Scala) + Cluster Usage ####################### .. note:: This module is :ref:`experimental `. This document describes how to use the features implemented so far. More features are coming in Akka Coltrane. Track progress of the Coltrane milestone in `Assembla `_ and the `Roadmap `_. @@ -310,7 +310,7 @@ order to account for network issues that sometimes occur on such platforms. The following chart illustrates how *phi* increase with increasing time since the previous heartbeat. -.. image:: images/phi1.png +.. image:: ../images/phi1.png Phi is calculated from the mean and standard deviation of historical inter arrival times. The previous chart is an example for standard deviation @@ -318,7 +318,7 @@ of 200 ms. If the heartbeats arrive with less deviation the curve becomes steepe i.e. it is possible to determine failure more quickly. The curve looks like this for a standard deviation of 100 ms. -.. image:: images/phi2.png +.. image:: ../images/phi2.png To be able to survive sudden abnormalities, such as garbage collection pauses and transient network failures the failure detector is configured with a margin, @@ -327,7 +327,7 @@ adjust the :ref:`cluster_configuration_scala` of this depending on you environme This is how the curve looks like for ``acceptable-heartbeat-pause`` configured to 3 seconds. -.. image:: images/phi3.png +.. image:: ../images/phi3.png Death watch uses the cluster failure detector for nodes in the cluster, i.e. it diff --git a/akka-docs/rst/scala/dataflow.rst b/akka-docs/rst/scala/dataflow.rst index c03f5fe6cc..01ecd2a250 100644 --- a/akka-docs/rst/scala/dataflow.rst +++ b/akka-docs/rst/scala/dataflow.rst @@ -1,4 +1,4 @@ -Dataflow Concurrency (Scala) +Dataflow Concurrency ============================ Description diff --git a/akka-docs/rst/scala/dispatchers.rst b/akka-docs/rst/scala/dispatchers.rst index 2dad196a0e..b1bce0320e 100644 --- a/akka-docs/rst/scala/dispatchers.rst +++ b/akka-docs/rst/scala/dispatchers.rst @@ -1,6 +1,6 @@ .. _dispatchers-scala: -Dispatchers (Scala) +Dispatchers =================== An Akka ``MessageDispatcher`` is what makes Akka Actors "tick", it is the engine of the machine so to speak. diff --git a/akka-docs/rst/scala/durable-mailbox.rst b/akka-docs/rst/scala/durable-mailbox.rst index 42b4069dbf..76815df4cd 100644 --- a/akka-docs/rst/scala/durable-mailbox.rst +++ b/akka-docs/rst/scala/durable-mailbox.rst @@ -2,7 +2,7 @@ .. _durable-mailboxes-scala: ########################### - Durable Mailboxes (Scala) + Durable Mailboxes ########################### diff --git a/akka-docs/rst/scala/event-bus.rst b/akka-docs/rst/scala/event-bus.rst index 6e5c594f0c..a8e1262a90 100644 --- a/akka-docs/rst/scala/event-bus.rst +++ b/akka-docs/rst/scala/event-bus.rst @@ -1,7 +1,7 @@ .. _event-bus-scala: ################# -Event Bus (Scala) +Event Bus ################# diff --git a/akka-docs/rst/scala/extending-akka.rst b/akka-docs/rst/scala/extending-akka.rst index 52b7a715c5..8247b57ac4 100644 --- a/akka-docs/rst/scala/extending-akka.rst +++ b/akka-docs/rst/scala/extending-akka.rst @@ -1,7 +1,7 @@ .. _extending-akka-scala: ######################### - Akka Extensions (Scala) + Akka Extensions ######################### diff --git a/akka-docs/rst/scala/fault-tolerance-sample.rst b/akka-docs/rst/scala/fault-tolerance-sample.rst index 12621e968b..c3d9eca28c 100644 --- a/akka-docs/rst/scala/fault-tolerance-sample.rst +++ b/akka-docs/rst/scala/fault-tolerance-sample.rst @@ -1,6 +1,6 @@ .. _fault-tolerance-sample-scala: -Diagrams of the Fault Tolerance Sample (Scala) +Diagrams of the Fault Tolerance Sample ---------------------------------------------- @@ -48,7 +48,7 @@ Step Description 15, 16 and tells the ``Counter`` to use the new ``Storage`` =========== ================================================================================== -Full Source Code of the Fault Tolerance Sample (Scala) +Full Source Code of the Fault Tolerance Sample ------------------------------------------------------ .. includecode:: code/docs/actor/FaultHandlingDocSample.scala#all diff --git a/akka-docs/rst/scala/fault-tolerance.rst b/akka-docs/rst/scala/fault-tolerance.rst index 1e705b4b0b..050edb4788 100644 --- a/akka-docs/rst/scala/fault-tolerance.rst +++ b/akka-docs/rst/scala/fault-tolerance.rst @@ -1,6 +1,6 @@ .. _fault-tolerance-scala: -Fault Tolerance (Scala) +Fault Tolerance ======================= As explained in :ref:`actor-systems` each actor is the supervisor of its diff --git a/akka-docs/rst/scala/futures.rst b/akka-docs/rst/scala/futures.rst index 6cfb188a6d..8ec676b263 100644 --- a/akka-docs/rst/scala/futures.rst +++ b/akka-docs/rst/scala/futures.rst @@ -1,6 +1,6 @@ .. _futures-scala: -Futures (Scala) +Futures =============== diff --git a/akka-docs/rst/scala/index-actors.rst b/akka-docs/rst/scala/index-actors.rst new file mode 100644 index 0000000000..af097d8693 --- /dev/null +++ b/akka-docs/rst/scala/index-actors.rst @@ -0,0 +1,14 @@ +Actors +====== + +.. toctree:: + :maxdepth: 2 + + actors + typed-channels + typed-actors + fault-tolerance + dispatchers + routing + fsm + testing diff --git a/akka-docs/rst/scala/index-futures.rst b/akka-docs/rst/scala/index-futures.rst new file mode 100644 index 0000000000..b8f350ad61 --- /dev/null +++ b/akka-docs/rst/scala/index-futures.rst @@ -0,0 +1,11 @@ +Futures and Agents +================== + +.. toctree:: + :maxdepth: 2 + + futures + dataflow + stm + agents + transactors diff --git a/akka-docs/rst/scala/index-network.rst b/akka-docs/rst/scala/index-network.rst new file mode 100644 index 0000000000..bf57876b50 --- /dev/null +++ b/akka-docs/rst/scala/index-network.rst @@ -0,0 +1,13 @@ +Networking +========== + +.. toctree:: + :maxdepth: 2 + + ../common/cluster + cluster-usage + remoting + serialization + io + zeromq + camel diff --git a/akka-docs/rst/scala/index-utilities.rst b/akka-docs/rst/scala/index-utilities.rst new file mode 100644 index 0000000000..3132e60d58 --- /dev/null +++ b/akka-docs/rst/scala/index-utilities.rst @@ -0,0 +1,14 @@ +Utilities +========= + +.. toctree:: + :maxdepth: 2 + + event-bus + logging + scheduler + ../common/duration + ../common/circuitbreaker + extending-akka + durable-mailbox + microkernel diff --git a/akka-docs/rst/scala/index.rst b/akka-docs/rst/scala/index.rst deleted file mode 100644 index 21cf66b551..0000000000 --- a/akka-docs/rst/scala/index.rst +++ /dev/null @@ -1,33 +0,0 @@ -.. _scala-api: - -Scala API -========= - -.. toctree:: - :maxdepth: 2 - - actors - typed-actors - typed-channels - logging - event-bus - scheduler - futures - dataflow - fault-tolerance - dispatchers - routing - remoting - serialization - fsm - stm - agents - transactors - io - testing - extending-akka - zeromq - microkernel - camel - durable-mailbox - howto diff --git a/akka-docs/rst/scala/io-old.rst b/akka-docs/rst/scala/io-old.rst index cc038fb401..ebba60b347 100644 --- a/akka-docs/rst/scala/io-old.rst +++ b/akka-docs/rst/scala/io-old.rst @@ -1,6 +1,6 @@ .. _io-scala-old: -Old IO (Scala) +Old IO ============== .. warning:: diff --git a/akka-docs/rst/scala/io.rst b/akka-docs/rst/scala/io.rst index c44fb4e9c1..9e39b21b65 100644 --- a/akka-docs/rst/scala/io.rst +++ b/akka-docs/rst/scala/io.rst @@ -1,6 +1,6 @@ .. _io-scala: -I/O (Scala) +I/O =========== Introduction diff --git a/akka-docs/rst/scala/logging.rst b/akka-docs/rst/scala/logging.rst index 73cb0210c4..adeea22873 100644 --- a/akka-docs/rst/scala/logging.rst +++ b/akka-docs/rst/scala/logging.rst @@ -1,7 +1,7 @@ .. _logging-scala: ################# - Logging (Scala) + Logging ################# Logging in Akka is not tied to a specific logging backend. By default diff --git a/akka-docs/rst/scala/microkernel.rst b/akka-docs/rst/scala/microkernel.rst index 5a1908346a..0d0935434e 100644 --- a/akka-docs/rst/scala/microkernel.rst +++ b/akka-docs/rst/scala/microkernel.rst @@ -1,7 +1,7 @@ .. _microkernel-scala: -Microkernel (Scala) +Microkernel =================== The purpose of the Akka Microkernel is to offer a bundling mechanism so that you can distribute diff --git a/akka-docs/rst/scala/remoting.rst b/akka-docs/rst/scala/remoting.rst index dd4f945db5..730d9f3a37 100644 --- a/akka-docs/rst/scala/remoting.rst +++ b/akka-docs/rst/scala/remoting.rst @@ -1,7 +1,7 @@ .. _remoting-scala: ################# - Remoting (Scala) + Remoting ################# @@ -197,7 +197,7 @@ order to account for network issues that sometimes occur on such platforms. The following chart illustrates how *phi* increase with increasing time since the previous heartbeat. -.. image:: ../cluster/images/phi1.png +.. image:: ../images/phi1.png Phi is calculated from the mean and standard deviation of historical inter arrival times. The previous chart is an example for standard deviation @@ -205,7 +205,7 @@ of 200 ms. If the heartbeats arrive with less deviation the curve becomes steepe i.e. it is possible to determine failure more quickly. The curve looks like this for a standard deviation of 100 ms. -.. image:: ../cluster/images/phi2.png +.. image:: ../images/phi2.png To be able to survive sudden abnormalities, such as garbage collection pauses and transient network failures the failure detector is configured with a margin, @@ -214,7 +214,7 @@ adjust the :ref:`remote-configuration-scala` of this depending on you environmen This is how the curve looks like for ``acceptable-heartbeat-pause`` configured to 3 seconds. -.. image:: ../cluster/images/phi3.png +.. image:: ../images/phi3.png Serialization ^^^^^^^^^^^^^ diff --git a/akka-docs/rst/scala/routing.rst b/akka-docs/rst/scala/routing.rst index e55d6f7c46..358051cc32 100644 --- a/akka-docs/rst/scala/routing.rst +++ b/akka-docs/rst/scala/routing.rst @@ -1,7 +1,7 @@ .. _routing-scala: -Routing (Scala) +Routing =============== A Router is an actor that receives messages and efficiently routes them to other actors, known as diff --git a/akka-docs/rst/scala/scheduler.rst b/akka-docs/rst/scala/scheduler.rst index b67a9a7de5..2ecb87a8a9 100644 --- a/akka-docs/rst/scala/scheduler.rst +++ b/akka-docs/rst/scala/scheduler.rst @@ -2,7 +2,7 @@ .. _scheduler-scala: ################### - Scheduler (Scala) + Scheduler ################### Sometimes the need for making things happen in the future arises, and where do diff --git a/akka-docs/rst/scala/serialization.rst b/akka-docs/rst/scala/serialization.rst index 285dd52e49..07af2afc42 100644 --- a/akka-docs/rst/scala/serialization.rst +++ b/akka-docs/rst/scala/serialization.rst @@ -2,7 +2,7 @@ .. _serialization-scala: ###################### - Serialization (Scala) + Serialization ###################### Akka has a built-in Extension for serialization, diff --git a/akka-docs/rst/scala/stm.rst b/akka-docs/rst/scala/stm.rst index 3b1fe4cb2c..972fa47b04 100644 --- a/akka-docs/rst/scala/stm.rst +++ b/akka-docs/rst/scala/stm.rst @@ -2,7 +2,7 @@ .. _stm-scala: ####################################### - Software Transactional Memory (Scala) + Software Transactional Memory ####################################### diff --git a/akka-docs/rst/scala/testing.rst b/akka-docs/rst/scala/testing.rst index a929a35bbe..8b878c6d8d 100644 --- a/akka-docs/rst/scala/testing.rst +++ b/akka-docs/rst/scala/testing.rst @@ -1,7 +1,7 @@ .. _akka-testkit: ############################## -Testing Actor Systems (Scala) +Testing Actor Systems ############################## .. toctree:: diff --git a/akka-docs/rst/scala/testkit-example.rst b/akka-docs/rst/scala/testkit-example.rst index dd7aba0812..4756bb3a27 100644 --- a/akka-docs/rst/scala/testkit-example.rst +++ b/akka-docs/rst/scala/testkit-example.rst @@ -1,7 +1,7 @@ .. _testkit-example: ######################## -TestKit Example (Scala) +TestKit Example ######################## Ray Roestenburg's example code from `his blog `_ adapted to work with Akka 2.x. diff --git a/akka-docs/rst/scala/transactors.rst b/akka-docs/rst/scala/transactors.rst index d915b15aa4..da5b0415e7 100644 --- a/akka-docs/rst/scala/transactors.rst +++ b/akka-docs/rst/scala/transactors.rst @@ -1,7 +1,7 @@ .. _transactors-scala: ##################### - Transactors (Scala) + Transactors ##################### diff --git a/akka-docs/rst/scala/typed-actors.rst b/akka-docs/rst/scala/typed-actors.rst index 7c9062fd7d..d6fbc8fb30 100644 --- a/akka-docs/rst/scala/typed-actors.rst +++ b/akka-docs/rst/scala/typed-actors.rst @@ -1,4 +1,4 @@ -Typed Actors (Scala) +Typed Actors ==================== Akka Typed Actors is an implementation of the `Active Objects `_ pattern. diff --git a/akka-docs/rst/scala/zeromq.rst b/akka-docs/rst/scala/zeromq.rst index b9780b70d6..f5008a7c4b 100644 --- a/akka-docs/rst/scala/zeromq.rst +++ b/akka-docs/rst/scala/zeromq.rst @@ -2,7 +2,7 @@ .. _zeromq-scala: ################ - ZeroMQ (Scala) + ZeroMQ ################