nifi git commit: NIFI-2481 improved content repo archive description in Admin Guide

[af...@apache.org]

Repository: nifi
Updated Branches:
  refs/heads/master a298f1a70 -> 2dd61125d


NIFI-2481 improved content repo archive description in Admin Guide

This closes: #1603

Signed-off-by: Andre F de Miranda <tr...@users.noreply.github.com>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2dd61125
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2dd61125
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2dd61125

Branch: refs/heads/master
Commit: 2dd61125d13dd04798663cc8f1ef06436cf7bb16
Parents: a298f1a
Author: Mike Moser <mo...@apache.org>
Authored: Fri Mar 17 20:53:52 2017 +0000
Committer: Andre F de Miranda <tr...@users.noreply.github.com>
Committed: Fri Mar 24 22:49:01 2017 +1100

----------------------------------------------------------------------
 nifi-docs/src/main/asciidoc/administration-guide.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/2dd61125/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index fff0bdd..ca8f6a0 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -2053,8 +2053,8 @@ nifi.content.repository.directory.content2=/repos/content2 +
 Providing three total locations, including  _nifi.content.repository.directory.default_.
 |nifi.content.repository.archive.max.retention.period|If archiving is enabled (see nifi.content.repository.archive.enabled below), then
 this property specifies the maximum amount of time to keep the archived data. It is 12 hours by default.
-|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled (see nifi.content.repository.archive.enabled below), then this property also must have a value to indicate the maximum percentage of disk space that may be used before archive data is removed. If this value is already met even before archiving then arhival will not be of much use. It is 50% by default.
-|nifi.content.repository.archive.enabled|To enable archiving, set this to _true_ and specify a value for the nifi.content.repository.archive.max.usage.percentage property above. By default, archiving is enabled.
+|nifi.content.repository.archive.max.usage.percentage|If archiving is enabled (see nifi.content.repository.archive.enabled below), then this property must have a value that indicates the content repository disk usage percentage at which archived data begins to be removed. If the archive is empty and content repository disk usage is above this percentage, then archiving is temporarily disabled. Archiving will resume when disk usage is below this percentage. It is 50% by default.
+|nifi.content.repository.archive.enabled|To enable content archiving, set this to _true_ and specify a value for the nifi.content.repository.archive.max.usage.percentage property above. Content archiving enables the provenance UI to view or replay content that is no longer in a dataflow queue. By default, archiving is enabled.
 |nifi.content.repository.always.sync|If set to _true_, any change to the repository will be synchronized to the disk, meaning that NiFi will ask the operating system not to cache the information. This is very expensive and can significantly reduce NiFi performance. However, if it is _false_, there could be the potential for data loss if either there is a sudden power loss or the operating system crashes. The default value is _false_.
 |nifi.content.viewer.url|The URL for a web-based content viewer if one is available. It is blank by default.
 |====