Update branch from upstream

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,16 +1,16 @@
----
-name: "\U0001F41BBug report"
-about: Something isn't working correctly.
----
-
-**Do you want to request a _feature_ or report a _bug_?**
-
-(If this is a _usage question_, please **do not post it here**—post it on [Stack Overflow](http://stackoverflow.com/questions/tagged/redux) instead. If this is not a “feature” or a “bug”, or the phrase “How do I...?” applies, then it's probably a usage question.)
-
-**What is the current behavior?**
-
-**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar.**
-
-**What is the expected behavior?**
-
-**Which versions of Redux, and which browser and OS are affected by this issue? Did this work in previous versions of Redux?**
+---
+name: "\U0001F41BBug report"
+about: Something is wrong with Redux.
+---
+
+**Do you want to request a _feature_ or report a _bug_?**
+
+(If this is a _usage question_, please **do not post it here**—post it on [Stack Overflow](http://stackoverflow.com/questions/tagged/redux) instead. If this is not a “feature” or a “bug”, or the phrase “How do I...?” applies, then it's probably a usage question.)
+
+**What is the current behavior?**
+
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar.**
+
+**What is the expected behavior?**
+
+**Which versions of Redux, and which browser and OS are affected by this issue? Did this work in previous versions of Redux?**

.github/ISSUE_TEMPLATE/Custom.md

@@ -1,9 +1,9 @@
----
-name: "\U0001F914Support/Usage Question"
-about: For usage questions, please use Stack Overflow or Reactiflux!
----
-
-This is a bug tracker, not a support system. For usage questions, please use Stack Overflow or Reactiflux where there are a lot more people ready to help you out. Thanks!
-
-https://stackoverflow.com/questions/tagged/redux  
-https://www.reactiflux.com/
+---
+name: "\U0001F914Support/Usage Question"
+about: For usage questions, please use Stack Overflow or Reactiflux!
+---
+
+This is a bug tracker, not a support system. For usage questions, please use Stack Overflow or Reactiflux where there are a lot more people ready to help you out. Thanks!
+
+https://stackoverflow.com/questions/tagged/redux  
+https://www.reactiflux.com/

.gitignore

@@ -5,3 +5,8 @@ dist
 lib
 es
 coverage
+
+website/translated_docs
+website/build/
+website/node_modules
+website/i18n/*

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Visit the [issue tracker](https://github.com/reduxjs/redux/issues) to find a lis
 
 Fork, then clone the repo:
 
-```
+```sh
 git clone https://github.com/your-username/redux.git
 ```
 
@@ -44,27 +44,27 @@ git clone https://github.com/your-username/redux.git
 
 Running the `build` task will create a CommonJS module-per-module build, a ES Modules build and a UMD build.
 
-```
+```sh
 npm run build
 ```
 
 ### Testing and Linting
 
 To only run linting:
 
-```
+```sh
 npm run lint
 ```
 
 To only run tests:
 
-```
+```sh
 npm run test
 ```
 
 To continuously watch and run tests, run the following:
 
-```
+```sh
 npm run test:watch
 ```
 
@@ -84,7 +84,7 @@ When adding a new example, please adhere to the style and format of the existing
 
 To test the official Redux examples, run the following:
 
-```
+```sh
 npm run examples:test
 ```
 

README.md

@@ -8,6 +8,8 @@ It helps you write applications that behave consistently, run in different envir
 You can use Redux together with [React](https://reactjs.org), or with any other view library.  
 It is tiny (2kB, including dependencies).
 
+> **Note**: We are currently planning a rewrite of the Redux docs. Please take some time to **[fill out this survey on what content is most important in a docs site](https://docs.google.com/forms/d/e/1FAIpQLSfzIkY3fXZ8PrQKScYMK0YoEgALfAK2qQ0mOj1_ibKv2qDTuQ/viewform)**. Thanks!
+
 [![build status](https://img.shields.io/travis/reduxjs/redux/master.svg?style=flat-square)](https://travis-ci.org/reduxjs/redux)
 [![npm version](https://img.shields.io/npm/v/redux.svg?style=flat-square)](https://www.npmjs.com/package/redux)
 [![npm downloads](https://img.shields.io/npm/dm/redux.svg?style=flat-square)](https://www.npmjs.com/package/redux)
@@ -90,7 +92,7 @@ Even if you haven't used Flux or Elm, Redux only takes a few minutes to get star
 
 To install the stable version:
 
-```
+```sh
 npm install --save redux
 ```
 
@@ -108,7 +110,7 @@ The Redux source code is written in ES2015 but we precompile both CommonJS and U
 
 Most likely, you'll also need [the React bindings](https://github.com/reduxjs/react-redux) and [the developer tools](https://github.com/reduxjs/redux-devtools).
 
-```
+```sh
 npm install --save react-redux
 npm install --save-dev redux-devtools
 ```
@@ -215,7 +217,7 @@ The **[Building React Applications with Idiomatic Redux](https://egghead.io/cour
 **[Practical Redux](https://www.educative.io/collection/5687753853370368/5707702298738688/)** is a paid interactive course by Redux co-maintainer [Mark Erikson](https://twitter.com/acemarke). The course is designed to show how to apply the basic concepts of Redux to building something larger than a TodoMVC application. It includes real-world topics like:
 
 - Adding Redux to a new Create-React-App project and configuring Hot Module Replacement for faster development
-- Controling your UI behavior with Redux
+- Controlling your UI behavior with Redux
 - Using the Redux-ORM library to manage relational data in your Redux store
 - Building a master/detail view to display and edit data
 - Writing custom advanced Redux reducer logic to solve specific problems
@@ -230,7 +232,7 @@ The course is based on Mark's original free **["Practical Redux" blog tutorial s
 Redux co-maintainer [Mark Erikson](https://twitter.com/acemarke) has put together a [**Redux Fundamentals workshop**, and slides are available here](https://blog.isquaredsoftware.com/2018/06/redux-fundamentals-workshop-slides/). They cover:
 
 - The history and purpose of Redux
-- Reducers, actions, and working with a Redux store
+- Reducers and actions, and working with a Redux store
 - Using Redux with React
 - Using and writing Redux middleware
 - Working with AJAX calls and other side effects
@@ -239,14 +241,14 @@ Redux co-maintainer [Mark Erikson](https://twitter.com/acemarke) has put togethe
 
 ## Documentation
 
-- [Introduction](http://redux.js.org/introduction/index.html)
-- [Basics](http://redux.js.org/basics/index.html)
-- [Advanced](http://redux.js.org/advanced/index.html)
-- [Recipes](http://redux.js.org/recipes/index.html)
-- [FAQ](http://redux.js.org/FAQ.html)
-- [Troubleshooting](http://redux.js.org/Troubleshooting.html)
-- [Glossary](http://redux.js.org/Glossary.html)
-- [API Reference](http://redux.js.org/api/index.html)
+- [Introduction](http://redux.js.org/introduction)
+- [Basics](http://redux.js.org/basics)
+- [Advanced](http://redux.js.org/advanced)
+- [Recipes](http://redux.js.org/recipes)
+- [FAQ](http://redux.js.org/faq)
+- [Troubleshooting](http://redux.js.org/troubleshooting)
+- [Glossary](http://redux.js.org/glossary)
+- [API Reference](http://redux.js.org/api)
 
 For PDF, ePub, and MOBI exports for offline reading, and instructions on how to create them, please see: [paulkogel/redux-offline-docs](https://github.com/paulkogel/redux-offline-docs).
 
@@ -260,6 +262,7 @@ Almost all examples have a corresponding CodeSandbox sandbox. This is an interac
 - [**Counter**](https://redux.js.org/introduction/examples#counter): [Source](https://github.com/reduxjs/redux/tree/master/examples/counter) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/counter)
 - [**Todos**](https://redux.js.org/introduction/examples#todos): [Source](https://github.com/reduxjs/redux/tree/master/examples/todos) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/todos)
 - [**Todos with Undo**](https://redux.js.org/introduction/examples#todos-with-undo): [Source](https://github.com/reduxjs/redux/tree/master/examples/todos-with-undo) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/todos-with-undo)
+- [**Todos w/ Flow**](https://redux.js.org/introduction/examples#todos-flow): [Source](https://github.com/reduxjs/redux/tree/master/examples/todos-flow)
 - [**TodoMVC**](https://redux.js.org/introduction/examples#todomvc): [Source](https://github.com/reduxjs/redux/tree/master/examples/todomvc) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/todomvc)
 - [**Shopping Cart**](https://redux.js.org/introduction/examples#shopping-cart): [Source](https://github.com/reduxjs/redux/tree/master/examples/shopping-cart) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/shopping-cart)
 - [**Tree View**](https://redux.js.org/introduction/examples#tree-view): [Source](https://github.com/reduxjs/redux/tree/master/examples/tree-view) | [Sandbox](https://codesandbox.io/s/github/reduxjs/redux/tree/master/examples/tree-view)