NIFI-370 This adds system requirements to the Admin Guide and a list of 
supported browsers to the User Guide.


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

Branch: refs/heads/develop
Commit: 01038f4e2c26c21c7443cffb8a7426596687a43e
Parents: b6f4026
Author: Jenn Barnabee <[email protected]>
Authored: Mon Feb 23 14:08:47 2015 -0500
Committer: Jenn Barnabee <[email protected]>
Committed: Mon Feb 23 14:08:47 2015 -0500

----------------------------------------------------------------------
 .../src/main/asciidoc/administration-guide.adoc | 22 ++++++++++++++++++--
 .../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 ++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/01038f4e/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc 
b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
index b2fdc5a..938b581 100644
--- a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -19,6 +19,24 @@ NiFi System Administrator's Guide
 Apache NiFi Team <[email protected]>
 :homepage: http://nifi.incubator.apache.org
 
+System Requirements
+-------------------
+Apache NiFi can run on something as simple as a laptop, but it can also be 
clustered across many enterprise servers. The hardware and memory you need will 
depend on the size and nature of the dataflow you are running. NiFi has the 
following system requirements:
+
+* Requires Java 7
+* Supported Operating Systems: 
+** Linux
+** Unix
+** Windows
+** Mac OS X
+* Supported Web Browsers: 
+** Internet Explorer 9+ (see note below)
+** Mozilla FireFox 24+
+** Google Chrome 36+
+** Safari 8
+
+Note that there is a known issue in Internet Explorer (IE) 10 and 11 that can 
cause problems when moving items on the NiFi graph. If you encounter this 
problem, we suggest using a browser other than IE. This known issue is 
described here: https://connect.microsoft.com/IE/Feedback/Details/1050422.
+
 How to install and start NiFi
 -----------------------------
 
@@ -63,8 +81,8 @@ See the <<system_properties>> section of this guide for more 
information about c
 Best Practice Configuration
 ---------------------------
 NOTE: Typical Linux defaults are not necessarily well tuned for the needs of 
an IO intensive application like
-NiFi.  For all of these areas your distributions requirements may vary.  Use 
these sections as advice but
-consult your distribution specific documentation for how best to achieve these 
recommendations.
+NiFi.  For all of these areas your distribution's requirements may vary.  Use 
these sections as advice but
+consult your distribution-specific documentation for how best to achieve these 
recommendations.
 
 Maximum File Handles::
 NiFi will at any one time potentially have a very large number of file handles 
open.  Increase the limits by

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/01038f4e/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc 
b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
index 9208153..e13aaac 100644
--- a/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -29,6 +29,17 @@ along several dimensions of quality of service, such as 
loss-tolerant versus gua
 high throughput, and priority-based queuing. NiFi provides fine-grained data 
provenance for all data received, forked, joined
 cloned, modified, sent, and ultimately dropped upon reaching its configured 
end-state.
 
+See the Admin Guide for information about system requirements, installation, 
and configuration. Once NiFi is installed,
+use a supported web browser to view the User Interface. Supported web browsers 
include:
+
+* Internet Explorer 9+ (see note below)
+* Mozilla FireFox 24+
+* Google Chrome 36+
+* Safari 8
+
+Note that there is a known issue in Internet Explorer (IE) 10 and 11 that can 
cause problems when moving items on the NiFi graph. If you encounter this 
problem, we suggest using a browser other than IE. This known issue is 
described here: https://connect.microsoft.com/IE/Feedback/Details/1050422.
+
+
 
 [template="glossary", id="terminology"]
 Terminology

Reply via email to