Merge branch '2.11.x' into 2.12.x

Author: adriaanm

src/main/scala/MakeDownloadPage.scala

@@ -9,7 +9,7 @@ class MakeDownloadPage(version: String, releaseDate: Date = new Date()) {
     require(!version.startsWith("v"), "version should *not* start with 'v'")
     val fileName = s"${format("yyyy-MM-dd")}-$version.md"
     IO.write(new java.io.File(fileName), page)
-    println(s"cp $fileName ../scala-lang/download/_posts/")
+    println(s"cp $fileName ../scala-lang/_downloads/")
     println("# to prepare your scala-lang PR")
   }
 

src/main/scala/MakeReleaseNotes.scala

@@ -30,7 +30,7 @@ object MakeReleaseNotes {
     println("# generated " + fileName)
 
     if (ext == "md") {
-      println(s"cp $fileName ../scala-lang/news/_posts/")
+      println(s"cp $fileName ../scala-lang/_posts/")
       println(s"# don't forget to\n${scala.util.Properties.envOrElse("EDITOR", "mate")} ../scala-lang/download/index.md ../scala-lang/documentation/api.md ../scala-lang/_config.yml")
       println("# and, to prepare and sanity check your scala-lang PR:")
       println(s"maruku --html $fileName")
@@ -109,7 +109,6 @@ object MakeReleaseNotes {
       </body>
     </html>"""
       case MarkDown => s"""---
-layout: news
 post-type: announcement
 permalink: /news/$version
 title: "Scala ${currentTag drop 1} is now available!"