Repository: nifi
Updated Branches:
  refs/heads/master 17dec0493 -> 7884d0994


NIFI-2536 Update User Guide Template section. This closes #852


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

Branch: refs/heads/master
Commit: 7884d09948381c655571c5868a40ba5b7e9c1c76
Parents: 17dec04
Author: James Wing <[email protected]>
Authored: Fri Aug 12 13:38:41 2016 -0700
Committer: Matt Gilman <[email protected]>
Committed: Mon Aug 22 15:07:54 2016 -0400

----------------------------------------------------------------------
 nifi-docs/src/main/asciidoc/user-guide.adoc | 30 ++++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/7884d099/nifi-docs/src/main/asciidoc/user-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc 
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index 8024065..82825d9 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -1537,7 +1537,7 @@ received from others can then be imported into an 
instance of NiFi and dragged o
 To create a Template, select the components that are to be a part of the 
template, and then click the
 ``Create Template'' (
 image:iconNewTemplate.png["Create Template"]
-) button in the Actions Toolbar (See <<User_Interface>> for more information 
on the Actions Toolbar).
+) button in the Operate Palette (See <<User_Interface>> for more information 
on the Operate Palette).
 
 Clicking this button without selecting anything will create a Template that 
contains all of the contents of the
 current Process Group. This means that creating a Template with nothing 
selected while on the Root Process Group
@@ -1557,6 +1557,21 @@ Connection that was selected when making the Template is 
not included in the Tem
 destination of the Connection is not also included in the Template.
 
********************************************************************************************************************
 
+[[Import_Template]]
+=== Importing a Template
+After receiving a Template that has been exported from another NiFi, the first 
step needed to use the template is to import
+the template into this instance of NiFi. You may import templates into any 
Process Group where you have the appropriate
+authorization.
+
+From the Operate Palette, click the ``Upload Template'' (
+image:iconUploadTemplate.png["Upload Template"]
+)  button (See <<User_Interface>> for more information on the Operate 
Palette).  This will display the Upload Template
+dialog.  Click the find icon and use the File Selection dialog to choose which 
template file to upload.
+Select the file and click Open.
+Clicking the ``Upload'' button will attempt to import the Template into this 
instance of NiFi.
+The Upload Template dialog will update to show ``Success'' or an error message 
if there was a problem importing the template.
+
+
 === Instantiating a Template
 
 Once a Template has been created (see <<Create_Template>>) or imported (see 
<<Import_Template>>), it is ready to be
@@ -1579,18 +1594,7 @@ One of the most powerful features of NiFi Templates is 
the ability to easily exp
 and to import a Template that has already been exported. This provides a very 
simple mechanism for sharing parts
 of a DataFlow with others. You can select Templates from the Global Menu (see 
<<User_Interface>>) to open a dialog
 that displays all of the Templates that are currently available,
-filter the templates to see only those of interest, and import, export, and 
delete Templates.
-
-
-[[Import_Template]]
-==== Importing a Template
-After receiving a Template that has been exported from another NiFi, the first 
step needed to use the template is to import
-the template into this instance of NiFi. From the Template Management dialog 
(see <<Manage_Templates>>), click the
-``Browse'' button. This provides a File Selection dialog that allows the user 
to choose which template file to upload.
-Select the file and click Open. The ``Browse'' button is replaced by an 
``Import'' button and a ``Cancel'' button.
-Clicking the ``Import'' button will attempt to import the Template into this 
instance of NiFi. If unable to import
-the Template, an error message will appear in red next to the ``Browse'' 
button. Otherwise, the Template will be
-added to the table and the ``Browse'' button will reappear.
+filter the templates to see only those of interest, export, and delete 
Templates.
 
 
 [[Export_Template]]

Reply via email to