This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main-staging
in repository https://gitbox.apache.org/repos/asf/nifi-site.git


The following commit(s) were added to refs/heads/main-staging by this push:
     new 3a8edca  NIFI-10282 Updated Downloads pages with Markdown and 
shortcodes
3a8edca is described below

commit 3a8edcab0e89c121b69a2ae413752ae373f2ee48
Author: exceptionfactory <[email protected]>
AuthorDate: Tue Jul 26 13:32:52 2022 -0500

    NIFI-10282 Updated Downloads pages with Markdown and shortcodes
    
    - Added download-links shortcode
    - Added project-label shortcode
    - Added config variables for current and previous project versions
---
 config.toml                            | 11 +++-
 layouts/shortcodes/download-links.html | 31 +++++++++++
 layouts/shortcodes/project-label.html  |  1 +
 source/download.html                   | 95 ----------------------------------
 source/download.md                     | 51 ++++++++++++++++++
 source/minifi/download.html            | 65 +++++++----------------
 source/registry.html                   | 16 ++----
 source/release-guide.md                | 26 ++++------
 8 files changed, 124 insertions(+), 172 deletions(-)

diff --git a/config.toml b/config.toml
index 1b726b3..dedc049 100644
--- a/config.toml
+++ b/config.toml
@@ -37,4 +37,13 @@ repositorySourceBranch = "main"
 
 siteRepositoryUrl = "https://github.com/apache/nifi-site";
 siteRepositorySourceBranch = "main"
-assets = "assets"
\ No newline at end of file
+assets = "assets"
+
+dynamicDownloadPathUrl = "https://www.apache.org/dyn/closer.lua?path=/nifi";
+downloadPathUrl = "https://downloads.apache.org/nifi";
+archiveDownloadPathUrl = "https://archive.apache.org/dist/nifi";
+
+currentProjectVersion = "1.16.3"
+currentProjectVersionReleased = "2022-06-15"
+previousProjectVersion = "1.15.3"
+previousProjectVersionReleased = "2022-01-18"
diff --git a/layouts/shortcodes/download-links.html 
b/layouts/shortcodes/download-links.html
new file mode 100644
index 0000000..202e50b
--- /dev/null
+++ b/layouts/shortcodes/download-links.html
@@ -0,0 +1,31 @@
+{{- $downloadVersion := (.Site.Params.currentProjectVersion) -}}
+{{- $primaryDownloadUrl := (.Site.Params.dynamicDownloadPathUrl) -}}
+{{- $secondaryDownloadUrl := (.Site.Params.downloadPathUrl) -}}
+
+{{- if eq (.Get "version") "previous" -}}
+  {{- $downloadVersion = (.Site.Params.previousProjectVersion) -}}
+  {{- $primaryDownloadUrl = (.Site.Params.archiveDownloadPathUrl) -}}
+  {{- $secondaryDownloadUrl = (.Site.Params.archiveDownloadPathUrl) -}}
+{{- end -}}
+
+{{- $project := "nifi" -}}
+{{- with .Get "project" -}}
+  {{- $project = . -}}
+{{- end -}}
+
+{{- $qualifier := "" -}}
+{{- with .Get "qualifier" -}}
+  {{- $qualifier = (print . "-") -}}
+{{- end -}}
+
+{{- $extension := "" -}}
+{{- with .Get "extension" -}}
+  {{- $extension = . -}}
+{{- end -}}
+
+{{- $downloadFilePath := (print $downloadVersion "/" $project "-" $qualifier 
$downloadVersion "-" $extension) -}}
+
+<a href="{{ $primaryDownloadUrl }}/{{ $downloadFilePath }}">{{ .Get "label" }} 
{{ $downloadVersion }}</a>
+[<a href="{{ $secondaryDownloadUrl }}/{{ $downloadFilePath }}.asc">OpenPGP</a>]
+[<a href="{{ $secondaryDownloadUrl }}/{{ $downloadFilePath 
}}.sha256">SHA-256</a>]
+[<a href="{{ $secondaryDownloadUrl }}/{{ $downloadFilePath 
}}.sha512">SHA-512</a>]
diff --git a/layouts/shortcodes/project-label.html 
b/layouts/shortcodes/project-label.html
new file mode 100644
index 0000000..d889061
--- /dev/null
+++ b/layouts/shortcodes/project-label.html
@@ -0,0 +1 @@
+<span class="ni">ni</span><span class="fi">fi</span>
diff --git a/source/download.html b/source/download.html
deleted file mode 100644
index e5d64f5..0000000
--- a/source/download.html
+++ /dev/null
@@ -1,95 +0,0 @@
----
-title: Apache NiFi Downloads
----
-
-<div class="large-space"></div>
-<div class="row">
-    <div class="large-12 columns">
-        <h1 class="nifi-txt">
-            <span>
-                Apache <span class="ni">ni</span><span class="fi">fi</span> 
Downloads
-            </span>
-        </h1>
-    </div>
-</div>
-<div class="row">
-    <div class="large-12 columns">
-        <p>To verify the downloads please follow these <a 
href="https://www.apache.org/info/verification.html";>procedures</a>
-            using these <a 
href="https://downloads.apache.org/nifi/KEYS";>KEYS</a></p>
-        <p>If a download is not found please allow up to 24 hours for the 
mirrors to sync.</p>
-    </div>
-</div>
-<div class="row">
-    <div class="large-12 columns">
-        <h2>Releases</h2>
-        <ul>
-            <li><h3>1.16.3</h3>
-                <ul>
-                    <li>Released June 15, 2022</li>
-                    <li>
-                        Sources:
-                        <ul>
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-1.16.3-source-release.zip";>nifi-1.16.3-source-release.zip</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-source-release.zip.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-source-release.zip.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-source-release.zip.sha512";>sha512</a>
 )</li>
-                        </ul>
-                    </li>
-                    <li>
-                        Binaries
-                        <ul>
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-1.16.3-bin.tar.gz";>nifi-1.16.3-bin.tar.gz</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-1.16.3-bin.zip";>nifi-1.16.3-bin.zip</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.zip.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.zip.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-1.16.3-bin.zip.sha512";>sha512</a>
 )</li>
-
-
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-toolkit-1.16.3-bin.tar.gz";>nifi-toolkit-1.16.3-bin.tar.gz</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-toolkit-1.16.3-bin.zip";>nifi-toolkit-1.16.3-bin.zip</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.zip.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.zip.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-toolkit-1.16.3-bin.zip.sha512";>sha512</a>
 )</li>
-                            <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-stateless-1.16.3-bin.tar.gz";>nifi-stateless-1.16.3-bin.tar.gz</a>
 ( <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-stateless-1.16.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-stateless-1.16.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-stateless-1.16.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-                        </ul>
-                    </li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.16.3";>Release
 Notes</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance";>Migration
 Guidance</a></li>
-                </ul>
-            </li>
-            <li><h3>1.15.3</h3>
-                <ul>
-                    <li>Released January 18, 2022</li>
-                    <li><strong>Note: The download links pull from 
archive.apache.org.  Apache limits how much can be downloaded from this site 
per day so please avoid automated/continuous downloads from the 
archives</strong></li>
-                    <li>
-                        Sources:
-                        <ul>
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-source-release.zip";>nifi-1.15.3-source-release.zip</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-source-release.zip.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-source-release.zip.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-source-release.zip.sha512";>sha512</a>
 )</li>
-                        </ul>
-                    </li>
-                    <li>
-                        Binaries
-                        <ul>
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.tar.gz";>nifi-1.15.3-bin.tar.gz</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.zip";>nifi-1.15.3-bin.zip</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.zip.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.zip.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-1.15.3-bin.zip.sha512";>sha512</a>
 )</li>
-
-
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz";>nifi-toolkit-1.15.3-bin.tar.gz</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.zip";>nifi-toolkit-1.15.3-bin.zip</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.zip.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.zip.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-toolkit-1.15.3-bin.zip.sha512";>sha512</a>
 )</li>
-                            <li><a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-stateless-1.15.3-bin.tar.gz";>nifi-stateless-1.15.3-bin.tar.gz</a>
 ( <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-stateless-1.15.3-bin.tar.gz.asc";>asc</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-stateless-1.15.3-bin.tar.gz.sha256";>sha256</a>,
 <a 
href="https://archive.apache.org/dist/nifi/1.15.3/nifi-stateless-1.15.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-                        </ul>
-                    </li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.15.3";>Release
 Notes</a></li>
-                    <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance";>Migration
 Guidance</a></li>
-                </ul>
-            </li>
-        </ul>
-    </div>
-    <div class="row">
-        <div class="large-12 columns">
-            <h3>Docker images of convenience binaries are hosted on <a 
href="https://hub.docker.com/";>Docker Hub</a></h3>
-            <ul>
-                <li><a href="https://hub.docker.com/r/apache/nifi/";>Apache 
NiFi Docker Image</a></li>
-            </ul>
-        </div>
-    </div>
-<div class="row">
-    <div class="large-12 columns">
-        <p>If you need access to older releases they can be found in the <a 
href="https://archive.apache.org/dist/nifi/";>release archives</a>. Please note 
that the link is to archive.apache.org.  Apache limits how much can be 
downloaded from this site per day so please avoid automated/continuous 
downloads from the archives.</p>
-    </div>
-</div>
diff --git a/source/download.md b/source/download.md
new file mode 100644
index 0000000..04554c9
--- /dev/null
+++ b/source/download.md
@@ -0,0 +1,51 @@
+---
+title: Apache NiFi Downloads
+containerEnabled: true
+---
+
+# Apache {{< project-label >}} Downloads
+
+Apache NiFi [Project Keys](https://downloads.apache.org/nifi/KEYS) can be used 
to
+[verify downloads](https://www.apache.org/info/verification.html). 
+
+Please allow up to 24 hours for mirrors to synchronize following the release 
of a new version.
+
+Previous releases can be found in [release 
archives](https://archive.apache.org/dist/nifi/).
+Please avoid repeated downloads from archives to avoid infrastructure rate 
limits.
+
+## Releases
+
+### {{< param currentProjectVersion >}}
+
+- Released: {{< param currentProjectVersionReleased >}}
+  - [Release 
Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{<
 param currentProjectVersion >}})
+  - [Migration 
Guidance](https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance)
+- Sources
+  - {{< download-links label="Apache NiFi Sources" 
extension=source-release.zip >}}
+- Binaries 
+  - {{< download-links label="Apache NiFi Binary" extension=bin.zip >}} 
+  - {{< download-links label="Apache NiFi Stateless Binary" 
qualifier="stateless" extension=bin.tar.gz >}}
+  - {{< download-links label="Apache NiFi Toolkit Binary" qualifier="toolkit" 
extension=bin.zip >}}
+
+### {{< param previousProjectVersion >}}
+
+- Released: {{< param previousProjectVersionReleased >}}
+  - [Release 
Notes](https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{<
 param previousProjectVersion >}})
+  - [Migration 
Guidance](https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance)
+- Sources
+  - {{< download-links label="Apache NiFi Sources" 
extension=source-release.zip version=previous >}}
+- Binaries
+  - {{< download-links label="Apache NiFi Binary" extension=bin.zip 
version=previous >}}
+  - {{< download-links label="Apache NiFi Stateless Binary" 
qualifier="stateless" extension=bin.tar.gz version=previous >}}
+  - {{< download-links label="Apache NiFi Toolkit Binary" qualifier="toolkit" 
extension=bin.zip version=previous >}}
+
+## Images
+
+[Docker Hub](https://hub.docker.com) hosts container images of convenience 
binaries.
+
+- [Apache NiFi](https://hub.docker.com/r/apache/nifi)
+- [Apache NiFi Toolkit](https://hub.docker.com/r/apache/nifi-toolkit)
+- [Apache NiFi Registry](https://hub.docker.com/r/apache/nifi-registry)
+- [Apache NiFi MiNiFi](https://hub.docker.com/r/apache/nifi-minifi)
+- [Apache NiFi MiNiFi C++](https://hub.docker.com/r/apache/nifi-minifi-cpp)
+- [Apache NiFi MiNiFi C2](https://hub.docker.com/r/apache/nifi-minifi-c2)
diff --git a/source/minifi/download.html b/source/minifi/download.html
index 9c8cc09..195b3b4 100644
--- a/source/minifi/download.html
+++ b/source/minifi/download.html
@@ -8,7 +8,7 @@ menu: minifi-topbar.html
     <div class="large-12 columns">
         <h1 class="nifi-txt">
             <span>
-                Apache <span class="ni">ni</span><span class="fi">fi</span> 
<span class="minifi">minifi</span> Downloads
+                Apache {{< project-label >}} <span 
class="minifi">minifi</span> Downloads
             </span>
         </h1>
     </div>
@@ -23,30 +23,33 @@ menu: minifi-topbar.html
 <div class="row">
     <div class="large-12 columns">
         <h2>Releases</h2>
-        <h3>MiNiFi (Java)</h3>
+        <h3>MiNiFi Java</h3>
         <ul>
-          <li>1.16.3
+          <li>{{< param currentProjectVersion >}}
               <ul>
-                      Sources:
+                  <li>Released: {{< param currentProjectVersionReleased 
>}}</li>
+                  <ul>
+                    <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{<
 param currentProjectVersion >}}">Release Notes</a></li>
+                  </ul>
+              </ul>
+              <ul>
+                  <li>Sources
                       <ul>
-                          <li><a 
href="http://nifi.apache.org/download.html";>Source comes from NiFi</a>
-                          </li>
+                          <li>{{< download-links label="Apache NiFi Sources" 
extension=source-release.zip >}}</li>
                       </ul>
                   </li>
                   <li>
                       Binaries
                       <ul>
-                          <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-1.16.3-bin.tar.gz";>minifi-1.16.3-bin.tar.gz</a>
-                            ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-1.16.3-bin.tar.gz.asc";>asc</a>,
-                              <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-1.16.3-bin.tar.gz.sha256";>sha256</a>
 )
-                          </li>
-                          <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-1.16.3-bin.zip";>minifi-1.16.3-bin.zip</a>
-                            ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-1.16.3-bin.zip.asc";>asc</a>,
-                              <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-1.16.3-bin.zip.sha256";>sha256</a>
 )
+                          <li>{{< download-links label="Apache NiFi MiNiFi 
Binary" project=minifi extension=bin.zip >}}</li>
+                      </ul>
+                      <ul>
+                          <li>{{< download-links label="Apache NiFi MiNiFi 
Toolkit Binary" project=minifi qualifier=toolkit extension=bin.zip >}}</li>
+                      </ul>
+                      <ul>
+                          <li>{{< download-links label="Apache NiFi MiNiFi 
Command and Control Binary" project=minifi qualifier=c2 extension=bin.zip 
>}}</li>
                       </ul>
                   </li>
-
-                  <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.16.3";>Release
 Notes</a></li>
               </ul>
           </li>
         </ul>
@@ -102,37 +105,5 @@ menu: minifi-topbar.html
               </ul>
           </li>
         </ul>
-        <h3>MiNiFi Toolkit Binaries</h3>
-        <ul>
-          <li>1.16.3
-            <ul>
-              <li>
-                <a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-toolkit-1.16.3-bin.tar.gz";>minifi-toolkit-1.16.3-bin.tar.gz</a>
-                ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-toolkit-1.16.3-bin.tar.gz.asc";>asc</a>,
-                  <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-toolkit-1.16.3-bin.tar.gz.sha256";>sha256</a>
 )
-              </li>
-              <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-toolkit-1.16.3-bin.zip";>minifi-toolkit-1.16.3-bin.zip</a>
-                ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-toolkit-1.16.3-bin.zip.asc";>asc</a>,
-                  <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-toolkit-1.16.3-bin.zip.sha256";>sha256</a>
 )
-              </li>
-            </ul>
-          </li>
-        </ul>
-        <h3>MiNiFi Command and Control Server Binaries</h3>
-        <ul>
-          <li>1.16.3
-            <ul>
-              <li>
-                <a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-c2-1.16.3-bin.tar.gz";>minifi-c2-1.16.3-bin.tar.gz</a>
-                ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-c2-1.16.3-bin.tar.gz.asc";>asc</a>,
-                  <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-c2-1.16.3-bin.tar.gz.sha256";>sha256</a>
 )
-              </li>
-              <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/minifi-c2-1.16.3-bin.zip";>minifi-c2-1.16.3-bin.zip</a>
-                ( <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-c2-1.16.3-bin.zip.asc";>asc</a>,
-                  <a 
href="https://downloads.apache.org/nifi/1.16.3/minifi-c2-1.16.3-bin.zip.sha256";>sha256</a>
 )
-              </li>
-            </ul>
-          </li>
-        </ul>
     </div>
 </div>
diff --git a/source/registry.html b/source/registry.html
index f73e6da..fa5813e 100644
--- a/source/registry.html
+++ b/source/registry.html
@@ -67,29 +67,21 @@ title: Apache NiFi - Registry
               </p>
               <ul>
                   <li>
-                      1.16.3
+                      {{< param currentProjectVersion >}}
                       <ul>
                           <li>
                               Sources
                               <ul>
-                                  <li><a 
href="http://nifi.apache.org/download.html";>NiFi Registry sources are in the 
NiFi source</a></li>
+                                  <li>{{< download-links label="Apache NiFi 
Sources" extension=source-release.zip >}}</li>
                               </ul>
                           </li>
                           <li>
                               Binaries
                               <ul>
-                                  <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-registry-1.16.3-bin.tar.gz";>nifi-registry-1.16.3-bin.tar.gz</a>
 (
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.tar.gz.asc";>asc</a>,
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.tar.gz.sha256";>sha256</a>,
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.tar.gz.sha512";>sha512</a>
 )</li>
-
-                                  <li><a 
href="https://www.apache.org/dyn/closer.lua?path=/nifi/1.16.3/nifi-registry-1.16.3-bin.zip";>nifi-registry-1.16.3-bin.zip</a>
 (
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.zip.asc";>asc</a>,
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.zip.sha256";>sha256</a>,
-                                      <a 
href="https://downloads.apache.org/nifi/1.16.3/nifi-registry-1.16.3-bin.zip.sha512";>sha512</a>
 )</li>
+                                  <li>{{< download-links label="Apache NiFi 
Registry" qualifier="registry" extension=bin.zip >}}</li>
                               </ul>
                           </li>
-                          <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.16.3";>Release
 Notes</a></li>
+                          <li><a 
href="https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{<
 param currentProjectVersion >}}">Release Notes</a></li>
                       </ul>
                   </li>
               </ul>
diff --git a/source/release-guide.md b/source/release-guide.md
index 2e54475..2c263b6 100644
--- a/source/release-guide.md
+++ b/source/release-guide.md
@@ -415,27 +415,19 @@ After the vote is complete and the release is approved, 
these steps complete the
     git push asf main
     ```
 
-1. 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.
-
 1. Remove artifacts other than the current/new release from the dist/SVN 
storage https://dist.apache.org/repos/dist/release/nifi/ Confirm the artifacts 
you deleted are present in apache archive where ASF keeps all releases forever 
http://archive.apache.org/dist/nifi/
 
 1. Update the [Migration Guide][nifi-migration-guide] on the Wiki.
 
-1. If the release is on the latest development line, update the NiFi website 
documentation pages to match the release. _(This section will be updated when a 
complete plan for maintaining different versions of the guides, API docs, etc. 
is available.)_
-    1. Run the NiFi ${NIFI_VERSION}
-    1. Pull down the documentation by running `wget -prk 
http://${host}:${port}/nifi-docs/documentation`
-    1. Rename the directory to avoid escaping characters by running `mv -v 
${host}\:${port} ${NIFI_VERSION}-docs` 
-    1. Rename the file index file that was generated by running `mv -v 
${NIFI_VERSION}-docs/nifi-docs/documentation 
${NIFI_VERSION}-docs/nifi-docs/index.html`
-    1. Merge the existing documentation (i.e. version _n-1_, _n-2_, etc.) with 
the new version documentation _(`rsync` is used to avoid issues with recursion 
and merging)_
-        1. Checkout the existing Subversion repository containing the docs by 
running `svn co https://svn.apache.org/repos/asf/nifi/site/trunk/docs svn-docs`
-        1. Replace the `nifi` directory (site JS assets, images, etc.) by 
running `rsync -av ${NIFI_VERSION}-docs/nifi/ svn-docs/nifi/`
-        1. Replace the `nifi-docs/...` directories (guides, API docs, JS/CSS 
assets, images, etc. but _excluding_ `component` docs) by running `rsync -av 
--delete --exclude='components' ${NIFI_VERSION}-docs/nifi-docs/ 
svn-docs/nifi-docs/` (the trailing slashes are important)
-        1. Merge the component documentation by running `rsync -av 
${NIFI_VERSION}-docs/nifi-docs/components/ svn-docs/nifi-docs/components/`
-        1. (Optional) Check the status by running `svn st svn-docs`
-        1. Add the new files to version control by running `cd svn-docs && svn 
add . --force`
-        1. Commit the changes by running `svn ci -m "Added ${NIFI_VERSION} 
docs to NiFi site."`
+1. Update the NiFi website to point to the new downloads.
+
+    1. Update the following website configuration variables in 
[config.toml](https://github.com/apache/nifi-site/blob/main/config.toml)
+        1. Set `currentProjectVersion` to the new released version
+        2. Set `currentProjectVersionReleased` to the date of release 
publication
+        3. Set `previousProjectVersion` to the previous released version
+        4. Set `previousProjectVersionReleased` to the date of release 
publication for the previous version
+        
+1. If the release is on the latest development line, update the NiFi website 
documentation pages to match the release. See [Website 
Publishing](https://cwiki.apache.org/confluence/display/NIFI/Website+Publishing)
 on the project wiki for updating generated documentation.
 
 1. In JIRA mark the release version as 'Released' and 'Archived' through 
'version' management in the 'administration' console.
 

Reply via email to