You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/07/27 04:36:34 UTC
[3/9] nifi git commit: NIFI-783
NIFI-783
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/106d5dbd
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/106d5dbd
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/106d5dbd
Branch: refs/heads/master
Commit: 106d5dbdc562083b441831e8259c3d0dca063710
Parents: 712d607
Author: joewitt <jo...@apache.org>
Authored: Thu Jul 23 09:31:58 2015 -0700
Committer: joewitt <jo...@apache.org>
Committed: Thu Jul 23 09:31:58 2015 -0700
----------------------------------------------------------------------
.../src/main/asciidoc/administration-guide.adoc | 4 ++--
nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc | 8 ++++----
.../src/main/asciidoc/expression-language-guide.adoc | 12 ++++++------
nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 ++--
nifi/nifi-docs/src/main/asciidoc/user-guide.adoc | 6 +++---
.../webapp/WEB-INF/partials/canvas/about-dialog.jsp | 4 ++--
6 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/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 5535c35..4595c75 100644
--- a/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -16,8 +16,8 @@
//
NiFi System Administrator's Guide
=================================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
System Requirements
-------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
index b372562..a17ee3b 100644
--- a/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -16,13 +16,13 @@
//
NiFi Developer's Guide
======================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
== Introduction
-The intent of this Developer Guide is to provide the reader with the information needed to understand how Apache NiFi (incubating)
+The intent of this Developer Guide is to provide the reader with the information needed to understand how Apache NiFi
extensions are developed and help to explain the thought process behind developing the components. It provides an introduction to
and explanation of the API that is used to develop extensions. It does not, however, go into great detail about each
of the methods in the API, as this guide is intended to supplement the JavaDocs of the API rather than replace them.
@@ -2163,7 +2163,7 @@ and attaching that patch to a ticket, or by generating a Pull Request.
=== Contact Us
-The developer mailing list (dev@nifi.incubator.apache.org) is monitored pretty closely, and we tend to respond pretty
+The developer mailing list (dev@nifi.apache.org) is monitored pretty closely, and we tend to respond pretty
quickly. If you have a question, don't hesitate to shoot us an e-mail - we're here to help! Unfortunately, though, e-mails
can get lost in the shuffle, so if you do send an e-mail and don't get a response within a day or two, it's our fault - don't
worry about bothering us. Just ping the mailing list again.
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc b/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index d8ccdb4..af0ee02 100644
--- a/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -16,8 +16,8 @@
//
Apache NiFi Expression Language Guide
=====================================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
[[overview]]
Overview
@@ -543,8 +543,8 @@ Each of the following functions manipulates a String in some way.
*Return Type*: [.returnType]#String#
*Examples*: We can URL-Encode an attribute named "url" by using the Expression `${url:urlEncode()}`. If
- the value of the "url" attribute is "https://nifi.incubator.apache.org/some value with spaces", this
- Expression will then return "https://nifi.incubator.apache.org/some%20value%20with%20spaces".
+ the value of the "url" attribute is "https://nifi.apache.org/some value with spaces", this
+ Expression will then return "https://nifi.apache.org/some%20value%20with%20spaces".
@@ -561,8 +561,8 @@ Each of the following functions manipulates a String in some way.
*Return Type*: [.returnType]#String#
*Examples*: If we have a URL-Encoded attribute named "url" with the value
- "https://nifi.incubator.apache.org/some%20value%20with%20spaces", then the Expression
- `${url:urlDecode()}` will return "https://nifi.incubator.apache.org/some value with spaces".
+ "https://nifi.apache.org/some%20value%20with%20spaces", then the Expression
+ `${url:urlDecode()}` will return "https://nifi.apache.org/some value with spaces".
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/nifi/nifi-docs/src/main/asciidoc/overview.adoc
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/src/main/asciidoc/overview.adoc b/nifi/nifi-docs/src/main/asciidoc/overview.adoc
index 2e62649..af5a907 100644
--- a/nifi/nifi-docs/src/main/asciidoc/overview.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/overview.adoc
@@ -16,8 +16,8 @@
//
Apache NiFi Overview
====================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
What is Apache NiFi?
--------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/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 7386b72..e718bce 100644
--- a/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -16,13 +16,13 @@
//
Apache NiFi User Guide
======================
-Apache NiFi Team <de...@nifi.incubator.apache.org>
-:homepage: http://nifi.incubator.apache.org
+Apache NiFi Team <de...@nifi.apache.org>
+:homepage: http://nifi.apache.org
Introduction
------------
-Apache NiFi (Incubating) is a dataflow system based on the concepts of flow-based programming. It supports
+Apache NiFi is a dataflow system based on the concepts of flow-based programming. It supports
powerful and scalable directed graphs of data routing, transformation, and system mediation logic. NiFi has
a web-based user interface for design, control, feedback, and monitoring of dataflows. It is highly configurable
along several dimensions of quality of service, such as loss-tolerant versus guaranteed delivery, low latency versus
http://git-wip-us.apache.org/repos/asf/nifi/blob/106d5dbd/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
index 12c5246..ce43f84 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
@@ -20,10 +20,10 @@
<div id="nf-about-content">
<span id="nf-version"></span>
<p>
- Apache NiFi (incubating) is a framework to support highly scalable and flexible dataflows.
+ Apache NiFi is a framework to support highly scalable and flexible dataflows.
It can be run on on laptops up through clusters of enterprise class servers.
Instead of dictating a particular dataflow or behavior it empowers you to design your own
optimal dataflow tailored to your specific environment.
</p>
</div>
-</div>
\ No newline at end of file
+</div>