summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2017-02-08 14:26:58 -0800
committerGitHub <noreply@github.com>2017-02-08 14:26:58 -0800
commit14521835ff9aed7caab0ffce21120e30af0104fa (patch)
tree9665fb5d3c7f82878d901513f822608bb093d725 /src/library
parentd6837aef059b6d2df1eac10284036ec1ed603a7b (diff)
parent16e2d15e50215d06e2f36b44d26ebf0f542a8c00 (diff)
downloadscala-14521835ff9aed7caab0ffce21120e30af0104fa.tar.gz
scala-14521835ff9aed7caab0ffce21120e30af0104fa.tar.bz2
scala-14521835ff9aed7caab0ffce21120e30af0104fa.zip
Merge pull request #5680 from SethTisue/deprecation-policy
update and improve description of deprecation policy
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/deprecated.scala18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/library/scala/deprecated.scala b/src/library/scala/deprecated.scala
index 60f0857550..a57745dbea 100644
--- 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