summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-03-30 21:51:59 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-03-30 21:51:59 -0700
commitf40d63acf90f99a919ffa3c25593c55b3380352d (patch)
tree9e29f5c7600e37640544106c099a79830388c60a /spec
parentbb2a952bc7593e26a312491a2564525b0b5397e9 (diff)
downloadscala-f40d63acf90f99a919ffa3c25593c55b3380352d.tar.gz
scala-f40d63acf90f99a919ffa3c25593c55b3380352d.tar.bz2
scala-f40d63acf90f99a919ffa3c25593c55b3380352d.zip
Don't mention C#
Diffstat (limited to 'spec')
-rw-r--r--spec/12-the-scala-standard-library.md7
-rw-r--r--spec/index.md4
2 files changed, 5 insertions, 6 deletions
diff --git a/spec/12-the-scala-standard-library.md b/spec/12-the-scala-standard-library.md
index 8868d6e17a..9d4d69e52a 100644
--- a/spec/12-the-scala-standard-library.md
+++ b/spec/12-the-scala-standard-library.md
@@ -422,12 +422,11 @@ used (it is `Object` on the Java platform).
and `update` means element update.
Because of the syntactic sugar for `apply` and `update` operations,
-we have the following correspondences between Scala and Java/C# code for
+we have the following correspondences between Scala and Java code for
operations on an array `xs`:
-| | |
+|_Scala_ |_Java_ |
|------------------|------------|
-|_Scala_ |_Java/C#_ |
|`xs.length` |`xs.length` |
|`xs(i)` |`xs[i]` |
|`xs(i) = e` |`xs[i] = e` |
@@ -449,7 +448,7 @@ explained in the following.
#### Variance
-Unlike arrays in Java or C#, arrays in Scala are _not_
+Unlike arrays in Java, arrays in Scala are _not_
co-variant; That is, $S <: T$ does not imply
`Array[$S$] $<:$ Array[$T$]` in Scala.
However, it is possible to cast an array
diff --git a/spec/index.md b/spec/index.md
index 22209b4262..b47cb033cb 100644
--- a/spec/index.md
+++ b/spec/index.md
@@ -33,8 +33,8 @@ object-oriented and functional programming. It is a pure
object-oriented language in the sense that every value is an
object. Types and behavior of objects are described by
classes. Classes can be composed using mixin composition. Scala is
-designed to work seamlessly with two less pure but mainstream
-object-oriented languages – Java and C#.
+designed to work seamlessly with less pure but mainstream
+object-oriented languages like Java.
Scala is a functional language in the sense that every function is a
value. Nesting of function definitions and higher-order functions are