diff --git a/akka-docs/pending/actor-registry-java.rst b/akka-docs/java/actor-registry.rst
similarity index 100%
rename from akka-docs/pending/actor-registry-java.rst
rename to akka-docs/java/actor-registry.rst
diff --git a/akka-docs/java/index.rst b/akka-docs/java/index.rst
index ca3a84c5de..412e76d1cd 100644
--- a/akka-docs/java/index.rst
+++ b/akka-docs/java/index.rst
@@ -5,3 +5,4 @@ Java API
    :maxdepth: 2
 
    untyped-actors
+   actor-registry
diff --git a/akka-docs/java/untyped-actors.rst b/akka-docs/java/untyped-actors.rst
index e7977801a3..5a29d13ae5 100644
--- a/akka-docs/java/untyped-actors.rst
+++ b/akka-docs/java/untyped-actors.rst
@@ -1,5 +1,9 @@
-Actors
-======
+Actors (Java)
+=============
+
+.. sidebar:: Contents
+
+   .. contents:: :local:
 
 Module stability: **SOLID**
 
@@ -21,7 +25,8 @@ Here is an example:
 
     public void onReceive(Object message) throws Exception {
       if (message instanceof String) 
-        EventHandler.info(this, String.format("Received String message: %s", message));
+        EventHandler.info(this, String.format("Received String message: %s",
+          message));
       else 
         throw new IllegalArgumentException("Unknown message: " + message);
     }
diff --git a/akka-docs/pending/actor-registry-scala.rst b/akka-docs/scala/actor-registry.rst
similarity index 100%
rename from akka-docs/pending/actor-registry-scala.rst
rename to akka-docs/scala/actor-registry.rst
diff --git a/akka-docs/scala/actors.rst b/akka-docs/scala/actors.rst
index a3e0bbd28f..ed186e17ba 100644
--- a/akka-docs/scala/actors.rst
+++ b/akka-docs/scala/actors.rst
@@ -1,5 +1,9 @@
-Actors
-======
+Actors (Scala)
+==============
+
+.. sidebar:: Contents
+
+   .. contents:: :local:
 
 Module stability: **SOLID**
 
diff --git a/akka-docs/scala/index.rst b/akka-docs/scala/index.rst
index e54c88b979..adc2843f1e 100644
--- a/akka-docs/scala/index.rst
+++ b/akka-docs/scala/index.rst
@@ -5,5 +5,6 @@ Scala API
    :maxdepth: 2
 
    actors
+   actor-registry
    fsm
    testing