From 092a1f1ba685b0153284dde86f31fae8f7266cc0 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Mon, 18 Sep 2017 11:33:49 +0530
Subject: [PATCH] Prepare for release v3.4.

---
 CHANGELOG | 11 +++++++++++
 README.md |  2 +-
 buku.1    |  2 +-
 buku.py   |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a59ae24..1934d43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+Buku 3.4
+2017-09-18
+
+What's in?
+- Export bookmarks (including specific tags) to Buku DB file using `--export`
+- Option `--import` can merge Buku DB files now, option `--merge` is retired
+- Option `--suggest` now works at prompt as well
+- Auto-import issue when Firefox is not installed fixed
+
+-------------------------------------------------------------------------------
+
 Buku 3.3.1
 2017-09-11
 
diff --git a/README.md b/README.md
index 4fa9913..5d83651 100644
--- a/README.md
+++ b/README.md
@@ -200,8 +200,8 @@ POWER TOYS:
       -e, --export file    export bookmarks in Firefox format html
                            export markdown, if file ends with '.md'
                            format: [title](url), 1 entry per line
-                           use --tag to export only specific tags
                            export buku DB, if file ends with '.db'
+                           use --tag to export specific tags
       -i, --import file    import Firefox or Chrome bookmarks html
                            import markdown, if file ends with '.md'
                            import buku DB, if file ends with '.db'
diff --git a/buku.1 b/buku.1
index 1e29c94..9637aab 100644
--- a/buku.1
+++ b/buku.1
@@ -1,4 +1,4 @@
-.TH "BUKU" "1" "Sep 2017" "Version 3.3.1" "User Commands"
+.TH "BUKU" "1" "Sep 2017" "Version 3.4" "User Commands"
 .SH NAME
 buku \- Powerful command-line bookmark manager.
 .SH SYNOPSIS
diff --git a/buku.py b/buku.py
index 5b21dcf..78bea69 100755
--- a/buku.py
+++ b/buku.py
@@ -39,7 +39,7 @@ import urllib3
 from urllib3.util import parse_url, make_headers
 import webbrowser
 
-__version__ = '3.3.1'
+__version__ = '3.4'
 __author__ = 'Arun Prakash Jana <engineerarun@gmail.com>'
 __license__ = 'GPLv3'
 
@@ -3900,7 +3900,7 @@ POSITIONAL ARGUMENTS:
                          export markdown, if file ends with '.md'
                          format: [title](url), 1 entry per line
                          export buku DB, if file ends with '.db'
-                         use --tag to export only specific tags
+                         use --tag to export specific tags
     -i, --import file    import Firefox or Chrome bookmarks html
                          import markdown, if file ends with '.md'
                          import buku DB, if file ends with '.db'