gravitational · ptgott · Jul 5, 2023 · Jun 27, 2023 · Jun 30, 2023
diff --git a/docs/config.json b/docs/config.json
@@ -31,7 +31,7 @@
         {
           "title": "Teleport Assist",
           "slug": "/ai-assist/",
-          "forScopes": ["oss"]
+          "forScopes": ["oss", "team"]
         }
       ]
     },
@@ -45,7 +45,8 @@
         },
         {
           "title": "Teleport Team",
-          "slug": "/choose-an-edition/teleport-team/"
+          "slug": "/choose-an-edition/teleport-team/",
+	  "forScopes": ["team"]
         },
         {
           "title": "Teleport Enterprise Cloud",
@@ -99,7 +100,8 @@
       "entries": [
         {
           "title": "Introduction",
-          "slug": "/deploy-a-cluster/introduction/"
+          "slug": "/deploy-a-cluster/introduction/",
+          "forScopes": ["oss", "enterprise"]
         },
         {
           "title": "High Availability Deployments",
@@ -246,7 +248,7 @@
         {
           "title": "Single Sign-On (SSO)",
           "slug": "/access-controls/sso/",
-          "forScopes": ["enterprise", "oss", "cloud"],
+          "forScopes": ["oss", "team", "enterprise", "cloud"],
           "entries": [
             {
               "title": "Active Directory (ADFS)",
@@ -260,8 +262,7 @@
             },
             {
               "title": "GitHub",
-              "slug": "/access-controls/sso/github-sso/",
-              "forScopes": ["enterprise", "cloud", "oss"]
+              "slug": "/access-controls/sso/github-sso/"
             },
             {
               "title": "GitLab",
@@ -293,22 +294,22 @@
         {
           "title": "Teleport as an IdP",
           "slug": "/access-controls/idps/",
-          "forScopes": ["enterprise", "cloud"],
+          "forScopes": ["enterprise", "cloud", "team"],
           "entries": [
             {
               "title": "SAML Identity Provider Guide",
               "slug": "/access-controls/idps/saml-guide/",
-              "forScopes": ["enterprise", "cloud"]
+              "forScopes": ["enterprise", "cloud", "team"]
             },
             {
               "title": "Authenticate to Grafana with Teleport SAML",
               "slug": "/access-controls/idps/saml-grafana/",
-              "forScopes": ["enterprise", "cloud"]
+              "forScopes": ["enterprise", "cloud", "team"]
             },
             {
               "title": "SAML Identity Provider Reference",
               "slug": "/access-controls/idps/saml-reference/",
-              "forScopes": ["enterprise", "cloud"]
+              "forScopes": ["enterprise", "cloud", "team"]
             }
           ]
         },
@@ -380,7 +381,8 @@
           "entries": [
             {
               "title": "Role Requests",
-              "slug": "/access-controls/access-requests/role-requests/"
+              "slug": "/access-controls/access-requests/role-requests/",
+              "forScopes": ["enterprise", "cloud"]
             },
             {
               "title": "Resource Requests",
@@ -390,7 +392,7 @@
             {
               "title": "Role Requests in OSS Teleport",
               "slug": "/access-controls/access-requests/oss-role-requests/",
-              "forScopes": ["oss", "enterprise", "cloud"]
+              "forScopes": ["oss"]
             }
           ]
         },
@@ -473,7 +475,8 @@
 	  "entries": [            
 	    {
               "title": "Kubernetes Operator (Preview)",
-              "slug": "/management/dynamic-resources/teleport-operator/"
+              "slug": "/management/dynamic-resources/teleport-operator/",
+              "forScopes": ["oss","enterprise"]
             },
             {
               "title": "Terraform Provider",
@@ -499,8 +502,7 @@
             },
             {
               "title": "Troubleshooting",
-              "slug": "/management/admin/troubleshooting/",
-              "forScopes": ["oss", "enterprise", "cloud"]
+              "slug": "/management/admin/troubleshooting/"
             },
             {
               "title": "Upgrading the Teleport Binary",
@@ -512,7 +514,8 @@
             },
             {
               "title": "Run Teleport with Self-Signed Certificates",
-              "slug": "/management/admin/self-signed-certs/"
+              "slug": "/management/admin/self-signed-certs/",
+              "forScopes": ["oss", "enterprise"]
             },
             {
               "title": "Uninstall Teleport",
@@ -535,8 +538,7 @@
             },
             {
               "title": "Backup and Restore",
-              "slug": "/management/operations/backup-restore/",
-              "forScopes": ["oss", "enterprise"]
+              "slug": "/management/operations/backup-restore/"
             },
             {
               "title": "Cert Authority Rotation",
@@ -553,12 +555,12 @@
               "forScopes": ["enterprise"]
             },
             {
-              "title": "Self-hosted automatic updates",
+              "title": "Self-Hosted Automatic Updates",
               "slug": "/management/operations/self-hosted-automatic-agent-updates/",
               "forScopes": ["enterprise"]
             },
             {
-              "title": "Enroll agent in automatic updates",
+              "title": "Enroll Agents in Automatic Updates",
               "slug": "/management/operations/enroll-agent-into-automatic-updates/",
               "forScopes": ["enterprise", "cloud"]
             }
@@ -620,23 +622,19 @@
           "entries": [
             {
               "title": "Export Audit Events to Fluentd",
-              "slug": "/management/export-audit-events/fluentd/",
-              "forScopes": ["enterprise", "cloud"]
+              "slug": "/management/export-audit-events/fluentd/"
             },
             {
               "title": "Export Audit Events to Datadog",
-              "slug": "/management/export-audit-events/datadog/",
-              "forScopes": ["enterprise", "cloud"]
+              "slug": "/management/export-audit-events/datadog/"
             },
             {
               "title": "Export Audit Events to the Elastic Stack",
-              "slug": "/management/export-audit-events/elastic-stack/",
-              "forScopes": ["enterprise", "cloud"]
+              "slug": "/management/export-audit-events/elastic-stack/"
             },
             {
               "title": "Export Audit Events to Splunk",
-              "slug": "/management/export-audit-events/splunk/",
-              "forScopes": ["enterprise", "cloud"]
+              "slug": "/management/export-audit-events/splunk/"
             }
           ]
         }
@@ -686,7 +684,8 @@
           "entries": [
             {
               "title": "Via AWS EC2",
-              "slug": "/agents/join-services-to-your-cluster/aws-ec2/"
+              "slug": "/agents/join-services-to-your-cluster/aws-ec2/",
+              "forScopes": ["oss", "enterprise"]
             },
             {
               "title": "Via AWS IAM",
@@ -1317,7 +1316,8 @@
         },
         {
           "title": "How to Build an Access Request Plugin",
-          "slug": "/api/access-plugin/"
+          "slug": "/api/access-plugin/",
+          "forScopes": ["enterprise", "cloud"]
         },
         {
           "title": "Automatically Register Teleport Agents",
@@ -1388,7 +1388,11 @@
           "entries": [
             {
               "title": "teleport-cluster",
-              "slug": "/reference/helm-reference/teleport-cluster/"
+              "slug": "/reference/helm-reference/teleport-cluster/",
+              "forScopes": [
+              	  "oss",
+              	  "enterprise"
+	      ]
             },
             {
               "title": "teleport-kube-agent",
@@ -1456,7 +1460,8 @@
         },
         {
           "title": "Proxy Peering (Preview)",
-          "slug": "/architecture/proxy-peering/"
+          "slug": "/architecture/proxy-peering/",
+          "forScopes": ["enterprise"]
         },
         {
           "title": "Agent Update Management",

diff --git a/docs/pages/access-controls/access-request-plugins/ssh-approval-discord.mdx b/docs/pages/access-controls/access-request-plugins/ssh-approval-discord.mdx
@@ -286,7 +286,7 @@ Once Teleport is running, you've created the Discord app, and the plugin is
 configured, you can now run the plugin and test the workflow.
 
 <Tabs>
-<TabItem label="Executable" scope={["oss", "enterprise"]}>
+<TabItem label="Executable">
 Start the plugin:
 
 ```code
@@ -301,7 +301,7 @@ INFO   Starting Teleport Access Discord Plugin 7.2.1: discord/app.go:80
 INFO   Plugin is ready discord/app.go:101
 ```
 </TabItem>
-<TabItem label="Helm Chart" scope={["oss", "enterprise"]}>
+<TabItem label="Helm Chart">
 Install the plugin:
 
 ```code

diff --git a/docs/pages/access-controls/access-request-plugins/ssh-approval-email.mdx b/docs/pages/access-controls/access-request-plugins/ssh-approval-email.mdx
@@ -38,20 +38,23 @@ in your Teleport cluster.
 
 ## Step 2/7. Install the Teleport email plugin
 
-<ScopedBlock scope={["enterprise", "oss"]}>
+In this step, you will install the Teleport email plugin.
+
+<Tabs>
+<TabItem label="Teleport Enterprise" scope={["enterprise"]}>
 
 We recommend installing Teleport plugins on the same host as the Teleport Proxy
 Service. This is an ideal location as plugins have a low memory footprint, and
 will require both public internet access and Teleport Auth Service access. 
 
-</ScopedBlock>
-
-<ScopedBlock scope="cloud">
+</TabItem>
+<TabItem scope="cloud" label="Teleport Enterprise Cloud">
 
 Install the Teleport email plugin on a host that can access both your
 Teleport Cloud tenant and your SMTP service.
 
-</ScopedBlock>
+</TabItem>
+</Tabs>
 
 <Details title="Using a local SMTP server?">
 

diff --git a/docs/pages/access-controls/access-request-plugins/ssh-approval-mattermost.mdx b/docs/pages/access-controls/access-request-plugins/ssh-approval-mattermost.mdx
@@ -152,7 +152,7 @@ Edit the configuration as explained below:
 ### `[mattermost]`
 
 <Tabs>
-<TabItem label="Executable" scope={["oss", "enterprise"]}>
+<TabItem label="Executable">
 
 **`url`**: Include the scheme (`https://`) and fully qualified domain name of
 your Mattermost deployment.
@@ -183,7 +183,7 @@ recipients = [
 ```
 
 </TabItem>
-<TabItem label="Helm Chart" scope={["oss", "enterprise"]}>
+<TabItem label="Helm Chart">
 
 **`url`**: Include the scheme (`https://`) and fully qualified domain name of
 your Mattermost deployment.
@@ -275,7 +275,7 @@ severity = "INFO" # Logger severity. Could be "INFO", "ERROR", "DEBUG" or "WARN"
 ## Step 7/8. Test your Mattermost bot
 
 <Tabs>
-<TabItem label="Executable" scope={["oss", "enterprise"]}>
+<TabItem label="Executable">
 After modifying your configuration, run the bot with the following command:
 
 ```code
@@ -294,7 +294,7 @@ DEBU   Watcher connected mattermost/main.go:260
 DEBU   Mattermost API health check finished ok mattermost/main.go:19
 ```
 </TabItem>
-<TabItem label="Helm Chart" scope={["oss", "enterprise"]}>
+<TabItem label="Helm Chart">
 After modifying your configuration, run the bot with the following command:
 
 ```code

diff --git a/docs/pages/access-controls/access-request-plugins/ssh-approval-pagerduty.mdx b/docs/pages/access-controls/access-request-plugins/ssh-approval-pagerduty.mdx
@@ -32,20 +32,21 @@ PagerDuty.
 
 - Either a Linux host or Kubernetes cluster where you will run the PagerDuty plugin.
 
-<ScopedBlock scope={["enterprise", "oss"]}>
+<Tabs>
+<TabItem label="Teleport Enterprise" scope={["enterprise"]}>
 
 We recommend installing Teleport plugins on the same host as the Teleport Proxy
 Service. This is an ideal location as plugins have a low memory footprint, and
 will require both public internet access and Teleport Auth Service access.
 
-</ScopedBlock>
-
-<ScopedBlock scope="cloud">
+</TabItem>
+<TabItem label="Teleport Enterprise Cloud" scope="cloud">
 
 Install the Teleport PagerDuty plugin on a host that can access both your
 Teleport Cloud tenant and PagerDuty.
 
-</ScopedBlock>
+</TabItem>
+</Tabs>
 
 - (!docs/pages/includes/tctl.mdx!)
 
@@ -521,7 +522,7 @@ The final configuration should resemble the following:
 ## Step 7/8. Test the PagerDuty plugin
 
 <Tabs>
-<TabItem label="Executable" scope={["oss", "enterprise"]}>
+<TabItem label="Executable">
 After you configure the PagerDuty plugin, run the following command to start it.
 The `-d` flag will provide debug information to ensure that the plugin can
 connect to PagerDuty and your Teleport cluster:
@@ -539,7 +540,7 @@ $ teleport-pagerduty start -d
 # DEBU   Setting up the webhook extensions pagerduty/main.go:178
 ```
 </TabItem>
-<TabItem label="Helm Chart" scope={["oss", "enterprise"]}>
+<TabItem label="Helm Chart">
 After modifying your configuration, run the bot with the following command:
 
 ```code
@@ -597,7 +598,7 @@ should still check the Teleport audit log to ensure that the right users are
 reviewing the right requests.
 
 When auditing Access Request reviews, check for events with the type `Access
-Request Reviewed` in the Teleport Web UI <ScopedBlock scope={["oss",
+Request Reviewed` in the Teleport Web UI <ScopedBlock scope={[
 "enterprise"]}>and `access_request.review` if reviewing the audit log on the
 Auth Service host</ScopedBlock>.
 

diff --git a/docs/pages/access-controls/access-request-plugins/ssh-approval-slack.mdx b/docs/pages/access-controls/access-request-plugins/ssh-approval-slack.mdx
@@ -339,7 +339,7 @@ Once Teleport is running, you've created the Slack app, and the plugin is
 configured, you can now run the plugin and test the workflow.
 
 <Tabs>
-<TabItem label="Executable" scope={["oss", "enterprise"]}>
+<TabItem label="Executable">
 Start the plugin:
 
 ```code
@@ -354,7 +354,7 @@ INFO   Starting Teleport Access Slack Plugin 7.2.1: slack/app.go:80
 INFO   Plugin is ready slack/app.go:101
 ```
 </TabItem>
-<TabItem label="Helm Chart" scope={["oss", "enterprise"]}>
+<TabItem label="Helm Chart">
 Install the plugin:
 
 ```code

diff --git a/docs/pages/access-controls/access-requests/role-requests.mdx b/docs/pages/access-controls/access-requests/role-requests.mdx
@@ -10,7 +10,7 @@ via ChatOps or anywhere else via our flexible Authorization Workflow API.
 
 ## Prerequisites
 
-(!docs/pages/includes/edition-prereqs-tabs.mdx!)
+(!docs/pages/includes/commercial-prereqs-tabs.mdx!)
 
 - (!docs/pages/includes/tctl.mdx!)