diff --git a/docs/gatsby-node.js b/docs/gatsby-node.js
index 081885d3c682f..6c08f6d3c9b56 100644
--- a/docs/gatsby-node.js
+++ b/docs/gatsby-node.js
@@ -664,4 +664,9 @@ exports.createPages = ({ actions }) => {
     toPath: '/docs/miscellaneous/issue-codes#issue-1005',
     isPermanent: true,
   });
+  createRedirect({
+    fromPath: '/docs/installation/email-reports',
+    toPath: '/docs/installation/alerts-reports',
+    isPermanent: true,
+  });
 };
diff --git a/docs/src/components/MainMenu.tsx b/docs/src/components/MainMenu.tsx
index 3255ed33b2b46..9ac31cf4fb93e 100644
--- a/docs/src/components/MainMenu.tsx
+++ b/docs/src/components/MainMenu.tsx
@@ -137,7 +137,7 @@ export default class MainMenu extends React.Component {
     const { visible } = this.state;
     return (
       <Layout.Header css={headerStyle}>
-        <a href="https://superset.apache.org">
+        <a href="/">
           <img height="50" css={logoStyle} src={logoSvg} alt="logo" />
         </a>
         <MenuItems toggleDrawer={this.toggleDrawer} mode="horizontal" />
diff --git a/docs/src/images/databases/rockset.png b/docs/src/images/databases/rockset.png
new file mode 100644
index 0000000000000..c38350619c921
Binary files /dev/null and b/docs/src/images/databases/rockset.png differ
diff --git a/docs/src/images/databases/trino.png b/docs/src/images/databases/trino.png
new file mode 100644
index 0000000000000..12f3b4dd921e0
Binary files /dev/null and b/docs/src/images/databases/trino.png differ
diff --git a/docs/src/images/databases/trino2.jpg b/docs/src/images/databases/trino2.jpg
new file mode 100644
index 0000000000000..6c6a087a1313f
Binary files /dev/null and b/docs/src/images/databases/trino2.jpg differ
diff --git a/docs/src/pages/docs/Connecting to Databases/firebird.mdx b/docs/src/pages/docs/Connecting to Databases/firebird.mdx
new file mode 100644
index 0000000000000..12bf99c3d59fe
--- /dev/null
+++ b/docs/src/pages/docs/Connecting to Databases/firebird.mdx	
@@ -0,0 +1,24 @@
+---
+name: Firebird
+menu: Connecting to Databases
+route: /docs/databases/firebird
+index: 30
+version: 1
+---
+
+## Firebird
+
+The recommended connector library for Firebird is [sqlalchemy-firebird](https://pypi.org/project/sqlalchemy-firebird/).
+Superset has been tested on `sqlalchemy-firebird>=0.7.0, <0.8`.
+
+The recommended connection string is:
+
+```
+firebird+fdb://{username}:{password}@{host}:{port}//{path_to_db_file}
+```
+
+Here's a connection string example of Superset connecting to a local Firebird database:
+
+```
+firebird+fdb://SYSDBA:masterkey@192.168.86.38:3050//Library/Frameworks/Firebird.framework/Versions/A/Resources/examples/empbuild/employee.fdb
+```
diff --git a/docs/src/pages/docs/Connecting to Databases/google-bigquery.mdx b/docs/src/pages/docs/Connecting to Databases/google-bigquery.mdx
index 63f745491381e..c6a8aa5749cc9 100644
--- a/docs/src/pages/docs/Connecting to Databases/google-bigquery.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/google-bigquery.mdx	
@@ -46,7 +46,7 @@ The resulting file should have this structure:
         "auth_uri": "...",
         "token_uri": "...",
         "auth_provider_x509_cert_url": "...",
-        "client_x509_cert_url": "...",
+        "client_x509_cert_url": "..."
     }
 }
 ```
diff --git a/docs/src/pages/docs/Connecting to Databases/rockset.mdx b/docs/src/pages/docs/Connecting to Databases/rockset.mdx
new file mode 100644
index 0000000000000..589905b9bae38
--- /dev/null
+++ b/docs/src/pages/docs/Connecting to Databases/rockset.mdx	
@@ -0,0 +1,17 @@
+---
+name: Rockset
+menu: Connecting to Databases
+route: /docs/databases/rockset
+index: 29
+version: 1
+---
+
+## Rockset
+
+The connection string for Rockset is:
+
+```
+rockset://apikey:{your-apikey}@api.rs2.usw2.rockset.com/
+```
+
+For more complete instructions, we recommend the [Rockset documentation](https://docs.rockset.com/apache-superset/).
diff --git a/docs/src/pages/docs/Connecting to Databases/sql-server.mdx b/docs/src/pages/docs/Connecting to Databases/sql-server.mdx
index 1ee647c4b54be..bc87aa3e5222a 100644
--- a/docs/src/pages/docs/Connecting to Databases/sql-server.mdx	
+++ b/docs/src/pages/docs/Connecting to Databases/sql-server.mdx	
@@ -1,5 +1,5 @@
 ---
-name: SQL Server
+name: Microsoft SQL Server
 menu: Connecting to Databases
 route: /docs/databases/sql-server
 index: 24
@@ -13,5 +13,5 @@ The recommended connector library for SQL Server is [pymssql](https://github.com
 The connection string for SQL Server looks like this:
 
 ```
-mssql+pymssql://UserName@DB:Password@DB_Host:1433/TestSchema
+mssql+pymssql://<Username>:<Password>@<Host>:<Port-default:1433>/<Database Name>/?Encrypt=yes
 ```
diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx
index 5b247cc299532..43bbdb23465c3 100644
--- a/docs/src/pages/index.tsx
+++ b/docs/src/pages/index.tsx
@@ -361,7 +361,7 @@ const Theme = () => {
                     title="Integrates with modern databases"
                     descr={`
                     Superset can connect to any SQL based datasource
-                    through SQL Alchemy, including modern cloud native databases
+                    through SQLAlchemy, including modern cloud native databases
                     and engines at petabyte scale.
                   `}
                   />
diff --git a/docs/src/resources/data.js b/docs/src/resources/data.js
index 28e7fdc65c7a2..aae3b075b6bbe 100644
--- a/docs/src/resources/data.js
+++ b/docs/src/resources/data.js
@@ -215,6 +215,16 @@ export const Databases = [
     href: 'https://www.sqlite.org/index.html',
     imgName: 'sqllite.png',
   },
+  {
+    title: 'Trino',
+    href: 'https://trino.io/',
+    imgName: 'trino2.jpg',
+  },
+  {
+    title: 'Rockset',
+    href: 'https://rockset.com/',
+    imgName: 'rockset.png',
+  },
   {
     title: 'Vertica',
     href: 'https://www.vertica.com/',