Merge pull request #15011 from csomogyi/master

Fixing minor issues I found while building Akka on Windows

akka-docs/rst/dev/building-akka.rst

@@ -103,12 +103,6 @@ to use from an sbt project) use the ``publish-local`` command::
 
    sbt publish-local
 
-.. note::
-
-   Akka generates class diagrams for the API documentation using ScalaDoc. This needs the ``dot`` command from
-   the Graphviz software package to be installed to avoid errors. You can disable the diagram generation by
-   adding the flag ``-Dakka.scaladoc.diagrams=false``
-
 
 sbt Interactive Mode
 --------------------
@@ -150,3 +144,12 @@ You can look at the Ivy dependency resolution information that is created on
 the resolution information for the akka-remote module compile dependencies. If
 you open this file in a web browser you will get an easy to navigate view of
 dependencies.
+
+Scaladoc Dependencies
+=====================
+
+Akka generates class diagrams for the API documentation using ScalaDoc. This 
+needs the ``dot`` command from the Graphviz software package to be installed to
+avoid errors. You can disable the diagram generation by adding the flag
+``-Dakka.scaladoc.diagrams=false``. After installing Graphviz, make sure you add
+the toolset to the PATH (definitely on Windows).

project/AkkaBuild.scala

@@ -874,7 +874,7 @@ object AkkaBuild extends Build {
           val name = f.getName
           if (name.endsWith(".html") && !name.startsWith("index-") &&
             !(name.compare("index.html") == 0) && !(name.compare("package.html") == 0)) {
-            val source = scala.io.Source.fromFile(f)
+            val source = scala.io.Source.fromFile(f)("utf-8")
             val hd = source.getLines().exists(_.contains("<div class=\"toggleContainer block diagram-container\" id=\"inheritance-diagram-container\">"))
             source.close()
             hd