Merge pull request #147 from alphagov/release

2.1.0 release notes and version bump

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.1.0
+
+New documentation to make it easier to install and run from scratch - tested with users and everything! The kit will now copy new files from assets to public (previously only updates to existing files were copied). It's easier to run multiple prototypes at once - the kit will automatically find a free port to run on.
+
+- Add default cookie message (#150)
+- New documentation (#145)
+- Add example pages for branching (#143)
+- Use grunt-sync for assets (#141)
+- Fix warning for npm engine (#140)
+- Add tmuxp config files to gitignore (#132)
+- Improve 'port in use' errors, find a new port (#130)
+
 # 2.0.0
 
 This release switches templating language from [Mustache](http://mustache.github.io/) to [Nunjucks](https://mozilla.github.io/nunjucks/).

README.md

@@ -2,7 +2,7 @@
 
 ## News
 
-**Version 2.0.0 update:** the latest version of the kit (2.0.0) is not compatible with previous versions. If you update your old prototypes you'll need to [convert them as well](https://github.com/alphagov/govuk_prototype_kit/blob/master/docs/updating-the-kit.md).
+**Upgrading from version 1 to 2:** the latest version of the kit (2.0.0 and later) is not compatible with previous versions. If you update your old prototypes you'll need to [convert them as well](https://github.com/alphagov/govuk_prototype_kit/blob/master/docs/updating-the-kit.md).
 
 ## About the prototype kit
 

VERSION.txt

@@ -1 +1 @@
-2.0.0
+2.1.0

docs/install/install-the-kit.md

@@ -2,7 +2,7 @@
 
 ## Download the kit as a zip
 
-The simplest way to get the kit is to [download it as a zip](https://github.com/alphagov/govuk_prototype_kit/archive/v2.0.0.zip). You'll use a new copy of the kit for each new prototype you make. That way your prototypes don’t interfere with each other.
+The simplest way to get the kit is to [download it as a zip](https://github.com/alphagov/govuk_prototype_kit/archive/v2.1.0.zip). You'll use a new copy of the kit for each new prototype you make. That way your prototypes don’t interfere with each other.
 
 ### Decide where you want to keep your prototypes
 
@@ -20,7 +20,7 @@ Create a folder called `projects` in your `Documents` or `My Documents` folder.
 
 ### Unzip the kit
 
-Unzip the kit you downloaded - you should end up with a folder called `govuk_prototype_kit-2.0.0`
+Unzip the kit you downloaded - you should end up with a folder called `govuk_prototype_kit-2.1.0`
 
 ### Rename the kit
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express-prototype",
   "description": "GOVUK prototyping app in Express",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "private": true,
   "engines": {
     "node": ">=4.0 <5.0"