diff --git a/docs/pages/includes/edition-prereqs-tabs.mdx b/docs/pages/includes/edition-prereqs-tabs.mdx index 712888a08cf3..ec30ddd9f449 100644 --- a/docs/pages/includes/edition-prereqs-tabs.mdx +++ b/docs/pages/includes/edition-prereqs-tabs.mdx @@ -8,6 +8,19 @@ See [Installation](../installation.mdx) for details. +To check version information, run the `tctl version` and `tsh version` commands. +For example: + +```code +$ tctl version +# Teleport v(=teleport.version=) git:(=teleport.git=) go(=teleport.golang=) + +$ tsh version +# Teleport v(=teleport.version=) go(=teleport.golang=) +Proxy version: (=teleport.version=) +Proxy: (=teleport.url=) +``` + @@ -18,6 +31,19 @@ up to begin your [free trial](https://goteleport.com/signup/). You can download these tools from the [Cloud Downloads page](../choose-an-edition/teleport-cloud/downloads.mdx). +To check version information, run the `tctl version` and `tsh version` commands. +For example: + +```code +$ tctl version +# Teleport Enterprise v(=cloud.version=) git:(=teleport.git=) go(=teleport.golang=) + +$ tsh version +# Teleport v(=cloud.version=) go(=teleport.golang=) +Proxy version: (=cloud.version=) +Proxy: (=teleport.url=) +``` + @@ -43,20 +82,18 @@ up to begin your [free trial](https://goteleport.com/signup/). - The Enterprise `tctl` admin tool and `tsh` client tool version >= (=cloud.version=). You can download these tools from the [Cloud Downloads page](../choose-an-edition/teleport-cloud/downloads.mdx). - - - To check version information, run the `tctl version` and `tsh version` commands. - For example: +To check version information, run the `tctl version` and `tsh version` commands. +For example: - ```code - $ tctl version - # Teleport Enterprise v(=cloud.version=) git:(=teleport.git=) go(=teleport.golang=) +```code +$ tctl version +# Teleport Enterprise v(=cloud.version=) git:(=teleport.git=) go(=teleport.golang=) - $ tsh version - # Teleport v(=cloud.version=) go(=teleport.golang=) - Proxy version: (=cloud.version=) - Proxy: (=teleport.url=) - ``` - - +$ tsh version +# Teleport v(=cloud.version=) go(=teleport.golang=) +Proxy version: (=cloud.version=) +Proxy: (=teleport.url=) +``` + + diff --git a/docs/pages/management/admin/labels.mdx b/docs/pages/management/admin/labels.mdx index e0fb02e2a912..aba5899b157d 100644 --- a/docs/pages/management/admin/labels.mdx +++ b/docs/pages/management/admin/labels.mdx @@ -49,7 +49,7 @@ but filter and limit access to the servers based on their AWS region. 1. Generate an invitation token for the host. - The invitation token is required for the local computer to join the Teleport cluster. + The invitation token is required for the local computer to join the Teleport cluster. The following example generates a new token that is valid for five minutes and can be used to enroll a server: