Merge remote-tracking branch 'upstream/master'

sake92 · sake92 · commit 23cac0973870 · 2017-10-11T22:33:35.000+02:00
diff --git a/_overviews/tutorials/scala-for-java-programmers.md b/_overviews/tutorials/scala-for-java-programmers.md
@@ -342,7 +342,7 @@ inherited from `Object`.
       def re = real
       def im = imaginary
       override def toString() =
-        "" + re + (if (im < 0) "" else "+") + im + "i"
+        "" + re + (if (im < 0) "-" else "+") + im + "i"
     }
 
 
diff --git a/_sips/index.md b/_sips/index.md
@@ -23,7 +23,7 @@ use and a low barrier to entry for beginners and intermediate users. The
 Platform consists of several independent modules that solve specific problems.
 The Scala community sets the overall direction of the Platform.
 
-<a class="button" href="https://scalacenter.github.io/platform-staging/platform.html">Learn more</a>
+<a class="button" href="https://scalacenter.github.io/platform/">Learn more</a>
 
 
 
