gatsbyjs · marcysutton · Jun 24, 2019 · Jun 14, 2019 · Jun 17, 2019 · Jun 17, 2019
diff --git a/docs/docs/content-and-data.md b/docs/docs/content-and-data.md
@@ -1,6 +1,13 @@
 ---
 title: Sourcing Content and Data
-overview: true
 ---
 
+A core feature of Gatsby is its ability to **load data from anywhere**. This is part of what makes Gatsby more powerful than static site generators that are limited to only loading content from Markdown files.
+
+A core benefit of this “data from anywhere” approach is that it allows teams to manage their content in nearly any [backend](/docs/glossary/#backend) they prefer.
+
+Gatsby uses source plugins to pull in data. [Numerous source plugins already exist](/plugins/?=gatsby-source) for pulling in data from other APIs, CMSs, and databases. Each plugin fetches data from their source, meaning the filesystem source plugin knows how to fetch data from the file system, the WordPress plugin knows how to fetch data from the WordPress API, etc. By including multiple source plugins, you can fetch data and combine it all in one data layer.
+
+_(If there isn’t a plugin yet for your favorite option, consider [contributing](/docs/creating-plugins) one!)_
+
 <GuideList slug={props.slug} />
diff --git a/docs/docs/headless-cms.md b/docs/docs/headless-cms.md
@@ -1,12 +1,8 @@
 ---
-title: Headless CMS
+title: Sourcing from Headless CMSs
 overview: true
 ---
 
-A core feature of Gatsby is its ability to **load data from anywhere**. This is what makes Gatsby more powerful than many other static site generators that are limited to only loading content from Markdown files.
-
-A core benefit of this “data from anywhere” approach is that it allows teams to manage their content in nearly any backend they prefer.
-
 Many content management systems (CMS) now support a “headless” mode, which is perfect for Gatsby sites. A headless CMS allows content creators to manage their content through a familiar admin interface, but allows developers to access the content via API endpoints, allowing for a fully customized frontend experience.
 
 Through use of [source plugins](/plugins/?=source), Gatsby has support for dozens of headless CMS options, allowing your content team the comfort and familiarity of its preferred admin interface, and your development team the improved developer experience and performance gains of using Gatsby, GraphQL, and React to build the frontend.
@@ -19,22 +15,29 @@ The guides in this section will walk through the process of setting up content s
   Ordering in this section is driven by Gatsby plugin downloads (/plugins/?=gatsby-source-) & CMS vendor size/adoption.
 -->
 
-Other CMS systems you can connect to include:
-
-- [Shopify](/packages/gatsby-source-shopify)
-- [Strapi](/packages/gatsby-source-strapi)
-- [DatoCMS](https://www.datocms.com): [docs](/packages/gatsby-source-datocms), [business case](https://www.gatsbyjs.com/guides/datocms/)
-- [Sanity](https://www.sanity.io/): [docs](/packages/gatsby-source-sanity/), [guide](/docs/sourcing-from-sanity)
-- [Contentstack](https://www.contentstack.com): [docs](/packages/gatsby-source-contentstack), [guide](https://www.contentstack.com/docs/example-apps/build-a-sample-website-using-gatsby-and-contentstack), [starter](/starters/contentstack/gatsby-starter-contentstack/)
-- [ButterCMS](https://buttercms.com): [docs](/packages/gatsby-source-buttercms), [guide](/docs/sourcing-from-buttercms/), [starter](/starters/ButterCMS/gatsby-starter-buttercms/)
-- [Ghost](https://ghost.org): [docs](/docs/sourcing-from-ghost/), [guide](/blog/2019-01-14-modern-publications-with-gatsby-ghost/), [starter](/starters/TryGhost/gatsby-starter-ghost/)
-- [Kentico Cloud](https://kenticocloud.com/): [docs](/packages/gatsby-source-kentico-cloud), [guide](/docs/sourcing-from-kentico-cloud), [launch post](/blog/2018-12-19-kentico-cloud-and-gatsby-take-you-beyond-static-websites/), [starter](/starters/Kentico/gatsby-starter-kentico-cloud/)
-- [Directus](/packages/gatsby-source-directus)
-- [GraphCMS](https://graphcms.com/?ref=gatsby-headless-cms-landing]): [docs](/packages/gatsby-source-graphql), [guide](/docs/sourcing-from-graphcms), [starter](/starters/GraphCMS/gatsby-graphcms-tailwindcss-example/)
-- [CosmicJS](https://cosmicjs.com/): [docs](/packages/gatsby-source-cosmicjs), [guide](/blog/2018-06-07-build-a-gatsby-blog-using-the-cosmic-js-source-plugin/)
-- [Cockpit](/packages/gatsby-plugin-cockpit)
-- [Storyblok](/packages/gatsby-source-storyblok)
-- [CraftCMS](/packages/gatsby-source-craftcms)
+Here are more resources for guides, plugins, and starters for CMS systems you can connect to:
+
+| CMS                                           | Guides                                                                                                       | Plugin Docs                                   | Official Starter                                                    |
+| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------ | --------------------------------------------- | ------------------------------------------------------------------- |
+| [Contentful](https://www.contentful.com/)     | [guide](/docs/sourcing-from-contentful/)                                                                     | [docs](/packages/gatsby-source-contentful)    | [starter](/starters/contentful-userland/gatsby-contentful-starter/) |
+| [NetlifyCMS](https://www.netlifycms.com/)     | [guide](/docs/sourcing-from-netlify-cms/)                                                                    | [docs](/packages/gatsby-source-netlifycms)    | [starter](/starters/netlify-templates/gatsby-starter-netlify-cms/)  |
+| [WordPress](https://www.wordpress.com/)       | [guide](/docs/sourcing-from-wordpress/)                                                                      | [docs](/packages/gatsby-source-wordpress)     |                                                                     |
+| [Prismic](https://www.prismic.io/)            | [guide](/docs/sourcing-from-prismic/)                                                                        | [docs](/packages/gatsby-source-prismic)       |                                                                     |
+| [Strapi](https://strapi.io/)                  |                                                                                                              | [docs](/packages/gatsby-source-strapi)        |
+| [DatoCMS](https://www.datocms.com/)           | [guide](https://www.gatsbyjs.com/guides/datocms/)                                                            | [docs](/packages/gatsby-source-datocms)       | [starter](/starters/datocms/gatsby-portfolio/)                      |
+| [Sanity](https://www.sanity.io/)              | [guide](/docs/sourcing-from-sanity)                                                                          | [docs](/packages/gatsby-source-sanity/)       |
+| [Drupal](https://www.drupal.com/)             | [guide](/docs/sourcing-from-drupal/)                                                                         | [docs](/packages/gatsby-source-drupal)        |                                                                     |
+| [Shopify](https://www.shopify.com/)           |                                                                                                              | [docs](/packages/gatsby-source-shopify)       |                                                                     |
+| [CosmicJS](https://cosmicjs.com/)             | [guide](/blog/2018-06-07-build-a-gatsby-blog-using-the-cosmic-js-source-plugin/)                             | [docs](/packages/gatsby-source-cosmicjs)      | [starters](/starters/?s=cosmicjs&v=2)                               |
+| [Contentstack](https://www.contentstack.com/) | [guide](https://www.contentstack.com/docs/example-apps/build-a-sample-website-using-gatsby-and-contentstack) | [docs](/packages/gatsby-source-contentstack)  | [starter](/starters/contentstack/gatsby-starter-contentstack/)      |
+| [ButterCMS](https://buttercms.com/)           | [guide](/docs/sourcing-from-buttercms/)                                                                      | [docs](/packages/gatsby-source-buttercms)     | [starter](/starters/ButterCMS/gatsby-starter-buttercms/)            |
+| [Ghost](https://ghost.org/)                   | [guide](/docs/sourcing-from-ghost/)                                                                          | [docs](/packages/gatsby-source-ghost/)        | [starter](/starters/TryGhost/gatsby-starter-ghost/)                 |
+| [Kentico Cloud](https://kenticocloud.com/)    | [guide](/docs/sourcing-from-kentico-cloud)                                                                   | [docs](/packages/gatsby-source-kentico-cloud) | [starter](/starters/Kentico/gatsby-starter-kentico-cloud/)          |
+| [Directus](https://directus.io/)              |                                                                                                              | [docs](/packages/gatsby-source-directus)      |
+| [GraphCMS](https://graphcms.com/)             | [guide](/docs/sourcing-from-graphcms)                                                                        | [docs](/packages/gatsby-source-graphql)       | [starter](/starters/GraphCMS/gatsby-graphcms-tailwindcss-example/)  |
+| [Storyblok](https://www.storyblok.com/)       |                                                                                                              | [docs](/packages/gatsby-source-storyblok)     |
+| [Cockpit](https://getcockpit.com/)            |                                                                                                              | [docs](/packages/gatsby-plugin-cockpit)       |
+| [CraftCMS](https://craftcms.com/)             |                                                                                                              | [docs](/packages/gatsby-source-craftcms)      |
 
 ## How to add new guides to this section
 

diff --git a/docs/docs/sourcing-from-databases.md b/docs/docs/sourcing-from-databases.md
@@ -7,5 +7,7 @@ The Gatsby ecosystem includes built-in connectors to several database systems. T
 - [PostgreSQL](/packages/gatsby-source-pg/?=pg)
 - [MySQL](/packages/gatsby-source-mysql/?=mysql)
 - [Amazon Redshift, SQLite3, Oracle and MSSQL](https://github.com/mrfunnyshoes/gatsby-source-sql)
+- [MongoDB](/packages/gatsby-source-mongodb/)
+- [Firebase](/packages/gatsby-source-firebase/)/[Firestore](/packages/gatsby-source-firestore/)
 
 These plugins will ingest data from your DB and make it available for your page components to query.
diff --git a/www/src/data/sidebars/doc-links.yaml b/www/src/data/sidebars/doc-links.yaml
@@ -109,16 +109,16 @@
                 # This list should only include the top 5 CMSs by Gatsby plugin usage.
                 # Please do not add your headless CMS here.
                 # Instead, please add links on the /docs/headless-cms/ page
-                - title: Sourcing from WordPress
-                  link: /docs/sourcing-from-wordpress/
-                - title: Sourcing from Drupal
-                  link: /docs/sourcing-from-drupal/
                 - title: Sourcing from Contentful
                   link: /docs/sourcing-from-contentful/
-                - title: Sourcing from Prismic
-                  link: /docs/sourcing-from-prismic/
                 - title: Sourcing from Netlify CMS
                   link: /docs/sourcing-from-netlify-cms/
+                - title: Sourcing from WordPress
+                  link: /docs/sourcing-from-wordpress/
+                - title: Sourcing from Prismic
+                  link: /docs/sourcing-from-prismic/
+                - title: Sourcing from Drupal
+                  link: /docs/sourcing-from-drupal/
         - title: Querying Your Data with GraphQL
           link: /docs/graphql/
           items: