@jaffathecake - can you sort this merge.
On 27 Jan 2014 10:05, "Mathias Bynens" <notifications@github.com> wrote:

> In content/tutorials/es6/promises/en/index.html:
>
> > @@ -183,14 +183,13 @@ <h2 id="toc-javascript-promises">Promises arrive in JavaScript!</h2>
> >  <p>Although they're a JavaScript feature, the DOM isn't afraid to use them. In fact, all new DOM APIs with async success/failure methods will use promises. This is happening already with <a href="https://dvcs.w3.org/hg/quota/raw-file/tip/Overview.html#idl-def-StorageQuota">Quota Management</a>, <a href="http://dev.w3.org/csswg/css-font-load-events/#dom-fontface-ready">Font Load Events</a>,<a href="https://github.com/slightlyoff/ServiceWorker/blob/cf459d473ae09f6994e8539113d277cbd2bce939/service_worker.ts#L17"> ServiceWorker</a>, <a href="http://webaudio.github.io/web-midi-api/#widl-Navigator-requestMIDIAccess-Promise-MIDIOptions-options">Web MIDI</a>, <a href="https://github.com/whatwg/streams#basereadablestream">Streams</a>, and more.</p>
> >
> >  <h2 id="toc-browser-support">Browser support &amp; polyfill</h2>
> > -<p>There are already (partial) implementations of promises in browsers today.</p>
> > -<p>When in Chrome, do as the Chromans do. <a href="https://www.google.com/intl/en/chrome/browser/canary.html">Download Canary</a>, which has promises enabled by default. Alternatively, if you're of the Firefox persuasion, <a href="http://nightly.mozilla.org/">grab their latest nightly</a>, which also features promises.</p>
> > +<p>There are already implementations of promises in browsers today.</p>
> > +<p>As of Chrome 32 and Opera 19, promises are enabled by default. Alternatively, if you're of the Firefox persuasion, <a href="http://nightly.mozilla.org/">grab their latest nightly</a>, which has <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=918806">partial</a> promises support.</p>
>
> So sorry I had to get rid of the joke here :( You can probably work it
> back in somehow.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/html5rocks/www.html5rocks.com/pull/921/files#r9197279>
> .
>