Merge pull request scala#5680 from SethTisue/deprecation-policy

adriaanm · web-flow · commit 14521835ff9a · 2017-02-08T14:26:58.000-08:00
update and improve description of deprecation policy
diff --git a/src/library/scala/deprecated.scala b/src/library/scala/deprecated.scala
@@ -39,20 +39,18 @@ import scala.annotation.meta._
  *  '''`@deprecated` in the Scala language and its standard library'''<br/>
  *
  *  A deprecated element of the Scala language or a definition in the Scala standard library will
- *  be preserved or at least another major version.
+ *  be preserved at least for the current major version.
  *
- *  This means that an element deprecated since 2.12 will be preserved in 2.13, but will very likely
- *  not be part of 2.14. Sometimes a deprecated element might be kept for more than a major
- *  release to ease migration and upgrades from older Scala versions.<br/>
- *  Developers should not rely on this.
+ *  This means that an element deprecated in some 2.12.x release will be preserved in
+ *  all 2.12.x releases, but may be removed in 2.13. (A deprecated element
+ *  might be kept longer to ease migration. Developers should not rely on this.)
  *
  *  '''Special deprecation policy for Scala 2.12'''<br>
- *  The Scala team has decided to enact a special deprecation policy for the 2.12 release:<br/>
+ *  The Scala team has decided to enact a special deprecation policy for Scala 2.12:<br/>
  *
- *  As an upgrade from Scala 2.11 to Scala 2.12 also requires upgrading from Java 6 to Java 8,
- *  no deprecated elements will be removed in this release to ease migration and upgrades
- *  from older Scala versions. This means that elements deprecated since 2.11 (or earlier)
- *  will not be removed in Scala 2.12.
+ *  As an upgrade from 2.11 to 2.12 also requires upgrading from Java 6 to Java 8,
+ *  deprecated elements will not normally be removed in this release, to ease migration
+ *  and cross-building.
  *
  *  @see    The official documentation on [[http://www.scala-lang.org/news/2.11.0/#binary-compatibility binary compatibility]].
  *  @param  message the message to print during compilation if the definition is accessed

Original file line number	Diff line number	Diff line change
`@@ -39,20 +39,18 @@ import scala.annotation.meta._`
`39`	`39`	* '''`@deprecated` in the Scala language and its standard library'''<br/>
`40`	`40`	`*`
`41`	`41`	`* A deprecated element of the Scala language or a definition in the Scala standard library will`
`42`		`- * be preserved or at least another major version.`
	`42`	`+ * be preserved at least for the current major version.`
`43`	`43`	`*`
`44`		`- * This means that an element deprecated since 2.12 will be preserved in 2.13, but will very likely`
`45`		`- * not be part of 2.14. Sometimes a deprecated element might be kept for more than a major`
`46`		`- * release to ease migration and upgrades from older Scala versions.<br/>`
`47`		`- * Developers should not rely on this.`
	`44`	`+ * This means that an element deprecated in some 2.12.x release will be preserved in`
	`45`	`+ * all 2.12.x releases, but may be removed in 2.13. (A deprecated element`
	`46`	`+ * might be kept longer to ease migration. Developers should not rely on this.)`
`48`	`47`	`*`
`49`	`48`	`* '''Special deprecation policy for Scala 2.12'''<br>`
`50`		`- * The Scala team has decided to enact a special deprecation policy for the 2.12 release:<br/>`
	`49`	`+ * The Scala team has decided to enact a special deprecation policy for Scala 2.12:<br/>`
`51`	`50`	`*`
`52`		`- * As an upgrade from Scala 2.11 to Scala 2.12 also requires upgrading from Java 6 to Java 8,`
`53`		`- * no deprecated elements will be removed in this release to ease migration and upgrades`
`54`		`- * from older Scala versions. This means that elements deprecated since 2.11 (or earlier)`
`55`		`- * will not be removed in Scala 2.12.`
	`51`	`+ * As an upgrade from 2.11 to 2.12 also requires upgrading from Java 6 to Java 8,`
	`52`	`+ * deprecated elements will not normally be removed in this release, to ease migration`
	`53`	`+ * and cross-building.`
`56`	`54`	`*`
`57`	`55`	`* @see The official documentation on [[http://www.scala-lang.org/news/2.11.0/#binary-compatibility binary compatibility]].`
`58`	`56`	`* @param message the message to print during compilation if the definition is accessed`