diff --git a/akka-docs/dev/multi-jvm-testing.rst b/akka-docs/dev/multi-jvm-testing.rst
index dade7c30c1..dfad74f84e 100644
--- a/akka-docs/dev/multi-jvm-testing.rst
+++ b/akka-docs/dev/multi-jvm-testing.rst
@@ -20,9 +20,9 @@ http://github.com/typesafehub/sbt-multi-jvm
 
 You can add it as a plugin by adding the following to your plugins/build.sbt::
 
-   resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
+   resolvers += Classpaths.typesafeResolver
 
-   libraryDependencies += "com.typesafe.sbt-multi-jvm" %% "sbt-multi-jvm" % "0.1.3"
+   addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.7")
 
 You can then add multi-JVM testing to a project by including the ``MultiJvm``
 settings and config. For example, here is how the akka-cluster project adds
diff --git a/akka-docs/index.rst b/akka-docs/index.rst
index 96631859ad..5bd1b7ed80 100644
--- a/akka-docs/index.rst
+++ b/akka-docs/index.rst
@@ -28,8 +28,6 @@ Links
 
 * :ref:`other-doc`
 
-* `Akka Modules Documentation <http://akka.io/docs/akka-modules/snapshot/>`_
-
 * :ref:`issue_tracking`
 
 * :ref:`support`
diff --git a/akka-docs/project/issue-tracking.rst b/akka-docs/project/issue-tracking.rst
index 6afb23308f..9e7e362559 100644
--- a/akka-docs/project/issue-tracking.rst
+++ b/akka-docs/project/issue-tracking.rst
@@ -3,7 +3,7 @@
 Issue Tracking
 ==============
 
-Akka is using ``Assembla`` as issue tracking system.
+Akka is using ``Assembla`` as its issue tracking system.
 
 Browsing
 --------
@@ -13,14 +13,11 @@ Tickets
 
 `You can find the Akka tickets here <http://www.assembla.com/spaces/akka/tickets>`_
 
-`You can find the Akka Modules tickets here <https://www.assembla.com/spaces/akka-modules/tickets>`_
-
 Roadmaps
 ^^^^^^^^
 
 `The roadmap for each Akka milestone is here <https://www.assembla.com/spaces/akka/milestones>`_
 
-`The roadmap for each Akka Modules milestone is here <https://www.assembla.com/spaces/akka-modules/milestones>`_
 
 Creating tickets
 ----------------
@@ -31,14 +28,11 @@ In order to create tickets you need to do the following:
 
 Then you also need to become a "Watcher" of the Akka space.
 
-For Akka tickets:
-`Link to create new ticket <https://www.assembla.com/spaces/akka/tickets/new>`__
-
-For Akka Modules tickets:
-`Link to create new ticket <https://www.assembla.com/spaces/akka-modules/tickets/new>`__
+`Link to create a new ticket <https://www.assembla.com/spaces/akka/tickets/new>`__
 
 Thanks a lot for reporting bugs and suggesting features.
 
+
 Failing test
 ------------
 
diff --git a/akka-docs/project/links.rst b/akka-docs/project/links.rst
index 4db77b3f4e..8b387eceb5 100644
--- a/akka-docs/project/links.rst
+++ b/akka-docs/project/links.rst
@@ -57,7 +57,7 @@ http://repo.typesafe.com/typesafe/snapshots/ as both ``SNAPSHOT`` and
 timestamped versions.
 
 For timestamped versions, pick a timestamp from
-http://repo.typesafe.com/typesafe/akka-snapshots/com/typesafe/akka/akka-actor/.
+http://repo.typesafe.com/typesafe/snapshots/com/typesafe/akka/akka-actor/.
 All Akka modules that belong to the same build have the same timestamp.
 
 Make sure that you add the repository to the sbt resolvers or maven repositories::
diff --git a/akka-docs/project/other-doc.rst b/akka-docs/project/other-doc.rst
index aeba2d9c13..769f4b457e 100644
--- a/akka-docs/project/other-doc.rst
+++ b/akka-docs/project/other-doc.rst
@@ -19,23 +19,17 @@ be found here:
 Release Versions
 ================
 
-1.3
----
-
-- Akka 1.3 - http://akka.io/docs/akka/1.3/ (or in `PDF format <http://akka.io/docs/akka/1.3/Akka.pdf>`__)
-- Akka Modules 1.3 - http://akka.io/docs/akka-modules/1.3/ (or in `PDF format <http://akka.io/docs/akka-modules/1.3/AkkaModules.pdf>`__)
-
 1.2
 ---
 
 - Akka 1.2 - http://akka.io/docs/akka/1.2/ (or in `PDF format <http://akka.io/docs/akka/1.2/Akka.pdf>`__)
 - Akka Modules 1.2 - http://akka.io/docs/akka-modules/1.2/ (or in `PDF format <http://akka.io/docs/akka-modules/1.2/AkkaModules.pdf>`__)
 
-1.1
----
+1.1.3
+-----
 
-- Akka 1.1 - http://akka.io/docs/akka/1.1/ (or in `PDF format <http://akka.io/docs/akka/1.1/Akka.pdf>`__)
-- Akka Modules 1.1 - http://akka.io/docs/akka-modules/1.1/ (or in `PDF format <http://akka.io/docs/akka-modules/1.1/AkkaModules.pdf>`__)
+- Akka 1.1.3 - http://akka.io/docs/akka/1.1.3/ (or in `PDF format <http://akka.io/docs/akka/1.1.3/Akka.pdf>`__)
+- Akka Modules 1.1.3 - http://akka.io/docs/akka-modules/1.1.3/ (or in `PDF format <http://akka.io/docs/akka-modules/1.1.3/AkkaModules.pdf>`__)
 
 1.0
 ---
diff --git a/akka-docs/project/scaladoc.rst b/akka-docs/project/scaladoc.rst
index 728b917d17..5a6ccba7c4 100644
--- a/akka-docs/project/scaladoc.rst
+++ b/akka-docs/project/scaladoc.rst
@@ -16,14 +16,19 @@ be found here: http://akka.io/api/akka/snapshot
 Release Versions
 ================
 
-1.1
----
+1.2
+-----
 
-- Akka 1.1 - http://akka.io/api/akka/1.1/
-- Akka Modules 1.1 - http://akka.io/api/akka-modules/1.1/
+- Akka 1.2 - http://akka.io/api/akka/1.2/
+- Akka Modules 1.2 - http://akka.io/api/akka-modules/1.2/
+
+1.1.3
+-----
+
+- Akka 1.1.3 - http://akka.io/api/akka/1.1.3/
+- Akka Modules 1.1.3 - http://akka.io/api/akka-modules/1.1.3/
 
 1.0
 ---
 
 - Akka 1.0 - http://akka.io/api/1.0/
-
diff --git a/akka-docs/scala/fsm.rst b/akka-docs/scala/fsm.rst
index 36e8e0a11a..af2b36ad4c 100644
--- a/akka-docs/scala/fsm.rst
+++ b/akka-docs/scala/fsm.rst
@@ -8,14 +8,6 @@ FSM
 
    .. contents:: :local:
 
-.. module:: FSM
-   :platform: Scala
-   :synopsis: Finite State Machine DSL on top of Actors
-.. moduleauthor:: Irmo Manie, Roland Kuhn
-.. versionadded:: 1.0
-.. versionchanged:: 1.2
-   added Tracing and Logging
-
 Overview
 ========
 
diff --git a/akka-docs/scala/testing.rst b/akka-docs/scala/testing.rst
index ce2a175cd6..e45ab5d0a5 100644
--- a/akka-docs/scala/testing.rst
+++ b/akka-docs/scala/testing.rst
@@ -12,10 +12,6 @@ Testing Actor Systems
 
    .. contents:: :local:
 
-.. module:: akka-testkit
-   :synopsis: Tools for Testing Actor Systems
-.. moduleauthor:: Roland Kuhn
-
 As with any piece of software, automated tests are a very important part of the
 development cycle. The actor model presents a different view on how units of
 code are delimited and how they interact, which has an influence on how to