aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-25 20:07:29 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-25 20:07:29 +0200
commitbd487bf732129b5ab36ff6a3eb653dc62ec70d84 (patch)
treec0b14f828bd0f1868b3b77c23bfc6cd1e0bc84c7
parent150090852bdd1ad8e93996a2e6ab766ecc75e9e3 (diff)
parent607af7bcca09df0e41ffb3b79d6bddc48f07e492 (diff)
downloadopen-keychain-bd487bf732129b5ab36ff6a3eb653dc62ec70d84.tar.gz
open-keychain-bd487bf732129b5ab36ff6a3eb653dc62ec70d84.tar.bz2
open-keychain-bd487bf732129b5ab36ff6a3eb653dc62ec70d84.zip
Merge pull request #692 from da-kid/master
Temporary fix for #648
-rw-r--r--OpenKeychain/src/main/res/raw/help_faq.html8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html
index e6757d0da..6f8763f36 100644
--- a/OpenKeychain/src/main/res/raw/help_faq.html
+++ b/OpenKeychain/src/main/res/raw/help_faq.html
@@ -12,5 +12,13 @@ And don't add newlines before or after p tags because of transifex -->
<h2>A wrong primary user id is shown when searching on a Keyserver</h2>
<p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p>
+<h2>How do I activate OpenKeychain in K9-Mail?</h2>
+<p>To use OpenKeychain with K9-Mail, you want to follow these steps:</p>
+<ol>
+ <li>Open K9-Mail and long-tap on the account you want to use OpenKeychain with.</li>
+ <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
+ <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
+</ol>
+<p>Thats it.</p>
</body>
</html>