Merge branch 'master' into master

mhegazy · web-flow · commit 277f1e40ab0d · 2016-12-19T13:39:13.000-08:00
diff --git a/pages/Interfaces.md b/pages/Interfaces.md
@@ -86,8 +86,8 @@ interface SquareConfig {
 function createSquare(config: SquareConfig): { color: string; area: number } {
     let newSquare = {color: "white", area: 100};
     if (config.color) {
-        // Error: Property 'color' does not exist on type 'SquareConfig'
-        newSquare.color = config.color;
+        // Error: Property 'clor' does not exist on type 'SquareConfig'
+        newSquare.color = config.clor;
     }
     if (config.width) {
         newSquare.area = config.width * config.width;
diff --git a/pages/tutorials/Migrating from JavaScript.md b/pages/tutorials/Migrating from JavaScript.md
@@ -279,7 +279,7 @@ function myCoolFunction() {
 }
 
 myCoolFunction(function(x) { console.log(x) }, [1, 2, 3, 4]);
-myCoolFunction(function(x) { console.log(x) }, 1, 2, 3, 4]);
+myCoolFunction(function(x) { console.log(x) }, 1, 2, 3, 4);
 ```
 
 In this case, we need to use TypeScript to tell any of our callers about the ways `myCoolFunction` can be called using function overloads.
@@ -388,7 +388,7 @@ For instance, imagine a `Point` class, and imagine a function that we wish to ad
 ```ts
 class Point {
     constuctor(public x, public y) {}
-    getDistance(point: Point) {
+    getDistance(p: Point) {
         let dx = p.x - this.x;
         let dy = p.y - this.y;
         return Math.sqrt(dx ** 2 + dy ** 2);
diff --git a/pages/tutorials/React & Webpack.md b/pages/tutorials/React & Webpack.md
@@ -120,8 +120,7 @@ import * as React from "react";
 
 export interface HelloProps { compiler: string; framework: string; }
 
-export const Hello = (props: HelloProps) => <h1>Hello from {this.props.compiler} and {this.props.framework}!</h1>;
-
+export const Hello = (props: HelloProps) => <h1>Hello from {props.compiler} and {props.framework}!</h1>;
 ```
 
 Note that while this example uses [stateless functional components](https://facebook.github.io/react/docs/reusable-components.html#stateless-functions)), we could also make our example a little *classier* as well.
