From d578d8133fefcc34d7a9176ace9e9268c5a7eeb3 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Thu, 1 Oct 2020 22:15:36 -0700
Subject: [PATCH] docs: comply to ASF requirements (#11133)

* docs: comply to ASF requirements

* touch something out of docs/

* Just a few more things...

* messing with .htaccess

* SEO
---
 README.md                        |  4 ++--
 docs/.htaccess                   |  3 +++
 docs/src/components/MainMenu.tsx |  2 +-
 docs/src/components/footer.tsx   | 40 ++++++++++++++++++++++++++++----
 docs/src/components/layout.tsx   |  4 +++-
 docs/src/pages/resources.tsx     | 10 +++++++-
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 317b81d8ae..f5120c5b1b 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,6 @@ how to set up a development environment.
   * [Create Time Series Charts](https://preset.io/blog/2020-06-26-timeseries-chart/)
 * [Docker image](https://hub.docker.com/r/preset/superset/)
 * [Youtube Channel](https://www.youtube.com/channel/UCMuwrvBsg_jjI2gLcm04R0g)
-  * [May 15, 2020: Virtual Meetup Recording. Topics: 0.36 Overview, Committers Self-Intro, Roadmap](https://www.youtube.com/watch?v=tXGDmqjmcTs&t=20s)
-  * [July 16, 2020: Virtual Meetup Recording. Topics: Visualization Plugins, 0.37 Preview, Demo](https://www.youtube.com/watch?v=f6up5x_iRbI)
+  * [May 2020: Virtual Meetup Recording. Topics: 0.36 Overview, Committers Self-Intro, Roadmap](https://www.youtube.com/watch?v=tXGDmqjmcTs&t=20s)
+  * [July 2020: Virtual Meetup Recording. Topics: Visualization Plugins, 0.37 Preview, Demo](https://www.youtube.com/watch?v=f6up5x_iRbI)
 * [So, You Want to Build a Superset Viz Plugin...](https://preset.io/blog/2020-07-02-hello-world/)
diff --git a/docs/.htaccess b/docs/.htaccess
index 8059fb1f42..3eee8d20fb 100644
--- a/docs/.htaccess
+++ b/docs/.htaccess
@@ -18,3 +18,6 @@
 RewriteEngine On
 RewriteCond %{SERVER_PORT} 80
 RewriteRule ^(.*)$ https://superset.apache.org/$1 [R,L]
+
+RewriteCond %{HTTP_HOST} ^superset.incubator.apache.org$ [NC]
+RewriteRule ^(.*)$ https://superset.apache.org/$1 [R=301,L]
diff --git a/docs/src/components/MainMenu.tsx b/docs/src/components/MainMenu.tsx
index 46e7d5b7bb..4482fe5f17 100644
--- a/docs/src/components/MainMenu.tsx
+++ b/docs/src/components/MainMenu.tsx
@@ -133,7 +133,7 @@ export default class MainMenu extends React.Component {
     const { visible } = this.state;
     return (
       <Layout.Header css={headerStyle}>
-        <Link to="/">
+        <Link to="https://superset.incubator.apache.org">
           <img height="50" css={logoStyle} src={logoSvg} alt="logo" />
         </Link>
         <MenuItems toggleDrawer={this.toggleDrawer} mode="horizontal" />
diff --git a/docs/src/components/footer.tsx b/docs/src/components/footer.tsx
index a8778bdf62..5a827db4b4 100644
--- a/docs/src/components/footer.tsx
+++ b/docs/src/components/footer.tsx
@@ -109,7 +109,7 @@ const LayoutFooter = () => (
       </a>
       , &nbsp;Licensed under the Apache
       <a
-        href="https://www.apache.org/licenses/"
+        href="https://apache.org/licenses/LICENSE-2.0"
         target="_blank"
         rel="noreferrer"
       >
@@ -126,23 +126,39 @@ const LayoutFooter = () => (
         reflection of the completeness or stability of the code, it does
         indicate that the project has yet to be fully endorsed by the ASF.
       </div>
+      <div>
+        Apache Superset, Apache, Superset, the Superset logo, and the Apache
+        feather logo are either registered trademarks or trademarks of The
+        Apache Software Foundation. All other products or name brands
+        are trademarks of their respective holders, including The Apache
+        Software Foundation.
+      </div>
     </div>
     <div css={apacheLinksStyle} className="apacheLinks">
+      <a
+        href="https://www.apache.org/"
+        target="_blank"
+        rel="noreferrer"
+      >
+        Apache Software Foundation
+      </a>resources
+      <br/>
       <a
         href="https://www.apache.org/security/"
         target="_blank"
         rel="noreferrer"
       >
-        Security &nbsp;|
+        Security
       </a>
+      {' | '}
       <a
         href="https://www.apache.org/foundation/sponsorship.html"
         target="_blank"
         rel="noreferrer"
       >
-        Donate &nbsp;|
+        Donate
       </a>
-
+      {' | '}
       <a
         href="https://www.apache.org/foundation/thanks.html"
         target="_blank"
@@ -150,6 +166,22 @@ const LayoutFooter = () => (
       >
         Thanks
       </a>
+      {' | '}
+      <a
+        href="https://apache.org/events/current-event"
+        target="_blank"
+        rel="noreferrer"
+      >
+        Events
+      </a>
+      {' | '}
+      <a
+        href="https://apache.org/licenses/"
+        target="_blank"
+        rel="noreferrer"
+      >
+        Licenses
+      </a>
     </div>
   </Footer>
 );
diff --git a/docs/src/components/layout.tsx b/docs/src/components/layout.tsx
index a5a3fe1220..ad7bc0e935 100644
--- a/docs/src/components/layout.tsx
+++ b/docs/src/components/layout.tsx
@@ -124,7 +124,7 @@ const contentLayoutDocsStyle = css`
     overflow: auto;
   }
 `;
-const footerHeight = 135;
+const footerHeight = 185;
 const baseLayoutStyle = css`
   min-height: 100vh;
   position: relative;
@@ -133,6 +133,8 @@ const baseLayoutStyle = css`
     bottom: 0;
     width: 100%;
     height: ${footerHeight}px;
+    overflow: auto; // sorry about this :/
+    background-color: #323232;
   }
   .content-wrap {
     padding-bottom: ${footerHeight}px;
diff --git a/docs/src/pages/resources.tsx b/docs/src/pages/resources.tsx
index 1f71a95073..92a1c07b7a 100644
--- a/docs/src/pages/resources.tsx
+++ b/docs/src/pages/resources.tsx
@@ -40,10 +40,18 @@ const learningLinks = [
 ];
 
 const installationLinks = [
+  [
+    'Official Apache releases',
+    'https://dist.apache.org/repos/dist/release/incubator/superset/',
+  ],
   [
     'Locally with Docker',
     'https://superset.incubator.apache.org/installation.html#start-with-docker',
   ],
+  [
+    'Superset on the Python Package Index (PyPI)',
+    'https://dist.apache.org/repos/dist/release/incubator/superset/',
+  ],
   [
     'Install on CentOS',
     'https://aichamp.wordpress.com/2019/11/20/installing-apache-superset-into-centos-7-with-python-3-7/',
@@ -97,7 +105,7 @@ interface featureProps {
 }
 const LinkSection = ({ title, links }: featureProps) => (
   <div className="link-section">
-    <h2>{title}</h2>
+    <h3>{title}</h3>
     <List
       size="small"
       bordered