From 38daf321ad783a120ad13a2f5893ca781374d6f0 Mon Sep 17 00:00:00 2001
From: Joe Evans <joseph.evans@gmail.com>
Date: Thu, 7 Apr 2022 11:00:52 -0700
Subject: [PATCH 1/5] Update footer to include required Apache links, according
 to https://www.apache.org/foundation/marks/pmcs#navigation

---
 docs/static_site/src/_includes/footer.html    | 22 ++++++++++++++-----
 .../static_site/src/_sass/minima/_layout.scss |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/static_site/src/_includes/footer.html b/docs/static_site/src/_includes/footer.html
index 7e289dc5dd8e..a1eb24e48b8e 100644
--- a/docs/static_site/src/_includes/footer.html
+++ b/docs/static_site/src/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-4">
+            <div class="col-5">
                 <h4 class="footer-category-title">Resources</h4>
                 <ul class="contact-list">
                     <li><a href="{{'community/contribute#mxnet-dev-communications'|relative_url}}">Mailing lists</a></li>
@@ -10,15 +10,25 @@ <h4 class="footer-category-title">Resources</h4>
                     <li><a href="https://github.com/apache/incubator-mxnet/labels/Roadmap">Github Roadmap</a></li>
                     <li><a href="https://discuss.mxnet.io">MXNet Discuss forum</a></li>
                     <li><a href="{{'community/contribute'|relative_url}}">Contribute To MXNet</a></li>
-
+                </ul>
+            </div>
+            <div class="col-5">
+                <h4 class="footer-category-title">Apache</h4>
+                <ul class="apache-list">
+                    <li><a href="https://www.apache.org/foundation/">Foundation</a></li>
+                    <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                    <li><a href="{{'/api/faq/security.html' | relative_url }}">Security</a></li>
+                    <li><a href="https://www.apache.org/licenses/">License</a></li>
+                    <li><a href="https://www.apache.org/events/current-event">Events</a></li>
+                    <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
                 </ul>
             </div>
 
-            <div class="col-4">
+            <div class="col-5">
                 {%- include social.html -%}
             </div>
 
-            <div class="col-4 footer-text">
+            <div class="col-5 footer-text">
                 <p>{{- site.description | escape -}}</p>
             </div>
         </div>
@@ -31,13 +41,13 @@ <h4 class="footer-category-title">Resources</h4>
                 <img src="{{'/assets/img/apache_incubator_logo.png' | relative_url}}" class="footer-logo col-2">
             </div>
             <div class="footer-bottom-warning col-9">
-                <p>Apache MXNet is an effort undergoing incubation at The Apache Software Foundation (ASF), <span
+                <p>Apache MXNet is an effort undergoing incubation at <a href="http://www.apache.org/">The Apache Software Foundation</a> (ASF), <span
                         style="font-weight:bold">sponsored by the <i>Apache Incubator</i></span>. Incubation is required
                     of all newly accepted projects until a further review indicates that the infrastructure,
                     communications, and decision making process have stabilized in a manner consistent with other
                     successful ASF projects. While incubation status is not necessarily a reflection of the completeness
                     or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-                </p><p>"Copyright © 2017-2018, The Apache Software Foundation Apache MXNet, MXNet, Apache, the Apache
+                </p><p>"Copyright © 2017-2022, The Apache Software Foundation Apache MXNet, MXNet, Apache, the Apache
                     feather, and the Apache MXNet project logo are either registered trademarks or trademarks of the
                     Apache Software Foundation."</p>
             </div>
diff --git a/docs/static_site/src/_sass/minima/_layout.scss b/docs/static_site/src/_sass/minima/_layout.scss
index 5dd4a968a354..8ed010aebf32 100644
--- a/docs/static_site/src/_sass/minima/_layout.scss
+++ b/docs/static_site/src/_sass/minima/_layout.scss
@@ -184,6 +184,7 @@
 }
 
 .contact-list,
+.apache-list,
 .social-media-list {
   list-style: none;
   margin-left: 0;

From 11aa060b4f7a3685c8cb7b61bd0b595081797bf3 Mon Sep 17 00:00:00 2001
From: Joe Evans <joseph.evans@gmail.com>
Date: Thu, 7 Apr 2022 11:26:03 -0700
Subject: [PATCH 2/5] Better layout with col-3 class.

---
 docs/static_site/src/_includes/footer.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/static_site/src/_includes/footer.html b/docs/static_site/src/_includes/footer.html
index a1eb24e48b8e..47ebc37fca8d 100644
--- a/docs/static_site/src/_includes/footer.html
+++ b/docs/static_site/src/_includes/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-5">
+            <div class="col-3">
                 <h4 class="footer-category-title">Resources</h4>
                 <ul class="contact-list">
                     <li><a href="{{'community/contribute#mxnet-dev-communications'|relative_url}}">Mailing lists</a></li>
@@ -12,7 +12,7 @@ <h4 class="footer-category-title">Resources</h4>
                     <li><a href="{{'community/contribute'|relative_url}}">Contribute To MXNet</a></li>
                 </ul>
             </div>
-            <div class="col-5">
+            <div class="col-3">
                 <h4 class="footer-category-title">Apache</h4>
                 <ul class="apache-list">
                     <li><a href="https://www.apache.org/foundation/">Foundation</a></li>
@@ -24,11 +24,11 @@ <h4 class="footer-category-title">Apache</h4>
                 </ul>
             </div>
 
-            <div class="col-5">
+            <div class="col-3">
                 {%- include social.html -%}
             </div>
 
-            <div class="col-5 footer-text">
+            <div class="col-3 footer-text">
                 <p>{{- site.description | escape -}}</p>
             </div>
         </div>

From 076661db778bd1eef72fe06c3dedc9469cb9c5ed Mon Sep 17 00:00:00 2001
From: Bartosz Kuncer <bartosz.kuncer@intel.com>
Date: Wed, 6 Apr 2022 14:31:05 +0200
Subject: [PATCH 3/5] Fix 'module 'jinja2' has no attribute 'contextfilter''

---
 julia/docs/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/julia/docs/Makefile b/julia/docs/Makefile
index 337a28615e6e..f0b111479860 100644
--- a/julia/docs/Makefile
+++ b/julia/docs/Makefile
@@ -20,8 +20,9 @@ all:
 	  'using Pkg; \
 	   Pkg.develop(PackageSpec(name="MXNet", path = joinpath(pwd(), "..")))'
 	julia --color=yes --project=./ ./make.jl
-	pip install --user Markdown==3.1 \
-          mkdocs==1.0.4 \
+	pip install --user jinja2>=2.7.1,<3.1.0 \
+	  Markdown==3.1 \
+	  mkdocs==1.0.4 \
 	  mkdocs-material==4.6.0 \
 	  pygments==2.5.2 \
 	  pymdown-extensions==6.2.1 \

From 36607694f91228685fa7b9340effaadfa7e7f8bd Mon Sep 17 00:00:00 2001
From: bartekkuncer <bartosz.kuncer@intel.com>
Date: Wed, 6 Apr 2022 15:45:05 +0200
Subject: [PATCH 4/5] Update Makefile

---
 julia/docs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/julia/docs/Makefile b/julia/docs/Makefile
index f0b111479860..108149963a09 100644
--- a/julia/docs/Makefile
+++ b/julia/docs/Makefile
@@ -20,7 +20,7 @@ all:
 	  'using Pkg; \
 	   Pkg.develop(PackageSpec(name="MXNet", path = joinpath(pwd(), "..")))'
 	julia --color=yes --project=./ ./make.jl
-	pip install --user jinja2>=2.7.1,<3.1.0 \
+	pip install --user jinja2==3.0.3 \
 	  Markdown==3.1 \
 	  mkdocs==1.0.4 \
 	  mkdocs-material==4.6.0 \

From cc7c9f8e3e199215bdb1cca282cfd72f4ae6923b Mon Sep 17 00:00:00 2001
From: bartekkuncer <bartosz.kuncer@intel.com>
Date: Wed, 6 Apr 2022 15:47:38 +0200
Subject: [PATCH 5/5] Update Makefile

---
 julia/docs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/julia/docs/Makefile b/julia/docs/Makefile
index 108149963a09..829e87d16643 100644
--- a/julia/docs/Makefile
+++ b/julia/docs/Makefile
@@ -20,7 +20,7 @@ all:
 	  'using Pkg; \
 	   Pkg.develop(PackageSpec(name="MXNet", path = joinpath(pwd(), "..")))'
 	julia --color=yes --project=./ ./make.jl
-	pip install --user jinja2==3.0.3 \
+	pip install --user "jinja2>=2.7.1,<3.1.0" \
 	  Markdown==3.1 \
 	  mkdocs==1.0.4 \
 	  mkdocs-material==4.6.0 \