Merge branch 'master' of https://github.com/netlify/netlify-cms into 783-replace-media

Author: Dammmien

.all-contributorsrc

@@ -439,6 +439,15 @@
       "contributions": [
         "design"
       ]
+    },
+    {
+      "login": "davidejones",
+      "name": "David Jones",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/871552?v=4",
+      "profile": "http://davidejones.com",
+      "contributions": [
+        "doc"
+      ]
     }
   ]
 }

README.md

@@ -1,5 +1,5 @@
 # Netlify CMS
-[![All Contributors](https://img.shields.io/badge/all_contributors-54-orange.svg)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-55-orange.svg)](#contributors)
 [![](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/netlify/netlifycms)
 
 A CMS for static site generators. Give non-technical users a simple way to edit
@@ -56,7 +56,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 | [<img src="https://avatars3.githubusercontent.com/u/4349324?v=4" width="100px;"/><br /><sub><b>Benjamin Kniffler</b></sub>](https://github.com/bkniffler)<br /> | [<img src="https://avatars1.githubusercontent.com/u/845983?v=4" width="100px;"/><br /><sub><b>Mike Wickett</b></sub>](http://www.wickett.ca)<br /> | [<img src="https://avatars1.githubusercontent.com/u/2751799?v=4" width="100px;"/><br /><sub><b>Rory Claasen</b></sub>](http://roryclaasen.me)<br /> | [<img src="https://avatars3.githubusercontent.com/u/724844?v=4" width="100px;"/><br /><sub><b>Frederic Brodbeck</b></sub>](http://www.freder.io/)<br /> | [<img src="https://avatars2.githubusercontent.com/u/1245746?v=4" width="100px;"/><br /><sub><b>Stuart Dum</b></sub>](https://github.com/simplystuart)<br /> | [<img src="https://avatars0.githubusercontent.com/u/8184251?v=4" width="100px;"/><br /><sub><b>Ryan Watters</b></sub>](https://github.com/rdwatters)<br /> | [<img src="https://avatars3.githubusercontent.com/u/4315?v=4" width="100px;"/><br /><sub><b>Helder S Ribeiro</b></sub>](https://twitter.com/hsribei)<br /> |
 | [<img src="https://avatars1.githubusercontent.com/u/979966?v=4" width="100px;"/><br /><sub><b>Artem Govorov</b></sub>](http://dm.gl)<br /> | [<img src="https://avatars3.githubusercontent.com/u/2683300?v=4" width="100px;"/><br /><sub><b>Cédric Delpoux</b></sub>](http://xuopled.netlify.com/)<br /> | [<img src="https://avatars3.githubusercontent.com/u/83225?v=4" width="100px;"/><br /><sub><b>imorente</b></sub>](https://github.com/imorente)<br /> | [<img src="https://avatars3.githubusercontent.com/u/5230460?v=4" width="100px;"/><br /><sub><b>David Francoeur</b></sub>](http://davidfrancoeur.com)<br /> | [<img src="https://avatars3.githubusercontent.com/u/1954977?v=4" width="100px;"/><br /><sub><b>Rusta</b></sub>](https://github.com/Rusta)<br /> | [<img src="https://avatars1.githubusercontent.com/u/1299786?v=4" width="100px;"/><br /><sub><b>Henrik Lau Eriksson</b></sub>](http://henrik.laueriksson.com)<br /> | [<img src="https://avatars0.githubusercontent.com/u/1294877?v=4" width="100px;"/><br /><sub><b>Kraig Walker</b></sub>](https://www.kraigwalker.com)<br /> |
 | [<img src="https://avatars1.githubusercontent.com/u/2994311?v=4" width="100px;"/><br /><sub><b>Rich Cook</b></sub>](http://www.TalesofMurder.com)<br /> | [<img src="https://avatars3.githubusercontent.com/u/1309950?v=4" width="100px;"/><br /><sub><b>Damien Van Der Windt</b></sub>](https://github.com/damienvdw)<br /> | [<img src="https://avatars2.githubusercontent.com/u/1571899?v=4" width="100px;"/><br /><sub><b>Matt Jared</b></sub>](http://mattjared.github.io/)<br /> | [<img src="https://avatars1.githubusercontent.com/u/1100280?v=4" width="100px;"/><br /><sub><b>bruce-one</b></sub>](https://github.com/bruce-one)<br /> | [<img src="https://avatars3.githubusercontent.com/u/103008?v=4" width="100px;"/><br /><sub><b>Frank Taillandier</b></sub>](https://frank.taillandier.me)<br />[📖](https://github.com/netlify/netlify-cms/commits?author=DirtyF "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2936813?v=4" width="100px;"/><br /><sub><b>Aquib Master</b></sub>](http://aquibm.com/)<br />[💻](https://github.com/netlify/netlify-cms/commits?author=aquibm "Code") | [<img src="https://avatars0.githubusercontent.com/u/3147296?v=4" width="100px;"/><br /><sub><b>Eric Jinks</b></sub>](http://ericjinks.com)<br />[💻](https://github.com/netlify/netlify-cms/commits?author=Jinksi "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/784848?v=4" width="100px;"/><br /><sub><b>Tony Alves</b></sub>](https://github.com/talves)<br />[💻](https://github.com/netlify/netlify-cms/commits?author=talves "Code") | [<img src="https://avatars3.githubusercontent.com/u/782?v=4" width="100px;"/><br /><sub><b>Ernie Bello</b></sub>](http://ern.me)<br />[🐛](https://github.com/netlify/netlify-cms/issues?q=author%3Aebello "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/6202476?v=4" width="100px;"/><br /><sub><b>Alexander Kushi-Willis</b></sub>](https://ackushiw.com)<br />[📖](https://github.com/netlify/netlify-cms/commits?author=ackushiw "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/54089?v=4" width="100px;"/><br /><sub><b>Igor Kuznetsov</b></sub>](http://www.igk.ru)<br />[🐛](https://github.com/netlify/netlify-cms/issues?q=author%3Aigk1972 "Bug reports") [💻](https://github.com/netlify/netlify-cms/commits?author=igk1972 "Code") [🔌](#plugin-igk1972 "Plugin/utility libraries") | [<img src="https://avatars2.githubusercontent.com/u/1312538?v=4" width="100px;"/><br /><sub><b>Tim Erickson</b></sub>](http://neutyp.com)<br />[🎨](#design-neutyp "Design") |
+| [<img src="https://avatars3.githubusercontent.com/u/784848?v=4" width="100px;"/><br /><sub><b>Tony Alves</b></sub>](https://github.com/talves)<br />[💻](https://github.com/netlify/netlify-cms/commits?author=talves "Code") | [<img src="https://avatars3.githubusercontent.com/u/782?v=4" width="100px;"/><br /><sub><b>Ernie Bello</b></sub>](http://ern.me)<br />[🐛](https://github.com/netlify/netlify-cms/issues?q=author%3Aebello "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/6202476?v=4" width="100px;"/><br /><sub><b>Alexander Kushi-Willis</b></sub>](https://ackushiw.com)<br />[📖](https://github.com/netlify/netlify-cms/commits?author=ackushiw "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/54089?v=4" width="100px;"/><br /><sub><b>Igor Kuznetsov</b></sub>](http://www.igk.ru)<br />[🐛](https://github.com/netlify/netlify-cms/issues?q=author%3Aigk1972 "Bug reports") [💻](https://github.com/netlify/netlify-cms/commits?author=igk1972 "Code") [🔌](#plugin-igk1972 "Plugin/utility libraries") | [<img src="https://avatars2.githubusercontent.com/u/1312538?v=4" width="100px;"/><br /><sub><b>Tim Erickson</b></sub>](http://neutyp.com)<br />[🎨](#design-neutyp "Design") | [<img src="https://avatars0.githubusercontent.com/u/871552?v=4" width="100px;"/><br /><sub><b>David Jones</b></sub>](http://davidejones.com)<br />[📖](https://github.com/netlify/netlify-cms/commits?author=davidejones "Documentation") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

example/index.html

@@ -27,7 +27,7 @@ module.exports = merge.smart(require('./webpack.base.js'), {
       NETLIFY_CMS_VERSION: JSON.stringify(require("./package.json").version),
     }),
 
-    // Combine/hoist module scopes when possibile.
+    // Combine/hoist module scopes when possible.
     new webpack.optimize.ModuleConcatenationPlugin(),
 
     // Minify and optimize the JavaScript

webpack.prod.js

@@ -63,10 +63,11 @@ If you would like to facilitate your own OAuth authentication rather than use Ne
 can use one of the community-maintained projects below. Feel free to [submit a pull request](https://github.com/netlify/netlify-cms/blob/master/CONTRIBUTING.md) if you'd like to add yours!
 
 
-| Author                                 | Supported Git hosts       | Languages | Link                                                                         |
-|----------------------------------------|---------------------------|-----------|------------------------------------------------------------------------------|
-| [@vencax](https://github.com/vencax)   | GitHub, GitHub Enterprise | Node.js   | [Repo](https://github.com/vencax/netlify-cms-github-oauth-provider)          |
-| [@igk1972](https://github.com/igk1972) | GitHub, GitHub Enterprise | Go        | [Repo](https://github.com/igk1972/netlify-cms-oauth-provider-go)             |
+| Author                                         | Supported Git hosts       | Languages | Link                                                                         |
+|------------------------------------------------|---------------------------|-----------|------------------------------------------------------------------------------|
+| [@vencax](https://github.com/vencax)           | GitHub, GitHub Enterprise | Node.js   | [Repo](https://github.com/vencax/netlify-cms-github-oauth-provider)          |
+| [@igk1972](https://github.com/igk1972)         | GitHub, GitHub Enterprise | Go        | [Repo](https://github.com/igk1972/netlify-cms-oauth-provider-go)             |
+| [@davidejones](https://github.com/davidejones) | GitHub, GitHub Enterprise | Python    | [Repo](https://github.com/davidejones/netlify-cms-oauth-provider-python)     |
 
 Check each project's documentation for instructions on how to configure it.
 
@@ -94,4 +95,4 @@ be nested under that field.
 | `branch`       | `master`                                                          | The branch where published content is stored. All CMS commits and PRs are made to this branch.                                                       |
 | `api_root`     | `https://api.github.com` (ignored for `git-gateway` backend)      | The API endpoint. Only necessary in certain cases, like with GitHub Enterprise.                                                                      |
 | `site_domain`  | `location.hostname` (or `cms.netlify.com` when on `localhost`)    | Sets the `site_id` query param sent to the API endpoint. Non-Netlify auth setups will often need to set this for local development to work properly. |
-| `base_url`     | `https://api.netlify.com`                                         | OAuth client URL for the `github` backend. **Required** when using an external OAuth server with the `github` backend.                               |
+| `base_url`     | `https://api.netlify.com`                                         | OAuth client URL for the `github` backend. **Required** when using an external OAuth server with the `github` backend.                               |

website/site/content/docs/authentication-backends.md

@@ -88,7 +88,7 @@ These settings determine how collection files are parsed and saved. Both are opt
 
 `extension` determines the file extension searched for when finding existing entries in a folder collection determines the file extension saved for new collection items. It accepts the following values: `yml`, `yaml`, `toml`, `json`, `md`, `markdown`, `html`.
 
-You may also specify a custom `extention` not included in the list above, as long as the collection files can be parsed and saved in one of the supported formats below.
+You may also specify a custom `extension` not included in the list above, as long as the collection files can be parsed and saved in one of the supported formats below.
 
 `format` determines how collection files are parsed and saved. It will be inferred if the `extension` field or existing collection file extensions match one of the supported extensions above. It accepts the following values:
 

website/site/content/docs/configuration-options.md

@@ -99,7 +99,7 @@ The file widget allows editors to upload a file or select an existing one from t
 
   ```yaml
   - label: "Manual PDF"
-    **Name:** "manual_pdf"
+    name: "manual_pdf"
     widget: "file"
     default: "/uploads/general-manual.pdf"
   ```
@@ -281,8 +281,8 @@ The select widget allows you to pick a single string value from a dropdown menu.
 - **Options:**
   - `default`: accepts a string; defaults to an empty string
   - `options`: (**required**) a list of options for the dropdown menu; can be listed in two ways:
-    - string values: the label displayed in the dropdown is the value saved in the file
-    - object with `label` and `value` fields: the label displays in the dropdown; the value is saved in the file
+      - string values: the label displayed in the dropdown is the value saved in the file
+      - object with `label` and `value` fields: the label displays in the dropdown; the value is saved in the file
 - **Example** (options as strings):
 
   ```yaml