From 42f213f4effba24332c0a8d82b998d45bda66e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 28 Dec 2016 19:05:06 +0100
Subject: [PATCH] Some docs

---
 .../sufficientlysecure/keychain/provider/ProviderHelper.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 4255f2cd6..ec1c8ab4c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -906,9 +906,11 @@ public class ProviderHelper {
 
     /**
      * Save a public keyring into the database.
-     * <p/>
+     * <p>
      * This is a high level method, which takes care of merging all new information into the old and
      * keep public and secret keyrings in sync.
+     * <p>
+     * If you want to merge keys in-memory only and not save in database set skipSave=true.
      */
     public SaveKeyringResult savePublicKeyRing(UncachedKeyRing publicRing, Progressable progress,
                                                String expectedFingerprint,