Merge pull request #1281 from zbjornson/zb/200

Ship 2.0.0
Automattic · Oct 14, 2018 · 2cf63ee · 2cf63ee
2 parents 8064216 + 4bc2b04
commit 2cf63ee
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
 project adheres to [Semantic Versioning](http://semver.org/).
 
-2.0.0 (unreleased -- encompasses all alpha versions)
+(Unreleased)
+==================
+### Changed
+### Added
+### Fixed
+
+2.0.0
 ==================
 
 **Upgrading from 1.x**

diff --git a/Readme.md b/Readme.md
@@ -1,14 +1,5 @@
 # node-canvas
 
-## This is the documentation for version 2.0.0-alpha
-Alpha versions of 2.0 can be installed using `npm install canvas@next`.
-
-See the [changelog](https://github.com/Automattic/node-canvas/blob/master/CHANGELOG.md) for a guide to upgrading from 1.x to 2.x.
-
-**For version 1.x documentation, see [the v1.x branch](https://github.com/Automattic/node-canvas/tree/v1.x)**
-
------
-
 [![Build Status](https://travis-ci.org/Automattic/node-canvas.svg?branch=master)](https://travis-ci.org/Automattic/node-canvas)
 [![NPM version](https://badge.fury.io/js/canvas.svg)](http://badge.fury.io/js/canvas)
 
@@ -70,6 +61,12 @@ loadImage('examples/images/lime-cat.jpg').then((image) => {
 })
 ```
 
+## Upgrading from 2.x
+
+See the [changelog](https://github.com/Automattic/node-canvas/blob/master/CHANGELOG.md) for a guide to upgrading from 1.x to 2.x.
+
+For version 1.x documentation, see [the v1.x branch](https://github.com/Automattic/node-canvas/tree/v1.x).
+
 ## Documentation
 
 This project is an implementation of the Web Canvas API and implements that API as closely as possible. For API documentation, please visit [Mozilla Web Canvas API](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API). (See [Compatibility Status](https://github.com/Automattic/node-canvas/wiki/Compatibility-Status) for the current API compliance.) All utility methods and non-standard APIs are documented below.