Updated docs and version number in advance

8 files changed, 31 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c9e461c..2b66a3b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,24 +8,12 @@
 
 - I translated for Simplified Chinese.  [\#208](https://github.com/IJHack/QtPass/issues/208)
 - Short fullname hangs QtPass keypair generation process for infinite time [\#202](https://github.com/IJHack/QtPass/issues/202)
-- More options for password generation [\#98](https://github.com/IJHack/QtPass/issues/98)
-- Git hangs on windows [\#71](https://github.com/IJHack/QtPass/issues/71)
-
-**Fixed bugs:**
-
 - view box is trimming whitespace [\#210](https://github.com/IJHack/QtPass/issues/210)
-- Short fullname hangs QtPass keypair generation process for infinite time [\#202](https://github.com/IJHack/QtPass/issues/202)
-
-**Closed issues:**
-
-- PREFIX is now really a prefix [\#185](https://github.com/IJHack/QtPass/issues/185)
-- QtPass, git and windows [\#173](https://github.com/IJHack/QtPass/issues/173)
 
 **Merged pull requests:**
 
 - Allow ssh links [\#211](https://github.com/IJHack/QtPass/pull/211) ([cgonzalez](https://github.com/cgonzalez))
 - Increase maximum password length to 255 [\#209](https://github.com/IJHack/QtPass/pull/209) ([vladimiroff](https://github.com/vladimiroff))
-- Password templates [\#207](https://github.com/IJHack/QtPass/pull/207) ([jounathaen](https://github.com/jounathaen))
 - Updated German Translation [\#206](https://github.com/IJHack/QtPass/pull/206) ([jounathaen](https://github.com/jounathaen))
 - Italian translation [\#204](https://github.com/IJHack/QtPass/pull/204) ([dakk](https://github.com/dakk))
 - keygendialog email and name validition \(issue 202\) [\#203](https://github.com/IJHack/QtPass/pull/203) ([dakk](https://github.com/dakk))
@@ -400,4 +388,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76ccd97b..132dd71f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,3 +21,7 @@ Qt Linguist has very nice in-context translation options [for translators](https
 ## IRC
 
 For questions or brainstorming about features please join #ijhack on freenode.
+
+## Gitter
+
+Or if you prefer to use [gitter](https://gitter.im/IJHack/qtpass)
diff --git a/Doxyfile b/Doxyfile
index 5b3bb737..71394454 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = QtPass
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.5
+PROJECT_NUMBER         = 1.1.6	
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/FAQ.md b/FAQ.md
index e09f71c0..fbf612fc 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -44,10 +44,29 @@ fi
   link `/usr/bin/pinentry` to your pinentry application of choice
   eg: `ln -s /usr/bin/pinentry-qt5 /usr/bin/pinentry`
 
+### I have an other issue with gpg
+
+* Possibly you have you key only in gpg and not in gpg2
+
+```
+gpg --export [ID] > public.key
+gpg --export-secret-key [ID] > private.key
+gpg2 --import public.key
+gpg2 --import private.key
+rm public.key private.key
+```
+Where [ID] is your gpg key-id.
+* It might be the case where it is the other way around, exchange gpg and gpg2 accordingly . .
+
 ### Git doesn't work on Windows
 
 git for Windows comes with an `ssh-askpass` compatible command, git `gui--askpass` (located in `/mingw64/libexec/git-core/git-gui--askpass` on PortableGit version, presumably some place similar for the installed version).
 
+### Git has issues with GPG SSH Authentication
+
+This tutorial might resolve your issues.
+https://github.com/git-for-windows/git/wiki/OpenSSH-Integration-with-Pageant
+
 ### Where is the configuration stored?
 
 QtPass tries to use the native config choice for the OS it's running.
diff --git a/README.md b/README.md
index bfe938b2..8026f051 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Features
 * Cross platform: Linux, BSD, OS X and Windows
 * Per-folder user selection for multi recipient encryption
 * Multiple profiles
+* Easy onboarding
 
 Logo based on [Heart-padlock by AnonMoos](https://commons.wikimedia.org/wiki/File:Heart-padlock.svg).
 
@@ -117,7 +118,9 @@ Further reading
 ---------------
 
 [FAQ](FAQ.md) and [CONTRIBUTING](CONTRIBUTING.md) documentation.
+[CHANGELOG](CHANGELOG.md)
 
 [Website](https://qtpass.org/)
 [Source code](https://github.com/IJHack/qtpass)
 [Issue queue](https://github.com/IJHack/qtpass/issues)
+[Chat](https://gitter.im/IJHack/qtpass)
diff --git a/qtpass.iss b/qtpass.iss
index df2861dd..8ebf83e9 100644
--- a/qtpass.iss
+++ b/qtpass.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

 

 #define MyAppName "QtPass"

-#define MyAppVersion "1.1.5"

+#define MyAppVersion "1.1.6"

 #define MyAppPublisher "IJhack"

 #define MyAppURL "https://qtpass.org/"

 #define MyAppExeName "qtpass.exe"

diff --git a/qtpass.pro b/qtpass.pro
index 41c72124..9ccb3805 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -7,7 +7,7 @@
 #                                                         #
 #---------------------------------------------------------#
 
-VERSION    = 1.1.5
+VERSION    = 1.1.6
 
 TEMPLATE   = app
 QT        += core gui
diff --git a/qtpass.spec b/qtpass.spec
index 7afc7ef3..c4282c85 100644
--- a/qtpass.spec
+++ b/qtpass.spec
@@ -7,7 +7,7 @@
 # This should probably be part of a release process.
 
 Name: qtpass		
-Version: 1.1.5
+Version: 1.1.6
 Release: 2%{?dist}
 Summary: QtPass is a multi-platform GUI for pass, the standard unix password manager.	
 License: GPLv3