Modified: nifi/site/trunk/licensing-guide.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/licensing-guide.html?rev=1799298&r1=1799297&r2=1799298&view=diff ============================================================================== --- nifi/site/trunk/licensing-guide.html (original) +++ nifi/site/trunk/licensing-guide.html Tue Jun 20 03:09:40 2017 @@ -149,7 +149,7 @@ LICENSE/NOTICE then should be a combinat files) then you must only account for any 3rd party works source dependencies. If you have any 3rd party works source dependencies then you should create or edit the LICENSE and/or NOTICE local to that subcomponent AND modify the NOTICE and/or LICENSE of the top level nifi source.</p> -<p>In the case of subcomponents which produce binary artifacts which themselves can bunde 3rd party works (as would be +<p>In the case of subcomponents which produce binary artifacts which themselves can bundle 3rd party works (as would be typical in a NAR, WAR, tar.gz, zip bundle) then you must ensure that the subcomponent binary artifact itself includes a full and complete LICENSE and/or NOTICE as needed to cover those 3rd party works. For every modification to the subcomponent LICENSE/NOTICE for a given 3rd party work the overall Apache NiFi source and binary LICENSE/NOTICE pairs @@ -159,9 +159,9 @@ need to be updated and/or verified as we locations for the binary artifact. This way for every binary artifact produced from Apache NiFi there will be a local and accurate LICENSE/NOTICE for that artifact.</p> <h3 id="how-to-go-about-working-with-the-license-notice-modifications">How to go about working with the LICENSE/NOTICE modifications</h3> -<p>If the dependency is a source dependency (ie you copied in javascript, css, java source files from a website) then you +<p>If the dependency is a source dependency (for example: you copied in javascript, css, java source files from a website) then you must ensure it is from <a href="https://www.apache.org/legal/resolved.html#category-a";>Category-A</a> licenses.</p> -<p>If the dependency is a binary dependency (ie maven pulled in a jar file) then you must ensure it is either from +<p>If the dependency is a binary dependency (for example: maven pulled in a jar file) then you must ensure it is either from <a href="https://www.apache.org/legal/resolved.html#category-a";>Category-A</a> or <a href="https://www.apache.org/legal/resolved.html#category-b";>Category-B</a>.</p> <p>The key guides for how to apply the LICENSE/NOTICE is found in the following:</p>
Modified: nifi/site/trunk/minifi/system-admin-guide.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/minifi/system-admin-guide.html?rev=1799298&r1=1799297&r2=1799298&view=diff ============================================================================== --- nifi/site/trunk/minifi/system-admin-guide.html (original) +++ nifi/site/trunk/minifi/system-admin-guide.html Tue Jun 20 03:09:40 2017 @@ -418,7 +418,7 @@ nifi.minifi.status.reporter.log.period=6 </tr> </tbody> </table> -<p>An example query to get the health, bulletins, input ports and stats of all the RPGS is below.</p> +<p>An example query to get the health, bulletins, input ports and stats of all the RPGs is below.</p> <pre><code>minifi.sh flowStatus remoteprocessgroup:all:health,bulletins,inputports,stats</code></pre> <h3 id="controller-services">Controller Services</h3> <p>To query the controller services use the "controllerServices" flag followed by one of the controller service options. The controller service options are below.</p> Modified: nifi/site/trunk/quickstart.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/quickstart.html?rev=1799298&r1=1799297&r2=1799298&view=diff ============================================================================== --- nifi/site/trunk/quickstart.html (original) +++ nifi/site/trunk/quickstart.html Tue Jun 20 03:09:40 2017 @@ -113,7 +113,7 @@ <br />The NiFi website source code is available (<a href="https://git-wip-us.apache.org/repos/asf?p=nifi-site.git;a=summary";>browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/nifi-site.git";>checkout</a>). <br />The NiFi Nar maven plugin source code is available (<a href="https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git;a=summary";>browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/nifi-maven.git";>checkout</a>).</p> <h2 id="issue-tracking">Issue Tracking</h2> -<p>Track issues on the "NIFI" Project on the Apache Jira (<a href="https://issues.apache.org/jira/browse/NIFI";>browse</a>).</p> +<p>Track issues on the "NIFI" Project on the Apache JIRA (<a href="https://issues.apache.org/jira/browse/NIFI";>browse</a>).</p> <h2 id="building">Building</h2> <h4 id="configure-your-git-client">Configure your git client</h4> <p>We recommend running the following git config commands in order to ensure @@ -214,7 +214,7 @@ to run as, which Java command to use, et enduring service is something we're working hard on and would appreciate ideas for. The user experience needs to be excellent.</p> <p>With the default settings you can point a web browser at <code>http://localhost:8080/nifi/</code></p> -<p>Logging is configured by default to log to <code>./logs/nifi-app.log</code>. The following log message should indicate the web ui +<p>Logging is configured by default to log to <code>./logs/nifi-app.log</code>. The following log message should indicate the web UI is ready for use:</p> <pre><code>2014-12-09 00:42:03,540 INFO [main] org.apache.nifi.web.server.JettyServer NiFi has started. The UI is available at the following URLs:</code></pre> Modified: nifi/site/trunk/release-guide.html URL: http://svn.apache.org/viewvc/nifi/site/trunk/release-guide.html?rev=1799298&r1=1799297&r2=1799298&view=diff ============================================================================== --- nifi/site/trunk/release-guide.html (original) +++ nifi/site/trunk/release-guide.html Tue Jun 20 03:09:40 2017 @@ -169,7 +169,7 @@ those variable values have been written "<code>/tmp/src/nifi-${NIFI_VERSION}</code>" is seen in an instruction or email template it should be replaced with "<code>/tmp/src/nifi-0.7.0</code>" when working the release of "Apache NiFi 0.7.0".</p> <ul> -<li><p>Subtitutions used in tasks and email templates</p> +<li><p>Substitutions used in tasks and email templates</p> <pre> Reference Example value Description ========= ============== =========== @@ -179,7 +179,7 @@ those variable values have been written ${JIRA_TICKET} NIFI-2112 the JIRA ticket created by the release manager for the release tasks. ${RC} 2 the Release Candidate index start at 1 for the first release candidate. ${RC_TAG_COMMIT_ID} the 40 byte commit ID of the RC tag created during the Maven release process. - ${STAGING_REPO_ID} orgapachenifi-1088 the temporate repository ID where staged artifacts have been placed. + ${STAGING_REPO_ID} orgapachenifi-1088 the temporary repository ID where staged artifacts have been placed. ${RM_USERID} johndoe the Apache account ID of Release Manager. ${RELEASE_TAG} rel/nifi-0.7.0 the Git repository tag for the source code as released. ${VOTE_THREAD_URL} [0.7.0 vote thread][070-rc2-vote] the URL for the Apache Pony Mail archive of the release vote thread. @@ -488,7 +488,7 @@ Thank you for your time and effort to va </li> </ul> </li> -<li><p>Developers in the community review the release candiate and reply to the vote email with their vote.</p> +<li><p>Developers in the community review the release candidate and reply to the vote email with their vote.</p> </li> <li><p>After 72 hours if</p> <ul>
