Merge branch 'master' of github.com:davidkpiano/react-redux-form

Author: davidkpiano

README.md

@@ -3,7 +3,7 @@
 [![Join the chat at https://gitter.im/react-redux-form/Lobby](https://badges.gitter.im/react-redux-form/Lobby.svg)](https://gitter.im/react-redux-form/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/davidkpiano/react-redux-form.svg?branch=master)](https://travis-ci.org/davidkpiano/react-redux-form) [![npm version](https://badge.fury.io/js/react-redux-form.svg)](https://badge.fury.io/js/react-redux-form)
 
-## [🆕 Read the Documentation](https://davidkpiano.github.io/react-redux-form)
+## [🆕 Read the Documentation](https://davidkpiano.github.io/react-redux-form/docs.html)
 
 Or, if you're using an old version, [read the v0.14.x documentation](https://davidkpiano.gitbooks.io/react-redux-form/content/)
 

docs/api/actions.md

@@ -368,7 +368,7 @@ The "touched" state indicates that this model has been interacted with.
 
 <h2 id="actions-setUntouched"></h2>
 ## `actions.setUntouched(model)`
-Returns an action that, when handled by a [`formReducer`](TODO), changes the `.touched` state to `true`.
+Returns an action that, when handled by a [`formReducer`](TODO), changes the `.touched` state to `false`.
 
 An "untouched" field indicates that this model has not been interacted with yet.
 

examples/immutable/components/submit-button.js

@@ -11,7 +11,11 @@ SubmitButton.propTypes = {
   user: React.PropTypes.instanceOf(Immutable.Map).isRequired,
 };
 
-const mapStateToProps = (state) => ({ user: state.get('user') });
+const mapStateToProps = (state) => {
+  // Enable one of the two:
+  return { user: state.user };  // Enable when using redux
+  // return { user: state.get('user') };  // Enable when using redux-immutable
+};
 
 export default connect(mapStateToProps)(SubmitButton);
 

examples/immutable/store.js

@@ -3,7 +3,11 @@ import {
   createStore,
   applyMiddleware,
 } from 'redux';
-import { combineReducers } from 'redux-immutable';
+
+// Enable one of the two:
+import { combineReducers } from 'redux';
+//import { combineReducers } from 'redux-immutable';
+
 import { createForms } from 'react-redux-form/immutable';
 import thunk from 'redux-thunk';
 import Immutable from 'immutable';