update component api docs
li.li committed
Aug 12, 2015 at 11:32 UTC
f027ca8ca061df9b7483bb3c5d8070434a0af11a
1 file changed
+1
-1
docs/docs/ref-02-component-api.md
+1
-1
@@ -16,7 +16,7 @@ Instances of a React Component are created internally in React when rendering. T
16
```javascript
17
setState(function|object nextState[, function callback])
18
```
19
-Merges nextState with the current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks.
19
+Performs a shallow merge of nextState into current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks.
20
21
The first argument can be an object (containing zero or more keys to update) or a function (of state and props) that returns an object containing keys to update.
22