Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-29 21:06:11 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-29 21:06:11 +0300
commite7c9b53c76d2673e6409dda59a5f738808379588 (patch)
treebda7f162b8167fefd47f3530f49957589f6551ba /doc
parentc1e135e7033b626c2bce65a900a5b0e669c2f6c2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/development/python_guide/index.md2
-rw-r--r--doc/integration/google.md2
-rw-r--r--doc/user/project/merge_requests/index.md2
-rw-r--r--doc/user/project/pages/getting_started_part_one.md2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/python_guide/index.md b/doc/development/python_guide/index.md
index 47d9d96766c..d898351345d 100644
--- a/doc/development/python_guide/index.md
+++ b/doc/development/python_guide/index.md
@@ -27,7 +27,7 @@ To install `pyenv` on Linux, you can run the command below:
curl https://pyenv.run | bash
```
-Alternatively, you may find `pypenv` available as a system package via your distro package manager.
+Alternatively, you may find `pyenv` available as a system package via your distro package manager.
You can read more about it in: <https://github.com/pyenv/pyenv-installer#prerequisites>.
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 4f6999571b6..225d855d25e 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -16,7 +16,7 @@ In Google's side:
the randomly generated ID or choose a new one.
1. Refresh the page and you should see your new project in the list
1. Go to the [Google API Console](https://console.developers.google.com/apis/dashboard)
-1. Select the previously created project form the upper left corner
+1. Select the previously created project in the upper left corner
1. Select **Credentials** from the sidebar
1. Select **OAuth consent screen** and fill the form with the required information
1. In the **Credentials** tab, select **Create credentials > OAuth client ID**
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index a583ef45a76..3b327472e0f 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -465,7 +465,7 @@ have been marked as a **Work In Progress**.
## Merge Requests for Confidential Issues
Create [merge requests to resolve confidential issues](../issues/confidential_issues.md#merge-requests-for-confidential-issues)
-for preventing leakage or early release of sentive data through regular merge requests.
+for preventing leakage or early release of sensitive data through regular merge requests.
## Merge request approvals **(STARTER)**
diff --git a/doc/user/project/pages/getting_started_part_one.md b/doc/user/project/pages/getting_started_part_one.md
index 45fdab1ca3a..98126262692 100644
--- a/doc/user/project/pages/getting_started_part_one.md
+++ b/doc/user/project/pages/getting_started_part_one.md
@@ -5,7 +5,7 @@ type: concepts, reference
# Static sites and GitLab Pages domains
-On this docucument, learn how to name your project for GitLab Pages
+On this document, learn how to name your project for GitLab Pages
according to your intended website's URL.
## Static sites