From 596d6585a0426038f3812099a68fb7eb33bed1ac Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Mon, 2 Oct 2023 13:08:52 -0400 Subject: [PATCH 1/3] docs: update tctl tsh version location in prereqs --- docs/pages/includes/edition-prereqs-tabs.mdx | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/docs/pages/includes/edition-prereqs-tabs.mdx b/docs/pages/includes/edition-prereqs-tabs.mdx index 52b882d0f4e8..17eb2446f57c 100644 --- a/docs/pages/includes/edition-prereqs-tabs.mdx +++ b/docs/pages/includes/edition-prereqs-tabs.mdx @@ -16,6 +16,20 @@ 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=) +``` + + @@ -26,6 +40,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=) +``` + From 5cf0ed784d1e61ba5be0cfb61dbfd54c066ec45f Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Tue, 3 Oct 2023 08:21:02 -0400 Subject: [PATCH 2/3] remove unavailable variable seconds --- docs/pages/includes/edition-prereqs-tabs.mdx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/pages/includes/edition-prereqs-tabs.mdx b/docs/pages/includes/edition-prereqs-tabs.mdx index 17eb2446f57c..195252c5ff7a 100644 --- a/docs/pages/includes/edition-prereqs-tabs.mdx +++ b/docs/pages/includes/edition-prereqs-tabs.mdx @@ -21,12 +21,10 @@ For example: ```code $ tctl version -# Teleport v(=teleport.version=) git:(=teleport.git=) go(=teleport.golang=) +# Teleport v(=teleport.version=) go(=teleport.golang=) $ tsh version # Teleport v(=teleport.version=) go(=teleport.golang=) -Proxy version: (=teleport.version=) -Proxy: (=teleport.url=) ``` @@ -45,12 +43,10 @@ For example: ```code $ tctl version -# Teleport Enterprise v(=cloud.version=) git:(=teleport.git=) go(=teleport.golang=) +# Teleport Enterprise v(=cloud.version=) go(=teleport.golang=) $ tsh version # Teleport v(=cloud.version=) go(=teleport.golang=) -Proxy version: (=cloud.version=) -Proxy: (=teleport.url=) ``` From f12a7cb36cae1fc2f75531e1eb2cbc16d53a70fc Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Tue, 3 Oct 2023 08:27:25 -0400 Subject: [PATCH 3/3] lint fix --- docs/pages/management/admin/labels.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: