diff options
Diffstat (limited to 'doc/administration/integration')
| -rw-r--r-- | doc/administration/integration/diagrams_net.md | 2 | ||||
| -rw-r--r-- | doc/administration/integration/plantuml.md | 10 | ||||
| -rw-r--r-- | doc/administration/integration/terminal.md | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/administration/integration/diagrams_net.md b/doc/administration/integration/diagrams_net.md index 335b26565e6..7f8c01ad7bd 100644 --- a/doc/administration/integration/diagrams_net.md +++ b/doc/administration/integration/diagrams_net.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: reference, howto --- -# Diagrams.net **(FREE)** +# Diagrams.net **(FREE SELF)** With the [diagrams.net](https://www.diagrams.net/) integration, you can create and embed SVG diagrams in wikis. The diagram editor is available in both the plain text editor and the rich text editor. diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md index f05197d45e7..5e499e302db 100644 --- a/doc/administration/integration/plantuml.md +++ b/doc/administration/integration/plantuml.md @@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated type: reference, howto --- -# PlantUML **(FREE)** +# PlantUML **(FREE SELF)** With the [PlantUML](https://plantuml.com) integration, you can create diagrams in snippets, wikis, and repositories. This integration is enabled on GitLab.com for all SaaS users and does not require any additional configuration. @@ -291,6 +291,14 @@ The default URL is different when using this approach. The Docker-based image makes the service available at the root URL, with no relative path. Adjust the configuration below accordingly. +#### `404` error when opening the PlantUML page in the browser + +You might get a `404` error when visiting `https://gitlab.example.com/-/plantuml/`, when the PlantUML +server is set up [in Debian or Ubuntu](#debianubuntu). + +This can happen even when the integration is working. +It does not necessarily indicate a problem with your PlantUML server or configuration. + ### Configure PlantUML security PlantUML has features that allow fetching network resources. If you self-host the diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 1ab45d6ce99..2939e227a04 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -4,7 +4,7 @@ group: Environments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- -# Web terminals (deprecated) **(FREE)** +# Web terminals (deprecated) **(FREE SELF)** > - [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5. > - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/353410) in GitLab 15.0. @@ -114,5 +114,5 @@ lifetime in your GitLab instance: 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). 1. Select **Admin Area**. -1. Select [**Settings > Web terminal**](../../administration/settings/index.md#general). +1. Select **Settings > Web terminal**. 1. Set a `max session time`. |