Merge branch '2.11.x' into 2.12.x

lrytz · lrytz · commit 1a99507def43 · 2017-04-19T13:58:00.000+02:00
diff --git a/src/main/scala/MakeDownloadPage.scala b/src/main/scala/MakeDownloadPage.scala
@@ -80,7 +80,7 @@ release_version: $version
 release_date: "${format("MMMM dd, yyyy")}"
 show_resources: "true"
 permalink: /download/$version.html
-requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.8 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."
+requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available <a href='http://www.java.com/'>here</a>."
 resources: [
   $resources
 ]

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ release_version: $version`
`80`	`80`	`release_date: "${format("MMMM dd, yyyy")}"`
`81`	`81`	`show_resources: "true"`
`82`	`82`	`permalink: /download/$version.html`
`83`		`-requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires the Java runtime version 1.8 or later, which can be downloaded <a href='http://www.java.com/'>here</a>."`
	`83`	`+requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available <a href='http://www.java.com/'>here</a>."`
`84`	`84`	`resources: [`
`85`	`85`	`$resources`
`86`	`86`	`]`