diff options
| author | Evan Read <eread@gitlab.com> | 2019-09-09 01:12:12 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-09-09 01:12:12 +0000 |
| commit | 2e8cf4d5e41c50839b55f390839dd1c85581fb1c (patch) | |
| tree | ce8898631846dbb66cbf4cf4b56f2ccbfb8ff58a | |
| parent | e7ac3a246c3f83cfc6179fccbd9c393a2c22666b (diff) | |
| parent | 7a607e5b5639b00b665256b29697d77ab9a2396b (diff) | |
| download | gitlab-ce-2e8cf4d5e41c50839b55f390839dd1c85581fb1c.tar.gz | |
Merge branch 'docs-api-divergence' into 'master'
Bring typo fix over from EE
See merge request gitlab-org/gitlab-ce!32802
| -rw-r--r-- | doc/api/v3_to_v4.md | 4 | ||||
| -rw-r--r-- | doc/user/project/web_ide/index.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/v3_to_v4.md b/doc/api/v3_to_v4.md index 5f875528a6c..b6059c71b27 100644 --- a/doc/api/v3_to_v4.md +++ b/doc/api/v3_to_v4.md @@ -23,8 +23,8 @@ Below are the changes made between V3 and V4. - Status 409 returned for `POST /projects/:id/members` when a member already exists [!9093](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9093) - Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` [!9328](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9328) - Removed the following deprecated Templates endpoints (these are still accessible with `/templates` prefix) [!8853](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8853) - - `/licences` - - `/licences/:key` + - `/licenses` + - `/licenses/:key` - `/gitignores` - `/gitlab_ci_ymls` - `/dockerfiles` diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 9bf400e7dff..ecd8f74194e 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -194,7 +194,7 @@ terminal: Once the terminal has started, the console will be displayed and we could access the project repository files. -**Important**. The terminal job is branch dependant. This means that the +**Important**. The terminal job is branch dependent. This means that the configuration file used to trigger and configure the terminal will be the one in the selected branch of the Web IDE. |