summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-01-18 17:59:21 +0000
committerPaul Phillips <paulp@improving.org>2011-01-18 17:59:21 +0000
commit8fbe377d4ed4ff170653d317abaf12bece08bec3 (patch)
tree081c066bfcb2424529c9fc84b809c8726c584b1e
parent9722b4a42091ed16e9c4268e1231105e3545e905 (diff)
downloadscala-8fbe377d4ed4ff170653d317abaf12bece08bec3.tar.gz
scala-8fbe377d4ed4ff170653d317abaf12bece08bec3.tar.bz2
scala-8fbe377d4ed4ff170653d317abaf12bece08bec3.zip
Who knew system was such a popular sentence end...
Who knew system was such a popular sentence ending choice. Fixes some doc comments caught up in the s/// net, no review.
-rw-r--r--src/actors/scala/actors/threadpool/helpers/ThreadHelpers.java2
-rw-r--r--src/compiler/scala/tools/nsc/doc/SourcelessComments.scala4
-rw-r--r--src/compiler/scala/tools/nsc/io/AbstractFile.scala2
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Scopes.scala4
-rw-r--r--src/msil/ch/epfl/lamp/compiler/msil/BindingFlags.java2
-rw-r--r--src/swing/doc/README2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/actors/scala/actors/threadpool/helpers/ThreadHelpers.java b/src/actors/scala/actors/threadpool/helpers/ThreadHelpers.java
index 9577537f30..13da20c4d6 100644
--- a/src/actors/scala/actors/threadpool/helpers/ThreadHelpers.java
+++ b/src/actors/scala/actors/threadpool/helpers/ThreadHelpers.java
@@ -45,7 +45,7 @@ public class ThreadHelpers {
/**
* Abstraction of the exception handler which receives notifications of
- * exceptions occurred possibly in various parts of the sys. Exception
+ * exceptions occurred possibly in various parts of the system. Exception
* handlers present attractive approach to exception handling in multi-threaded
* systems, as they can handle exceptions that occurred in different threads.
* <p>
diff --git a/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala b/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
index 647a17b66b..46e45a861b 100644
--- a/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
+++ b/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
@@ -214,7 +214,7 @@ abstract class SourcelessComments {
/** Class `AnyVal` is the root class of all ''value types''.
*
* `AnyVal` has a fixed number of subclasses, which describe values which are not implemented as objects in the
- * underlying host sys.
+ * underlying host system.
*
* Classes [[scala.Double]], [[scala.Float]], [[scala.Long]], [[scala.Int]], [[scala.Char]], [[scala.Short]],
* and [[scala.Byte]] are together called ''numeric value types''. Classes [[scala.Byte]], [[scala.Short]], and
@@ -235,7 +235,7 @@ abstract class SourcelessComments {
val minValue = "MIN_" + sym.name.toString().toUpperCase()
comment(sym) = new DocComment("""
/** Class `""" + sym.name + """` belongs to the value classes whose instances are not represented as objects by
- * the underlying host sys. There is an implicit conversion from instances of `""" + sym.name + """` to
+ * the underlying host system. There is an implicit conversion from instances of `""" + sym.name + """` to
* instances of [[scala.runtime.Rich""" + sym.name + """]] which provides useful non-primitive operations.
* All value classes inherit from class [[scala.AnyVal]].
*
diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
index c2b73b2831..01aaa6c007 100644
--- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala
+++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
@@ -61,7 +61,7 @@ object AbstractFile {
* <p>
* This class and its children serve to unify handling of files and
* directories. These files and directories may or may not have some
- * real counter part within the file sys. For example, some file
+ * real counter part within the file system. For example, some file
* handles reference files within a zip archive or virtual ones
* that exist only in memory.
* </p>
diff --git a/src/compiler/scala/tools/nsc/symtab/Scopes.scala b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
index 6ce244b772..b5e23d61f0 100644
--- a/src/compiler/scala/tools/nsc/symtab/Scopes.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
@@ -227,7 +227,7 @@ trait Scopes {
/** lookup a symbol entry matching given name.
* @note from Martin: I believe this is a hotspot or will be one
- * in future versions of the type sys. I have reverted the previous
+ * in future versions of the type system. I have reverted the previous
* change to use iterators as too costly.
*/
def lookupEntry(name: Name): ScopeEntry = {
@@ -248,7 +248,7 @@ trait Scopes {
/** lookup next entry with same name as this one
* @note from Martin: I believe this is a hotspot or will be one
- * in future versions of the type sys. I have reverted the previous
+ * in future versions of the type system. I have reverted the previous
* change to use iterators as too costly.
*/
def lookupNextEntry(entry: ScopeEntry): ScopeEntry = {
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/BindingFlags.java b/src/msil/ch/epfl/lamp/compiler/msil/BindingFlags.java
index efac91d3b2..cac2319b50 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/BindingFlags.java
+++ b/src/msil/ch/epfl/lamp/compiler/msil/BindingFlags.java
@@ -126,7 +126,7 @@ public abstract class BindingFlags {
* throws an exception if the caller supplies a non-null Binder object,
* since that implies that the caller is supplying BindToXXX
* implementations that will pick the appropriate method.
- * Reflection models the accessibility rules of the common type sys.
+ * Reflection models the accessibility rules of the common type system.
* For example, if the caller is in the same assembly, the caller
* does not need special permissions for internal members. Otherwise,
* the caller needs ReflectionPermission. This is consistent with
diff --git a/src/swing/doc/README b/src/swing/doc/README
index f910e8fe52..cdfee01f82 100644
--- a/src/swing/doc/README
+++ b/src/swing/doc/README
@@ -16,7 +16,7 @@ The widget class hierarchy loosely resembles that of Java Swing. The main differ
child component. In the end, it is not more work to move all children to a newly created
panel.)
- The event sys. TODO
+ The event system. TODO
The library comprises three main packages: