diff --git a/docs/config.json b/docs/config.json
index f23211e1139a4..512ee1722e12c 100644
--- a/docs/config.json
+++ b/docs/config.json
@@ -42,20 +42,15 @@
"title": "Introduction",
"slug": "/choose-an-edition/introduction/"
},
+ {
+ "title": "Teleport Team",
+ "slug": "/choose-an-edition/teleport-team/"
+ },
{
"title": "Teleport Enterprise Cloud",
"slug": "/choose-an-edition/teleport-cloud/introduction/",
- "forScopes": [
- "cloud"
- ],
+ "forScopes": ["cloud"],
"entries": [
- {
- "title": "Getting Started",
- "slug": "/choose-an-edition/teleport-cloud/getting-started/",
- "forScopes": [
- "cloud"
- ]
- },
{
"title": "Architecture",
"slug": "/choose-an-edition/teleport-cloud/architecture/",
@@ -2253,12 +2248,12 @@
},
{
"source": "/cloud/getting-started/",
- "destination": "/choose-an-edition/teleport-cloud/getting-started/",
+ "destination": "/choose-an-edition/teleport-team/",
"permanent": true
},
{
"source": "/cloud/introduction/",
- "destination": "/choose-an-edition/teleport-cloud/introduction/",
+ "destination": "/choose-an-edition/teleport-cloud/",
"permanent": true
},
{
@@ -2523,12 +2518,12 @@
},
{
"source": "/deploy-a-cluster/teleport-cloud/getting-started/",
- "destination": "/choose-an-edition/teleport-cloud/getting-started/",
+ "destination": "/choose-an-edition/teleport-team/",
"permanent": true
},
{
"source": "/deploy-a-cluster/teleport-cloud/introduction/",
- "destination": "/choose-an-edition/teleport-cloud/introduction/",
+ "destination": "/choose-an-edition/teleport-cloud/",
"permanent": true
},
{
@@ -2621,6 +2616,11 @@
"destination": "/kubernetes-access/introduction/",
"permanent": true
},
+ {
+ "source": "/choose-an-edition/teleport-cloud/getting-started/",
+ "destination": "/choose-an-edition/teleport-team/",
+ "permanent": true
+ },
{
"source": "/access-controls/faq/",
"destination": "/access-controls/introduction/",
diff --git a/docs/img/cloud/getting-started/choose-resource@2x.png b/docs/img/cloud/getting-started/choose-resource@2x.png
new file mode 100644
index 0000000000000..c465e64a5e4f0
Binary files /dev/null and b/docs/img/cloud/getting-started/choose-resource@2x.png differ
diff --git a/docs/img/cloud/getting-started/paste-script@2x.png b/docs/img/cloud/getting-started/paste-script@2x.png
new file mode 100644
index 0000000000000..a387011f991cc
Binary files /dev/null and b/docs/img/cloud/getting-started/paste-script@2x.png differ
diff --git a/docs/img/cloud/getting-started/session-recordings@2x.png b/docs/img/cloud/getting-started/session-recordings@2x.png
index 7c24bfc6343c2..bcf3b86371c15 100644
Binary files a/docs/img/cloud/getting-started/session-recordings@2x.png and b/docs/img/cloud/getting-started/session-recordings@2x.png differ
diff --git a/docs/img/cloud/getting-started/set-up-access@2x.png b/docs/img/cloud/getting-started/set-up-access@2x.png
index 0eaf4e4ef5330..b44aeb8b8d616 100644
Binary files a/docs/img/cloud/getting-started/set-up-access@2x.png and b/docs/img/cloud/getting-started/set-up-access@2x.png differ
diff --git a/docs/img/cloud/getting-started/successfully-connected@2x.png b/docs/img/cloud/getting-started/successfully-connected@2x.png
index e7fd86283fb9b..0b91b8e188128 100644
Binary files a/docs/img/cloud/getting-started/successfully-connected@2x.png and b/docs/img/cloud/getting-started/successfully-connected@2x.png differ
diff --git a/docs/img/cloud/getting-started/test-connection@2x.png b/docs/img/cloud/getting-started/test-connection@2x.png
index e2eba6364e6df..7e4283e262cf7 100644
Binary files a/docs/img/cloud/getting-started/test-connection@2x.png and b/docs/img/cloud/getting-started/test-connection@2x.png differ
diff --git a/docs/pages/choose-an-edition/introduction.mdx b/docs/pages/choose-an-edition/introduction.mdx
index 41e2942321c72..08e95222c77fa 100644
--- a/docs/pages/choose-an-edition/introduction.mdx
+++ b/docs/pages/choose-an-edition/introduction.mdx
@@ -3,19 +3,19 @@ title: "How to Choose a Teleport Edition"
description: "Read this guide to determine whether to deploy Teleport Enterprise, Teleport Cloud, or Open Source Teleport"
---
-Teleport supports three editions. In this guide, we will help you determine
+Teleport supports four editions. In this guide, we will help you determine
which edition is most appropriate for your use case.
## Editions
-### Teleport Community Edition
+### Teleport Team
-We provide a free, open source distribution of Teleport that enables you to get
-secure access to databases, Windows desktops, Kubernetes clusters, and more.
+Teleport Team makes it easier for small organizations to get started enabling
+secure access to their infrastructure. It includes a subset of Teleport
+Enterprise Cloud features, and teams can switch to Teleport Enterprise Cloud as
+they scale up.
-[Try out Teleport on a Linux server](../get-started.mdx). If you would like to
-take a look at the source, visit the [Teleport GitHub
-repository](https://github.com/gravitational/teleport).
+[Read more about Teleport Team](./teleport-team.mdx).
### Teleport Enterprise Cloud
@@ -33,6 +33,15 @@ compliance.
[Read more about Teleport Enterprise](./teleport-enterprise/introduction.mdx).
+### Teleport Community Edition
+
+We provide a free, open source distribution of Teleport that enables you to get
+secure access to databases, Windows desktops, Kubernetes clusters, and more.
+
+[Try out Teleport on a Linux server](../get-started.mdx). If you would like to
+take a look at the source, visit the [Teleport GitHub
+repository](https://github.com/gravitational/teleport).
+
## Comparing editions
(!docs/pages/includes/edition-comparison.mdx!)
diff --git a/docs/pages/choose-an-edition/teleport-cloud/getting-started.mdx b/docs/pages/choose-an-edition/teleport-cloud/getting-started.mdx
deleted file mode 100644
index a102aaa51ee37..0000000000000
--- a/docs/pages/choose-an-edition/teleport-cloud/getting-started.mdx
+++ /dev/null
@@ -1,201 +0,0 @@
----
-title: Getting Started With Teleport Enterprise Cloud
-description: Teleport hosted and managed by the Teleport team.
----
-
-In this guide, we will show you how to get started with Teleport Enterprise
-Cloud and register your first resource with Teleport so you can provide secure
-access to your infrastructure.
-
-Teleport Enterprise Cloud includes two components:
-
-- **Teleport Auth Service:** The certificate authority for your cluster. It
- issues certificates and conducts authentication challenges.
-- **Teleport Proxy Service:** The cluster frontend, which handles user requests,
- forwards user credentials to the Auth Service, and communicates with Teleport
- instances that enable access to specific resources in your infrastructure.
-
-In this guide, you will register a server with your Teleport Cloud account so
-you can access it securely. Your server will connect to the Teleport Proxy
-Service and open a reverse tunnel that the Proxy Service can use to allow
-traffic to the server from authorized clients.
-
-## Prerequisites
-
-- A Teleport Enterprise Cloud account. You can sign up for a free trial at the
- following page:
-
- https://goteleport.com/signup/
-
-- Docker installed on your workstation. We will use a Docker container to
- register a server with Teleport via the Teleport SSH Service. You can find
- installation instructions on [Docker's
- website](https://docs.docker.com/get-docker/).
-
-
-
- Docker is only required for a local demo environment. If you want to get
- started registering your servers in your infrastructure with Teleport, view
- our documentation on how to [register servers and configure access to
- them](../../server-access/introduction.mdx).
-
-
-
-- The `tsh` client tool. Visit our [Installation Guide](../../installation.mdx)
- for instructions. If you want to get started quickly, you can skip this for
- now and access Teleport through your browser.
-
-## Step 1/4. Spin up your server
-
-Spin up a server on your workstation. In Step 2, we will register this server
-with your Teleport Enterprise Cloud tenant:
-
-```code
-$ docker run -it ubuntu:22.10 /bin/bash
-```
-
-Your terminal will begin a shell session in the `ubuntu:22.10` container. From
-there, make sure you have `curl` and `telnet` installed. When we run a script to install Teleport later in this guide, the script will require both of these tools.
-
-```code
-$ apt update && apt install -y curl telnet
-```
-
-Keep this shell open in your terminal for the next step.
-
-## Step 2/4. Install the Teleport SSH Service
-
-To install the Teleport SSH Service on your server, visit the Teleport Web UI at
-the address of your Teleport Enterprise Cloud tenant,
-`.teleport.sh` (e.g., `mytenant.teleport.sh`).
-
-If this is your first time visiting the Web UI, you will see a prompt to add
-your first resource:
-
-
-
-Clicking **Add my first resource** will take you to the Teleport Discover UI:
-
-
-
-Leave **Server** selected and click **Next**.
-
-You will see a script that you can copy from the Teleport Web UI:
-
-
-
-Copy the script and paste it into the shell you opened in the previous step.
-
-The script assumes that you will run it as a non-`root` user, but the shell in
-the container you created earlier is running as root. Remove `sudo` from the
-start of the script so you can run it on your container. It should look
-something like this:
-
-```text
-bash -c "$(curl -fsSL https://TENANT_SUBDOMAIN.teleport.sh/scripts/SCRIPT_NAME/install-node.sh)"
-```
-
-Leave the script running in your shell. Teleport will run in the foreground. You
-will see a message in the Web UI that your new server connected successfully:
-
-
-
-Click **Next**.
-
-Confirm that you will authenticate as the `root` user and click **Next**:
-
-
-
-From there, you can test the connection and access the server. Click **Start
-Session** to connect:
-
-
-
-
-
-If you get an error connecting to your container, interrupt the `teleport`
-process in your container's shell with **Ctrl-C**, then run `teleport start` to
-restart the process.
-
-
-
-You should see a terminal prompt in your browser. Your Teleport Enterprise Cloud
-account routes your SSH connection through the Teleport Proxy Service, which
-connects to your container via a reverse tunnel.
-
-Reverse tunnels like this allow Teleport to manage access to resources like
-Kubernetes clusters and remote desktops, even if these resources are running on
-private networks.
-
-Execute some commands in your terminal. When you have finished, run `exit` to
-end your session.
-
-In the **Manage Access** view, click **Finish**, then **Browse existing
-resources** to visit the main view of the Teleport Web UI.
-
-## Step 3/4. Play back your session
-
-As Teleport Enterprise Cloud proxies SSH connections to registered servers, it
-records the commands that users execute during their sessions so operators can
-play them back later to investigate issues.
-
-In the Teleport Web UI, click the **Activity** tab in the sidebar on the left of
-the screen, then click **Session Recordings**. You will see your session from
-the previous step:
-
-
-
-Click **PLAY**. You will see a full recording of your session.
-
-## Step 4/4. Access your server from the command line
-
-Open a new terminal window and log in to your Teleport Enterprise Cloud tenant
-via the command line, filling in the URL of your tenant and the name of your
-Teleport user:
-
-```code
-$ tsh login --proxy=.teleport.sh --user=
-```
-
-List the servers your Teleport user can access. You should see the name of the
-container you just registered:
-
-```code
-$ tsh ls
-Node Name Address Labels
------------- ---------- ----------------------------------------------------------------------------------------
-000000000000 ⟵ Tunnel hostname=000000000000,teleport.internal/resource-id=000000000000
-```
-
-Access your server as the `root` user:
-
-```code
-$ tsh ssh root@
-```
-
-## Next steps
-
-- Now that you have registered your first server with Teleport, read about how
- you can register resources in your infrastructure, including:
-
- - [Additional SSH servers](../../server-access/introduction.mdx)
- - [Cloud provider tools and internal web applications](../../application-access/introduction.mdx)
- - [Databases](../../database-access/introduction.mdx)
- - [Kubernetes clusters](../../kubernetes-access/introduction.mdx)
- - [Service accounts](../../machine-id/introduction.mdx)
- - [Windows desktops](../../desktop-access/introduction.mdx)
-
-- Aside from `tsh` and the Web UI, you can also connect to Teleport with our
- desktop application, [Teleport
- Connect](../../connect-your-client/teleport-connect.mdx).
-
-- Learn more about Teleport Enterprise Cloud with our [Architecture
- Guide](./architecture.mdx) and [Frequently Asked Questions](./faq.mdx) page.
-
-- Get support in our [Discussion
- Forum](https://github.com/gravitational/teleport/discussions) and [Slack
- community](https://goteleport.com/slack).
diff --git a/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx b/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx
index 767a23caf3b23..9ce2191030607 100644
--- a/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx
+++ b/docs/pages/choose-an-edition/teleport-cloud/introduction.mdx
@@ -27,9 +27,8 @@ Windows desktops, and service accounts.
## Next steps
-- [Sign up](https://goteleport.com/signup/): Sign up for a free trial of Teleport Enterprise Cloud
-- [Get started](./getting-started.mdx): Start using your Teleport Enterprise Cloud account
-- [Download Teleport](./downloads.mdx): Download Teleport binaries for your agents and clients
+- [Download Teleport binaries](./downloads.mdx): Download Teleport binaries for
+ your agents and clients
## Learn more
diff --git a/docs/pages/choose-an-edition/teleport-team.mdx b/docs/pages/choose-an-edition/teleport-team.mdx
new file mode 100644
index 0000000000000..cd4e03a789291
--- /dev/null
+++ b/docs/pages/choose-an-edition/teleport-team.mdx
@@ -0,0 +1,241 @@
+---
+title: "Introduction to Teleport Team"
+description: "Teleport Team makes it quick and easy for small organizations set up secure RBAC for their infrastructure."
+tocDepth: 3
+---
+
+Teleport Team helps small organizations get started quickly enabling secure
+access to their infrastructure.
+
+With Teleport Team, the Auth Service and Proxy Service are fully managed, giving
+you a scalable, fault tolerant certificate authority and reverse proxy that you
+can use to configure access from users across the globe to your infrastructure,
+including private networks.
+
+After starting a [free trial](https://goteleport.com/signup) of Teleport Team,
+you can set up RBAC, enable single sign-on with GitHub or Teleport's own
+identity provider, and start protecting resources with Teleport.
+
+```mermaid
+flowchart LR
+subgraph team["Teleport Team tenant"]
+ direction LR
+ proxy["Teleport Proxy Service"]
+ auth["Teleport Auth Service"]
+ proxy<-.->auth
+end
+
+web["Teleport Web UI"]
+tsh["tsh client"]
+
+subgraph private["Private network"]
+ service["Teleport Services"]
+end
+
+service-- Reverse tunnels -->proxy
+web & tsh--Client traffic-->proxy
+```
+
+
+
+For a detailed comparison of Teleport's editions, including how Teleport Team
+compares to Teleport Team, see the [Choose an Edition](introduction.mdx) guide.
+
+
+
+## Get started with Teleport Team
+
+This guide walks you through the process of registering a local server with a
+Teleport Team account. You can then access the server through the browser and
+the terminal, and record your session so you can review it later.
+
+### Prerequisites
+
+- A Teleport Team account. You can sign up for a free trial at the following
+ page:
+
+ https://goteleport.com/signup/
+
+- Docker installed on your workstation. We will use a Docker container to
+ register a server with Teleport via the Teleport SSH Service. You can find
+ installation instructions on [Docker's
+ website](https://docs.docker.com/get-docker/).
+
+
+
+ Docker is only required for the local demo environment we use in this guide.
+ If you want to get started registering your servers in your infrastructure
+ with Teleport, view our documentation on how to [register servers and
+ configure access to them](../server-access/introduction.mdx).
+
+
+
+- The `tsh` client tool. Visit our [Installation Guide](../installation.mdx)
+ for instructions. If you want to get started quickly, you can skip this for
+ now and access Teleport through your browser.
+
+### Step 1/4. Spin up your server
+
+Start a Docker container on your workstation to register as a server in your
+Teleport Team tenant:
+
+```code
+$ docker run -it ubuntu:22.10 /bin/bash
+```
+
+Your terminal will begin a shell session in the `ubuntu:22.10` container. From
+there, make sure you have `curl` and `telnet` installed. When we run a script to
+install Teleport later in this guide, the script will require both of these
+tools:
+
+```code
+$ apt update && apt install -y curl telnet
+```
+
+Keep this shell open in your terminal.
+
+### Step 2/4. Install the Teleport SSH Service
+
+To install the Teleport SSH Service on your server, visit the Teleport Web UI at
+the address of your Teleport Team tenant, `.teleport.sh`
+(e.g., `mytenant.teleport.sh`).
+
+If this is your first time visiting the Web UI, you will see a prompt to add
+your first resource:
+
+
+
+Clicking **Add my first resource** will take you to the **Enroll New Resource**
+view. Enter "server" in the search box as shown below:
+
+
+
+Select "Ubuntu 14.04+" so you can register your Docker container.
+
+After selecting an OS, you will see a script that you can copy from the Teleport
+Web UI:
+
+
+
+The Teleport installation script uses `sudo`, which is not installed on your
+Docker container. Alias `sudo` in your container terminal to override this:
+
+```code
+$ alias sudo=""
+```
+
+Copy the script and paste it into the shell you opened earlier on your Docker
+container.
+
+Leave the script running in your shell. Teleport will run in the foreground. You
+will see a message in the Web UI that your new server connected successfully:
+
+
+
+Click **Next**.
+
+Confirm that you will authenticate as the `root` user and click **Next**:
+
+
+
+From there, you can test the connection and access the server. Click **Start
+Session** to connect:
+
+
+
+
+
+If you get an error connecting to your container, interrupt the `teleport`
+process in your container's shell with **Ctrl-C**, then run `teleport start` to
+restart the process.
+
+
+
+You should see a terminal prompt in a new browser window. Your Teleport Team
+account routes your SSH connection through the Teleport Proxy Service, which
+connects to your container via a reverse tunnel.
+
+Reverse tunnels like this allow Teleport to manage access to resources like
+Kubernetes clusters and remote desktops, even if these resources are running on
+private networks.
+
+Execute some commands in your terminal. When you have finished, run `exit` to
+end your session.
+
+Return to your original browser window. In the **Manage Access** view, click
+**Finish**, then **Browse existing resources** to visit the main view of the
+Teleport Web UI.
+
+### Step 3/4. Play back your session
+
+As Teleport Team proxies SSH connections to registered servers, it records the
+commands that users execute during their sessions so operators can play them
+back later to investigate issues.
+
+In the Teleport Web UI, set the dropdown menu on the upper left of the screen to
+**Management**, then click **Session Recordings**. You will see your session
+from the previous step:
+
+
+
+Click **PLAY**. You will see a full recording of your session.
+
+### Step 4/4. Access your server from the command line
+
+Open a new terminal window and log in to your Teleport Team tenant
+via the command line, filling in the URL of your tenant and the name of your
+Teleport user:
+
+```code
+$ tsh login --proxy=.teleport.sh --user=
+```
+
+List the servers your Teleport user can access. You should see the name of the
+container you just registered:
+
+```code
+$ tsh ls
+Node Name Address Labels
+------------ ---------- ----------------------------------------------------------------------------------------
+000000000000 ⟵ Tunnel hostname=000000000000,teleport.internal/resource-id=000000000000
+```
+
+Access your server as the `root` user:
+
+```code
+$ tsh ssh root@
+```
+
+## Next steps
+
+We have shown you how to use Teleport Team to quickly protect your
+infrastructure by registering a server with your Teleport Team cluster. From
+here, you can explore more of the documentation to see how to set up secure
+access for your infrastructure.
+
+### Register resources
+
+Read about how you can register resources in your infrastructure, including:
+
+ - [Additional SSH servers](../server-access/introduction.mdx)
+ - [Cloud provider tools and internal web applications](../application-access/introduction.mdx)
+ - [Databases](../database-access/introduction.mdx)
+ - [Kubernetes clusters](../kubernetes-access/introduction.mdx)
+ - [Service accounts](../machine-id/introduction.mdx)
+ - [Windows desktops](../desktop-access/introduction.mdx)
+
+### Connect to your infrastructure
+
+Aside from `tsh` and the Web UI, you can also connect to Teleport with our
+desktop application, [Teleport
+Connect](../connect-your-client/teleport-connect.mdx).
+
+### Subscribe
+
+After you finish your free trial, Teleport Team will charge based on usage.
+Check the [pricing page](https://goteleport.com/teleport-pricing/) for detailed
+billing information.
diff --git a/docs/pages/core-concepts.mdx b/docs/pages/core-concepts.mdx
index 4c3e495e3d101..082ecabb3bbe1 100644
--- a/docs/pages/core-concepts.mdx
+++ b/docs/pages/core-concepts.mdx
@@ -129,24 +129,17 @@ source core, which is available at the
[`gravitational/teleport`](https://github.com/gravitational/teleport) repository
on GitHub.
-You can find a detailed comparison of Teleport's editions in our [Frequently
-Asked Questions](./faq.mdx#how-is-open-source-different-from-enterprise) page.
+You can find a detailed comparison of Teleport's editions in our [Choose an
+Edition](./choose-an-edition/introduction.mdx) documentation.
-### Teleport Community Edition
+### Teleport Team
-**Teleport Community Edition** is a free, open source distribution of Teleport
-that anyone can download, install, and host on their own infrastructure.
+Teleport Team makes it easier for small organizations to get started with
+enabling secure access to their infrastructure. It includes a subset of Teleport
+Enterprise Cloud features, and teams can switch to Teleport Enterprise Cloud
+as they scale up their Teleport usage.
-### Teleport Enterprise
-
-**Teleport Enterprise** is a paid plan that includes all of the features of
-**Teleport Community Edition**, plus advanced features for organizations with
-advanced security needs, such as support for Federal Information Processing
-Standards (FIPS) and a hardware security module (HSM). Teleport Enterprise
-includes a support agreement with Teleport.
-
-Read more in our [Teleport Enterprise
-guide](./choose-an-edition/teleport-enterprise/introduction.mdx).
+[Read more about Teleport Team](choose-an-edition/teleport-team.mdx).
### Teleport Enterprise Cloud
@@ -161,6 +154,22 @@ subdomain of `.teleport.sh`, e.g., `mytenant.teleport.sh`.
Read more in our [Teleport Enterprise Cloud
guide](./choose-an-edition/teleport-cloud/introduction.mdx).
+### Teleport Enterprise
+
+**Teleport Enterprise** is a paid plan that includes all of the features of
+**Teleport Community Edition**, plus advanced features for organizations with
+advanced security needs, such as support for Federal Information Processing
+Standards (FIPS) and a hardware security module (HSM). Teleport Enterprise
+includes a support agreement with Teleport.
+
+Read more in our [Teleport Enterprise
+guide](./choose-an-edition/teleport-enterprise/introduction.mdx).
+
+### Teleport Community Edition
+
+**Teleport Community Edition** is a free, open source distribution of Teleport
+that anyone can download, install, and host on their own infrastructure.
+
## Configuration resources
A **configuration resource** is a document stored on the **Teleport Auth
diff --git a/docs/pages/faq.mdx b/docs/pages/faq.mdx
index 71ebadde23f1f..d183930458d97 100644
--- a/docs/pages/faq.mdx
+++ b/docs/pages/faq.mdx
@@ -72,9 +72,10 @@ don't support the SFTP protocol, and it's enabled by default in `tsh` v11.0.0 an
Teleport provides three editions:
-- Open Source
-- Enterprise
-- Cloud
+- Teleport Team
+- Teleport Enterprise
+- Teleport Enterprise Cloud
+- Teleport Community Edition
Here is a detailed breakdown of the differences between Teleport's editions.
diff --git a/docs/pages/includes/edition-comparison.mdx b/docs/pages/includes/edition-comparison.mdx
index ef3c16a22cbdc..eb3b2883a0a17 100644
--- a/docs/pages/includes/edition-comparison.mdx
+++ b/docs/pages/includes/edition-comparison.mdx
@@ -1,65 +1,65 @@
### Access controls
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|[Access Requests](../access-controls/guides/dual-authz.mdx)|Limited|✔|✔|
-|[Single Sign-On](../access-controls/sso.mdx)|GitHub|GitHub, Google Workspace, OIDC, SAML|GitHub, Google Workspace, OIDC, SAML|
-|[Role-Based Access Control](../access-controls/guides/role-templates.mdx)|✔|✔|✔|
-|[Moderated Sessions](../access-controls/guides/moderated-sessions.mdx)|✖|✔|✔|
-|[Device Trust](../access-controls/guides/device-trust.mdx)|✖|✔|✔|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|[Access Requests](../access-controls/guides/dual-authz.mdx)|Limited|✔|✔|✖|
+|[Single Sign-On](../access-controls/sso.mdx)|GitHub|GitHub, Google Workspace, OIDC, SAML, Teleport|GitHub, Google Workspace, OIDC, SAML, Teleport|GitHub, Teleport|
+|[Role-Based Access Control](../access-controls/guides/role-templates.mdx)|✔|✔|✔|✔|
+|[Moderated Sessions](../access-controls/guides/moderated-sessions.mdx)|✖|✔|✔|✖|
+|[Device Trust](../access-controls/guides/device-trust.mdx)|✖|✔|✔|✖|
### Infrastructure access
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|[Application access](../application-access/getting-started.mdx)|✔|✔|✔|
-|[Server access](../server-access/getting-started.mdx)|✔|✔|✔|
-|[Database access](../database-access/getting-started.mdx)|✔|✔|✔|
-|[Desktop access - Active Directory](../desktop-access/active-directory.mdx)|✔|✔|✔|
-|[Passwordless Windows access for local users](../desktop-access/getting-started.mdx)|✖|✔|✔|
-|[Kubernetes access](../kubernetes-access/getting-started.mdx)|✔|✔|✔|
-|[Machine ID](../machine-id/getting-started.mdx)|✔|✔|✔|
-|Agentless integration with [OpenSSH servers](../server-access/guides/openssh.mdx)|✔|✔|✔|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|[Application Access](../application-access/getting-started.mdx)|✔|✔|✔|✔|
+|[Server Access](../server-access/getting-started.mdx)|✔|✔|✔|✔|
+|[Database Access](../database-access/getting-started.mdx)|✔|✔|✔|✔|
+|[Desktop Access](../desktop-access/getting-started.mdx)|✔|✔|✔|✔|
+|[Kubernetes Access](../kubernetes-access/getting-started.mdx)|✔|✔|✔|✔|
+|[Machine ID](../machine-id/getting-started.mdx)|✔|✔|✔|✔|
+|Agentless Integration with [OpenSSH Servers](../server-access/guides/openssh.mdx)|✔|✔|✔|✔|
-### Session recording
+### Audit logging and session recording
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|[Recording Proxy Mode](../server-access/guides/recording-proxy-mode.mdx)|✔|✔|✖|
-|[Enhanced Session Recording](../server-access/guides/bpf-session-recording.mdx)|✔|✔|✔|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|[Structured Audit Logs](../reference/audit.mdx)|✔|✔|✔|✔|
+|[Session Recording with Playback](../architecture/session-recording.mdx)|✔|✔|✔|✔|
+|[Recording Proxy Mode](../server-access/guides/recording-proxy-mode.mdx)|✔|✔|✖|✔|
+|[Enhanced Session Recording](../server-access/guides/bpf-session-recording.mdx)|✔|✔|✔|✔|
### Compliance
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|[FedRAMP Control](../access-controls/compliance-frameworks/fedramp.mdx)|✖|✔|✖|
-|PCI DSS Features|Limited|✔|✔|
-|SOC 2 Features|Limited|✔|✔|
-|FIPS-compliant binaries available for FedRAMP High|✖|✔|✖|
-|IP-Based Restrictions|✖|✔|✔|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|[FedRAMP Control](../access-controls/compliance-frameworks/fedramp.mdx)|✖|✔|✖|✖|
+|PCI DSS Features|Limited|✔|✔|Limited|
+|SOC 2 Features|Limited|✔|✔|Limited|
+|FIPS-compliant binaries available for FedRAMP High|✖|✔|✖|✖|
+|IP-Based Restrictions|✖|✔|✔|✖|
### Operations
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|Auth and Proxy Service management|Self-hosted|Self-hosted|Fully managed|
-|Proxy Service domain name|Custom|Custom|A subdomain of `teleport.sh`|
-|Version support|All supported releases available to install and download.|All supported releases available to install and download.|Deploys last stable release with 2-3 week lag for stability.|
-|[Backend support](../reference/backends.mdx)|Any S3-compatible storage for session records, many managed backends for custom audit log storage.|Any S3-compatible storage for session records, many managed backends for custom audit log storage|All data is stored in DynamoDB and S3 with server-side encryption|
-|Data storage location|Can store data anywhere in the world, on most managed cloud backends|Can store data anywhere in the world, on most managed cloud backends| Data is stored in `us-west-2`, with Proxy Service instances deployed across the world for low-latency access|
-|[Hardware Security Module support](../choose-an-edition/teleport-enterprise/hsm.mdx) for encryption at rest|✖|✔|✖|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|Auth and Proxy Service Management|Self-hosted|Self-hosted|Fully managed|Fully managed|
+|Proxy Service domain name|Custom|Custom|A subdomain of `teleport.sh`|A subdomain of `teleport.sh`|
+|Version support|All supported releases available to install and download.|All supported releases available to install and download.|Deploys last stable release with 2-3 week lag for stability.|Deploys last stable release with 2-3 week lag for stability.|
+|[Backend support](../reference/backends.mdx)|Any S3-compatible storage for session records, many managed backends for custom audit log storage.|Any S3-compatible storage for session records, many managed backends for custom audit log storage|All data is stored in DynamoDB and S3 with server-side encryption.|All data is stored in DynamoDB and S3 with server-side encryption.|
+|Data storage location|Can store data anywhere in the world, on most managed cloud backends|Can store data anywhere in the world, on most managed cloud backends|Data is stored in `us-west-2`, with Proxy Service instances deployed across the world for low-latency access.|Data is stored in `us-west-2`, with Proxy Service instances deployed across the world for low-latency access.|
+|[Hardware Security Module support](../choose-an-edition/teleport-enterprise/hsm.mdx) for encryption at rest|✖|✔|✖|✖|
### Support
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|Support|Best-effort, community|24x7 support with premium SLAs and account managers|24x7 support with premium SLAs and account managers|
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|Support|Community|24x7 support with premium SLAs and account managers|24x7 support with premium SLAs and account managers|Community|
### Licensing and usage management
-||Open Source|Enterprise|Cloud|
-|---|---|---|---|
-|Annual or multi-year contracts, volume discounts|✖|✔|✔|
-|License|Apache 2|Commercial|Commercial|
-|Usage tracking|✖|✖|Enables you to track the number of users per protocol.|
-
+||Open Source|Enterprise|Cloud|Team|
+|---|---|---|---|---|
+|Annual or multi-year contracts, volume discounts|✖|✔|✔|✖|
+|License|Apache 2|Commercial|Commercial|Commercial|
+|Anonymized Usage Tracking|Opt-in|✔|✔|✔|
diff --git a/docs/pages/index.mdx b/docs/pages/index.mdx
index 05120c9c2db28..188710951857b 100644
--- a/docs/pages/index.mdx
+++ b/docs/pages/index.mdx
@@ -39,7 +39,7 @@ Teleport.
You can also get started right away with a production-ready Teleport cluster.
[Sign up for a free trial](https://goteleport.com/signup/) of Teleport
-Enterprise Cloud.
+Team.
Once you are ready to learn more about Teleport, read our [Core Concepts
guide](./core-concepts.mdx), which introduces the components of a Teleport
@@ -49,9 +49,15 @@ documentation.
## Choose an edition
After trying out Teleport, you are ready to deploy a cluster to your
-infrastructure. Teleport has three editions, Teleport Enterprise, Teleport
-Enterprise Cloud, and Teleport Community Edition, and you can compare these in
-our [Choose an Edition](./choose-an-edition/introduction.mdx) section.
+infrastructure. Teleport has four editions:
+
+- Teleport Team
+- Teleport Enterprise Cloud
+- Teleport Enterprise
+- Teleport Community Edition
+
+You can compare these in our [Choose an
+Edition](./choose-an-edition/introduction.mdx) section.