diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-07 14:56:26 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-07 14:56:26 +0300 |
commit | f88672b02c95b1cd93a9e40a76109c23bf1f20fa (patch) | |
tree | 9ddc226bae556e40908649608ab4f218643584df /doc/user | |
parent | a965edb89d3c260394ffc987832a469e7740415d (diff) | |
parent | e60ff0288289c54fed2b9d19b830aba2b0c4fd18 (diff) |
Merge branch 'docs/fix-broken-links' into 'master'
Fix broken links to docs
See merge request !9022
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/account/security.md | 2 | ||||
-rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 2 | ||||
-rw-r--r-- | doc/user/project/container_registry.md | 11 | ||||
-rw-r--r-- | doc/user/project/integrations/kubernetes.md | 4 | ||||
-rw-r--r-- | doc/user/project/integrations/mattermost_slash_commands.md | 15 | ||||
-rw-r--r-- | doc/user/project/integrations/slack_slash_commands.md | 2 | ||||
-rw-r--r-- | doc/user/project/repository/web_editor.md | 3 |
7 files changed, 17 insertions, 22 deletions
diff --git a/doc/user/account/security.md b/doc/user/account/security.md index 9336dee7451..2459f913583 100644 --- a/doc/user/account/security.md +++ b/doc/user/account/security.md @@ -1 +1 @@ -This document was moved to [profile](../profile/index.md#security). +This document was moved to [profile](../profile/index.md). diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index cc688a7f99c..a23ad79ae1d 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -206,7 +206,7 @@ Sign in and re-enable two-factor authentication as soon as possible. ## Note to GitLab administrators - You need to take special care to that 2FA keeps working after -[restoring a GitLab backup](../raketasks/backup_restore.md). +[restoring a GitLab backup](../../../raketasks/backup_restore.md). - To ensure 2FA authorizes correctly with TOTP server, you may want to ensure your GitLab server's time is synchronized via a service like NTP. Otherwise, diff --git a/doc/user/project/container_registry.md b/doc/user/project/container_registry.md index 47a4a3f85d0..91b35c73b34 100644 --- a/doc/user/project/container_registry.md +++ b/doc/user/project/container_registry.md @@ -1,10 +1,7 @@ # GitLab Container Registry -> [Introduced][ce-4040] in GitLab 8.8. - ---- - >**Notes:** +> [Introduced][ce-4040] in GitLab 8.8. - Docker Registry manifest `v1` support was added in GitLab 8.9 to support Docker versions earlier than 1.10. - This document is about the user guide. To learn how to enable GitLab Container @@ -98,8 +95,8 @@ delete them. This feature requires GitLab 8.8 and GitLab Runner 1.2. Make sure that your GitLab Runner is configured to allow building Docker images by -following the [Using Docker Build](../ci/docker/using_docker_build.md) -and [Using the GitLab Container Registry documentation](../ci/docker/using_docker_build.md#using-the-gitlab-container-registry). +following the [Using Docker Build](../../ci/docker/using_docker_build.md) +and [Using the GitLab Container Registry documentation](../../ci/docker/using_docker_build.md#using-the-gitlab-container-registry). ## Limitations @@ -252,4 +249,4 @@ Once the right permissions were set, the error will go away. [ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040 [docker-docs]: https://docs.docker.com/engine/userguide/intro/ -[private-docker]: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/configuration/advanced-configuration.md#using-a-private-docker-registry +[private-docker]: https://docs.gitlab.com/runner/configuration/advanced-configuration.html#using-a-private-docker-registry diff --git a/doc/user/project/integrations/kubernetes.md b/doc/user/project/integrations/kubernetes.md index 99aa9e44bdb..7b33327f6cf 100644 --- a/doc/user/project/integrations/kubernetes.md +++ b/doc/user/project/integrations/kubernetes.md @@ -40,7 +40,7 @@ the `ca.crt` contents as the `Custom CA bundle`. ## Deployment variables The Kubernetes service exposes following -[deployment variables](../ci/variables/README.md#deployment-variables) in the +[deployment variables](../../../ci/variables/README.md#deployment-variables) in the GitLab CI build environment: - `KUBE_URL` - equal to the API URL @@ -55,7 +55,7 @@ Added in GitLab 8.15. You must be the project owner or have `master` permissions to use terminals. Support is currently limited to the first container in the first pod of your environment. -When enabled, the Kubernetes service adds [web terminal](../ci/environments.md#web-terminals) +When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals) support to your environments. This is based on the `exec` functionality found in Docker and Kubernetes, so you get a new shell session within your existing containers. To use this integration, you should deploy to Kubernetes using diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md index 67cb88104c1..9a09e6d37ea 100644 --- a/doc/user/project/integrations/mattermost_slash_commands.md +++ b/doc/user/project/integrations/mattermost_slash_commands.md @@ -17,7 +17,7 @@ in it. All you have to do is configure it. Read more in the ## Automated Configuration If Mattermost is installed on the same server as GitLab, the configuration process can be -done for you by GitLab. +done for you by GitLab. Go to the Mattermost Slash Command service on your project and click the 'Add to Mattermost' button. @@ -29,7 +29,7 @@ commands in Mattermost and then enable the service in GitLab. ### Step 1. Enable custom slash commands in Mattermost This step is only required when using a source install, omnibus installs will be -preconfigured with the right settings. +preconfigured with the right settings. The first thing to do in Mattermost is to enable custom slash commands from the administrator console. @@ -41,8 +41,8 @@ the administrator console. --- -1. Click **Custom integrations** and set **Enable Custom Slash Commands**, - **Enable custom integrations to override usernames**, and **Override +1. Click **Custom integrations** and set **Enable Custom Slash Commands**, + **Enable custom integrations to override usernames**, and **Override custom integrations to override profile picture icons** to true ![Mattermost console](img/mattermost_console_integrations.png) @@ -149,15 +149,14 @@ trigger word followed by <kbd>help</kbd>. Example: <samp>/gitlab help</samp> ## Permissions -The permissions to run the [available commands](#available-commands) derive from -the [permissions you have on the project](../user/permissions.md#project). +The permissions to run the [available commands](#available-slash-commands) derive from +the [permissions you have on the project](../../permissions.md#project). ## Further reading - [Mattermost slash commands documentation][mmslashdocs] - [Omnibus GitLab Mattermost][omnimmdocs] - [omnimmdocs]: https://docs.gitlab.com/omnibus/gitlab-mattermost/ [mmslashdocs]: https://docs.mattermost.com/developer/slash-commands.html -[ciyaml]: ../ci/yaml/README.md +[ciyaml]: ../../../ci/yaml/README.md diff --git a/doc/user/project/integrations/slack_slash_commands.md b/doc/user/project/integrations/slack_slash_commands.md index d9ff573d185..6efc2a168fa 100644 --- a/doc/user/project/integrations/slack_slash_commands.md +++ b/doc/user/project/integrations/slack_slash_commands.md @@ -6,7 +6,7 @@ Slack commands give users an extra interface to perform common operations from the chat environment. This allows one to, for example, create an issue as soon as the idea was discussed in chat. For all available commands try the help subcommand, for example: `/gitlab help`, -all review the [full list of commands](../integration/chat_commands.md). +all review the [full list of commands](../../../integration/chat_commands.md). ## Prerequisites diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index 675e89e4247..c415d566a7c 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -170,6 +170,5 @@ you commit the changes you will be taken to a new merge request form. ![Start a new merge request with these changes](img/web_editor_start_new_merge_request.png) -![New file button](basicsimages/file_button.png) [ce-2808]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2808 -[issue closing pattern]: ../user/project/issues/automatic_issue_closing.md +[issue closing pattern]: ../issues/automatic_issue_closing.md |