[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3056: fix documentation.

[eo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.6 by this push:
     new dbe29a9  ZOOKEEPER-3056: fix documentation.
dbe29a9 is described below

commit dbe29a9cffb0a6616e74df9c3f81e45cdc90e87a
Author: Michael Han <lh...@twitter.com>
AuthorDate: Mon Dec 23 16:50:59 2019 +0100

    ZOOKEEPER-3056: fix documentation.
    
    snapshot.trust.empty can be used in both zoo.cfg file (with name snapshot.trust.empty), and as a system property (with name zookeeper.snapshot.trust.empty).
    
    Author: Michael Han <lh...@twitter.com>
    
    Reviewers: Enrico Olivelli <eo...@apache.org>
    
    Closes #1178 from hanm/ZOOKEEPER-3056
    
    (cherry picked from commit 04e91c3889b2d0a477036ae088794b6f5b3b04ba)
    Signed-off-by: Enrico Olivelli <en...@diennea.com>
---
 zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index 08a054e..8e0574c 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -969,7 +969,7 @@ property, when available, is noted below.
     By default, this feautre is disabled, set "true" to enable it.
 
 * *snapshot.trust.empty* :
-    (Java system property only: **zookeeper.snapshot.trust.empty**)
+    (Java system property: **zookeeper.snapshot.trust.empty**)
     **New in 3.5.6:**
     This property controls whether or not ZooKeeper should treat missing
     snapshot files as a fatal state that can't be recovered from.