You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/04/10 07:50:12 UTC

svn commit: r1828794 [8/8] - in /nifi/site/trunk: ./ assets/js/ assets/stylesheets/ minifi/

Modified: nifi/site/trunk/release-guide.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/release-guide.html?rev=1828794&r1=1828793&r2=1828794&view=diff
==============================================================================
--- nifi/site/trunk/release-guide.html (original)
+++ nifi/site/trunk/release-guide.html Tue Apr 10 07:50:11 2018
@@ -20,382 +20,390 @@
     </head>
     <body>
         <div class="sticky contain-to-grid">
-    <nav class="top-bar" data-topbar role="navigation">
-        <ul class="title-area">
-            <li class="name">
-                <h1>
-                    <a href="index.html">
-                        <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
-                    </a>
-                </h1>
-            </li>
-            <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-            <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
-        </ul>
-
-        <section class="top-bar-section">
-            <!-- Right Nav Section -->
-            <ul class="right">
-                <li class="has-dropdown">
-                    <a href="#">Project</a>
-                    <ul class="dropdown">
-                        <li><a href="index.html">Home</a></li>
-                        <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
-                        <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+            <nav class="top-bar" data-topbar role="navigation">
+                <ul class="title-area">
+                    <li class="name">
+                        <h1>
+                            <a href="index.html">
+                                <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
+                            </a>
+                        </h1>
+                    </li>
+                    <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+                    <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
+                </ul>
+        
+                <section class="top-bar-section">
+                    <!-- Right Nav Section -->
+                    <ul class="right">
+                        <li class="has-dropdown">
+                            <a href="#">Project</a>
+                            <ul class="dropdown">
+                                <li><a href="index.html">Home</a></li>
+                                <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
+                                <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Documentation</a>
+                            <ul class="dropdown">
+                                <li><a href="faq.html">FAQ</a></li>
+                                <li><a href="videos.html">Videos</a></li>
+                                <li><a href="docs.html">NiFi Docs</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
+                                <li><a href="security.html">Security Reports</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Downloads</a>
+                            <ul class="dropdown">
+                                <li><a href="download.html">Download NiFi</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Community</a>
+                            <ul class="dropdown">
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
+                                <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
+                                <li><a href="people.html">People</a></li>
+                                <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Development</a>
+                            <ul class="dropdown">
+                                <li><a href="quickstart.html">Quickstart</a></li>
+                                <li><a href="release-guide.html">Release Guide</a></li>
+                                <li><a href="licensing-guide.html">Licensing Guide</a></li>
+                                <li><a href="developer-guide.html">Developer Guide</a></li>
+                                <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
+                                <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">ASF Links</a>
+                            <ul class="dropdown">
+                                <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
+                                <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
+                                <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
+                                <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Subprojects</a>
+                            <ul class="dropdown">
+                                <li><a href="minifi/index.html">MiNiFi</a></li>
+                                <li><a href="registry.html">Registry</a></li>
+                            </ul>
+                        </li>
                     </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Documentation</a>
-                    <ul class="dropdown">
-                        <li><a href="faq.html">FAQ</a></li>
-                        <li><a href="videos.html">Videos</a></li>
-                        <li><a href="docs.html">NiFi Docs</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
-                        <li><a href="security.html">Security Reports</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Downloads</a>
-                    <ul class="dropdown">
-                        <li><a href="download.html">Download NiFi</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Community</a>
-                    <ul class="dropdown">
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
-                        <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
-                        <li><a href="people.html">People</a></li>
-                        <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Development</a>
-                    <ul class="dropdown">
-                        <li><a href="quickstart.html">Quickstart</a></li>
-                        <li><a href="release-guide.html">Release Guide</a></li>
-                        <li><a href="licensing-guide.html">Licensing Guide</a></li>
-                        <li><a href="developer-guide.html">Developer Guide</a></li>
-                        <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
-                        <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">ASF Links</a>
-                    <ul class="dropdown">
-                        <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
-                        <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
-                        <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
-                        <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Subprojects</a>
-                    <ul class="dropdown">
-                        <li><a href="minifi/index.html">MiNiFi</a></li>
-                        <li><a href="registry.html">Registry</a></li>
-                    </ul>
-                </li>
-            </ul>
-        </section>
-    </nav>
-</div>
-
-
+                </section>
+            </nav>
+        </div>
 
 <div class="row">
     <div class="large-12 columns">
         <div class="large-space"></div>
-        <h1 id="apache-nifi-release-guidelines">Apache NiFi Release Guidelines</h1>
-<p>The purpose of this document is to capture and describe the steps involved in producing
-an official release of Apache NiFi.  It is written specifically to someone acting in the
-capacity of a <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a> (RM).  </p>
-<h2 id="the-objective">The objective</h2>
-<p>Our aim is to produce an official Apache release from an existing release branch.  </p>
-<h2 id="background-material">Background Material</h2>
+<h1>Apache NiFi Release Guidelines</h1>
+<p>The purpose of this document is to capture and describe the steps involved in producing<br>
+an official release of Apache NiFi.  It is written specifically to someone acting in the<br>
+capacity of a <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a> (RM).</p>
+<h2>The objective</h2>
+<p>Our aim is to produce an official Apache release from an existing release branch.</p>
+<h2>Background Material</h2>
 <ul>
 <li><p>These documents are necessary for all committers to be familiar with</p>
 <ul>
 <li><a href="https://apache.org/licenses/LICENSE-2.0">Apache License V2.0</a></li>
 <li><a href="https://www.apache.org/legal/resolved.html">Apache Legal License/Resolved</a></li>
 <li><a href="https://www.apache.org/dev/apply-license.html">Apache How-to Apply License</a></li>
-</ul>
-</li>
+</ul></li>
 <li><p>These documents are necessary for someone acting as the RM</p>
 <ul>
 <li><a href="https://www.apache.org/licenses/exports/">Apache Encryption Software / ECCN Info</a></li>
 <li><a href="https://www.apache.org/dev/release.html">Apache Release Policy</a></li>
 <li><a href="https://www.apache.org/dev/release-publishing">Apache Release Guide</a></li>
-</ul>
-</li>
+</ul></li>
 <li><p>These documents are helpful for general environmental setup to perform releases</p>
 <ul>
 <li><a href="https://www.apache.org/dev/openpgp.html">Apache PGP Info</a></li>
 <li><a href="http://www.apache.org/dev/release-signing.html">Apache Release Signing</a></li>
 <li><a href="https://www.apache.org/dev/publishing-maven-artifacts.html">Apache Guide to publish Maven Artifacts</a></li>
+</ul></li>
 </ul>
-</li>
-</ul>
-<h2 id="terms">Terms</h2>
+<h2>Terms</h2>
 <ul>
-<li><strong>Release Manager</strong> (RM) - the Apache NiFi PMC Member or Committer acting as <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a>
+<li><strong>Release Manager</strong> (RM) - the Apache NiFi PMC Member or Committer acting as <a href="https://www.apache.org/dev/release-publishing.html#release_manager">Release Manager</a><br>
 for a particular release of Apache NiFi.</li>
-<li><strong>Release Candidate</strong> (RC) - an iteration of the release process that is proposed for a vote by the Apache NiFi
+<li><strong>Release Candidate</strong> (RC) - an iteration of the release process that is proposed for a vote by the Apache NiFi<br>
 Community.</li>
-<li><strong>Community</strong> - the <a href="https://www.apache.org/foundation/glossary.html#Community">community</a> of people with an interest
+<li><strong>Community</strong> - the <a href="https://www.apache.org/foundation/glossary.html#Community">community</a> of people with an interest<br>
 in the improvement and advancement of Apache NiFi, including end-users, developers, evangelists, and advisers.</li>
 <li><strong>PMC</strong> - within the Apache NiFi community, members of the <a href="https://www.apache.org/foundation/glossary.html#PMC">PMC</a> oversee the ongoing project.</li>
-<li><strong>Committer</strong> - with the Apache NiFi community, <a href="https://www.apache.org/foundation/glossary.html#Committer">committers</a>
+<li><strong>Committer</strong> - with the Apache NiFi community, <a href="https://www.apache.org/foundation/glossary.html#Committer">committers</a><br>
 have gain the privilege to commit changes to the Apache NiFi codebase.</li>
 </ul>
-<h2 id="high-level-flow-of-a-release">High level flow of a release</h2>
+<h2>High level flow of a release</h2>
 <ul>
 <li>The Apache NiFi community is constantly contributing to JIRA tickets assigned to the next release.</li>
 <li>At some point the number of tickets open/remaining for the next release begins to approach zero.</li>
 <li>A member of the community suggests a release and initiates a discussion.</li>
-<li>Someone volunteers to perform the Release Manager (RM) role for the release.  (This can be a committer but Apache
+<li>Someone volunteers to perform the Release Manager (RM) role for the release.  (This can be a committer but Apache<br>
 guides indicate a preference for a PMC member.)</li>
-<li>The RM validate the proposed release and stages the source code, Maven artifacts, and distributable files for a
+<li>The RM validate the proposed release and stages the source code, Maven artifacts, and distributable files for a<br>
 Release Candidate (RC).</li>
 <li>The RM initiates a vote on the RC by the NiFi community.</li>
 <li>If the NiFi community rejects the RC, the issues noted are resolved and another RC is generated.</li>
-<li>If the NiFi community accepts the RC, the staged source code, artifacts, and distribution files are moved to the
+<li>If the NiFi community accepts the RC, the staged source code, artifacts, and distribution files are moved to the<br>
 appropriately locations for public release.</li>
 </ul>
-<h2 id="variable-reference-substitutions">Variable reference substitutions</h2>
-<p>Throughout this guide, references must be made to names and values that will vary from release to release.  For clarity
-those variable values have been written like Bash variable references.  When a term like
-&quot;<code>/tmp/src/nifi-${NIFI_VERSION}</code>&quot; is seen in an instruction or email template it should be replaced with
+<h2>Variable reference substitutions</h2>
+<p>Throughout this guide, references must be made to names and values that will vary from release to release.  For clarity<br>
+those variable values have been written like Bash variable references.  When a term like<br>
+&quot;<code>/tmp/src/nifi-${NIFI_VERSION}</code>&quot; is seen in an instruction or email template it should be replaced with<br>
 &quot;<code>/tmp/src/nifi-0.7.0</code>&quot; when working the release of &quot;Apache NiFi 0.7.0&quot;.</p>
 <ul>
-<li><p>Substitutions used in tasks and email templates</p>
- <pre>
- Reference            Example value       Description
- =========            ==============      ===========
- ${BRANCH}            master              the development branch on which the release is based.
- ${NIFI_VERSION}      0.7.0               the version currently in development on the release branch.
- ${NEXT_VERSION}      0.8.0-SNAPSHOT      the future version for development on the release branch.
- ${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 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.
- </pre>
-
-<p> <em>To be practical but avoid confusion with future release details, these example values reflect the previous release
-NiFi 0.7.0 RC2 release details.</em></p>
-</li>
-</ul>
-<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g master
-or 0.x). The next version should be the next incremental version if the release is based on a minor version development branch (e.g
-support/nifi-1.1.x or support/nifi-0.7.4). If this is the first incremental release (e.g. 1.2.1) for a minor release line the support
+<li><p>Substitutions used in tasks and email templates<br>
+<pre><br>
+Reference            Example value       Description<br>
+=========            ==============      ===========<br>
+${BRANCH}            master              the development branch on which the release is based.<br>
+${NIFI_VERSION}      0.7.0               the version currently in development on the release branch.<br>
+${NEXT_VERSION}      0.8.0-SNAPSHOT      the future version for development on the release branch.<br>
+${JIRA_TICKET}       NIFI-2112           the JIRA ticket created by the release manager for the release tasks.<br>
+${RC}                2                   the Release Candidate index start at 1 for the first release candidate.<br>
+${RC_TAG_COMMIT_ID}                      the 40 byte commit ID of the RC tag created during the Maven release process.<br>
+${STAGING_REPO_ID}   orgapachenifi-1088  the temporary repository ID where staged artifacts have been placed.<br>
+${RM_USERID}         johndoe             the Apache account ID of Release Manager.<br>
+${RELEASE_TAG}       rel/nifi-0.7.0      the Git repository tag for the source code as released.<br>
+${VOTE_THREAD_URL}   <a href="https://lists.apache.org/thread.html/8b111ce611238af8b71b95039c299ae0a1ec063ea77f83aa34e6a2bd@%3Cdev.nifi.apache.org%3E">0.7.0 vote thread</a>   the URL for the Apache Pony Mail archive of the release vote thread.<br>
+</pre></p>
+<p><em>To be practical but avoid confusion with future release details, these example values reflect the previous release<br>
+NiFi 0.7.0 RC2 release details.</em></p></li>
+</ul>
+<p>NOTE: The next version should be the next minor version if the release is based on a major version development branch (e.g master<br>
+or 0.x). The next version should be the next incremental version if the release is based on a minor version development branch (e.g<br>
+support/nifi-1.1.x or support/nifi-0.7.4). If this is the first incremental release (e.g. 1.2.1) for a minor release line the support<br>
 branch may need to be created.</p>
-<h2 id="what-to-validate-and-how-to-validate-a-release">What to validate and how to validate a release</h2>
-<p>The following is a list of the sorts of things that will be validated and are the basics to check
+<h2>What to validate and how to validate a release</h2>
+<p>The following is a list of the sorts of things that will be validated and are the basics to check<br>
 when evaluating a release for a vote.</p>
 <ul>
-<li>Are the LICENSE and NOTICE files present in the source root and complete?<ul>
-<li>Specifically look in the <code>nifi-${NIFI_VERSION}-sources-release.zip</code> artifact and ensure these files are
+<li>Are the LICENSE and NOTICE files present in the source root and complete?
+<ul>
+<li>Specifically look in the <code>nifi-${NIFI_VERSION}-sources-release.zip</code> artifact and ensure these files are<br>
 present at the root of the archive.</li>
-</ul>
-</li>
-<li>Evaluate the sources and dependencies.<ul>
+</ul></li>
+<li>Evaluate the sources and dependencies.
+<ul>
 <li>Does the overall LICENSE and NOTICE appear correct?</li>
 <li>Do all licenses fit within the ASF approved licenses?</li>
-<li>Here is an example path to a sources artifact that has been prepared but not released:<br><code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip</code></li>
-</ul>
-</li>
-<li>Is there a README available that explains how to build the application and to execute it?<ul>
+<li>Here is an example path to a sources artifact that has been prepared but not released:<br>
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip</code></li>
+</ul></li>
+<li>Is there a README available that explains how to build the application and to execute it?
+<ul>
 <li>Look in the *-sources.zip artifact root for the readme.</li>
-</ul>
-</li>
-<li>Are the signatures and hashes correct for the source release?<ul>
-<li>Validate the hashes of the sources artifact do in fact match:
-<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha1</code>
-<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha256</code>
+</ul></li>
+<li>Are the signatures and hashes correct for the source release?
+<ul>
+<li>Validate the hashes of the sources artifact do in fact match:<br>
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha1</code><br>
+<code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha256</code><br>
 <code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.sha512</code></li>
-<li>Validate the signature of the source artifact.  Here is an example path:
+<li>Validate the signature of the source artifact.  Here is an example path:<br>
 <code>https://repository.apache.org/content/repositories/${STAGING_REPO_ID}/org/apache/nifi/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-source-release.zip.asc</code></li>
 <li>Need a quick reminder on how to <a href="https://www.apache.org/dev/release-signing.html#verifying-signature">verify a signature</a>?</li>
-</ul>
-</li>
-<li>Do all sources have necessary headers?<ul>
+</ul></li>
+<li>Do all sources have necessary headers?
+<ul>
 <li>Unzip the sources file into a directory and execute <code>mvn install -Pcontrib-check,include-grpc</code></li>
-<li>You can avoid &#39;include-grpc&#39; if you&#39;re building on a system that doesn&#39;t support it.</li>
-</ul>
-</li>
-<li>Are there no unexpected binary files in the release?<ul>
-<li>The only thing we&#39;d expect would be potentially test resources files.</li>
-</ul>
-</li>
+<li>You can avoid 'include-grpc' if you're building on a system that doesn't support it.</li>
+</ul></li>
+<li>Are there no unexpected binary files in the release?
+<ul>
+<li>The only thing we'd expect would be potentially test resources files.</li>
+</ul></li>
 <li>Does the app (if appropriate) execute and function as expected?</li>
 </ul>
-<p>This list is reflected in the Release Vote and Release Helper Guide emails that are sent once the release has been
+<p>This list is reflected in the Release Vote and Release Helper Guide emails that are sent once the release has been<br>
 staged in the Git and Nexus repositories.</p>
-<h2 id="the-release-process">The Release Process</h2>
-<p>The release process includes steps to be performed by the Release Manager as well as the
+<h2>The Release Process</h2>
+<p>The release process includes steps to be performed by the Release Manager as well as the<br>
 Apache NiFi developer community.</p>
-<h3 id="step-1-configure-the-build-environment-rm-and-community-">Step 1. Configure the build environment (RM and community)</h3>
+<h3>Step 1. Configure the build environment (RM and community)</h3>
 <ol>
 <li>Follow the steps outlined in the <a href="https://nifi.apache.org/quickstart.html">Quickstart Guide</a> to prepare the development system.</li>
-<li>Confirm that the local Git workspace is configured with an origin remote pointing to the RM&#39;s personal fork of the
-NiFi source and an &quot;ASF&quot; remote pointing to the Apache Git Repository for NiFi.<pre><code> $ git remote -v
- asf    https://git-wip-us.apache.org/repos/asf/nifi.git (fetch)
- asf    https://git-wip-us.apache.org/repos/asf/nifi.git (push)
- origin    https://github.com/${RM_USERID}/nifi.git (fetch)
- origin    https://github.com/${RM_USERID}/nifi.git (push)</code></pre>
- Additional remotes will not cause a problem if these two are correct.  Other configurations are perfectly
- acceptable but the appropriate adjustments to the steps in this guide must be made by the release manager.</li>
-<li>Confirm that source code can be checked out for the branch being released.<pre><code> git checkout ${BRANCH}</code></pre>
-</li>
+<li>Confirm that the local Git workspace is configured with an origin remote pointing to the RM's personal fork of the<br>
+NiFi source and an &quot;ASF&quot; remote pointing to the Apache Git Repository for NiFi.
+<pre><code>$ git remote -v
+asf https://git-wip-us.apache.org/repos/asf/nifi.git (fetch)
+asf https://git-wip-us.apache.org/repos/asf/nifi.git (push)
+origin  https://github.com/${RM_USERID}/nifi.git (fetch)
+origin  https://github.com/${RM_USERID}/nifi.git (push)
+</code></pre>
+Additional remotes will not cause a problem if these two are correct.  Other configurations are perfectly<br>
+acceptable but the appropriate adjustments to the steps in this guide must be made by the release manager.</li>
+<li>Confirm that source code can be checked out for the branch being released.
+<pre><code>git checkout ${BRANCH}
+</code></pre></li>
 <li>Confirm that the entire application builds correctly in the build environment.</li>
 </ol>
-<h3 id="step-2-prepare-and-stage-the-release-rm-">Step 2. Prepare and stage the release (RM)</h3>
+<h3>Step 2. Prepare and stage the release (RM)</h3>
 <ol>
-<li>Create a JIRA ticket for the release tasks for version ${NIFI_VERSION}.<br> <strong><em>The resulting JIRA ticket number is referred to as ${JIRA_TICKET} in this guide.</em></strong></li>
-<li>Create the next version in JIRA, if it doesn&#39;t already exist, so work can continue towards that release.</li>
-<li>Create meaningful release notes for this version if not already created.  <a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes">Enter them here</a> on
+<li>Create a JIRA ticket for the release tasks for version ${NIFI_VERSION}.<br>
+<strong><em>The resulting JIRA ticket number is referred to as ${JIRA_TICKET} in this guide.</em></strong></li>
+<li>Create the next version in JIRA, if it doesn't already exist, so work can continue towards that release.</li>
+<li>Create meaningful release notes for this version if not already created.  <a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes">Enter them here</a> on<br>
 the NiFi wiki.</li>
-<li>Create a new branch off &#39;master&#39; named after the JIRA ticket.<pre><code class="language-bash"> $ git checkout -b NIFI-<span class="variable">${JIRA_TICKET}</span>-RC<span class="variable">${RC}</span> <span class="variable">${BRANCH}</span></code></pre>
-</li>
-<li>Verify that Maven has sufficient heap space to perform the build tasks.  Some plugins and parts of the build
-consumes a surprisingly large amount of space.   <ul>
-<li>These settings have been shown to work for Java 8 for NiFi version 1.x and later.<pre><code class="language-bash">$ <span class="keyword">export</span> MAVEN_OPTS=<span class="string">"-Xms1024m -Xmx3076m"</span></code></pre>
-</li>
-<li>And these work for Java 7 for NiFi version 0.x.<pre><code>$ export MAVEN_OPTS=&quot;-Xms1024m -Xmx3076m -XX:MaxPermSize=256m&quot;</code></pre>
-</li>
-</ul>
-</li>
-<li><p>Ensure your settings.xml has been updated to include a <code>signed_release</code> profile and a <code>&lt;server&gt;</code> entry for
-&quot;repository.apache.org&quot; as shown below. <a href="http://blog.sonatype.com/2009/10/maven-tips-and-tricks-encrypting-passwords">Steps to configure and encrypt Maven passwords</a>.
-There are  other ways to ensure your PGP key is available for signing as well.  </p>
-<pre><code class="language-XML">     &lt;profile&gt;
-         &lt;id&gt;signed_release&lt;/id&gt;
-         &lt;properties&gt;
-             &lt;mavenExecutorId&gt;forked-path&lt;/mavenExecutorId&gt;
-             &lt;gpg.keyname&gt;${RM_USERID}@apache.org&lt;/gpg.keyname&gt;
-             &lt;gpg.passphrase&gt;GPG passphrase&lt;/gpg.passphrase&gt;
-         &lt;/properties&gt;
-     &lt;/profile&gt;
-
-     &lt;servers&gt;
-         &lt;server&gt;
-             &lt;id&gt;repository.apache.org&lt;/id&gt;
-             &lt;username&gt;${RM_USERID}&lt;/username&gt;
-             &lt;password&gt;ENCRYPTED PASSWORD HERE&lt;/password&gt;
-         &lt;/server&gt;
-     &lt;/servers&gt;</code></pre>
-</li>
-<li>Ensure the the full application builds and all tests work by executing a parallel (multi-threaded) build.<pre><code> $ mvn -T 2.5C clean install -Pinclude-grpc</code></pre>
-</li>
-<li>Startup and test the application with from the root source folder.  After a few seconds, NiFi should be up and
-running at <a href="http://localhost:8080/nifi"><a href="http://localhost:8080/nifi">http://localhost:8080/nifi</a></a>.<pre><code> $ cd nifi-assembly/target/nifi-${NIFI_VERSION}-bin/nifi-${NIFI_VERSION}
- $ bin/nifi.sh start</code></pre>
-</li>
+<li>Create a new branch off 'master' named after the JIRA ticket.
+<pre><code class="language-bash">$ git checkout -b NIFI-${JIRA_TICKET}-RC${RC} ${BRANCH}
+</code></pre></li>
+<li>Verify that Maven has sufficient heap space to perform the build tasks.  Some plugins and parts of the build<br>
+consumes a surprisingly large amount of space.</li>
+</ol>
+<ul>
+<li>These settings have been shown to work for Java 8 for NiFi version 1.x and later.
+<pre><code class="language-bash"> $ export MAVEN_OPTS=&quot;-Xms1024m -Xmx3076m&quot;
+</code></pre></li>
+<li>And these work for Java 7 for NiFi version 0.x.
+<pre><code>$ export MAVEN_OPTS=&quot;-Xms1024m -Xmx3076m -XX:MaxPermSize=256m&quot;
+</code></pre></li>
+</ul>
+<ol>
+<li>Ensure your settings.xml has been updated to include a <code>signed_release</code> profile and a <code>&lt;server&gt;</code> entry for<br>
+&quot;repository.apache.org&quot; as shown below. <a href="http://blog.sonatype.com/2009/10/maven-tips-and-tricks-encrypting-passwords">Steps to configure and encrypt Maven passwords</a>.<br>
+There are  other ways to ensure your PGP key is available for signing as well.
+<pre><code class="language-XML">    &lt;profile&gt;
+        &lt;id&gt;signed_release&lt;/id&gt;
+        &lt;properties&gt;
+            &lt;mavenExecutorId&gt;forked-path&lt;/mavenExecutorId&gt;
+            &lt;gpg.keyname&gt;${RM_USERID}@apache.org&lt;/gpg.keyname&gt;
+            &lt;gpg.passphrase&gt;GPG passphrase&lt;/gpg.passphrase&gt;
+        &lt;/properties&gt;
+    &lt;/profile&gt;
+
+    &lt;servers&gt;
+        &lt;server&gt;
+            &lt;id&gt;repository.apache.org&lt;/id&gt;
+            &lt;username&gt;${RM_USERID}&lt;/username&gt;
+            &lt;password&gt;ENCRYPTED PASSWORD HERE&lt;/password&gt;
+        &lt;/server&gt;
+    &lt;/servers&gt;
+</code></pre></li>
+<li>Ensure the the full application builds and all tests work by executing a parallel (multi-threaded) build.
+<pre><code>$ mvn -T 2.5C clean install -Pinclude-grpc
+</code></pre></li>
+<li>Startup and test the application with from the root source folder.  After a few seconds, NiFi should be up and<br>
+running at <a href="http://localhost:8080/nifi">http://localhost:8080/nifi</a>.
+<pre><code>$ cd nifi-assembly/target/nifi-${NIFI_VERSION}-bin/nifi-${NIFI_VERSION}
+$ bin/nifi.sh start
+</code></pre></li>
 <li>Evaluate and ensure the appropriate license headers are present on all source files.</li>
-<li>Ensure LICENSE and NOTICE files are complete and accurate. (Developers should always be keeping these up to date as
- they go along adding source and modifying dependencies to keep this burden manageable.)</li>
-<li>Build the project with the <code>contrib-check</code> profile enabled to validate contribution expectations and find any
-problems that must be addressed before proceeding.  <pre><code> $ mvn install -Pcontrib-check,include-grpc</code></pre>
-</li>
+<li>Ensure LICENSE and NOTICE files are complete and accurate. (Developers should always be keeping these up to date as<br>
+they go along adding source and modifying dependencies to keep this burden manageable.)</li>
+<li>Build the project with the <code>contrib-check</code> profile enabled to validate contribution expectations and find any<br>
+problems that must be addressed before proceeding.
+<pre><code>$ mvn install -Pcontrib-check,include-grpc
+</code></pre></li>
 </ol>
-<h3 id="step-3-perform-the-release-rm-">Step 3. Perform the release (RM)</h3>
+<h3>Step 3. Perform the release (RM)</h3>
 <ol>
-<li>Now its time to have maven prepare the release with this command.<pre><code> $ mvn --batch-mode release:prepare \
-     -Psigned_release,include-grpc \
-     -DscmCommentPrefix=&quot;NIFI-${JIRA_TICKET}-RC${RC} &quot; \
-     -Dtag=&quot;nifi-${NIFI_VERSION}-RC${RC}&quot; \
-     -DreleaseVersion=&quot;${NIFI_VERSION}&quot; \
-     -DdevelopmentVersion=&quot;${NEXT_VERSION}&quot; \
-     -Darguments=&quot;-DskipTests&quot;</code></pre>
-</li>
-<li><p>Review the release preparation results.  If problems are found <code>$ mvn release:rollback</code> will reset the changes, or
-it may be necessary to run <code>$ mvn release:clean</code> to get the project to a state where it can be rebuilt.</p>
-</li>
+<li><p>Now its time to have maven prepare the release with this command.</p>
+<pre><code>$ mvn --batch-mode release:prepare \
+    -Psigned_release,include-grpc \
+    -DscmCommentPrefix=&quot;NIFI-${JIRA_TICKET}-RC${RC} &quot; \
+    -Dtag=&quot;nifi-${NIFI_VERSION}-RC${RC}&quot; \
+    -DreleaseVersion=&quot;${NIFI_VERSION}&quot; \
+    -DdevelopmentVersion=&quot;${NEXT_VERSION}&quot; \
+    -Darguments=&quot;-DskipTests&quot;
+</code></pre></li>
+<li><p>Review the release preparation results.  If problems are found <code>$ mvn release:rollback</code> will reset the changes, or<br>
+it may be necessary to run <code>$ mvn release:clean</code> to get the project to a state where it can be rebuilt.</p></li>
 <li><p>If the preparation without problems, it is time to perform the release and deploy artifacts to staging.</p>
-<pre><code> $ mvn release:perform \
-     -Psigned_release,include-grpc \
-     -DscmCommentPrefix=&quot;${JIRA_TICKET}-RC${RC} &quot; \
-     -Darguments=&quot;-DskipTests&quot;</code></pre>
-<p> When this completes the artifacts have been released to the Apache Nexus staging repository, a local release branch
- has been created and there should the staging repository ID returned in a log entry like this.</p>
-<pre><code> [INFO]  * Closing staging repository with ID &quot;orgapachenifi-1088&quot;</code></pre>
-<p> <strong><em>This staging repository ID is referred to by ${STAGING_REPO_ID} in this release guide.</em></strong></p>
-</li>
-<li><p>Browse to the Apache <a href="https://repository.apache.org/#stagingRepositories">Staging Repository</a> and
-login with your Apache committer credentials and you should see the newly created staging repository listed.  If you
-click on that you can inspect the various staged artifacts.</p>
-</li>
+<pre><code>$ mvn release:perform \
+    -Psigned_release,include-grpc \
+    -DscmCommentPrefix=&quot;${JIRA_TICKET}-RC${RC} &quot; \
+    -Darguments=&quot;-DskipTests&quot;
+</code></pre>
+<p>When this completes the artifacts have been released to the Apache Nexus staging repository, a local release branch<br>
+has been created and there should the staging repository ID returned in a log entry like this.</p>
+<pre><code>[INFO]  * Closing staging repository with ID &quot;orgapachenifi-1088&quot;
+</code></pre>
+<p><strong><em>This staging repository ID is referred to by ${STAGING_REPO_ID} in this release guide.</em></strong></p></li>
+<li><p>Browse to the Apache <a href="https://repository.apache.org/#stagingRepositories">Staging Repository</a> and<br>
+login with your Apache committer credentials and you should see the newly created staging repository listed.  If you<br>
+click on that you can inspect the various staged artifacts.</p></li>
 <li><p>Validate that all the various aspects of the staged artifacts appear correct</p>
 <ul>
 <li>Download the sources.  Do they compile cleanly?  If the result is a build does it execute?</li>
 <li>Validate the hashes match.</li>
 <li>Validate that the sources contain no unexpected binaries.</li>
 <li>Validate the signature for the build and hashes.</li>
-<li>Validate the LICENSE/NOTICE/Headers.  </li>
+<li>Validate the LICENSE/NOTICE/Headers.</li>
 <li>Validate that the README is present and provides sufficient information to build and if necessary execute.</li>
-</ul>
-</li>
+</ul></li>
 <li><p>The validated artifacts all look good then push the branch to origin release branch to the ASF repository.</p>
-<pre><code> $ git push asf NIFI-${JIRA_TICKET}-RC${RC}</code></pre>
-<p> <strong><em>From this branch, the ${RC_TAG_COMMIT_ID} will be the 40 byte commit hash with the comment NIFI-${JIRA_TICKET}-RC${RC} prepare release nifi-${NIFI_VERSION}-RC${RC}</em></strong></p>
-</li>
+<pre><code>$ git push asf NIFI-${JIRA_TICKET}-RC${RC}
+</code></pre>
+<p><strong><em>From this branch, the ${RC_TAG_COMMIT_ID} will be the 40 byte commit hash with the comment NIFI-${JIRA_TICKET}-RC${RC} prepare release nifi-${NIFI_VERSION}-RC${RC}</em></strong></p></li>
 <li><p>Create the signature and hashes for the source release and convenience binary files.</p>
 <ol>
-<li>ASCII armored GPG signatures (<code>--digest-algo=SHA512</code> select the SHA512 hash algorithm). <a href="https://www.apache.org/dev/openpgp.html#key-gen-avoid-sha1">Configure GPG to always prefer stronger hashes</a>.<pre><code> $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-source-release.zip  # produces nifi-${NIFI_VERSION}-source-release.zip.asc
- $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.tar.gz          # produces nifi-${NIFI_VERSION}-bin.tar.gz.asc
- $ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.zip             # produces nifi-${NIFI_VERSION}-bin.zip.asc
- $ gpg -a -b --digest-algo=SHA512 nifi-toolkit-${NIFI_VERSION}-bin.zip     # produces nifi-toolkit-${NIFI_VERSION}-bin.zip.asc
- $ gpg -a -b --digest-algo=SHA512 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz  # produces nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.asc</code></pre>
-</li>
-<li>Generate SHA1 hash summaries.<pre><code> $ shasum -a 1 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha1
- $ shasum -a 1 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha1
- $ shasum -a 1 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha1
- $ shasum -a 1 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha1
- $ shasum -a 1 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha1</code></pre>
-</li>
-<li>Generate SHA256 hash summaries.<pre><code> $ shasum -a 256 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha256
- $ shasum -a 256 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha256
- $ shasum -a 256 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha256
- $ shasum -a 256 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha256
- $ shasum -a 256 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha256</code></pre>
-</li>
-<li>Generate SHA512 hash summaries.<pre><code> $ shasum -a 512 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha512
- $ shasum -a 512 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha512
- $ shasum -a 512 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha512
- $ shasum -a 512 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha512
- $ shasum -a 512 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha512</code></pre>
-</li>
+<li>ASCII armored GPG signatures (<code>--digest-algo=SHA512</code> select the SHA512 hash algorithm). <a href="https://www.apache.org/dev/openpgp.html#key-gen-avoid-sha1">Configure GPG to always prefer stronger hashes</a>.
+<pre><code>$ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-source-release.zip  # produces nifi-${NIFI_VERSION}-source-release.zip.asc
+$ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.tar.gz          # produces nifi-${NIFI_VERSION}-bin.tar.gz.asc
+$ gpg -a -b --digest-algo=SHA512 nifi-${NIFI_VERSION}-bin.zip             # produces nifi-${NIFI_VERSION}-bin.zip.asc
+$ gpg -a -b --digest-algo=SHA512 nifi-toolkit-${NIFI_VERSION}-bin.zip     # produces nifi-toolkit-${NIFI_VERSION}-bin.zip.asc
+$ gpg -a -b --digest-algo=SHA512 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz  # produces nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.asc
+</code></pre></li>
+<li>Generate SHA1 hash summaries.
+<pre><code>$ shasum -a 1 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha1
+$ shasum -a 1 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha1
+$ shasum -a 1 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha1
+$ shasum -a 1 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha1
+$ shasum -a 1 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha1
+</code></pre></li>
+<li>Generate SHA256 hash summaries.
+<pre><code>$ shasum -a 256 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha256
+$ shasum -a 256 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha256
+$ shasum -a 256 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha256
+$ shasum -a 256 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha256
+$ shasum -a 256 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha256
+</code></pre></li>
+<li>Generate SHA512 hash summaries.
+<pre><code>$ shasum -a 512 nifi-${NIFI_VERSION}-source-release.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-source-release.zip.sha512
+$ shasum -a 512 nifi-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.tar.gz.sha512
+$ shasum -a 512 nifi-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi-${NIFI_VERSION}-bin.zip.sha512
+$ shasum -a 512 nifi-toolkit-${NIFI_VERSION}-bin.zip | cut -d&quot; &quot; -f1 &gt;  nifi--toolkit${NIFI_VERSION}-bin.zip.sha512
+$ shasum -a 512 nifi-toolkit-${NIFI_VERSION}-bin.tar.gz | cut -d&quot; &quot; -f1 &gt;  nifi-toolkit-${NIFI_VERSION}-bin.tar.gz.sha512
+</code></pre></li>
+</ol></li>
+<li><p>For reviewing of the release candidate, commit the source release and convenience binaries files along with their<br>
+hashes and signatures to <code>https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}</code>.</p></li>
 </ol>
-</li>
-<li><p>For reviewing of the release candidate, commit the source release and convenience binaries files along with their
-hashes and signatures to <code>https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION}</code>.</p>
-</li>
-</ol>
-<h3 id="step-4-error-recovery-rm-">Step 4. Error recovery (RM)</h3>
-<p>If anything isn&#39;t correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete
-the local tag in git.  If you also delete the local branch and clear your local maven repository under org/apache/nifi
-then it is as if the release never happened.  Before doing that though try to figure out what went wrong so the Release
+<h3>Step 4. Error recovery (RM)</h3>
+<p>If anything isn't correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete<br>
+the local tag in git.  If you also delete the local branch and clear your local maven repository under org/apache/nifi<br>
+then it is as if the release never happened.  Before doing that though try to figure out what went wrong so the Release<br>
 Guide can be updated or corrected if necessary.</p>
-<p>So, as has been described here you can test the release process until you get it right.  The <code>mvn versions:set -Pinclude-grpc</code> and
-<code>mvn versions:commit -Pinclude-grpc</code> commands can come in handy to help do this so you can set versions to something clearly release
+<p>So, as has been described here you can test the release process until you get it right.  The <code>mvn versions:set -Pinclude-grpc</code> and<br>
+<code>mvn versions:commit -Pinclude-grpc</code> commands can come in handy to help do this so you can set versions to something clearly release<br>
 test related.</p>
-<h3 id="step-5-release-vote-rm-and-community-">Step 5. Release Vote (RM and community)</h3>
-<p>After the release source and artifacts are staged in the repositories it&#39;s time for the RM to send a release vote to the
-NiFi community.  </p>
-<p>Once the release vote is called for, members of the NiFi developer community have 72 hours to evaluate the RC and
+<h3>Step 5. Release Vote (RM and community)</h3>
+<p>After the release source and artifacts are staged in the repositories it's time for the RM to send a release vote to the<br>
+NiFi community.</p>
+<p>Once the release vote is called for, members of the NiFi developer community have 72 hours to evaluate the RC and<br>
 cast their vote by replying to the &quot;[VOTE] Release ...&quot; email sent by the RM.</p>
-<p><em>NOTE:  The release vote is majority rule vote that must include at least 3 binding +1 votes Apache NiFi PMC members
+<p><em>NOTE:  The release vote is majority rule vote that must include at least 3 binding +1 votes Apache NiFi PMC members<br>
 and more positive than negative binding votes.</em></p>
 <ol>
 <li><p>RM sends a vote request email to the NiFi Developers Mailing List.</p>
 <ul>
 <li>TO: <code>dev@nifi.apache.org</code></li>
 <li>FROM: <code>${RM_USERID}@apache.org</code></li>
-<li><p>SUBJECT: <code>[VOTE] Release Apache NiFi ${NIFI_VERSION}</code></p>
+<li>SUBJECT: <code>[VOTE] Release Apache NiFi ${NIFI_VERSION}</code></li>
+</ul>
 <pre><code>Hello,
 
 I am pleased to be calling this vote for the source release of Apache NiFi nifi-${NIFI_VERSION}.
@@ -430,15 +438,14 @@ from source, and test.  The please vote:
 
 [ ] +1 Release this package as nifi-${NIFI_VERSION}
 [ ] +0 no opinion
-[ ] -1 Do not release this package because...</code></pre>
-</li>
-</ul>
-</li>
+[ ] -1 Do not release this package because...
+</code></pre></li>
 <li><p>RM sends the following helper email to the NiFi Developers Mailing List.</p>
 <ul>
 <li>TO: <code>dev@nifi.apache.org</code></li>
 <li>FROM: <code>${RM_USERID}@apache.org</code></li>
-<li><p>SUBJECT: <code>Apache NiFi ${NIFI_VERSION} RC${RC} Release Helper Guide</code></p>
+<li>SUBJECT: <code>Apache NiFi ${NIFI_VERSION} RC${RC} Release Helper Guide</code></li>
+</ul>
 <pre><code>Hello Apache NiFi community,
 
 Please find the associated guidance to help those interested in validating/verifying the release so they can vote.
@@ -487,107 +494,97 @@ mvn clean install -Pcontrib-check,includ
 
 # Send a response to the vote thread indicating a +1, 0, -1 based on your findings.
 
-Thank you for your time and effort to validate the release!</code></pre>
-</li>
-</ul>
-</li>
-<li><p>Developers in the community review the release candidate and reply to the vote email with their vote.</p>
-</li>
+Thank you for your time and effort to validate the release!
+</code></pre></li>
+<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>
 <li>at least 3 binding (PMC members) cast +1 votes, and</li>
 <li>the positive binding votes out number any negative binding votes</li>
 </ul>
-<p>the vote passes and the release candidate is officially released. If the vote does not pass, corrections are made
-on the release branch and a new release candidate is put forward for a new vote.</p>
-</li>
+<p>the vote passes and the release candidate is officially released. If the vote does not pass, corrections are made<br>
+on the release branch and a new release candidate is put forward for a new vote.</p></li>
 <li><p>RM sends vote result email.</p>
 <ul>
 <li>TO: <code>dev@nifi.apache.org</code></li>
 <li>FROM: <code>${RM_USERID}@apache.org</code></li>
-<li><p>SUBJECT: <code>[RESULT][VOTE] Release Apache NiFi ${NIFI_VERSION}</code></p>
+<li>SUBJECT: <code>[RESULT][VOTE] Release Apache NiFi ${NIFI_VERSION}</code></li>
+</ul>
 <pre><code>Apache NiFi Community,
 
 I am pleased to announce that the ${NIFI_VERSION} release of Apache NiFi passes with
-  X +1 (binding) votes
-  Y +1 (non-binding) votes
-  0 0 votes
-  0 -1 votes
+    X +1 (binding) votes
+    Y +1 (non-binding) votes
+    0 0 votes
+    0 -1 votes
 
 Thanks to all who helped make this release possible.
 
-Here is the PMC vote thread: ${VOTE_THREAD_URL}</code></pre>
-</li>
-</ul>
-</li>
+Here is the PMC vote thread: ${VOTE_THREAD_URL}
+</code></pre></li>
 </ol>
-<h3 id="step-6-finalize-the-release">Step 6. Finalize the Release</h3>
+<h3>Step 6. Finalize the Release</h3>
 <p>After the vote is complete and the release is approved, these steps complete the release process.</p>
 <ol>
-<li>Move convenience binaries and related artifacts from dist/dev to dist/release:  <pre><code> $ svn move -m &quot;NIFI-${JIRA_TICKET}&quot; https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION} https://dist.apache.org/repos/dist/release/nifi/${NIFI_VERSION}</code></pre>
-</li>
-<li><p>In repository.apache.org go to the staging repository and select <code>release</code> and follow the instructions on the site.</p>
-</li>
+<li><p>Move convenience binaries and related artifacts from dist/dev to dist/release:</p>
+<pre><code>$ svn move -m &quot;NIFI-${JIRA_TICKET}&quot; https://dist.apache.org/repos/dist/dev/nifi/nifi-${NIFI_VERSION} https://dist.apache.org/repos/dist/release/nifi/${NIFI_VERSION}
+</code></pre></li>
+<li><p>In repository.apache.org go to the staging repository and select <code>release</code> and follow the instructions on the site.</p></li>
 <li><p>Merge the release branch into master.</p>
-<pre><code> $ git checkout master
- $ git merge --no-ff NIFI-${JIRA_TICKET}-RC${RC}
- $ git push asf master</code></pre>
-</li>
-<li><p>Update Docker version information to point to the next release.  For instance, if the next version applied by Maven is 1.3.0-SNAPSHOT, these values should be updated to 1.3.0. This currently consists of two files:</p>
+<pre><code>$ git checkout master
+$ git merge --no-ff NIFI-${JIRA_TICKET}-RC${RC}
+$ git push asf master
+</code></pre></li>
+<li><p>Update Docker version information to point to the next release.  For instance, if the next version applied by Maven is 1.3.0-SNAPSHOT, these values should be updated to 1.3.0. This currently consists of two files:</p></li>
+</ol>
 <ul>
 <li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/Dockerfile#L24">nifi-docker/dockerhub/Dockerfile, Line 24</a>, and</li>
 <li><a href="https://github.com/apache/nifi/blob/master/nifi-docker/dockerhub/DockerImage.txt#L16">nifi-docker/dockerhub/DockerImage.txt, Line 16</a>.</li>
 </ul>
-</li>
-<li><p>Update the NiFi website to point to the new download(s).  Remove older release artifacts from download page (leave
-the current release and the previous one).  For the release just previous to this new one change the links to point to
-the archive location.  See current page as an example of the needed URL changes.  In addition to updating the download
-page as described delete artifacts other than the current/new release from the dist/nifi SVN storage.  They are already
-in the archive location so no need to do anything else.</p>
-</li>
-<li><p>Update the <a href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance">Migration Guide</a> on the Wiki.</p>
-</li>
-<li><p>Update the NiFi Web Page to indicate NEWS of the release as appropriate</p>
-</li>
+<ol>
+<li><p>Update the NiFi website to point to the new download(s).  Remove older release artifacts from download page (leave<br>
+the current release and the previous one).  For the release just previous to this new one change the links to point to<br>
+the archive location.  See current page as an example of the needed URL changes.  In addition to updating the download<br>
+page as described delete artifacts other than the current/new release from the dist/nifi SVN storage.  They are already<br>
+in the archive location so no need to do anything else.</p></li>
+<li><p>Update the <a href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance">Migration Guide</a> on the Wiki.</p></li>
+<li><p>Update the NiFi Web Page to indicate NEWS of the release as appropriate</p></li>
 <li><p>If the release is on the latest development line, update the NiFi website documentation pages to match the release.</p>
 <ol>
 <li>Run the NiFi ${NIFI_VERSION}</li>
 <li>Pull down the documentation by running <code>wget -prk http://${host}:${port}/nifi-docs/documentation</code></li>
 <li>Rename the file index file that was generated by running <code>mv ${host}:${port}/nifi-docs/documentation ${host}:${port}/nifi-docs/index.html</code></li>
 <li>Use svn to replace the <code>nifi</code> and <code>nifi-docs</code> folders in <code>https://svn.apache.org/repos/asf/nifi/site/trunk/docs</code> with those in the <code>${host}:${port}</code> directory pulled down above</li>
+</ol></li>
+<li><p>In JIRA mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.</p></li>
+<li><p>Ensure the release artifacts are successfully mirrored to the archive, specifically https://archive.apache.org/dist/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-bin.tar.gz.<br>
+This convenience binary file is the basis for our <a href="https://hub.docker.com/r/apache/nifi">Docker build</a> and is needed in place before the released tag is pushed to the repository.  If there were any<br>
+issues with the above listed file not being available, it may be necessary to reach out to the ASF Infra team to adjust file size limits to accommodate larger artifacts.</p></li>
 </ol>
-</li>
-<li><p>In JIRA mark the release version as &#39;Released&#39; and &#39;Archived&#39; through &#39;version&#39; management in the &#39;administration&#39; console.</p>
-</li>
-<li><p>Ensure the release artifacts are successfully mirrored to the archive, specifically <a href="https://archive.apache.org/dist/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-bin.tar.gz">https://archive.apache.org/dist/nifi/${NIFI_VERSION}/nifi-${NIFI_VERSION}-bin.tar.gz</a>.<br>This convenience binary file is the basis for our <a href="https://hub.docker.com/r/apache/nifi">Docker build</a> and is needed in place before the released tag is pushed to the repository.  If there were any 
-issues with the above listed file not being available, it may be necessary to reach out to the ASF Infra team to adjust file size limits to accommodate larger artifacts.</p>
-</li>
-</ol>
-<p>NOTE: The <a href="https://hub.docker.com/r/apache/nifi">Docker build</a> is triggered by pushing the signed tag in the next step. The release artifacts must be present
+<p>NOTE: The <a href="https://hub.docker.com/r/apache/nifi">Docker build</a> is triggered by pushing the signed tag in the next step. The release artifacts must be present<br>
 in the archive before continuing.</p>
 <ol>
 <li><p>Create a proper signed tag of the released codebase based on the RC Tag created during the Maven release process.</p>
-<pre><code>$ git tag -s rel/nifi-${NIFI_VERSION} -m &quot;${JIRA_TICKET} signed release tag for approved release of NiFi ${NIFI_VERSION}&quot; ${RC_TAG_COMMIT_ID}</code></pre>
-<p>For instructions on setting up to sign your tag see <a href="http://gitready.com/advanced/2014/11/02/gpg-sign-releases.html">here</a>.      </p>
-</li>
+<pre><code>$ git tag -s rel/nifi-${NIFI_VERSION} -m &quot;${JIRA_TICKET} signed release tag for approved release of NiFi ${NIFI_VERSION}&quot; ${RC_TAG_COMMIT_ID}
+</code></pre>
+<p>For instructions on setting up to sign your tag see <a href="http://gitready.com/advanced/2014/11/02/gpg-sign-releases.html">here</a>.</p></li>
 <li><p>Push the release tag to the official ASF repository.</p>
-<pre><code>$ git push asf rel/nifi-${NIFI_VERSION}</code></pre>
-</li>
-<li><p>Verify that the Docker build began at the <a href="https://hub.docker.com/r/apache/nifi/builds/">Build Status</a> page.  If the build does not take place soon after the release tag was pushed, it may be necessary to contact ASF Infra to ask for assistance and the job to be triggered again.</p>
-</li>
-<li><p>Update the release notes with the final date of the release.</p>
-</li>
-<li><p>After the release has been complete for 24 hours send the release announcement.</p>
+<pre><code>$ git push asf rel/nifi-${NIFI_VERSION}
+</code></pre></li>
+<li><p>Verify that the Docker build began at the <a href="https://hub.docker.com/r/apache/nifi/builds/">Build Status</a> page.  If the build does not take place soon after the release tag was pushed, it may be necessary to contact ASF Infra to ask for assistance and the job to be triggered again.</p></li>
+<li><p>Update the release notes with the final date of the release.</p></li>
+<li><p>After the release has been complete for 24 hours send the release announcement.</p></li>
+</ol>
 <ul>
 <li>See <a href="https://www.apache.org/dev/release.html#release-announcements">here</a> for an understanding of why you need to wait 24 hours</li>
-<li>The announcement should addressed as follows.<ul>
+<li>The announcement should addressed as follows.
+<ul>
 <li>TO: <code>announce@apache.org</code>, <code>dev@nifi.apache.org</code></li>
 <li>REPLY-TO: <code>dev@nifi.apache.org</code></li>
 <li>FROM: ${RM_USERID}@apache.org</li>
-</ul>
-</li>
+</ul></li>
 <li>The subject should include <code>[ANNOUNCE] Apache NiFi x.y.z release</code>.</li>
-<li><p>The text should be based on the template included below.</p>
+<li>The text should be based on the template included below.
 <pre><code>Hello
 
 The Apache NiFi team would like to announce the release of Apache NiFi ${NIFI_VERSION}.
@@ -612,29 +609,28 @@ Release note highlights can be found her
 https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version${NIFI_VERSION}
 
 Thank you
-The Apache NiFi team</code></pre>
-</li>
+The Apache NiFi team
+</code></pre></li>
 </ul>
-</li>
-</ol>
-
     </div>
 </div>
 
         <div class="row">
-    <div class="large-12 columns footer">
-        <a href="https://www.apache.org">
-            <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200">
-        </a>
-        <div id="copyright">
-            <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
-                    href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
-                Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
-                Foundation.</p>
+            <div class="large-12 columns footer">
+                <a href="https://www.apache.org">
+                    <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200" style="margin:0px 10px" />
+                </a>
+                <a  href="http://www.apache.org/events/current-event.html">
+                    <img src="http://www.apache.org/events/current-event-234x60.png" style="margin:0px 10px" />
+                </a>
+                <div id="copyright">
+                    <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
+                            href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+                        Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
+                        Foundation.</p>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
         <script src="assets/js/jquery.min.js"></script>
         <script src="assets/js/foundation.js"></script>
         <script src="assets/js/app.js"></script>

Modified: nifi/site/trunk/security.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/security.html?rev=1828794&r1=1828793&r2=1828794&view=diff
==============================================================================
--- nifi/site/trunk/security.html (original)
+++ nifi/site/trunk/security.html Tue Apr 10 07:50:11 2018
@@ -20,89 +20,87 @@
     </head>
     <body>
         <div class="sticky contain-to-grid">
-    <nav class="top-bar" data-topbar role="navigation">
-        <ul class="title-area">
-            <li class="name">
-                <h1>
-                    <a href="index.html">
-                        <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
-                    </a>
-                </h1>
-            </li>
-            <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-            <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
-        </ul>
-
-        <section class="top-bar-section">
-            <!-- Right Nav Section -->
-            <ul class="right">
-                <li class="has-dropdown">
-                    <a href="#">Project</a>
-                    <ul class="dropdown">
-                        <li><a href="index.html">Home</a></li>
-                        <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
-                        <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Documentation</a>
-                    <ul class="dropdown">
-                        <li><a href="faq.html">FAQ</a></li>
-                        <li><a href="videos.html">Videos</a></li>
-                        <li><a href="docs.html">NiFi Docs</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
-                        <li><a href="security.html">Security Reports</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Downloads</a>
-                    <ul class="dropdown">
-                        <li><a href="download.html">Download NiFi</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Community</a>
-                    <ul class="dropdown">
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
-                        <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
-                        <li><a href="people.html">People</a></li>
-                        <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Development</a>
-                    <ul class="dropdown">
-                        <li><a href="quickstart.html">Quickstart</a></li>
-                        <li><a href="release-guide.html">Release Guide</a></li>
-                        <li><a href="licensing-guide.html">Licensing Guide</a></li>
-                        <li><a href="developer-guide.html">Developer Guide</a></li>
-                        <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
-                        <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">ASF Links</a>
-                    <ul class="dropdown">
-                        <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
-                        <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
-                        <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
-                        <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Subprojects</a>
-                    <ul class="dropdown">
-                        <li><a href="minifi/index.html">MiNiFi</a></li>
-                        <li><a href="registry.html">Registry</a></li>
+            <nav class="top-bar" data-topbar role="navigation">
+                <ul class="title-area">
+                    <li class="name">
+                        <h1>
+                            <a href="index.html">
+                                <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
+                            </a>
+                        </h1>
+                    </li>
+                    <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+                    <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
+                </ul>
+        
+                <section class="top-bar-section">
+                    <!-- Right Nav Section -->
+                    <ul class="right">
+                        <li class="has-dropdown">
+                            <a href="#">Project</a>
+                            <ul class="dropdown">
+                                <li><a href="index.html">Home</a></li>
+                                <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
+                                <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Documentation</a>
+                            <ul class="dropdown">
+                                <li><a href="faq.html">FAQ</a></li>
+                                <li><a href="videos.html">Videos</a></li>
+                                <li><a href="docs.html">NiFi Docs</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
+                                <li><a href="security.html">Security Reports</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Downloads</a>
+                            <ul class="dropdown">
+                                <li><a href="download.html">Download NiFi</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Community</a>
+                            <ul class="dropdown">
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
+                                <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
+                                <li><a href="people.html">People</a></li>
+                                <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Development</a>
+                            <ul class="dropdown">
+                                <li><a href="quickstart.html">Quickstart</a></li>
+                                <li><a href="release-guide.html">Release Guide</a></li>
+                                <li><a href="licensing-guide.html">Licensing Guide</a></li>
+                                <li><a href="developer-guide.html">Developer Guide</a></li>
+                                <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
+                                <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">ASF Links</a>
+                            <ul class="dropdown">
+                                <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
+                                <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
+                                <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
+                                <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Subprojects</a>
+                            <ul class="dropdown">
+                                <li><a href="minifi/index.html">MiNiFi</a></li>
+                                <li><a href="registry.html">Registry</a></li>
+                            </ul>
+                        </li>
                     </ul>
-                </li>
-            </ul>
-        </section>
-    </nav>
-</div>
-
-
+                </section>
+            </nav>
+        </div>
 
 
 <div class="large-space"></div>
@@ -371,22 +369,23 @@
 </div>
 
         <div class="row">
-    <div class="large-12 columns footer">
-        <a href="https://www.apache.org">
-            <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200">
-        </a>
-        <div id="copyright">
-            <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
-                    href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
-                Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
-                Foundation.</p>
+            <div class="large-12 columns footer">
+                <a href="https://www.apache.org">
+                    <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200" style="margin:0px 10px" />
+                </a>
+                <a  href="http://www.apache.org/events/current-event.html">
+                    <img src="http://www.apache.org/events/current-event-234x60.png" style="margin:0px 10px" />
+                </a>
+                <div id="copyright">
+                    <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
+                            href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+                        Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
+                        Foundation.</p>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
         <script src="assets/js/jquery.min.js"></script>
         <script src="assets/js/foundation.js"></script>
         <script src="assets/js/app.js"></script>
     </body>
 </html>
-

Modified: nifi/site/trunk/videos.html
URL: http://svn.apache.org/viewvc/nifi/site/trunk/videos.html?rev=1828794&r1=1828793&r2=1828794&view=diff
==============================================================================
--- nifi/site/trunk/videos.html (original)
+++ nifi/site/trunk/videos.html Tue Apr 10 07:50:11 2018
@@ -20,89 +20,87 @@
     </head>
     <body>
         <div class="sticky contain-to-grid">
-    <nav class="top-bar" data-topbar role="navigation">
-        <ul class="title-area">
-            <li class="name">
-                <h1>
-                    <a href="index.html">
-                        <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
-                    </a>
-                </h1>
-            </li>
-            <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-            <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
-        </ul>
-
-        <section class="top-bar-section">
-            <!-- Right Nav Section -->
-            <ul class="right">
-                <li class="has-dropdown">
-                    <a href="#">Project</a>
-                    <ul class="dropdown">
-                        <li><a href="index.html">Home</a></li>
-                        <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
-                        <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Documentation</a>
-                    <ul class="dropdown">
-                        <li><a href="faq.html">FAQ</a></li>
-                        <li><a href="videos.html">Videos</a></li>
-                        <li><a href="docs.html">NiFi Docs</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
-                        <li><a href="security.html">Security Reports</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Downloads</a>
-                    <ul class="dropdown">
-                        <li><a href="download.html">Download NiFi</a></li>
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Community</a>
-                    <ul class="dropdown">
-                        <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
-                        <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
-                        <li><a href="people.html">People</a></li>
-                        <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
+            <nav class="top-bar" data-topbar role="navigation">
+                <ul class="title-area">
+                    <li class="name">
+                        <h1>
+                            <a href="index.html">
+                                <img id="logo-top-bar" src="assets/images/nifi-drop-white.svg" alt="Apache NiFi"/>
+                            </a>
+                        </h1>
+                    </li>
+                    <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+                    <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
+                </ul>
+        
+                <section class="top-bar-section">
+                    <!-- Right Nav Section -->
+                    <ul class="right">
+                        <li class="has-dropdown">
+                            <a href="#">Project</a>
+                            <ul class="dropdown">
+                                <li><a href="index.html">Home</a></li>
+                                <li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
+                                <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Documentation</a>
+                            <ul class="dropdown">
+                                <li><a href="faq.html">FAQ</a></li>
+                                <li><a href="videos.html">Videos</a></li>
+                                <li><a href="docs.html">NiFi Docs</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI"><i class="fa fa-external-link external-link"></i>Wiki</a></li>
+                                <li><a href="security.html">Security Reports</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Downloads</a>
+                            <ul class="dropdown">
+                                <li><a href="download.html">Download NiFi</a></li>
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes"><i class="fa fa-external-link external-link"></i>Release Notes</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Community</a>
+                            <ul class="dropdown">
+                                <li><a href="https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide"><i class="fa fa-external-link external-link"></i>Contributor Guide</a></li>
+                                <li><a href="mailing_lists.html">Mailing Lists &amp; Chat</a></li>
+                                <li><a href="people.html">People</a></li>
+                                <li><a href="powered-by-nifi.html">Powered by NiFi</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Development</a>
+                            <ul class="dropdown">
+                                <li><a href="quickstart.html">Quickstart</a></li>
+                                <li><a href="release-guide.html">Release Guide</a></li>
+                                <li><a href="licensing-guide.html">Licensing Guide</a></li>
+                                <li><a href="developer-guide.html">Developer Guide</a></li>
+                                <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
+                                <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">ASF Links</a>
+                            <ul class="dropdown">
+                                <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
+                                <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
+                                <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
+                                <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
+                            </ul>
+                        </li>
+                        <li class="has-dropdown">
+                            <a href="#">Subprojects</a>
+                            <ul class="dropdown">
+                                <li><a href="minifi/index.html">MiNiFi</a></li>
+                                <li><a href="registry.html">Registry</a></li>
+                            </ul>
+                        </li>
                     </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Development</a>
-                    <ul class="dropdown">
-                        <li><a href="quickstart.html">Quickstart</a></li>
-                        <li><a href="release-guide.html">Release Guide</a></li>
-                        <li><a href="licensing-guide.html">Licensing Guide</a></li>
-                        <li><a href="developer-guide.html">Developer Guide</a></li>
-                        <li><a href="https://git-wip-us.apache.org/repos/asf/nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
-                        <li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">ASF Links</a>
-                    <ul class="dropdown">
-                        <li><a href="https://www.apache.org"><i class="fa fa-external-link external-link"></i>Apache Software Foundation</a></li>
-                        <li><a href="https://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link external-link"></i>Sponsorship</a></li>
-                        <li><a href="https://www.apache.org/security/"><i class="fa fa-external-link external-link"></i>Security</a></li>
-                        <li><a href="https://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link external-link"></i>Thanks</a></li>
-                    </ul>
-                </li>
-                <li class="has-dropdown">
-                    <a href="#">Subprojects</a>
-                    <ul class="dropdown">
-                        <li><a href="minifi/index.html">MiNiFi</a></li>
-                        <li><a href="registry.html">Registry</a></li>
-                    </ul>
-                </li>
-            </ul>
-        </section>
-    </nav>
-</div>
-
-
+                </section>
+            </nav>
+        </div>
 
 
 <div class="large-space"></div>
@@ -208,22 +206,23 @@
 </div>
 
         <div class="row">
-    <div class="large-12 columns footer">
-        <a href="https://www.apache.org">
-            <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200">
-        </a>
-        <div id="copyright">
-            <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
-                    href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
-                Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
-                Foundation.</p>
+            <div class="large-12 columns footer">
+                <a href="https://www.apache.org">
+                    <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/asf_logo.png" width="200" style="margin:0px 10px" />
+                </a>
+                <a  href="http://www.apache.org/events/current-event.html">
+                    <img src="http://www.apache.org/events/current-event-234x60.png" style="margin:0px 10px" />
+                </a>
+                <div id="copyright">
+                    <p>Copyright &#169; 2017 The Apache Software Foundation, Licensed under the <a
+                            href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+                        Apache feather logo, NiFi, Apache NiFi and the project logo are trademarks of The Apache Software
+                        Foundation.</p>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
         <script src="assets/js/jquery.min.js"></script>
         <script src="assets/js/foundation.js"></script>
         <script src="assets/js/app.js"></script>
     </body>
 </html>
-