summaryrefslogtreecommitdiff
path: root/spec/index.md
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-03-30 21:54:43 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-03-30 21:54:43 -0700
commit63fb98d96aa4d4d8eb4aaa97df836500c56db228 (patch)
tree9e29f5c7600e37640544106c099a79830388c60a /spec/index.md
parent10d68743c88c2b1bb9b6b34f33176cc0466c5402 (diff)
parentf40d63acf90f99a919ffa3c25593c55b3380352d (diff)
downloadscala-63fb98d96aa4d4d8eb4aaa97df836500c56db228.tar.gz
scala-63fb98d96aa4d4d8eb4aaa97df836500c56db228.tar.bz2
scala-63fb98d96aa4d4d8eb4aaa97df836500c56db228.zip
Merge pull request #3666 from adriaanm/spec
Spec cleanups
Diffstat (limited to 'spec/index.md')
-rw-r--r--spec/index.md4
1 files changed, 2 insertions, 2 deletions
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