diff --git a/AUTHORS b/AUTHORS
index 880169dd4295a2924555c5e38a957e2bd434f4d3..09fe9a893c7964ecc221ff2c3f7bc78da1fca5d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Alex Piggott
Aliaksei Chapyzhenka
Allen Sarkisyan
Amin Shali
+Amin Ullah Khan
amshali@google.com
Amsul
amuntean
@@ -59,8 +60,8 @@ Anthony Gégo
Anthony Grimes
Anton Kovalyov
AQNOUCH Mohammed
-Arnab Bose
areos
+Arnab Bose
as3boyan
AtomicPages LLC
Atul Bhouraskar
@@ -97,6 +98,7 @@ Chandra Sekhar Pydi
Charles Skelton
Cheah Chu Yeow
Chris Coyier
+Chris Ford
Chris Granger
Chris Houseknecht
Chris Lohfink
@@ -136,6 +138,7 @@ David Pathakjee
David Vázquez
deebugger
Deep Thought
+Devin Abbott
Devon Carew
dignifiedquire
Dimage Sapelkin
@@ -178,14 +181,15 @@ Gabriel Horner
Gabriel Nahmias
galambalazs
Gautam Mehta
+Gavin Douglas
gekkoe
Gerard Braad
Gergely Hegykozi
Giovanni Calò
Glenn Jorde
Glenn Ruehle
-Google Inc.
Golevka
+Google Inc.
Gordon Smith
Grant Skinner
greengiant
@@ -400,6 +404,7 @@ noragrossman
Norman Rzepka
Oreoluwa Onatemowo
pablo
+pabloferz
Page
Panupong Pasupat
paris
@@ -418,10 +423,13 @@ Peter Flynn
peterkroon
Peter Kroon
Philip Stadermann
+Piët Delport
prasanthj
Prasanth J
+Prayag Verma
Radek Piórkowski
Rahul
+Rahul Anand
ramwin1
Randall Mason
Randy Burden
@@ -515,10 +523,12 @@ wenli
Wes Cossick
Wesley Wiser
Will Binns-Smith
+Will Dean
William Jamieson
William Stein
Willy
Wojtek Ptak
+Wu Cheng-Han
Xavier Mendez
Yassin N. Hassan
YNH Webdev
diff --git a/doc/compress.html b/doc/compress.html
index a79b3097a37a3d4dfd64e638ace56cb19891cb2c..46c529646d05745e96924c167e314cff179198a3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@
<input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
<p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
<option value="http://codemirror.net/">HEAD</option>
+ <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
diff --git a/doc/manual.html b/doc/manual.html
index e56899ae907fdb0a2b3d56681b72d3ca2a98ed5c..96e4186ab23c526686867d4a09d6a1ac56c46d62 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,7 @@
<section class=first id=overview>
<h2 style="position: relative">
User manual and reference guide
- <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.10.1</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.11.0</span>
</h2>
<p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index 6df8f04c65b4d00ea5a7c670047d54e744d3f095..43ee827413e86d9b771512e64da7928484be4dea 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
<title>CodeMirror: Release History</title>
<meta charset="utf-8"/>
@@ -30,6 +30,17 @@
<h2>Version 5.x</h2>
+ <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
+
+ <ul>
+ <li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
+ <li>The editor now forwards more <a href="manual.html#event_dom">DOM events</a>: <code>cut</code>, <code>copy</code>, <code>paste</code>, and <code>touchstart</code>. It will also forward <code>mousedown</code> for drag events</li>
+ <li>Fixes a bug where bookmarks next to collapsed spans were not rendered</li>
+ <li>The <a href="../mode/swift/index.html">Swift</a> mode now supports auto-indentation</li>
+ <li>Frontmatters in the <a href="../mode/yaml-frontmatter/index.html">YAML frontmatter</a> mode are now optional as intended</li>
+ <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.10.0...5.11.0">list of patches</a></li>
+ </ul>
+
<p class="rel">21-12-2015: <a href="http://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
<ul class="rel-note">
diff --git a/index.html b/index.html
index 2e8dcc5cfd12c8027c29e6ade360278ec0f0eb36..2bb1f41d1fc567f6d3b45f0bead47d135c74e20f 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
</div>
</div>
<div class=actionsleft>
- Get the current version: <a href="http://codemirror.net/codemirror.zip">5.10</a>.<br>
+ Get the current version: <a href="http://codemirror.net/codemirror.zip">5.11</a>.<br>
You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a> or<br>
read the <a href="doc/releases.html">release notes</a>.<br>
There is a <a href="doc/compress.html">minification helper</a>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 98163e645adecb7afd3c43dba2ecd1ace2625b48..090e4216175e448a79f697a07e0a955cddee4fb2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8884,7 +8884,7 @@
// THE END
- CodeMirror.version = "5.10.1";
+ CodeMirror.version = "5.11.0";
return CodeMirror;
});
diff --git a/package.json b/package.json
index 165631b906207c963485e5c5ddc250b42c270ba4..d1783b495e291d9e2dc5d4e74a902c4ecddf298b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"5.10.1",
+ "version":"5.11.0",
"main": "lib/codemirror.js",
"description": "In-browser code editing made bearable",
"license": "MIT",