summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-05-04 11:10:20 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-05-04 11:10:20 +0200
commit9e29061fb75a71c271c5e0a9824aabe93bc269fe (patch)
tree4a01558a9141d7bbb6c6fc75a0b3edbe2b2cc31c /src
parent1374f114a3b5e781361294891538f5b3e0df48ac (diff)
parent6f0e4c64017e6504a3c8017a9322b5edbf73b79a (diff)
downloadscala-9e29061fb75a71c271c5e0a9824aabe93bc269fe.tar.gz
scala-9e29061fb75a71c271c5e0a9824aabe93bc269fe.tar.bz2
scala-9e29061fb75a71c271c5e0a9824aabe93bc269fe.zip
Merge pull request #4470 from swaldman/correct-predef-assertion-doc
Fix documentation of assertions in Predef
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/Predef.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 42448b38f2..4eed672794 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -36,8 +36,8 @@ import scala.io.StdIn
*
* A set of `assert` functions are provided for use as a way to document
* and dynamically check invariants in code. `assert` statements can be elided
- * at runtime by providing the command line argument `-Xdisable-assertions` to
- * the `scala` command.
+ * at compile time by providing the command line argument `-Xdisable-assertions` to
+ * the `scalac` command.
*
* Variants of `assert` intended for use with static analysis tools are also
* provided: `assume`, `require` and `ensuring`. `require` and `ensuring` are