Version 2.6.v2.6

Include the usual generate new .pot file, gettext-merge, push to
Transifex, pull from Transifex step.

3 files changed, 45 insertions, 5 deletions

diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md
index abc73da1f..b62e9f531 100644
--- a/docs/_includes/admin-tasks-content.md
+++ b/docs/_includes/admin-tasks-content.md
@@ -35,11 +35,14 @@ members will see reports within these categories by default.
 
 <span class="admin-task__permissions">Permissions required: none</span>
 
-If required, you can also use the controls to the right of the screen to zoom in or out, or pan across
-the map. As you’ll see, the list of reports always reflects the area you are viewing on the map, so
-this is another way of refining your view.
-
-Once you've found a satisfactory view, and if you are likely to want to revisit it, click on the 'Permalink' button at the bottom of the screen. This will alter the URL displayed in your browser, and allow you it as a bookmark which you may revisit, so you don't have to define the location again in the future.
+If required, you can also use the controls to the right of the screen to zoom
+in or out, or pan across the map. As you’ll see, the list of reports and URL
+(web address) always reflect the area you are viewing on the map, so this is
+another way of refining your view.
+
+Once you've found a satisfactory view, and if you are likely to want to revisit
+it, you can bookmark or otherwise take a copy of the URL displayed in your
+browser, so you don't have to define the location again in the future.
 
 </div>
 
diff --git a/docs/_posts/2019-04-29-v2.6.md b/docs/_posts/2019-04-29-v2.6.md
new file mode 100644
index 000000000..6e74b87f5
--- /dev/null
+++ b/docs/_posts/2019-04-29-v2.6.md
@@ -0,0 +1,37 @@
+---
+layout: post
+title: Version 2.6
+author: matthew
+---
+
+<div class="r" align="right">
+<img src="/assets/posts/v2.6-image.jpeg" alt="">
+Image &copy; <a href="https://twitter.com/StillWalkers">Ben Waddington</a>
+</div>
+
+Today we have released **version 2.6** of FixMyStreet.
+
+This release fixes a cross-site scripting security issue where someone could
+create a report through the site with a specially constructed query parameter,
+and then viewing that report on the admin report edit page would allow the
+report creator to run their own JavaScript. We have also released version 2.5.1
+which is identical to 2.5 including this fix.
+
+There's a new, optional, feature to auto-suggest similar nearby problems while
+reporting, to discourage duplicate reports; and the map state is now updated in
+the URL to make sharing links easier. A bit more work has been done on
+moderation, spotting conflicts and showing moderation history to staff on
+report pages, as well as in the admin.
+
+Mostly this release is bugfixes, please see the
+[changelog](https://github.com/mysociety/fixmystreet/releases/tag/v2.6) for
+full details.
+
+## Upgrading
+
+The admin body and user sections have been refactored – if you have custom
+templates/code, you may need to update links to those.
+
+If you wish the default for the showname checkbox to be checked, you can add
+`sub default_show_name { 1 }` to your cobrand file.
+
diff --git a/docs/assets/posts/v2.6-image.jpeg b/docs/assets/posts/v2.6-image.jpeg
new file mode 100644
index 000000000..478be2698
--- /dev/null
+++ b/docs/assets/posts/v2.6-image.jpeg