diff --git a/akka-docs/additional/index.rst b/akka-docs/additional/index.rst index fd3da0f898..f108deef51 100644 --- a/akka-docs/additional/index.rst +++ b/akka-docs/additional/index.rst @@ -5,7 +5,7 @@ Additional Information :maxdepth: 2 benchmarks - recipies + recipes companies-using-akka third-party-integrations language-bindings diff --git a/akka-docs/additional/recipies.rst b/akka-docs/additional/recipes.rst similarity index 78% rename from akka-docs/additional/recipies.rst rename to akka-docs/additional/recipes.rst index 55bc4085a1..eff333cb28 100644 --- a/akka-docs/additional/recipies.rst +++ b/akka-docs/additional/recipes.rst @@ -1,5 +1,5 @@ -Here is a list of recipies for all things Akka -============================================== +Here is a list of recipes for all things Akka +============================================= * PostStart => `Link to Klangism `_ * `Consumer actors best practices `_ diff --git a/akka-docs/additional/articles.rst b/akka-docs/disabled/articles.rst similarity index 100% rename from akka-docs/additional/articles.rst rename to akka-docs/disabled/articles.rst diff --git a/akka-docs/additional/external-sample-projects.rst b/akka-docs/disabled/external-sample-projects.rst similarity index 100% rename from akka-docs/additional/external-sample-projects.rst rename to akka-docs/disabled/external-sample-projects.rst diff --git a/akka-docs/intro/getting-started.rst b/akka-docs/intro/getting-started.rst index 3f43390c17..16a4a46c2f 100644 --- a/akka-docs/intro/getting-started.rst +++ b/akka-docs/intro/getting-started.rst @@ -58,8 +58,7 @@ external dependencies (apart from the ``scala-library.jar`` JAR). Using a release distribution ---------------------------- -Download the release you need, Akka Actors, Akka Core, or Akka Microkernel, from -http://akka.io/downloads and unzip it. +Download the release you need from http://akka.io/downloads and unzip it. Using a snapshot version ------------------------ diff --git a/akka-docs/java/extending-akka.rst b/akka-docs/java/extending-akka.rst index 7cc46cc93d..edbea859b1 100644 --- a/akka-docs/java/extending-akka.rst +++ b/akka-docs/java/extending-akka.rst @@ -1,4 +1,4 @@ -.. _extending-akka: +.. _extending-akka-java: Akka Extensions =============== @@ -60,4 +60,4 @@ Applicability ------------- The sky is the limit! -By the way, did you know that Akka's ``Typed Actors``, ``Serialization`` and other features are implemented as Akka Extensions? \ No newline at end of file +By the way, did you know that Akka's ``Typed Actors``, ``Serialization`` and other features are implemented as Akka Extensions? diff --git a/akka-docs/java/index.rst b/akka-docs/java/index.rst index fbc94dbc61..8ae79c5ba4 100644 --- a/akka-docs/java/index.rst +++ b/akka-docs/java/index.rst @@ -18,3 +18,4 @@ Java API remoting serialization extending-akka + transactors diff --git a/akka-docs/java/remoting.rst b/akka-docs/java/remoting.rst index 15eacc3f4c..1599d02ff8 100644 --- a/akka-docs/java/remoting.rst +++ b/akka-docs/java/remoting.rst @@ -82,7 +82,7 @@ For more information please see :ref:`serialization-java` Routers with Remote Destinations ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -It is absolutely feasible to combine remoting with :ref:`routers`. +It is absolutely feasible to combine remoting with :ref:`routing-java`. This is also done via configuration:: akka { @@ -100,4 +100,4 @@ This is also done via configuration:: } This configuration setting will clone the actor “aggregation” 10 times and deploy it evenly distributed across -the two given target nodes. \ No newline at end of file +the two given target nodes. diff --git a/akka-docs/java/typed-actors.rst b/akka-docs/java/typed-actors.rst index d857ac509d..4b7de5ee09 100644 --- a/akka-docs/java/typed-actors.rst +++ b/akka-docs/java/typed-actors.rst @@ -1,5 +1,5 @@ -Typed Actors (Scala) -==================== +Typed Actors (Java) +=================== .. sidebar:: Contents diff --git a/akka-docs/scala/extending-akka.rst b/akka-docs/scala/extending-akka.rst index a13326b626..6a1655db01 100644 --- a/akka-docs/scala/extending-akka.rst +++ b/akka-docs/scala/extending-akka.rst @@ -1,4 +1,4 @@ -.. _extending-akka: +.. _extending-akka-scala: Akka Extensions =============== @@ -50,4 +50,4 @@ Applicability ------------- The sky is the limit! -By the way, did you know that Akka's ``Typed Actors``, ``Serialization`` and other features are implemented as Akka Extensions? \ No newline at end of file +By the way, did you know that Akka's ``Typed Actors``, ``Serialization`` and other features are implemented as Akka Extensions? diff --git a/akka-docs/scala/index.rst b/akka-docs/scala/index.rst index 898a74f905..54139db119 100644 --- a/akka-docs/scala/index.rst +++ b/akka-docs/scala/index.rst @@ -20,3 +20,5 @@ Scala API fsm testing extending-akka + agents + transactors diff --git a/akka-docs/scala/remoting.rst b/akka-docs/scala/remoting.rst index 78f7a598ad..86c0ccf1c1 100644 --- a/akka-docs/scala/remoting.rst +++ b/akka-docs/scala/remoting.rst @@ -86,7 +86,7 @@ For more information please see :ref:`serialization-scala` Routers with Remote Destinations ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -It is absolutely feasible to combine remoting with :ref:`routers`. +It is absolutely feasible to combine remoting with :ref:`routing-scala`. This is also done via configuration:: akka { @@ -104,4 +104,4 @@ This is also done via configuration:: } This configuration setting will clone the actor “aggregation” 10 times and deploy it evenly distributed across -the two given target nodes. \ No newline at end of file +the two given target nodes.