diff --git a/docs/about/testimonials.md b/docs/about/testimonials.md
index f79907ce9..b38e7f493 100644
--- a/docs/about/testimonials.md
+++ b/docs/about/testimonials.md
@@ -1,3 +1,11 @@
+---
+audience: buyer
+components:
+ - eventing
+ - serving
+function: marketing
+---
+
Testimonials
Enterprise-grade Serverless on your own terms
diff --git a/docs/bookstore/create-slack-workspace/README.md b/docs/bookstore/create-slack-workspace/README.md
index 9768a751b..2e24642be 100644
--- a/docs/bookstore/create-slack-workspace/README.md
+++ b/docs/bookstore/create-slack-workspace/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: tutorial
+---
+
# Creating a Slack Workspace

diff --git a/docs/bookstore/disclaimer/README.md b/docs/bookstore/disclaimer/README.md
index 83885b6de..3b0338d0e 100644
--- a/docs/bookstore/disclaimer/README.md
+++ b/docs/bookstore/disclaimer/README.md
@@ -1,3 +1,9 @@
+---
+audience: developer
+components: []
+function: tutorial
+---
+
# **Disclaimer**

diff --git a/docs/bookstore/extra-challenge/README.md b/docs/bookstore/extra-challenge/README.md
index b0548187e..606fe155f 100644
--- a/docs/bookstore/extra-challenge/README.md
+++ b/docs/bookstore/extra-challenge/README.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - serving
+ - functions
+function: tutorial
+---
+
# **Extra Challenges**

diff --git a/docs/bookstore/page-0.5/environment-setup.md b/docs/bookstore/page-0.5/environment-setup.md
index 6bb182152..e43275a9b 100644
--- a/docs/bookstore/page-0.5/environment-setup.md
+++ b/docs/bookstore/page-0.5/environment-setup.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+ - eventing
+ - serving
+function: tutorial
+---
+
# Environment Setup

diff --git a/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md b/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
index 61a0f077a..32baa4ab1 100644
--- a/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
+++ b/docs/bookstore/page-0/welcome-knative-bookstore-tutorial.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: tutorial
+---
+
# Welcome: Knative Bookstore Tutorial

diff --git a/docs/bookstore/page-1/send-review-comment-to-broker.md b/docs/bookstore/page-1/send-review-comment-to-broker.md
index c29c5db2e..47a05f71b 100644
--- a/docs/bookstore/page-1/send-review-comment-to-broker.md
+++ b/docs/bookstore/page-1/send-review-comment-to-broker.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: tutorial
+---
+
# Send Review Comment to Broker

diff --git a/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md b/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
index 7fc58d25b..ef0996cbb 100644
--- a/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
+++ b/docs/bookstore/page-2/sentiment-analysis-service-for-bookstore-reviews.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+ - functions
+ - serving
+function: tutorial
+---
+
# Sentiment Analysis Service for Bookstore Reviews

diff --git a/docs/bookstore/page-3/create-bad-word-filter-service.md b/docs/bookstore/page-3/create-bad-word-filter-service.md
index 81d84136c..025826771 100644
--- a/docs/bookstore/page-3/create-bad-word-filter-service.md
+++ b/docs/bookstore/page-3/create-bad-word-filter-service.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+ - functions
+ - serving
+function: tutorial
+---
+
# Create Bad Word Filter Service

diff --git a/docs/bookstore/page-3/solution-create-bad-word-filter-service.md b/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
index 60eebe12f..ba743208c 100644
--- a/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
+++ b/docs/bookstore/page-3/solution-create-bad-word-filter-service.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+ - functions
+ - serving
+function: tutorial
+---
+
# Solution - Create Bad Word Filter Service

diff --git a/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md b/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
index 20640cde0..d9da41226 100644
--- a/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
+++ b/docs/bookstore/page-4/create-sequence-to-streamline-ML-workflows.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: tutorial
+---
+
# **Create Knative Sequence to Streamline ML Workflows**

diff --git a/docs/bookstore/page-5/deploy-database-service.md b/docs/bookstore/page-5/deploy-database-service.md
index 4515742d6..f5c3a5a87 100644
--- a/docs/bookstore/page-5/deploy-database-service.md
+++ b/docs/bookstore/page-5/deploy-database-service.md
@@ -1,3 +1,9 @@
+---
+audience: developer
+components: []
+function: tutorial
+---
+
# **Deploy the Database Service**

diff --git a/docs/bookstore/page-6/advanced-event-filtering.md b/docs/bookstore/page-6/advanced-event-filtering.md
index e3d461c70..cb8d87d1a 100644
--- a/docs/bookstore/page-6/advanced-event-filtering.md
+++ b/docs/bookstore/page-6/advanced-event-filtering.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: tutorial
+---
+
# **Advanced Event Filtering**

diff --git a/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md b/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
index 9504368b8..3052eed3c 100644
--- a/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
+++ b/docs/bookstore/page-7/slack-sink-learning-knative-eventing-and-apache-camel-K-integration.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: tutorial
+---
+
# **Slack sink - Learning Knative Eventing and the Apache Camel K integration**

diff --git a/docs/client/README.md b/docs/client/README.md
index fb1a18e17..1c37f3fb5 100755
--- a/docs/client/README.md
+++ b/docs/client/README.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: explanation
+---
+
# CLI tools
The following CLI tools are supported for use with Knative.
diff --git a/docs/client/configure-kn.md b/docs/client/configure-kn.md
index e2e5f0dac..3dcfdff8e 100644
--- a/docs/client/configure-kn.md
+++ b/docs/client/configure-kn.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: reference
+---
+
# Customizing kn
You can customize your `kn` CLI setup by creating a `config.yaml` configuration file. You can provide this configuration by using the `--config` flag, otherwise the configuration is picked up from a default location. The default configuration location conforms to the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html), and is different for Unix systems and Windows systems.
diff --git a/docs/client/install-kn.md b/docs/client/install-kn.md
index 47b38b74c..ead7c9650 100644
--- a/docs/client/install-kn.md
+++ b/docs/client/install-kn.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: how-to
+---
+
# Installing the Knative CLI
This guide provides details about how you can install the Knative `kn` CLI.
diff --git a/docs/client/kn-plugins.md b/docs/client/kn-plugins.md
index c5834eeff..1a82f6113 100644
--- a/docs/client/kn-plugins.md
+++ b/docs/client/kn-plugins.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: reference
+---
+
# kn plugins
The `kn` CLI supports the use of plugins. Plugins enable you to extend the functionality of your `kn` installation by adding custom commands and other shared commands that are not part of the core distribution of `kn`.
diff --git a/docs/community/README.md b/docs/community/README.md
index f63839378..5de38bf9f 100644
--- a/docs/community/README.md
+++ b/docs/community/README.md
@@ -1,3 +1,12 @@
+---
+audience: contributor
+components:
+ - eventing
+ - functions
+ - serving
+function: community
+---
+
# How to Get Involved
diff --git a/docs/community/contributing.md b/docs/community/contributing.md
index 499c5eff3..d13836054 100644
--- a/docs/community/contributing.md
+++ b/docs/community/contributing.md
@@ -1,3 +1,12 @@
+---
+audience: contributor
+components:
+ - eventing
+ - functions
+ - serving
+function: community
+---
+
# Contribute to Knative
This is the starting point for becoming a contributor - improving code, improving docs, giving talks, etc.
diff --git a/docs/community/governance.md b/docs/community/governance.md
index cc982a5c9..26f732dcd 100644
--- a/docs/community/governance.md
+++ b/docs/community/governance.md
@@ -1,3 +1,9 @@
+---
+audience: contributor
+components: []
+function: community
+---
+
# Community Rules and Practices
This page provides links to documents for common Knative community practices and
diff --git a/docs/concepts/README.md b/docs/concepts/README.md
index 69be66710..65511a3e1 100644
--- a/docs/concepts/README.md
+++ b/docs/concepts/README.md
@@ -1,3 +1,12 @@
+---
+audience: developer
+components:
+ - eventing
+ - functions
+ - serving
+function: explanation
+---
+
# Concepts
The documentation in this section explains commonly referenced Knative concepts and abstractions, and helps to provide you with a better understanding of how Knative works.
diff --git a/docs/concepts/duck-typing.md b/docs/concepts/duck-typing.md
index 72ff8e2ad..7a01f8daf 100644
--- a/docs/concepts/duck-typing.md
+++ b/docs/concepts/duck-typing.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+components:
+ - eventing
+ - serving
+function: explanation
+---
+
# Duck typing
Knative enables [loose coupling](https://en.wikipedia.org/wiki/Loose_coupling) of its components by using [duck typing](https://en.wikipedia.org/wiki/Duck_typing).
diff --git a/docs/concepts/eventing-resources/brokers.md b/docs/concepts/eventing-resources/brokers.md
index 742d26bad..1d93cde95 100644
--- a/docs/concepts/eventing-resources/brokers.md
+++ b/docs/concepts/eventing-resources/brokers.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: explanation
+---
+
# Brokers
--8<-- "about-brokers.md"
diff --git a/docs/concepts/serving-resources/revisions.md b/docs/concepts/serving-resources/revisions.md
index 52e83b09a..5e002b2ba 100644
--- a/docs/concepts/serving-resources/revisions.md
+++ b/docs/concepts/serving-resources/revisions.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - serving
+function: explanation
+---
+
# Revisions
--8<-- "about-revisions.md"
diff --git a/docs/eventing/README.md b/docs/eventing/README.md
index 5a5b3e53b..e7a8194ed 100644
--- a/docs/eventing/README.md
+++ b/docs/eventing/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: explanation
+---
+
# Knative Eventing - The Event-driven application platform for Kubernetes
--8<-- "about-eventing.md"
diff --git a/docs/eventing/accessing-traces.md b/docs/eventing/accessing-traces.md
index e976c073e..48d9352d2 100644
--- a/docs/eventing/accessing-traces.md
+++ b/docs/eventing/accessing-traces.md
@@ -1,3 +1,11 @@
+---
+audience: administrator
+# And audience: developer for accessing traces
+components:
+ - eventing
+function: how-to
+---
+
# Accessing CloudEvent traces
Depending on the request tracing tool that you have installed on your Knative
diff --git a/docs/eventing/brokers/README.md b/docs/eventing/brokers/README.md
index e570cd41c..248a55fd0 100644
--- a/docs/eventing/brokers/README.md
+++ b/docs/eventing/brokers/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: explanation
+---
+
# About Brokers
--8<-- "about-brokers.md"
diff --git a/docs/eventing/brokers/broker-developer-config-options.md b/docs/eventing/brokers/broker-developer-config-options.md
index 65b0aad42..41e761cde 100644
--- a/docs/eventing/brokers/broker-developer-config-options.md
+++ b/docs/eventing/brokers/broker-developer-config-options.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: reference
+---
+
# Developer configuration options
## Broker configuration
diff --git a/docs/eventing/brokers/broker-types/README.md b/docs/eventing/brokers/broker-types/README.md
index 0782aaa43..1c0ab3561 100644
--- a/docs/eventing/brokers/broker-types/README.md
+++ b/docs/eventing/brokers/broker-types/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: reference
+---
+
# Available Broker types
The following broker types are available for use with Knative Eventing.
diff --git a/docs/eventing/brokers/broker-types/channel-based-broker/README.md b/docs/eventing/brokers/broker-types/channel-based-broker/README.md
index c26d03022..a4a5b3b67 100644
--- a/docs/eventing/brokers/broker-types/channel-based-broker/README.md
+++ b/docs/eventing/brokers/broker-types/channel-based-broker/README.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+# And audience: administrator for install
+components:
+ - eventing
+function: how-to
+---
+
# Channel based Broker
The Channel based Broker (`MTChannelBasedBroker`) uses [Channels](../../../channels) for event routing. It is shipped by default with Knative Eventing.
diff --git a/docs/eventing/brokers/broker-types/kafka-broker/README.md b/docs/eventing/brokers/broker-types/kafka-broker/README.md
index b3670d299..97e11f29c 100644
--- a/docs/eventing/brokers/broker-types/kafka-broker/README.md
+++ b/docs/eventing/brokers/broker-types/kafka-broker/README.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+# And audience: administrator for install
+components:
+ - eventing
+function: how-to
+---
+
# Knative Broker for Apache Kafka
The Knative Broker for Apache Kafka is an implementation of the Knative Broker API natively targeting Apache Kafka to reduce network hops and offering a better integration with Apache Kafka for the Broker and Trigger API model.
diff --git a/docs/eventing/brokers/broker-types/kafka-broker/configuring-kafka-features.md b/docs/eventing/brokers/broker-types/kafka-broker/configuring-kafka-features.md
index 19ad9a878..6876fc273 100644
--- a/docs/eventing/brokers/broker-types/kafka-broker/configuring-kafka-features.md
+++ b/docs/eventing/brokers/broker-types/kafka-broker/configuring-kafka-features.md
@@ -1,3 +1,10 @@
+---
+audience: administrator
+components:
+ - eventing
+function: how-to
+---
+
# Configuring Kafka Features
There are many different configuration options for how Knative Eventing and the Knaitve Broker for Apache Kafka interact with the Apache Kafka clusters.
diff --git a/docs/eventing/brokers/broker-types/rabbitmq-broker/README.md b/docs/eventing/brokers/broker-types/rabbitmq-broker/README.md
index 6223e067f..634424582 100644
--- a/docs/eventing/brokers/broker-types/rabbitmq-broker/README.md
+++ b/docs/eventing/brokers/broker-types/rabbitmq-broker/README.md
@@ -1,3 +1,11 @@
+---
+audience: developer
+# And audience: administrator for install
+components:
+ - eventing
+function: explanation
+---
+
# Creating a RabbitMQ Broker
This topic describes how to create a RabbitMQ Broker.
diff --git a/docs/eventing/brokers/create-broker.md b/docs/eventing/brokers/create-broker.md
index 460488e76..a409c75c6 100644
--- a/docs/eventing/brokers/create-broker.md
+++ b/docs/eventing/brokers/create-broker.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: how-to
+---
+
# Creating a Broker
Once you have installed Knative Eventing and a Broker implementation, you can create an instance of a Broker.
diff --git a/docs/eventing/channels/README.md b/docs/eventing/channels/README.md
index 149a981a2..f14457aa7 100644
--- a/docs/eventing/channels/README.md
+++ b/docs/eventing/channels/README.md
@@ -1,3 +1,10 @@
+---
+audience: developer
+components:
+ - eventing
+function: explanation
+---
+
# Channels
Channels are Kubernetes [custom resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) that define a single event forwarding and persistence layer.
diff --git a/docs/eventing/channels/channel-types-defaults.md b/docs/eventing/channels/channel-types-defaults.md
index 25647bb26..a4e6584bd 100644
--- a/docs/eventing/channels/channel-types-defaults.md
+++ b/docs/eventing/channels/channel-types-defaults.md
@@ -1,3 +1,10 @@
+---
+audience: administrator
+components:
+ - eventing
+function: how-to
+---
+
# Channel types and defaults
Knative uses two types of Channels:
diff --git a/docs/eventing/channels/channels-crds.md b/docs/eventing/channels/channels-crds.md
index 18051147e..65ec28aa4 100644
--- a/docs/eventing/channels/channels-crds.md
+++ b/docs/eventing/channels/channels-crds.md
@@ -1,3 +1,9 @@
+---
+audience: developer
+components:
+ - eventing
+function: reference
+---