[incubator-mxnet] branch v1.x updated: [v1.x] Port #21055 from v1.9.x branch and fix CD docker python pipeline (#21062)

jevans Thu, 09 Jun 2022 14:48:32 -0700

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

jevans pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git



The following commit(s) were added to refs/heads/v1.x by this push:
     new 79fe506207 [v1.x] Port #21055 from v1.9.x branch and fix CD docker 
python pipeline (#21062)
79fe506207 is described below

commit 79fe5062079f5701c61a6c1bab827cd419198e6e
Author: Joe Evans <[email protected]>
AuthorDate: Thu Jun 9 14:48:07 2022 -0700

    [v1.x] Port #21055 from v1.9.x branch and fix CD docker python pipeline 
(#21062)
    
    * [v1.9.x] Website updates to address ASF website check tool results 
(#21055)
    
    * Switch from using Google Analytics to ASF Matmomo on MXNet website.
    
    * Add link to ASF privacy policy to MXNet website.
    
    * Remove live Medium blog integration and blog page and replace with link 
to blog in footer.
    
    * Add ASF header.
    
    * Add updated nvidia key to container.
    
    * Add updated nvidia key to container.
    
    * Fix download link (use https instead of http) for latest version.
    
    * Change page description to include Apache MXNet.
    
    * Update project name on trusted by page.
    
    * Update project name on features page.
    
    * Update contribute page.
    
    * Update ecosystem page.
    
    * Remove duplicate title.
    
    * Use local copies for js libraries.
    
    * Do not link to dmlc site for graphics, instead store copy locally.
    
    * Ignore temporary files.
    
    * Use local img for pip package list instead of to dmlc website.
    
    * Update project name on getting started page.
    
    * Simplify footer links.
    
    * Update homepage
    
    * Update MXNet to Apache MXNet.
    
    * Update python docs.
    
    * Update install selector page.
    
    * Update README to include new release, new URL to jenkins server and 
ensure it's clear this is an Apache project.
    
    * Move ASF links to main nav in python docs.
    
    * Move ASF links to main nav on MXNet site.
    
    * Make it clear this is an Apache project.
    
    * Skip flakey test test_quantization_mkldnn.test_quantized_rnn: tracked in 
#21061
    
    * Remove skip of flakey test.
    
    * pass arg to dockerfile
    
    * fix LD path for cuda files
    
    * change cuda version arg name
    
    * update gpu base image in ci
    
    * update base image in Dockerfile.build.ubuntu_build_cuda
    
    Co-authored-by: Wei Chu <[email protected]>
---
 README.md                                          |   7 +--
 cd/python/docker/Dockerfile                        |  10 +++-
 cd/python/docker/python_images.sh                  |   9 +++-
 ci/docker/Dockerfile.build.jetson                  |   2 +
 ci/docker/Dockerfile.build.ubuntu_build_cuda       |   6 +--
 ci/docker/Dockerfile.build.ubuntu_gpu_cu100        |   7 +--
 ci/docker/Dockerfile.build.ubuntu_gpu_cu101        |   7 +--
 ci/docker/Dockerfile.build.ubuntu_gpu_cu102        |   7 +--
 ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt     |   2 +
 .../{google_analytics.js => matomo_analytics.js}   |  22 +++++----
 docs/python_docs/python/api/index.rst              |   2 +-
 docs/python_docs/python/scripts/conf.py            |   2 +-
 .../themes/mx-theme/mxtheme/footer.html            |  22 +++------
 .../themes/mx-theme/mxtheme/header_top.html        |  16 ++++++-
 docs/static_site/Makefile                          |   5 +-
 docs/static_site/src/.gitignore                    |   6 +++
 docs/static_site/src/_config_prod.yml              |   1 -
 docs/static_site/src/_includes/footer.html         |  22 +++------
 .../src/_includes/get_started/get_started.html     |   2 +-
 .../src/_includes/get_started/pip_snippet.md       |   2 +-
 .../src/_includes/google-analytics.html            |  12 -----
 docs/static_site/src/_includes/head.html           |   6 +--
 docs/static_site/src/_includes/header.html         |  16 ++++++-
 .../src/_includes/matomo-analytics.html            |  18 ++++++++
 docs/static_site/src/_layouts/home.html            |  37 ++-------------
 docs/static_site/src/assets/img/medium_black.svg   |  13 ++++++
 .../src/assets/img/pip-packages-1.9.1.png          | Bin 0 -> 66695 bytes
 docs/static_site/src/assets/img/reddit_blue.svg    |  19 ++++++++
 docs/static_site/src/assets/img/twitter.svg        |  15 ++++++
 docs/static_site/src/assets/img/youtube_red.svg    |  20 ++++++++
 docs/static_site/src/pages/api/api.html            |  10 ++--
 .../pages/api/architecture/exception_handling.md   |   6 +--
 .../src/pages/api/architecture/overview.md         |   2 +-
 .../src/pages/api/architecture/program_model.md    |   4 +-
 docs/static_site/src/pages/api/python/index.md     |   6 +--
 docs/static_site/src/pages/blog.html               |  51 ---------------------
 docs/static_site/src/pages/community/contribute.md |  43 +++++++++--------
 docs/static_site/src/pages/ecosystem.html          |  14 +++---
 docs/static_site/src/pages/features.html           |   8 ++--
 .../src/pages/get_started/build_from_source.md     |   4 +-
 docs/static_site/src/pages/get_started/download.md |   6 +--
 docs/static_site/src/pages/get_started/index.html  |   4 +-
 docs/static_site/src/pages/trusted_by.html         |   2 +-
 43 files changed, 245 insertions(+), 230 deletions(-)

diff --git a/README.md b/README.md
index ad6ebbf964..92c23643f4 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ At its core, MXNet contains a dynamic dependency scheduler 
that automatically pa
 A graph optimization layer on top of that makes symbolic execution fast and 
memory efficient.
 MXNet is portable and lightweight, scalable to many GPUs and machines.
 
-MXNet is more than a deep learning project. It is a 
[community](https://mxnet.apache.org/versions/master/community)
+Apache MXNet is more than a deep learning project. It is a 
[community](https://mxnet.apache.org/versions/master/community)
 on a mission of democratizing AI. It is a collection of [blue prints and 
guidelines](https://mxnet.apache.org/api/architecture/overview)
 for building deep learning systems, and interesting insights of DL systems for 
hackers.
 
@@ -40,8 +40,8 @@ Licensed under an 
[Apache-2.0](https://github.com/apache/incubator-mxnet/blob/ma
 
 | Branch  | Build Status  |
 |:-------:|:-------------:|
-| [master](https://github.com/apache/incubator-mxnet/tree/master) | [![CentOS 
CPU Build 
Status](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-cpu/job/master/badge/icon?subject=build%20centos%20cpu)](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-cpu/job/master/)
 [![CentOS GPU Build 
Status](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-gpu/job/master/badge/icon?subject=build%20centos%20gpu)](http://jenkins.mxnet-ci.ama
 [...]
-| [v1.x](https://github.com/apache/incubator-mxnet/tree/v1.x) | [![CentOS CPU 
Build 
Status](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-cpu/job/v1.x/badge/icon?subject=build%20centos%20cpu)](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-cpu/job/v1.x/)
 [![CentOS GPU Build 
Status](http://jenkins.mxnet-ci.amazon-ml.com/job/mxnet-validation/job/centos-gpu/job/v1.x/badge/icon?subject=build%20centos%20gpu)](http://jenkins.mxnet-ci.amazon-ml.com
 [...]
+| [master](https://github.com/apache/incubator-mxnet/tree/master) | [![CentOS 
CPU Build 
Status](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-cpu/job/master/badge/icon?subject=build%20centos%20cpu)](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-cpu/job/master/)
 [![CentOS GPU Build 
Status](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-gpu/job/master/badge/icon?subject=build%20centos%20gpu)](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/cent
 [...]
+| [v1.x](https://github.com/apache/incubator-mxnet/tree/v1.x) | [![CentOS CPU 
Build 
Status](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-cpu/job/v1.x/badge/icon?subject=build%20centos%20cpu)](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-cpu/job/v1.x/)
 [![CentOS GPU Build 
Status](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-gpu/job/v1.x/badge/icon?subject=build%20centos%20gpu)](http://jenkins.mxnet-ci.com/job/mxnet-validation/job/centos-gpu/job
 [...]
 
 Features
 --------
@@ -65,6 +65,7 @@ Contents
 
 What's New
 ----------
+* [1.9.1 
Release](https://github.com/apache/incubator-mxnet/releases/tag/1.9.1) - MXNet 
1.9.1 Release.
 * [1.9.0 
Release](https://github.com/apache/incubator-mxnet/releases/tag/1.9.0) - MXNet 
1.9.0 Release.
 * [1.8.0 
Release](https://github.com/apache/incubator-mxnet/releases/tag/1.8.0) - MXNet 
1.8.0 Release.
 * [1.7.0 
Release](https://github.com/apache/incubator-mxnet/releases/tag/1.7.0) - MXNet 
1.7.0 Release.
diff --git a/cd/python/docker/Dockerfile b/cd/python/docker/Dockerfile
index 16d20832eb..adcf3211ef 100644
--- a/cd/python/docker/Dockerfile
+++ b/cd/python/docker/Dockerfile
@@ -23,6 +23,14 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG CUDA_VARIANT
+
+# manually update cuda repo key: 
https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
+# remove this after nvidia updates the base images with new keys
+RUN if [ "$CUDA_VARIANT" != "false" ] ; then \
+    apt-key adv --fetch-keys 
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub;
 \
+    fi
+
 RUN apt-get update && \
     apt-get install -y software-properties-common && \
     add-apt-repository -y ppa:deadsnakes/ppa && \
@@ -41,7 +49,7 @@ RUN if [ "$MXNET_VARIANT" = "aarch64_cpu" ] ; then \
     tar -xvf arm-performance-libraries_21.0_Ubuntu-18.04_gcc-8.2.tar && \
     
arm-performance-libraries_21.0_Ubuntu-18.04_gcc-8.2/arm-performance-libraries_21.0_Ubuntu-18.04.sh
 -a; \
     fi
-ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/arm/armpl_21.0_gcc-8.2/lib
+ENV 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/arm/armpl_21.0_gcc-8.2/lib:/usr/local/cuda-${CUDA_VARIANT}/compat
 
 ARG MXNET_COMMIT_ID
 ENV MXNET_COMMIT_ID=${MXNET_COMMIT_ID}
diff --git a/cd/python/docker/python_images.sh 
b/cd/python/docker/python_images.sh
index 41bf0d2120..4d9cf131c5 100755
--- a/cd/python/docker/python_images.sh
+++ b/cd/python/docker/python_images.sh
@@ -44,8 +44,15 @@ if [ ! -z "${RELEASE_PUBLIC_ECR_REPOSITORY}" ]; then
 fi
 
 build() {
+    # use this flag to set LD_LIBRARY_PATH for cuda files
+    if [[ $mxnet_variant = cu* ]]; then
+        cuda_variant=${mxnet_variant:2:-1}.${mxnet_variant: -1}
+    else
+        cuda_variant="false"
+    fi
+
     # NOTE: Ensure the correct context root is passed in when building - 
Dockerfile expects ./wheel_build
-    docker build -t "${image_name}" --build-arg BASE_IMAGE="${base_image}" 
--build-arg MXNET_COMMIT_ID=${GIT_COMMIT} --build-arg 
MXNET_VARIANT=${mxnet_variant} -f ${resources_path}/Dockerfile ./wheel_build
+    docker build -t "${image_name}" --build-arg BASE_IMAGE="${base_image}" 
--build-arg MXNET_COMMIT_ID=${GIT_COMMIT} --build-arg 
MXNET_VARIANT=${mxnet_variant} --build-arg CUDA_VARIANT=${cuda_variant} -f 
${resources_path}/Dockerfile ./wheel_build
 }
 
 test() {
diff --git a/ci/docker/Dockerfile.build.jetson 
b/ci/docker/Dockerfile.build.jetson
index 93c5558d22..432c4c3fe6 100644
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -28,6 +28,8 @@ ENV ARCH=aarch64 \
 
 WORKDIR /usr/local
 
+RUN apt-key adv --fetch-keys 
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
+
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     build-essential \
     ninja-build \
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda 
b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 7fa89f1e7f..f5e11100e5 100644
--- a/ci/docker/Dockerfile.build.ubuntu_build_cuda
+++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -21,7 +21,7 @@
 # package generation, requiring the actual CUDA library to be
 # present
 
-FROM nvidia/cuda:10.1-devel-ubuntu18.04
+FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
 
 WORKDIR /work/deps
 
@@ -44,10 +44,6 @@ RUN /work/ubuntu_clang.sh
 COPY install/ubuntu_binutils.sh /work/
 RUN /work/ubuntu_binutils.sh
 
-ENV CUDNN_VERSION=7.6.5.32
-COPY install/ubuntu_cudnn.sh /work/
-RUN /work/ubuntu_cudnn.sh
-
 # Special case because the CPP-Package requires the CUDA runtime libs
 # and not only stubs (which are provided by the base image)
 COPY install/ubuntu_nvidia.sh /work/
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 
b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100
index c10e76ec79..b48dfa598e 100644
--- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100
@@ -18,7 +18,7 @@
 #
 # Dockerfile to run MXNet on Ubuntu 18.04 for GPU
 
-FROM nvidia/cuda:10.0-devel-ubuntu18.04
+FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04
 
 WORKDIR /work/deps
 
@@ -64,11 +64,6 @@ RUN /work/ubuntu_docs.sh
 COPY install/ubuntu_tutorials.sh /work/
 RUN /work/ubuntu_tutorials.sh
 
-ENV CUDA_VERSION=10.0.130
-ENV CUDNN_VERSION=7.6.5.32
-COPY install/ubuntu_cudnn.sh /work/
-RUN /work/ubuntu_cudnn.sh
-
 # Always last
 ARG USER_ID=0
 ARG GROUP_ID=0
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 
b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101
index ef07948894..5f038b437d 100644
--- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101
@@ -18,7 +18,7 @@
 #
 # Dockerfile to run MXNet on Ubuntu 18.04 for GPU
 
-FROM nvidia/cuda:10.1-devel-ubuntu18.04
+FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
 
 WORKDIR /work/deps
 
@@ -64,11 +64,6 @@ RUN /work/ubuntu_docs.sh
 COPY install/ubuntu_tutorials.sh /work/
 RUN /work/ubuntu_tutorials.sh
 
-ENV CUDA_VERSION=10.1.105
-ENV CUDNN_VERSION=7.6.5.32
-COPY install/ubuntu_cudnn.sh /work/
-RUN /work/ubuntu_cudnn.sh
-
 # Always last
 ARG USER_ID=0
 ARG GROUP_ID=0
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 
b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102
index b096306040..21dd41fdbd 100644
--- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102
@@ -18,7 +18,7 @@
 #
 # Dockerfile to run MXNet on Ubuntu 18.04 for GPU
 
-FROM nvidia/cuda:10.2-devel-ubuntu18.04
+FROM nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04
 
 WORKDIR /work/deps
 
@@ -64,11 +64,6 @@ RUN /work/ubuntu_docs.sh
 COPY install/ubuntu_tutorials.sh /work/
 RUN /work/ubuntu_tutorials.sh
 
-ENV CUDA_VERSION=10.2.89
-ENV CUDNN_VERSION=8.0.4.30
-COPY install/ubuntu_cudnn.sh /work/
-RUN /work/ubuntu_cudnn.sh
-
 # Always last
 ARG USER_ID=0
 ARG GROUP_ID=0
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt 
b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt
index 30b6b5d271..5e9af00266 100644
--- a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt
@@ -22,6 +22,8 @@ FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04
 
 WORKDIR /work/deps
 
+RUN apt-key adv --fetch-keys 
https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
+
 COPY install/ubuntu_core.sh /work/
 RUN /work/ubuntu_core.sh
 COPY install/deb_ubuntu_ccache.sh /work/
diff --git a/docs/python_docs/_static/google_analytics.js 
b/docs/python_docs/_static/matomo_analytics.js
similarity index 57%
rename from docs/python_docs/_static/google_analytics.js
rename to docs/python_docs/_static/matomo_analytics.js
index ce6987dbb2..5cb04594b3 100644
--- a/docs/python_docs/_static/google_analytics.js
+++ b/docs/python_docs/_static/matomo_analytics.js
@@ -1,4 +1,4 @@
- /*!
+/*!
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -17,10 +17,16 @@
  * under the License.
  */
 
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-96378503-1', 'auto');
-  ga('send', 'pageview');
+var _paq = window._paq = window._paq || [];
+/* tracker methods like "setCustomDimension" should be called before 
"trackPageView" */
+/* We explicitly disable cookie tracking to avoid privacy issues */
+_paq.push(['disableCookies']);
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
+(function() {
+  var u="https://analytics.apache.org/";;
+  _paq.push(['setTrackerUrl', u+'matomo.php']);
+  _paq.push(['setSiteId', '23']);
+  var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+  g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+})();
diff --git a/docs/python_docs/python/api/index.rst 
b/docs/python_docs/python/api/index.rst
index 47363cf07c..5f6bb8b51b 100644
--- a/docs/python_docs/python/api/index.rst
+++ b/docs/python_docs/python/api/index.rst
@@ -21,7 +21,7 @@ Python API
 Overview
 --------
 
-This API section details functions, modules, and objects included in MXNet,
+This API section details functions, modules, and objects included in Apache 
MXNet,
 describing what they are and what they do. The APIs are grouped into the
 following categories:
 
diff --git a/docs/python_docs/python/scripts/conf.py 
b/docs/python_docs/python/scripts/conf.py
index 3d54b2ea3f..684c8decb3 100644
--- a/docs/python_docs/python/scripts/conf.py
+++ b/docs/python_docs/python/scripts/conf.py
@@ -241,6 +241,6 @@ def setup(app):
     app.add_transform(AutoStructify)
     app.add_config_value('recommonmark_config', {
     }, True)
-    app.add_javascript('google_analytics.js')
+    app.add_javascript('matomo_analytics.js')
     import mxtheme
     app.add_directive('card', mxtheme.CardDirective)
diff --git a/docs/python_docs/themes/mx-theme/mxtheme/footer.html 
b/docs/python_docs/themes/mx-theme/mxtheme/footer.html
index a17a243fcc..9c0da629e2 100644
--- a/docs/python_docs/themes/mx-theme/mxtheme/footer.html
+++ b/docs/python_docs/themes/mx-theme/mxtheme/footer.html
@@ -1,7 +1,7 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-3">
+            <div class="col-4">
                 <h4 class="footer-category-title">Resources</h4>
                 <ul class="contact-list">
                     <li><a class="u-email" 
href="mailto:[email protected]";>Dev list</a></li>
@@ -9,27 +9,17 @@
                     <li><a 
href="https://cwiki.apache.org/confluence/display/MXNET/Apache+MXNet+Home";>Developer
 Wiki</a></li>
                     <li><a 
href="https://issues.apache.org/jira/projects/MXNET/issues";>Jira 
Tracker</a></li>
                     <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">Contribute To 
MXNet</a></li>
+                    <li><a href="https://medium.com/apache-mxnet";>Blog</a></li>
+                    <li><a href="https://discuss.mxnet.io";>Forum</a></li>
+                    <li><a href="/community/contribute">Contribute</a></li>
 
                 </ul>
             </div>
-            <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>
-                    <li><a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
-                    <li><a href="/api/faq/security.html">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-3"><ul class="social-media-list"><li><a 
href="https://github.com/apache/incubator-mxnet";><svg class="svg-icon"><use 
xlink:href="{{pathto('_static/minima-social-icons.svg#github', 
1)}}"></use></svg> <span 
class="username">apache/incubator-mxnet</span></a></li><li><a 
href="https://www.twitter.com/apachemxnet";><svg class="svg-icon"><use 
xlink:href="{{pathto('_static/minima-social-icons.svg#twitter', 
1)}}"></use></svg> <span class="username">apachemxnet</span></a> [...]
+            <div class="col-4"><ul class="social-media-list"><li><a 
href="https://github.com/apache/incubator-mxnet";><svg class="svg-icon"><use 
xlink:href="{{pathto('_static/minima-social-icons.svg#github', 
1)}}"></use></svg> <span 
class="username">apache/incubator-mxnet</span></a></li><li><a 
href="https://www.twitter.com/apachemxnet";><svg class="svg-icon"><use 
xlink:href="{{pathto('_static/minima-social-icons.svg#twitter', 
1)}}"></use></svg> <span class="username">apachemxnet</span></a> [...]
 </div>
 
-            <div class="col-3 footer-text">
+            <div class="col-4 footer-text">
                 <p>A flexible and efficient library for deep learning.</p>
             </div>
         </div>
diff --git a/docs/python_docs/themes/mx-theme/mxtheme/header_top.html 
b/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
index c04f928cad..67b487c192 100644
--- a/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
+++ b/docs/python_docs/themes/mx-theme/mxtheme/header_top.html
@@ -14,12 +14,26 @@
 
       <div class="trigger">
         <a class="page-link" href="/versions/1.9.1/get_started">Get Started</a>
-        <a class="page-link" href="/versions/1.9.1/blog">Blog</a>
         <a class="page-link" href="/versions/1.9.1/features">Features</a>
         <a class="page-link" href="/versions/1.9.1/ecosystem">Ecosystem</a>
         <a class="page-link page-current" href="/versions/1.9.1/api">Docs & 
Tutorials</a>
         <a class="page-link" href="/versions/1.9.1/trusted_by">Trusted By</a>
         <a class="page-link" 
href="https://github.com/apache/incubator-mxnet";>GitHub</a>
+        <div class="dropdown" style="min-width:100px">
+          <span class="dropdown-header">Apache
+            <svg class="dropdown-caret" viewBox="0 0 32 32" class="icon 
icon-caret-bottom" aria-hidden="true"><path class="dropdown-caret-path" d="M24 
11.305l-7.997 11.39L8 11.305z"></path></svg>
+          </span>
+          <div class="dropdown-content" style="min-width:250px">
+            <a href="https://www.apache.org/foundation/";>Apache Software 
Foundation</a>
+            <a href="https://incubator.apache.org/";>Apache Incubator</a>
+            <a href="https://www.apache.org/licenses/";>License</a>
+            <a href="/versions/1.9.1/api/faq/security.html">Security</a>
+            <a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a>
+            <a href="https://www.apache.org/events/current-event";>Events</a>
+            <a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+            <a href="https://www.apache.org/foundation/thanks.html";>Thanks</a>
+          </div>
+        </div>
         <div class="dropdown">
           <span class="dropdown-header">1.9.1
             <svg class="dropdown-caret" viewBox="0 0 32 32" class="icon 
icon-caret-bottom" aria-hidden="true"><path class="dropdown-caret-path" d="M24 
11.305l-7.997 11.39L8 11.305z"></path></svg>
diff --git a/docs/static_site/Makefile b/docs/static_site/Makefile
index 073b8c28e0..e3a5819d9a 100644
--- a/docs/static_site/Makefile
+++ b/docs/static_site/Makefile
@@ -23,8 +23,9 @@ html:
        wget -O src/assets/img/mxnet-icon.png 
https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/image/mxnet-icon.png
        wget -O src/assets/docsearch.min.css 
'https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css'
        wget -O src/assets/js/docsearch.min.js 
'https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js'
-       wget -O src/assets/retainable.css 
https://www.twilik.com/assets/retainable/rss-embed/retainable.css
-       wget -O src/assets/js/retainable.js 
https://www.twilik.com/assets/retainable/rss-embed/retainable.js
+       wget -O src/assets/js/fontawesome.js 
'https://use.fontawesome.com/releases/v5.0.12/js/all.js'
+       wget -O src/assets/js/buttons.js 'https://buttons.github.io/buttons.js'
+       wget -O src/assets/js/platform.js 
'https://apis.google.com/js/platform.js'
        cd src && bundle install && JEKYLL_ENV=production bundle exec jekyll 
build --config _config_prod.yml -d ../build/html && cd ..
 
 
diff --git a/docs/static_site/src/.gitignore b/docs/static_site/src/.gitignore
index f53a1d42a4..b22ea0d599 100644
--- a/docs/static_site/src/.gitignore
+++ b/docs/static_site/src/.gitignore
@@ -1 +1,7 @@
 static_websites
+assets/docsearch.min.css
+assets/js/buttons.js
+assets/js/docsearch.min.js
+assets/js/fontawesome.js
+assets/js/jquery-3.3.1.min.js
+assets/js/platform.js
diff --git a/docs/static_site/src/_config_prod.yml 
b/docs/static_site/src/_config_prod.yml
index d75bd38173..f1750fe1a0 100644
--- a/docs/static_site/src/_config_prod.yml
+++ b/docs/static_site/src/_config_prod.yml
@@ -38,7 +38,6 @@ url: https://mxnet.apache.org
 twitter_username: apachemxnet
 github_username:  apache/incubator-mxnet
 youtube_username: apachemxnet
-google_analytics: UA-96378503-1
 baseurl: /versions/1.9.1
 versions: 
   - master
diff --git a/docs/static_site/src/_includes/footer.html 
b/docs/static_site/src/_includes/footer.html
index 47ebc37fca..7426e081df 100644
--- a/docs/static_site/src/_includes/footer.html
+++ b/docs/static_site/src/_includes/footer.html
@@ -1,34 +1,24 @@
 <footer class="site-footer h-card">
     <div class="wrapper">
         <div class="row">
-            <div class="col-3">
+            <div class="col-4">
                 <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>
                     <li><a 
href="https://cwiki.apache.org/confluence/display/MXNET/Apache+MXNet+Home";>Developer
 Wiki</a></li>
                     <li><a 
href="https://issues.apache.org/jira/projects/MXNET/issues";>Jira 
Tracker</a></li>
                     <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-3">
-                <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>
+                    <li><a href="https://medium.com/apache-mxnet";>Blog</a></li>
+                    <li><a href="https://discuss.mxnet.io";>Forum</a></li>
+                    <li><a 
href="{{'community/contribute'|relative_url}}">Contribute</a></li>
                 </ul>
             </div>
 
-            <div class="col-3">
+            <div class="col-4">
                 {%- include social.html -%}
             </div>
 
-            <div class="col-3 footer-text">
+            <div class="col-4 footer-text">
                 <p>{{- site.description | escape -}}</p>
             </div>
         </div>
diff --git a/docs/static_site/src/_includes/get_started/get_started.html 
b/docs/static_site/src/_includes/get_started/get_started.html
index e4fb674de5..a839d137ae 100644
--- a/docs/static_site/src/_includes/get_started/get_started.html
+++ b/docs/static_site/src/_includes/get_started/get_started.html
@@ -10,7 +10,7 @@
 <script src="{{'/assets/js/options.js'|relative_url}}"></script>
 
 <div class="install-selector">
-    <h2>Platform and use-case specific instructions for using MXNet</h2>
+    <h2>Platform and use-case specific instructions for using Apache MXNet</h2>
     <p>
         Please indicate your preferred configuration below to see specific 
instructions.
     </p>
diff --git a/docs/static_site/src/_includes/get_started/pip_snippet.md 
b/docs/static_site/src/_includes/get_started/pip_snippet.md
index cdce6c1d3b..af078ee84e 100644
--- a/docs/static_site/src/_includes/get_started/pip_snippet.md
+++ b/docs/static_site/src/_includes/get_started/pip_snippet.md
@@ -1,7 +1,7 @@
 You can then <a href="/get_started/validate_mxnet.html">validate your MXNet 
installation</a>.
 
 <div style="text-align: center">
-    <img 
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/install/pip-packages-1.9.1.png";
+    <img src="{{ "/assets/img/pip-packages-1.9.1.png" | relative_url }}"
     alt="pip packages"/>
 </div>
 
diff --git a/docs/static_site/src/_includes/google-analytics.html 
b/docs/static_site/src/_includes/google-analytics.html
deleted file mode 100644
index e9afb2093b..0000000000
--- a/docs/static_site/src/_includes/google-analytics.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-if(!(window.doNotTrack === "1" || navigator.doNotTrack === "1" || 
navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1")) {
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
-  
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
-}
-</script>
-  
diff --git a/docs/static_site/src/_includes/head.html 
b/docs/static_site/src/_includes/head.html
index 11264726e7..83b7b30750 100644
--- a/docs/static_site/src/_includes/head.html
+++ b/docs/static_site/src/_includes/head.html
@@ -6,15 +6,13 @@
   {%- seo -%}
   {%- if jekyll.environment == 'production' -%}
     <link rel="stylesheet" href="{{ "/assets/docsearch.min.css" | relative_url 
}}" />
-    <link rel="stylesheet" href="{{ "/assets/retainable.css" | relative_url 
}}" />
   {%- else -%}
     <link rel="stylesheet" 
href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"; />
-    <link rel="stylesheet" 
href="https://www.twilik.com/assets/retainable/rss-embed/retainable.css"; />
   {%- endif -%}
   <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
   {%- feed_meta -%}
-  {%- if jekyll.environment == 'production' and site.google_analytics -%}
-    {%- include google-analytics.html -%}
+  {%- if jekyll.environment == 'production' -%}
+    {%- include matomo-analytics.html -%}
   {%- endif -%}
   {%- if jekyll.environment == 'production' -%}
     <script src="{{'/assets/js/jquery-3.3.1.min.js'|relative_url}}"></script>
diff --git a/docs/static_site/src/_includes/header.html 
b/docs/static_site/src/_includes/header.html
index b69051e1b9..d8531bbe3c 100644
--- a/docs/static_site/src/_includes/header.html
+++ b/docs/static_site/src/_includes/header.html
@@ -81,12 +81,26 @@
         </div>
         </div>
         <a class="page-link" href="{{'/get_started' | relative_url }}">Get 
Started</a>
-        <a class="page-link" href="{{'/blog' | relative_url }}">Blog</a>
         <a class="page-link" href="{{'/features' | relative_url 
}}">Features</a>
         <a class="page-link" href="{{'/ecosystem' | relative_url 
}}">Ecosystem</a>
         <a class="page-link" href="{{'/api' | relative_url }}">Docs & 
Tutorials</a>
         <a class="page-link" href="{{'/trusted_by' | relative_url }}">Trusted 
By</a>
         <a class="page-link" 
href="https://github.com/apache/incubator-mxnet";>GitHub</a>
+        <div class="dropdown" style="min-width:100px">
+          <span class="dropdown-header">Apache
+            <svg class="dropdown-caret" viewBox="0 0 32 32" class="icon 
icon-caret-bottom" aria-hidden="true"><path class="dropdown-caret-path" d="M24 
11.305l-7.997 11.39L8 11.305z"></path></svg>
+          </span>
+          <div class="dropdown-content" style="min-width:250px">
+            <a href="https://www.apache.org/foundation/";>Apache Software 
Foundation</a>
+            <a href="https://incubator.apache.org/";>Apache Incubator</a>
+            <a href="https://www.apache.org/licenses/";>License</a>
+            <a href="{{ '/api/faq/security.html' | relative_url 
}}">Security</a>
+            <a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a>
+            <a href="https://www.apache.org/events/current-event";>Events</a>
+            <a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a>
+            <a href="https://www.apache.org/foundation/thanks.html";>Thanks</a>
+          </div>
+        </div>
         <div class="dropdown">
           <span class="dropdown-header">1.9.1
             <svg class="dropdown-caret" viewBox="0 0 32 32" class="icon 
icon-caret-bottom" aria-hidden="true"><path class="dropdown-caret-path" d="M24 
11.305l-7.997 11.39L8 11.305z"></path></svg>
diff --git a/docs/static_site/src/_includes/matomo-analytics.html 
b/docs/static_site/src/_includes/matomo-analytics.html
new file mode 100644
index 0000000000..1cb8e9ff7e
--- /dev/null
+++ b/docs/static_site/src/_includes/matomo-analytics.html
@@ -0,0 +1,18 @@
+<!-- Matomo -->
+<script>
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before 
"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '23']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<!-- End Matomo Code -->
+
diff --git a/docs/static_site/src/_layouts/home.html 
b/docs/static_site/src/_layouts/home.html
index 00286e65fa..605f53fec0 100644
--- a/docs/static_site/src/_layouts/home.html
+++ b/docs/static_site/src/_layouts/home.html
@@ -28,8 +28,8 @@
 <main class="page-content-home" aria-label="Content">
     <div class="wrapper">
         <div class="home">
-            <h1 style="margin-bottom:40px;"> A FLEXIBLE AND EFFICIENT<br> <span
-                    style="margin-left:100px"> LIBRARY FOR DEEP LEARNING</span>
+            <h1 style="margin-bottom:40px;">APACHE MXNET:<br><span 
style="margin-left:75px"> A FLEXIBLE AND EFFICIENT</span><br> <span
+                    style="margin-left:150px"> LIBRARY FOR DEEP LEARNING</span>
             </h1>
 
             <p style="margin-bottom:40px;">A truly open source deep learning 
framework suited<br>for flexible research
@@ -114,31 +114,6 @@
         </div>
     </div>
 
-    <div class="news-section section ">
-        <div class="wrapper">
-            <div class="row">
-                <div class="col-8">
-                    <h2>Latest News</h2>
-                </div>
-                <div class="col-4">
-                    <div>
-                        <a href="{{'/blog' | relative_url}}" class="btn 
btn-action">More Blog Posts <span
-                                class="span-accented">›</span></a>
-                    </div>
-                </div>
-                <div class="col-8">
-                    <p>Follow our blog post publications to get the latest 
news on MXNet and its ecosystem</p>
-                </div>
-            </div>
-
-            <div class="row" id="retainable-rss-embed" 
data-rss="https://medium.com/feed/apache-mxnet";
-                data-maxcols="3" data-layout="slider" data-poststyle="external"
-                data-readmore="Read more.." data-buttonclass="btn btn-primary">
-            </div>
-
-        </div>
-    </div>
-
     <div class="community-section section ">
         <div class="wrapper">
             <div class="row">
@@ -146,7 +121,7 @@
                     <h2>Community</h2>
                 </div>
                 <div class="col-8">
-                    <p>Join the MXNet scientific community to contribute, 
learn, and get
+                    <p>Join the Apache MXNet scientific community to 
contribute, learn, and get
                         answers to your questions.</p>
                 </div>
             </div>
@@ -174,12 +149,6 @@
 
 {%- include footer.html -%}
 
-{%- if jekyll.environment == 'production' -%}
-  <script src="{{ "/assets/js/retainable.js" | relative_url }}"></script>
-{%- else -%}
-  <script 
src="https://www.twilik.com/assets/retainable/rss-embed/retainable.js";></script>
-{%- endif -%}
-
 </body>
 
 </html>
diff --git a/docs/static_site/src/assets/img/medium_black.svg 
b/docs/static_site/src/assets/img/medium_black.svg
new file mode 100644
index 0000000000..da2c17f5d2
--- /dev/null
+++ b/docs/static_site/src/assets/img/medium_black.svg
@@ -0,0 +1,13 @@
+
+<svg width="400px" height="400px" viewBox="0 0 400 400" version="1.1" 
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch 
-->
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" 
fill-rule="evenodd">
+        <g id="medium" transform="translate(1.000000, 1.000000)">
+            <rect id="Rectangle-path" fill="#12100E" fill-rule="nonzero" 
x="110" y="110" width="195" height="195"></rect>
+            <path d="M35.487503,0 L362.83087,0 C382.430077,-3.84155008e-14 
398.318373,15.8882963 398.318373,35.487503 L398.318373,362.79987 
C398.318373,382.399077 382.430077,398.287373 362.83087,398.287373 
L35.487503,398.287373 C15.8882963,398.287373 -2.60214989e-14,382.399077 
-2.84217094e-14,362.79987 L-2.84217094e-14,35.487503 C-3.082192e-14,15.8882963 
15.8882963,3.60031587e-15 35.487503,0 Z" id="rectblack" stroke="#000000" 
stroke-width="0.5" fill="#000000" stroke-linecap="square" stro [...]
+            <path d="M87.6255836,130.327454 C87.9883713,126.740158 
86.6214595,123.194515 83.9449113,120.780129 L56.6806723,87.9100529 
L56.6806723,83 L141.336134,83 L206.770308,226.619047 L264.297854,83 L345,83 
L345,87.9100529 L321.689076,110.278072 C319.679418,111.81116 
318.682526,114.3309 319.098974,116.824809 L319.098974,281.175192 
C318.682526,283.6691 319.679418,286.188839 321.689076,287.721929 
L344.454716,310.089948 L344.454716,315 L229.944912,315 L229.944912,310.089948 
L253.528479,2 [...]
+        </g>
+    </g>
+</svg>
diff --git a/docs/static_site/src/assets/img/pip-packages-1.9.1.png 
b/docs/static_site/src/assets/img/pip-packages-1.9.1.png
new file mode 100644
index 0000000000..7dd036d3cc
Binary files /dev/null and 
b/docs/static_site/src/assets/img/pip-packages-1.9.1.png differ
diff --git a/docs/static_site/src/assets/img/reddit_blue.svg 
b/docs/static_site/src/assets/img/reddit_blue.svg
new file mode 100644
index 0000000000..55e16bd887
--- /dev/null
+++ b/docs/static_site/src/assets/img/reddit_blue.svg
@@ -0,0 +1,19 @@
+
+<svg width="400px" height="400px" viewBox="0 0 400 400" version="1.1" 
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch 
-->
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" 
fill-rule="evenodd">
+        <g id="reddit">
+            <path d="M36.3282318,0.856288136 L363.671599,0.856288136 
C383.270805,0.856288136 399.159102,16.7445844 399.159102,36.3437911 
L399.159102,363.656158 C399.159102,383.255365 383.270805,399.143661 
363.671599,399.143661 L36.3282318,399.143661 C16.7290251,399.143661 
0.840728814,383.255365 0.840728814,363.656158 L0.840728814,36.3437911 
C0.840728814,16.7445844 16.7290251,0.856288136 36.3282318,0.856288136 Z" 
id="rect1942" stroke="#000000" stroke-width="0.5" fill="#6BC1FF" stroke-line 
[...]
+            <path d="M98.9182625,195.795842 C98.9182625,216.073497 
83.1994409,232.511781 63.8093058,232.511781 C44.4191561,232.511781 
28.7003491,216.073497 28.7003491,195.795842 C28.7003491,175.518187 
44.4191561,159.079903 63.8093058,159.079903 C83.1994409,159.079903 
98.9182625,175.518187 98.9182625,195.795842 Z" id="path9382" stroke="#000000" 
stroke-width="8.00000177" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M362.840788,196.610147 C362.840788,216.887802 
347.121966,233.326086 327.731831,233.326086 C308.341682,233.326086 
292.622875,216.887802 292.622875,196.610147 C292.622875,176.332492 
308.341682,159.894208 327.731831,159.894208 C347.121966,159.894208 
362.840788,176.332492 362.840788,196.610147 Z" id="path9382-2" stroke="#000000" 
stroke-width="8.00000177" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M291.41222,97.3365593 C264.880288,86.4469492 
237.845051,73.5440847 217.562339,87.651322 C194.075695,98.4665424 
195.196,133.888712 196.98122,169.97578" id="path9944" stroke="#000000" 
stroke-width="10"></path>
+            <path d="M341.463207,249.273588 C341.463207,305.772447 
276.598119,351.573836 196.582985,351.573836 C116.567852,351.573836 
51.7027636,305.772447 51.7027636,249.273588 C51.7027636,192.774729 
116.567852,146.973343 196.582985,146.973343 C276.598119,146.973343 
341.463207,192.774729 341.463207,249.273588 Z" id="path9940" stroke="#000000" 
stroke-width="8.00000094" fill="#FFFFFF" fill-rule="nonzero" 
stroke-linecap="round"></path>
+            <path d="M338.627741,102.784492 C338.627741,121.171695 
324.806012,136.077468 307.756063,136.077468 C290.706114,136.077468 
276.884385,121.171695 276.884385,102.784492 C276.884385,84.3972864 
290.706114,69.4915136 307.756063,69.4915136 C324.806012,69.4915136 
338.627741,84.3972864 338.627741,102.784492 Z" id="path9942" stroke="#000000" 
stroke-width="8" fill="#FFFFFF" fill-rule="nonzero" 
stroke-linecap="round"></path>
+            <path d="M157.23144,228.692482 C157.23144,240.393429 
147.971793,249.878923 136.549435,249.878923 C125.127076,249.878923 
115.867429,240.393429 115.867429,228.692482 C115.867429,216.991536 
125.127076,207.506042 136.549435,207.506042 C147.971793,207.506042 
157.23144,216.991536 157.23144,228.692482 Z" id="path9946" fill="#FF0000" 
fill-rule="nonzero"></path>
+            <path d="M264.878728,226.876516 C264.878728,238.577462 
255.619081,248.062957 244.196723,248.062957 C232.774364,248.062957 
223.514717,238.577462 223.514717,226.876516 C223.514717,215.17557 
232.774364,205.690076 244.196723,205.690076 C255.619081,205.690076 
264.878728,215.17557 264.878728,226.876516 Z" id="path9946-2" fill="#FF0000" 
fill-rule="nonzero"></path>
+            <path d="M135.237881,284.987881 C181.185237,317.445559 
215.81861,304.647322 249.039339,286.198542" id="path9970" stroke="#000000" 
stroke-width="10" stroke-linecap="round"></path>
+        </g>
+    </g>
+</svg>
diff --git a/docs/static_site/src/assets/img/twitter.svg 
b/docs/static_site/src/assets/img/twitter.svg
new file mode 100644
index 0000000000..f8e6b4ae1c
--- /dev/null
+++ b/docs/static_site/src/assets/img/twitter.svg
@@ -0,0 +1,15 @@
+
+<svg width="400px" height="400px" viewBox="0 0 400 400" version="1.1" 
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch 
-->
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" 
fill-rule="evenodd">
+        <g id="Artboard">
+            <g id="twitter">
+                <rect id="Rectangle-path" x="0" y="0" width="400" 
height="400"></rect>
+                <path d="M36.487503,1 L363.83087,1 C383.430077,1 
399.318373,16.8882963 399.318373,36.487503 L399.318373,363.79987 
C399.318373,383.399077 383.430077,399.287373 363.83087,399.287373 
L36.487503,399.287373 C16.8882963,399.287373 1,383.399077 1,363.79987 
L1,36.487503 C1,16.8882963 16.8882963,1 36.487503,1 Z" id="rect1942" 
stroke="#000000" stroke-width="0.5" fill="#1DA1F2" stroke-linecap="square" 
stroke-dasharray="0.5,1" transform="translate(200.159186, 200.143686) scale(-1, 
1) [...]
+                <path d="M142.067949,359 C272.943939,359 344.527585,250.570199 
344.527585,156.540365 C344.527585,153.460603 344.527585,150.394715 
344.319493,147.342699 C358.245444,137.26981 370.266559,124.797726 
379.819986,110.510416 C366.833368,116.264878 353.056988,120.038652 
338.950719,121.705765 C353.804936,112.813052 364.922313,98.8263558 
370.233882,82.3486332 C356.266158,90.637011 340.985111,96.4782462 
325.050174,99.6202685 C302.993571,76.1668344 267.945838,70.4265239 
239.559731,85 [...]
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/docs/static_site/src/assets/img/youtube_red.svg 
b/docs/static_site/src/assets/img/youtube_red.svg
new file mode 100644
index 0000000000..9d182a233f
--- /dev/null
+++ b/docs/static_site/src/assets/img/youtube_red.svg
@@ -0,0 +1,20 @@
+
+<svg width="400px" height="400px" viewBox="0 0 400 400" version="1.1" 
xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>
+    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch 
-->
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" 
fill-rule="evenodd">
+        <g id="Artboard">
+            <g id="youtube" transform="translate(-7.000000, -4.000000)">
+                <path d="M43.487503,5 L370.83087,5 C390.430077,5 
406.318373,20.8882963 406.318373,40.487503 L406.318373,367.79987 
C406.318373,387.399077 390.430077,403.287373 370.83087,403.287373 
L43.487503,403.287373 C23.8882963,403.287373 8,387.399077 8,367.79987 
L8,40.487503 C8,20.8882963 23.8882963,5 43.487503,5 Z" id="rectwhite" 
stroke="#000000" stroke-width="0.5" fill="#D9252A" stroke-linecap="square" 
stroke-dasharray="0.5,1" transform="translate(207.159186, 204.143686) scale(-1, 
1 [...]
+                <rect id="Rectangle-path" x="0" y="0" width="400" 
height="400"></rect>
+                <g id="Group-3" transform="translate(57.000000, 94.000000)" 
fill-rule="nonzero">
+                    <g id="Fill-1-Clipped" fill="#FFFFFF">
+                        <path d="M293.391311,32.9792371 C289.945297,19.9973776 
279.792836,9.77471682 266.899228,6.30527996 C243.531371,0 149.826693,0 
149.826693,0 C149.826693,0 56.1220145,0 32.7541582,6.30527996 
C19.8622523,9.77471682 9.70808867,19.9973776 6.26207473,32.9792371 
C0,56.5073671 0,105.598962 0,105.598962 C0,105.598962 0,154.688854 
6.26207473,178.22039 C9.70808867,191.200546 19.8622523,201.423207 
32.7541582,204.894347 C56.1220145,211.197924 149.826693,211.197924 
149.826693,21 [...]
+                    </g>
+                    <polyline id="Fill-4" fill="#D9252A" points="119 140 180 
105.501318 119 71 119 140"></polyline>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/docs/static_site/src/pages/api/api.html 
b/docs/static_site/src/pages/api/api.html
index 87841d8bd0..2218d93e9b 100644
--- a/docs/static_site/src/pages/api/api.html
+++ b/docs/static_site/src/pages/api/api.html
@@ -12,7 +12,7 @@ faq_categories:
 - Model
 - Speed
 - Security
-- Extend and Contribute to MXNet
+- Extend and Contribute to Apache MXNet
 
 docs:
 - title: Python
@@ -111,11 +111,11 @@ docs:
 
     <div class="col-8 docs-hero-right">
         <h4>Python-first API</h4>
-        <p>MXNet provides a comprehensive and flexible Python API to serve a 
broad community of developers with different levels of experience and wide 
ranging requirements. Current efforts are focused on the
+        <p>Apache MXNet provides a comprehensive and flexible Python API to 
serve a broad community of developers with different levels of experience and 
wide ranging requirements. Current efforts are focused on the
         <a href="{{doc.api_link | relative_url}}"></a>Gluon API. Gluon 
provides a clear, concise, and simple API for deep learning. It makes it easy 
to prototype, build, and train deep learning models without sacrificing 
training speed.</p>
         <p>You can checkout the <a href="{{'/ecosystem'|relative_url}}">rich 
ecosystem</a> built around Apache MXNet Gluon, including <a 
href="https://d2l.ai";>D2L.ai</a>, <a 
href="https://gluon-cv.mxnet.io";>GluonCV</a>,
         <a href="https://gluon-nlp.mxnet.io";>GluonNLP</a> and <a 
href="https://gluon-ts.mxnet.io";>GluonTS</a>.</p>
-        <p>While most of the usability improvement around training are focused 
on the python API, the performance of MXNet is accessible through a variety of 
different language bindings, checkout their respective API and guides below!</p>
+        <p>While most of the usability improvement around training are focused 
on the python API, the performance of Apache MXNet is accessible through a 
variety of different language bindings, checkout their respective API and 
guides below!</p>
       </div>
 
     </div>
@@ -147,12 +147,12 @@ docs:
 </div> <!-- closing outer wrapper -->
 <div class="docs-architecture">
     <div class="wrapper">
-        <h2>MXNet Architecture</h2>
+        <h2>Apache MXNet Architecture</h2>
         <p>
         Building a high-performance deep learning library
         requires many systems-level design decisions.
         In this design note, we share the rationale
-        for the specific choices made when designing _MXNet_.
+        for the specific choices made when designing MXNet.
         We imagine that these insights may be useful
         to both deep learning practitioners
         and builders of other deep learning systems.
diff --git a/docs/static_site/src/pages/api/architecture/exception_handling.md 
b/docs/static_site/src/pages/api/architecture/exception_handling.md
index 875df5aabd..61674d678b 100644
--- a/docs/static_site/src/pages/api/architecture/exception_handling.md
+++ b/docs/static_site/src/pages/api/architecture/exception_handling.md
@@ -1,6 +1,6 @@
 ---
 layout: page_category
-title:  Exception Handling in MXNet
+title:  Exception Handling in Apache MXNet
 category: architecture
 permalink: /api/architecture/exception_handling
 ---
@@ -21,9 +21,9 @@ permalink: /api/architecture/exception_handling
 <!--- specific language governing permissions and limitations -->
 <!--- under the License. -->
 
-# Exception Handling in MXNet
+# Exception Handling in Apache MXNet
 
-This tutorial explains the exception handling support in MXNet,
+This tutorial explains the exception handling support in Apache MXNet,
 and provides examples on how to throw and handle exceptions when in a 
multithreaded context.
 Although, the examples are in Python, they can be easily extended to MXNet
 language bindings.
diff --git a/docs/static_site/src/pages/api/architecture/overview.md 
b/docs/static_site/src/pages/api/architecture/overview.md
index d595ed031d..676cd19d21 100644
--- a/docs/static_site/src/pages/api/architecture/overview.md
+++ b/docs/static_site/src/pages/api/architecture/overview.md
@@ -1,6 +1,6 @@
 ---
 layout: page_category
-title:  MXNet System Architecture
+title:  Apache MXNet System Architecture
 category: architecture
 permalink: /api/architecture/overview
 ---
diff --git a/docs/static_site/src/pages/api/architecture/program_model.md 
b/docs/static_site/src/pages/api/architecture/program_model.md
index 46ec7c7b51..25090cb487 100644
--- a/docs/static_site/src/pages/api/architecture/program_model.md
+++ b/docs/static_site/src/pages/api/architecture/program_model.md
@@ -615,10 +615,10 @@ finding that many of these trade-offs (like imperative vs 
symbolic aren't necess
 You can choose your approach, or combine the approaches
 to create more interesting and intelligent deep learning libraries.
 
-## Contribute to MXNet
+## Contribute to Apache MXNet
 
 This document is part of our effort to provide [open-source system design 
notes](overview)
-for deep learning libraries. If you're interested in contributing to _MXNet_ 
or its
+for deep learning libraries. If you're interested in contributing to Apache 
MXNet or its
 documentation, [fork us on GitHub](http://github.com/apache/incubator-mxnet).
 
 ## Next Steps
diff --git a/docs/static_site/src/pages/api/python/index.md 
b/docs/static_site/src/pages/api/python/index.md
index aa9e360cd8..da8ec53864 100644
--- a/docs/static_site/src/pages/api/python/index.md
+++ b/docs/static_site/src/pages/api/python/index.md
@@ -23,12 +23,12 @@ tag: python
 <!--- specific language governing permissions and limitations -->
 <!--- under the License. -->
 
-## MXNet - Python API
+## Apache MXNet - Python API
 
-MXNet provides a comprehensive and flexible Python API to serve a broad 
community of developers with different levels of experience and wide ranging 
requirements. In this section, we provide an in-depth discussion of the 
functionality provided by various MXNet Python packages.
+Apache MXNet provides a comprehensive and flexible Python API to serve a broad 
community of developers with different levels of experience and wide ranging 
requirements. In this section, we provide an in-depth discussion of the 
functionality provided by various MXNet Python packages.
 
 
-MXNet’s Python API has two primary high-level packages*: the Gluon API and 
Module API. We recommend that new users start with the Gluon API as it’s more 
flexible and easier to debug. Underlying these high-level packages are the core 
packages of NDArray and Symbol.
+Apache MXNet’s Python API has two primary high-level packages*: the Gluon API 
and Module API. We recommend that new users start with the Gluon API as it’s 
more flexible and easier to debug. Underlying these high-level packages are the 
core packages of NDArray and Symbol.
 
 
 NDArray works with arrays in an imperative fashion, i.e. you define how arrays 
will be transformed to get to an end result. Symbol works with arrays in a 
declarative fashion, i.e. you define the end result that is required (via a 
symbolic graph) and the MXNet engine will use various optimizations to 
determine the steps required to obtain this. With NDArray you have a great deal 
of flexibility when composing operations (as you can use Python control flow), 
and you can easily step through  [...]
diff --git a/docs/static_site/src/pages/blog.html 
b/docs/static_site/src/pages/blog.html
deleted file mode 100644
index 407cb09c7e..0000000000
--- a/docs/static_site/src/pages/blog.html
+++ /dev/null
@@ -1,51 +0,0 @@
----
-layout: page
-title: Blog
-subtitle: Latest news on MXNet and its ecosystem
-permalink: /blog/
-action: See All Blog Posts
-action_url: https://medium.com/apache-mxnet
----
-
-<!---
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<div class="row">
-    <div class="col-8">
-    </div>
-    <div class="col-4">
-
-    </div>
-</div>
-
-<div class="row">
-        <div class="col-12" id="retainable-rss-embed" 
data-rss="https://medium.com/feed/apache-mxnet";
-            data-maxcols="3" data-layout="grid" data-poststyle="external" 
data-readmore="Read more..">
-       </div>
-</div>
-<div class="blog-more">
-<a style="margin-top:20px" href="https://medium.com/apache-mxnet"; class="btn 
btn-action">See All Blog Posts<span class="span-accented">›</span></a>
-
-</div>
-{%- if jekyll.environment == 'production' -%}
-  <script src="{{ "/assets/js/retainable.js" | relative_url }}"></script>
-{%- else -%}
-  <script 
src="https://www.twilik.com/assets/retainable/rss-embed/retainable.js";></script>
-{%- endif -%}
-
diff --git a/docs/static_site/src/pages/community/contribute.md 
b/docs/static_site/src/pages/community/contribute.md
index 3ec56a3489..613f388fca 100644
--- a/docs/static_site/src/pages/community/contribute.md
+++ b/docs/static_site/src/pages/community/contribute.md
@@ -23,19 +23,19 @@ permalink: /community/contribute
 <!--- specific language governing permissions and limitations -->
 <!--- under the License. -->
 
-# Contributing to MXNet
+# Contributing to Apache MXNet
 
-Apache MXNet (incubating) is a community led, open source deep learning 
project. We welcome new members and look forward to your contributions. Here 
you will find how to get started and links to detailed information on MXNet 
best practices and processes.
+Apache MXNet (incubating) is a community led, open source deep learning 
project. We welcome new members and look forward to your contributions. Here 
you will find how to get started and links to detailed information on Apache 
MXNet best practices and processes.
 
 
 ## Getting Started
 
-The following actions are recommended steps for you to get started with 
contributing to MXNet.
+The following actions are recommended steps for you to get started with 
contributing to Apache MXNet.
 
 | Action | Purpose |
 |---|---|
-| [Create a forum account](#forum) | Asking & answering MXNet usage questions |
-| [Join the dev comm channels](#mxnet-dev-communications) | Discussions about 
the direction of MXNet |
+| [Create a forum account](#forum) | Asking & answering Apache MXNet usage 
questions |
+| [Join the dev comm channels](#mxnet-dev-communications) | Discussions about 
the direction of Apache MXNet |
 | [Follow MXNet on Social Media](#social-media) | Get updates about new 
features and events |
 | [Create a JIRA account](#jira) | Tracking tasks & prioritizing issues |
 | [Check out the MXNet wiki](#confluence-wiki) | The wiki has detailed 
contributor information |
@@ -53,7 +53,7 @@ The following actions are recommended steps for you to get 
started with contribu
     * [Pull request process](#formal-pull-request-process)
 * I want to propose a new feature. What is the process for this?
     * [New feature process](#new-feature-process)
-* What's coming next with MXNet, and how can I help?
+* What's coming next with Apache MXNet, and how can I help?
     * [Roadmap info](#roadmap)
 
 
@@ -61,12 +61,12 @@ The following actions are recommended steps for you to get 
started with contribu
 
 ### Forum
 
-If you need help with using MXNet, have questions about applying it to a 
particular kind of problem, or have a discussion topic, please use the 
discussion forum:
+If you need help with using Apache MXNet, have questions about applying it to 
a particular kind of problem, or have a discussion topic, please use the 
discussion forum:
 * [discuss.mxnet.io](https://discuss.mxnet.io) <i class="fas 
fa-external-link-alt"></i>
 
 ### Mailing Lists
 
-Please join either or both of the MXNet mailing lists:
+Please join either or both of the Apache MXNet mailing lists:
 
 **For MXNet Users, join the USER mailing list**:
 
@@ -86,19 +86,19 @@ To join the MXNet slack channel send request to the 
contributor mailing list.
 
 ### Social Media
 
-Keep connected with the latest MXNet news and updates.
+Keep connected with the latest Apache MXNet news and updates.
 
 <p>
-<a href="https://medium.com/apache-mxnet";><img 
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/social/medium_black.svg?sanitize=true";
 height="30px"/> Contributor and guest blogs about MXNet</a>
+<a href="https://medium.com/apache-mxnet";><img src="{{ 
"/assets/img/medium_black.svg" | relative_url}}" height="30px"/> Contributor 
and guest blogs about MXNet</a>
 </p>
 <p>
-<a href="https://reddit.com/r/mxnet";><img 
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/social/reddit_blue.svg?sanitize=true";
 height="30px" alt="reddit"/> Discuss MXNet on r/mxnet</a>
+<a href="https://reddit.com/r/mxnet";><img src="{{ 
"/assets/img/reddit_blue.svg" | relative_url}}" height="30px" alt="reddit"/> 
Discuss MXNet on r/mxnet</a>
 </p>
 <p>
-<a href="https://twitter.com/apachemxnet";><img 
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/social/twitter.svg?sanitize=true";
 height="30px"/> Apache MXNet on Twitter</a>
+<a href="https://twitter.com/apachemxnet";><img src="{{ 
"/assets/img/twitter.svg" | relative_url}}" height="30px"/> Apache MXNet on 
Twitter</a>
 </p>
 <p>
-<a href="https://www.youtube.com/apachemxnet";><img 
src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/social/youtube_red.svg?sanitize=true";
 height="30px"/> MXNet YouTube channel</a>
+<a href="https://www.youtube.com/apachemxnet";><img src="{{ 
"/assets/img/youtube_red.svg" | relative_url}}" height="30px"/> MXNet YouTube 
channel</a>
 </p>
 
 
@@ -174,19 +174,24 @@ Detailed information is also required, if you plan to 
contribute the improvement
 
 ## Roadmap
 
-MXNet is evolving fast. To see what's next and what the community is currently 
working on, check out the Roadmap issues on GitHub and the JIRA Boards:
+Apache MXNet is evolving fast. To see what's next and what the community is 
currently working on, check out the Roadmap issues on GitHub and the JIRA 
Boards:
 
 <a class="github-button" 
href="https://github.com/apache/incubator-mxnet/labels/Roadmap"; 
data-size="large" data-show-count="true" aria-label="Issue 
apache/incubator-mxnet on GitHub">Roadmap</a>
 <br/>
 [JIRA boards](https://issues.apache.org/jira/secure/RapidBoard.jspa) <i 
class="fas fa-lock"></i>
 
-
-<script defer src="https://use.fontawesome.com/releases/v5.0.12/js/all.js"; 
integrity="sha384-Voup2lBiiyZYkRto2XWqbzxHXwzcm4A5RfdfG6466bu5LqjwwrjXCMBQBLMWh7qR"
 crossorigin="anonymous"></script>
-<script async defer src="https://buttons.github.io/buttons.js";></script>
-<script src="https://apis.google.com/js/platform.js";></script>
+{%- if jekyll.environment == 'production' -%}
+  <script defer src="{{ "/assets/js/fontawesome.js" | relative_url}}"></script>
+  <script async defer src="{{ "/assets/js/buttons.js" | 
relative_url}}"></script>
+  <script src="{{ "/assets/js/platform.js" | relative_url}}"></script>
+{%- else -%}
+  <script defer src="https://use.fontawesome.com/releases/v5.0.12/js/all.js"; 
integrity="sha384-Voup2lBiiyZYkRto2XWqbzxHXwzcm4A5RfdfG6466bu5LqjwwrjXCMBQBLMWh7qR"
 crossorigin="anonymous"></script>
+  <script async defer src="https://buttons.github.io/buttons.js";></script>
+  <script src="https://apis.google.com/js/platform.js";></script>
+{%- endif -%}
 
 
 ## Contributors
-MXNet has been developed by and is used by a group of active community 
members. Contribute to improving it!
+Apache MXNet has been developed by and is used by a group of active community 
members. Contribute to improving it!
 
 <i class="fab fa-github"></i> [Contributors and 
Committers](https://github.com/apache/incubator-mxnet/blob/master/CONTRIBUTORS.md)
diff --git a/docs/static_site/src/pages/ecosystem.html 
b/docs/static_site/src/pages/ecosystem.html
index 4979a46b91..2fc4b9a15b 100644
--- a/docs/static_site/src/pages/ecosystem.html
+++ b/docs/static_site/src/pages/ecosystem.html
@@ -26,11 +26,11 @@ ecosystem_toolkits:
 
 ecosystem_other:
 - title: Coach RL
-  text: Coach is a python reinforcement learning framework containing 
implementation of many state-of-the-art algorithms, it supports MXNet as a 
back-end
+  text: Coach is a python reinforcement learning framework containing 
implementation of many state-of-the-art algorithms, it supports Apache MXNet as 
a back-end
   icon: /assets/img/coach_logo.png
   link: https://github.com/NervanaSystems/coach
 - title: Deep Graph Library
-  text: DGL is a Python package dedicated to deep learning on graphs 
supporting MXNet as a backend.
+  text: DGL is a Python package dedicated to deep learning on graphs 
supporting Apache MXNet as a backend.
   link: https://www.dgl.ai/
 - title: GluonFR
   text: Community-driven toolkit for Face Recognition and Face Detection
@@ -43,14 +43,14 @@ ecosystem_other:
   link: https://github.com/awslabs/keras-apache-mxnet
   icon: /assets/img/keras.png
 - title: MXBoard
-  text: MXBoard provides a set of APIs for logging MXNet data for 
visualization in TensorBoard.
+  text: MXBoard provides a set of APIs for logging Apache MXNet data for 
visualization in TensorBoard.
   link: https://github.com/awslabs/mxboard
 - title: MXFusion
   text: MXFusion is a modular deep probabilistic programming library. It lets 
you use state-of-the-art inference techniques for specialized probabilistic 
models.
   icon: /assets/img/mxfusion.png
   link: https://mxfusion.readthedocs.io/en/master/index.html
 - title: MXNet Model Server
-  text: Model Server for Apache MXNet (MMS) is a flexible and easy to use tool 
for serving deep learning models exported from MXNet or the Open Neural Network 
Exchange (ONNX).
+  text: Model Server for Apache MXNet (MMS) is a flexible and easy to use tool 
for serving deep learning models exported from Apache MXNet or the Open Neural 
Network Exchange (ONNX).
   link: https://github.com/awslabs/mxnet-model-server
 - title: Sockeye
   text: Sockeye is a sequence-to-sequence framework for Neural Machine 
Translation based on Apache MXNet Incubating. It implements state-of-the-art 
encoder-decoder architectures.
@@ -59,12 +59,12 @@ ecosystem_other:
   text: TensorLy is a high level API for tensor methods and deep tensorized 
neural networks in Python that aims to make tensor learning simple.
   icon: /assets/img/tensorly_logo.png
   link: http://tensorly.org/stable/home.html
-- title: TVM
-  text: TVM is an open deep learning compiler stack for CPUs, GPUs, and 
specialized accelerators. It supports a number of framework including MXNet.
+- title: Apache TVM
+  text: Apache TVM is an open deep learning compiler stack for CPUs, GPUs, and 
specialized accelerators. It supports a number of framework including Apache 
MXNet.
   link: https://tvm.ai/about
   icon: /assets/img/tvm.png
 - title: XFer
-  text: Xfer is a library that allows quick and easy transfer of knowledge 
stored in deep neural networks implemented in MXNet.
+  text: Xfer is a library that allows quick and easy transfer of knowledge 
stored in deep neural networks implemented in Apache MXNet.
   link: https://xfer.readthedocs.io/en/master/
   icon: /assets/img/xfer.png
 - title: DJL
diff --git a/docs/static_site/src/pages/features.html 
b/docs/static_site/src/pages/features.html
index 758beff219..eff42163c2 100644
--- a/docs/static_site/src/pages/features.html
+++ b/docs/static_site/src/pages/features.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Features
-subtitle: Whether you are looking for a flexible library to quickly develop 
cutting-edge deep learning research or a robust framework to push production 
workload, MXNet caters to all needs.
+subtitle: Whether you are looking for a flexible library to quickly develop 
cutting-edge deep learning research or a robust framework to push production 
workload, Apache MXNet caters to all needs.
 permalink: /features/
 action: Get Started
 action_url: /get_started
@@ -32,7 +32,7 @@ action_url: /get_started
         <h3 class="feature-title">Hybrid Front-End</h3>
     </div>
     <div class="col-5">
-        <p class="feature-paragraph">The Gluon Python API lets you use MXNet 
in a fully imperative manner. It also
+        <p class="feature-paragraph">The Gluon Python API lets you use Apache 
MXNet in a fully imperative manner. It also
             allows you to simply switch to
             symbolic mode by calling the <a
                     
href="/api/python/docs/tutorials/packages/gluon/blocks/hybridize.html">hybridize</a>
@@ -80,8 +80,8 @@ context = mx.gpu(hvd.local_rank())
 
     <div class="col-1"></div>
     <div class="col-5">
-        <p class="feature-paragraph">MXNet allows you to make the most out of 
your hardware, whether it is multi-gpu or
-            multi-host training with near-linear scaling efficiency. MXNet 
recently introduced support for
+        <p class="feature-paragraph">Apache MXNet allows you to make the most 
out of your hardware, whether it is multi-gpu or
+            multi-host training with near-linear scaling efficiency. Apache 
MXNet recently introduced support for
             <a 
href="https://medium.com/apache-mxnet/distributed-training-using-apache-mxnet-with-horovod-44f98bf0e7b7";>Horovod</a>,
             the distributed learning framework developed by Uber.
         </p>
diff --git a/docs/static_site/src/pages/get_started/build_from_source.md 
b/docs/static_site/src/pages/get_started/build_from_source.md
index 19f2f1a313..e6340f52f2 100644
--- a/docs/static_site/src/pages/get_started/build_from_source.md
+++ b/docs/static_site/src/pages/get_started/build_from_source.md
@@ -23,9 +23,9 @@ permalink: /get_started/build_from_source
 <!--- under the License. -->
 
 
-# Build MXNet from Source
+# Build Apache MXNet from Source
 
-Building and installing MXNet from source is a three-step process. First, build
+Building and installing Apache MXNet from source is a three-step process. 
First, build
 the shared `libmxnet` which provides the MXNet backend, then install your
 preferred language binding and finally validate that MXNet was installed
 correctly by running a small example.
diff --git a/docs/static_site/src/pages/get_started/download.md 
b/docs/static_site/src/pages/get_started/download.md
index e93da02682..e2712a781b 100644
--- a/docs/static_site/src/pages/get_started/download.md
+++ b/docs/static_site/src/pages/get_started/download.md
@@ -25,17 +25,17 @@ permalink: /get_started/download
 
 # Source Download
 
-The source archives listed on this page are official MXNet releases following
+The source archives listed on this page are official Apache MXNet releases 
following
 the [Apache Software Foundation Release
 Policy](http://www.apache.org/legal/release-policy.html).
 
-If you would like to actively participate in the MXNet development, you are
+If you would like to actively participate in the Apache MXNet development, you 
are
 encouraged to contribute to our development version on
 [GitHub](https://github.com/apache/incubator-mxnet).
 
 | Version | Source                                                             
                                         | PGP                                  
                                                                           | 
SHA                                                                             
                                   |
 
|---------|-------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
-| 1.9.1   | 
[apache-mxnet-src-1.9.1-incubating.tar.gz](http://www.apache.org/dyn/closer.lua?filename=incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz&action=download)
   | 
[asc](https://downloads.apache.org/incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz.asc)
    |  
[sha512](https://downloads.apache.org/incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz.sha512)
    |
+| 1.9.1   | 
[apache-mxnet-src-1.9.1-incubating.tar.gz](https://www.apache.org/dyn/closer.lua?filename=incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz&action=download)
   | 
[asc](https://downloads.apache.org/incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz.asc)
    |  
[sha512](https://downloads.apache.org/incubator/mxnet/1.9.1/apache-mxnet-src-1.9.1-incubating.tar.gz.sha512)
    |
 | 1.9.0   | 
[apache-mxnet-src-1.9.0-incubating.tar.gz](https://archive.apache.org/dist/incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz)
   | 
[asc](https://archive.apache.org/dist/incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz.asc)
    |  
[sha512](https://archive.apache.org/dist/incubator/mxnet/1.9.0/apache-mxnet-src-1.9.0-incubating.tar.gz.sha512)
    |
 | 1.8.0   | 
[apache-mxnet-src-1.8.0-incubating.tar.gz](https://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz)
   | 
[asc](https://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.asc)
    |  
[sha512](https://archive.apache.org/dist/incubator/mxnet/1.8.0/apache-mxnet-src-1.8.0-incubating.tar.gz.sha512)
    |
 | 1.7.0   | 
[apache-mxnet-src-1.7.0-incubating.tar.gz](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz)
   | 
[asc](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz.asc)
    |  
[sha512](https://archive.apache.org/dist/incubator/mxnet/1.7.0/apache-mxnet-src-1.7.0-incubating.tar.gz.sha512)
    |
diff --git a/docs/static_site/src/pages/get_started/index.html 
b/docs/static_site/src/pages/get_started/index.html
index f83396e28e..29eb0b05fc 100644
--- a/docs/static_site/src/pages/get_started/index.html
+++ b/docs/static_site/src/pages/get_started/index.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Get Started
-action: MXNet Tutorials
+action: Apache MXNet Tutorials
 action_url: /api/python/docs/tutorials
 permalink: /get_started/index.html
 ---
@@ -27,7 +27,7 @@ permalink: /get_started/index.html
 <div class="wrapper">
     <h2>Build and install Apache MXNet (incubating) from source</h2>
     <p>
-        To build and install MXNet from the official Apache Software Foundation
+        To build and install Apache MXNet from the official Apache Software 
Foundation
         signed source code please follow our <a 
href="/get_started/build_from_source">Building From Source</a> guide.
     </p>
     <p>
diff --git a/docs/static_site/src/pages/trusted_by.html 
b/docs/static_site/src/pages/trusted_by.html
index a49b3d8813..d9004127ad 100644
--- a/docs/static_site/src/pages/trusted_by.html
+++ b/docs/static_site/src/pages/trusted_by.html
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Trusted By
-subtitle: These are some of the organizations that use MXNet.
+subtitle: These are some of the organizations that use Apache MXNet.
 action: Get Started
 action_url: /get_started
 permalink: /trusted_by/

[incubator-mxnet] branch v1.x updated: [v1.x] Port #21055 from v1.9.x branch and fix CD docker python pipeline (#21062)

Reply via email to