diff --git a/akka-docs/rst/java/code/docs/actor/MyActor.java b/akka-docs/rst/java/code/docs/actor/MyJavaActor.java
similarity index 90%
rename from akka-docs/rst/java/code/docs/actor/MyActor.java
rename to akka-docs/rst/java/code/docs/actor/MyJavaActor.java
index f77a1fa410..e2fde63f8f 100644
--- a/akka-docs/rst/java/code/docs/actor/MyActor.java
+++ b/akka-docs/rst/java/code/docs/actor/MyJavaActor.java
@@ -13,10 +13,10 @@ import akka.japi.pf.ReceiveBuilder;
 //#imports
 
 //#my-actor
-public class MyActor extends AbstractActor {
+public class MyJavaActor extends AbstractActor {
   private final LoggingAdapter log = Logging.getLogger(context().system(), this);
 
-  public MyActor() {
+  public MyJavaActor() {
     receive(ReceiveBuilder.
       match(String.class, s -> {
         log.info("Received String message: {}", s);
diff --git a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
index 70efa56009..b939991977 100644
--- a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
@@ -21,21 +21,16 @@ import akka.util._
 import scala.concurrent.duration._
 import scala.concurrent.Await
 
-object x {
+//#my-actor
+class MyActor extends Actor {
+  val log = Logging(context.system, this)
 
-  //#my-actor
-  class MyActor extends Actor {
-    val log = Logging(context.system, this)
-
-    def receive = {
-      case "test" => log.info("received test")
-      case _      => log.info("received unknown message")
-    }
+  def receive = {
+    case "test" => log.info("received test")
+    case _      => log.info("received unknown message")
   }
-
-  //#my-actor
 }
-import x._
+//#my-actor
 
 final case class DoIt(msg: ImmutableMessage)
 final case class Message(s: String)
diff --git a/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala b/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala
index 3f25f78bd1..6cba14852e 100644
--- a/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala
+++ b/akka-docs/rst/scala/code/docs/stream/MigrationsScala.scala
@@ -8,12 +8,12 @@ import java.io.File
 import _root_.akka.http.scaladsl.model.Uri
 import _root_.akka.stream._
 import _root_.akka.stream.scaladsl._
-import _root_.akka.stream.stage.{GraphStage, GraphStageLogic, InHandler, OutHandler}
-import _root_.akka.stream.testkit.{AkkaSpec, TestPublisher, TestSubscriber}
+import _root_.akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler }
+import _root_.akka.stream.testkit.{ AkkaSpec, TestPublisher, TestSubscriber }
 
 import scala.concurrent.duration._
-import scala.concurrent.{ExecutionContext, Future, Promise}
-import scala.util.{Failure, Random, Success, Try}
+import scala.concurrent.{ ExecutionContext, Future, Promise }
+import scala.util.{ Failure, Random, Success, Try }
 
 class MigrationsScala extends AkkaSpec {
 
diff --git a/akka-docs/rst/scala/http/common/de-coding.rst b/akka-docs/rst/scala/http/common/de-coding.rst
index 89e2c9ae47..022c19c907 100644
--- a/akka-docs/rst/scala/http/common/de-coding.rst
+++ b/akka-docs/rst/scala/http/common/de-coding.rst
@@ -12,5 +12,5 @@ The support is not enabled automatically, but must be explicitly requested.
 For enabling message encoding/decoding with :ref:`Routing DSL <http-high-level-server-side-api>` see the :ref:`CodingDirectives`.
 
 .. _HTTP spec: http://tools.ietf.org/html/rfc7231#section-3.1.2.1
-.. _akka.http.scaladsl.coding: https://github.com/akka/akka/tree/release-2.3-dev/akka-http/src/main/scala/akka/http/scaladsl/coding
+.. _akka.http.scaladsl.coding: @github@/akka-http/src/main/scala/akka/http/scaladsl/coding
 
diff --git a/akka-docs/src/test/resources/application.conf b/akka-docs/src/test/resources/application.conf
index 9e04966ad7..b4d39bb8d2 100644
--- a/akka-docs/src/test/resources/application.conf
+++ b/akka-docs/src/test/resources/application.conf
@@ -1,2 +1 @@
-//akka.loggers = ["akka.testkit.TestEventListener"]
-akka.loggers = []
+akka.loggers = ["akka.testkit.TestEventListener"]