Merge branch 'master' into fix1-1224

Author: dongxuwang

_ko/tour/classes.md

@@ -19,7 +19,7 @@ previous-page: unified-types
     class Point(xc: Int, yc: Int) {
       var x: Int = xc
       var y: Int = yc
-      def move(dx: Int, dy: Int) {
+      def move(dx: Int, dy: Int): Unit = {
         x = x + dx
         y = y + dy
       }
@@ -33,7 +33,7 @@ previous-page: unified-types
 클래스들은 아래의 예제가 보여주는 것처럼 새로운 기본형으로 초기화된다.
 
     object Classes {
-      def main(args: Array[String]) {
+      def main(args: Array[String]): Unit = {
         val pt = new Point(1, 2)
         println(pt)
         pt.move(10, 10)

_overviews/tutorials/scala-for-java-programmers.md

@@ -155,7 +155,7 @@ Scala is a pure object-oriented language in the sense that
 *everything* is an object, including numbers or functions. It
 differs from Java in that respect, since Java distinguishes
 primitive types (such as `boolean` and `int`) from reference
-types, and does not enable one to manipulate functions as values.
+types.
 
 ### Numbers are objects
 
@@ -190,7 +190,7 @@ prevents `1` from being interpreted as a `Double`.
 
 ### Functions are objects
 
-Perhaps more surprising for the Java programmer, functions are also
+Functions are also
 objects in Scala. It is therefore possible to pass functions as
 arguments, to store them in variables, and to return them from other
 functions. This ability to manipulate functions as values is one of