Prepare for release v2.6v2.6

3 files changed, 18 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4c119fd..7045b15 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+Buku v2.6
+2016-11-04
+
+Modifications
+- Support Markdown import/export
+- Support regex search
+- New option `--upstream` to check latest upstream version
+- Fix search and delete behaviour
+- Lot of code reformatting, performance improvements
+- Use delayed commit wherever possible (e.g. bulk deletion cases)
+- When a range is specified, consider 0 as ALL
+- Added option to control verbosity in some APIs
+- In-source documentation update
+
+-------------------------------------------------------------------------------
+
 Buku v2.5
 2016-10-20
 
diff --git a/buku b/buku
index 1b27564..ea44f94 100755
--- a/buku
+++ b/buku
@@ -47,7 +47,7 @@ tagsearch = False  # Search bookmarks by tag
 title_data = None  # Title fetched from a webpage
 interrupted = False  # Received SIGINT
 DELIM = ','  # Delimiter used to store tags in DB
-_VERSION_ = '2.5'  # Program version
+_VERSION_ = '2.6'  # Program version
 
 # Crypto globals
 BLOCKSIZE = 65536
diff --git a/buku.1 b/buku.1
index 200da39..bcd556a 100644
--- a/buku.1
+++ b/buku.1
@@ -1,4 +1,4 @@
-.TH "BUKU" "1" "Oct 2016" "Version 2.5" "User Commands"
+.TH "BUKU" "1" "Nov 2016" "Version 2.6" "User Commands"
 .SH NAME
 buku \- A powerful command-line bookmark manager. Your mini web!
 .SH SYNOPSIS