Merge pull request #4074 from jimfb/docs-context-parameter-confusing

Fixed confusing use of the word/name `context` in documentation

docs/docs/ref-01-top-level-api.md

@@ -166,15 +166,15 @@ Configure React's event system to handle touch events on mobile devices.
 #### React.Children.map
 
 ```javascript
-object React.Children.map(object children, function fn [, object context])
+object React.Children.map(object children, function fn [, object thisArg])
 ```
 
-Invoke `fn` on every immediate child contained within `children` with `this` set to `context`. If `children` is a nested object or array it will be traversed: `fn` will never be passed the container objects. If children is `null` or `undefined` returns `null` or `undefined` rather than an empty object.
+Invoke `fn` on every immediate child contained within `children` with `this` set to `thisArg`. If `children` is a nested object or array it will be traversed: `fn` will never be passed the container objects. If children is `null` or `undefined` returns `null` or `undefined` rather than an empty object.
 
 #### React.Children.forEach
 
 ```javascript
-React.Children.forEach(object children, function fn [, object context])
+React.Children.forEach(object children, function fn [, object thisArg])
 ```
 
 Like `React.Children.map()` but does not return an object.

docs/tips/13-false-in-jsx.md

@@ -7,7 +7,7 @@ prev: initial-ajax.html
 next: communicate-between-components.html
 ---
 
-Here's how `false` renders in different contexts:
+Here's how `false` renders in different situations:
 
 Renders as `id="false"`: