summaryrefslogtreecommitdiff
path: root/doc/administration/integration
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-05-09 09:04:06 +0200
committerAchilleas Pipinellis <axil@gitlab.com>2018-05-09 09:04:06 +0200
commit2ac407b8d4a3f076a4c4ebbb8151b869b8220e15 (patch)
tree5e1097c57fd5b4b6546c1fc0bed26f1d8c2fe0d6 /doc/administration/integration
parent5b0e96d09a7b6309384ef4c300c56872adba0626 (diff)
downloadgitlab-ce-2ac407b8d4a3f076a4c4ebbb8151b869b8220e15.tar.gz
Deprecate the Kubernetes service docsdocs/redirect-k8s-service-page
Diffstat (limited to 'doc/administration/integration')
-rw-r--r--doc/administration/integration/terminal.md16
1 files changed, 7 insertions, 9 deletions
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index 91e844c7b42..32ad63c3706 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -1,12 +1,13 @@
# Web terminals
-> [Introduced][ce-7690] in GitLab 8.15. Only project masters and owners can
- access web terminals.
+>
+[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690)
+in GitLab 8.15. Only project masters and owners can access web terminals.
-With the introduction of the [Kubernetes project service][kubservice], GitLab
-gained the ability to store and use credentials for a Kubernetes cluster. One
-of the things it uses these credentials for is providing access to
-[web terminals](../../ci/environments.html#web-terminals) for environments.
+With the introduction of the [Kubernetes integration](../../user/project/clusters/index.md),
+GitLab gained the ability to store and use credentials for a Kubernetes cluster.
+One of the things it uses these credentials for is providing access to
+[web terminals](../../ci/environments.md#web-terminals) for environments.
## How it works
@@ -80,6 +81,3 @@ Terminal sessions use long-lived connections; by default, these may last
forever. You can configure a maximum session time in the Admin area of your
GitLab instance if you find this undesirable from a scalability or security
point of view.
-
-[ce-7690]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7690
-[kubservice]: ../../user/project/integrations/kubernetes.md