From 32755442cef687e060cfcc0932685032f93a1948 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Oct 2015 10:33:35 +0530
Subject: [PATCH] version 2.40.0

---
 Changelog.yaml           | 36 ++++++++++++++++++++++++++++++++++++
 src/calibre/constants.py |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 9ac2855cdc..988202b660 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,42 @@
 #   new recipes:
 #     - title: 
 
+- version: 2.40.0
+  date: 2015-10-02
+
+  new features:
+    - title: "A new tool to apply Tag mapper rules to existing books in the library. To use it, go to Preferences->Toolbars and add the tool to the toolbar."
+
+    - title: "Kindle driver: Detect books in Amazon's new KFX format present on e-ink kindles."
+      description: "Note that this only detects KFX books and allows you to delete them. You cannot copy them to your calibre library. Doing so would be pointless anyway, as KFX books are specialised for individual devices. Instead go to your 'Manage my content' page an amazon.com and download them from there -- this will give you a regular azw3 file you can add to calibre."
+      tickets: [1496206]
+
+  bug fixes:
+    - title: "TXT Output: Do not fail when input contains HTML comments with double hyphens in the comment text."
+
+    - title: "E-book polishing: Show a confirmation if the user selects both the add and remove jacket actions."
+
+    - title: "Edit Book: Fix order of checkboxes in filter style information tool is random"
+
+    - title: "PDB Input: Ingore malformed metadata records."
+      tickets: [1499878]
+
+    - title: "Revert change in previous release to workaround broken xdg-open on linux. Apparently xdg-open is so badly broken that working around it is not possible."
+      tickets: [1500226]
+
+    - title: "ZIP Output: Fix system encoding being used instead of UTF-8 for html files."
+      tickets: [1499514]
+
+  improved recipes:
+    - The Philosopher's Magazine
+    - Harper's Magazine
+    - Ambito
+    - Perfil
+    - Telam
+    - Infobae.com
+    - La Nacion
+    - Clarin
+
 - version: 2.39.0
   date: 2015-09-25
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 3edfd47eb3..1d3764cecc 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (2, 39, 0)
+numeric_version = (2, 40, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"