From 7cf376483f85bd39b9b9512a8818ecc6d85860ea Mon Sep 17 00:00:00 2001 From: Jim Date: Wed, 10 Jun 2015 13:32:03 -0700 Subject: [PATCH] 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 | 6 +++--- docs/tips/13-false-in-jsx.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/docs/ref-01-top-level-api.md b/docs/docs/ref-01-top-level-api.md index de8bcacba4..127df5c3f6 100644 --- a/docs/docs/ref-01-top-level-api.md +++ b/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. diff --git a/docs/tips/13-false-in-jsx.md b/docs/tips/13-false-in-jsx.md index 15567b0091..ac67400a2e 100644 --- a/docs/tips/13-false-in-jsx.md +++ b/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"`: