summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2019-02-23 21:49:55 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2019-02-25 10:31:35 +0900
commite8fee6b8f720b9b0340f40818a095fd941630423 (patch)
treea62dfd36a9f5b7bcc6fd9f2cb73cd44bf65444a7 /doc/user
parentecaa08cc284f4ea31fa1a181f909fef01eb48b05 (diff)
downloadgitlab-ce-e8fee6b8f720b9b0340f40818a095fd941630423.tar.gz
Fix misspellings in docs
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/clusters/index.md2
-rw-r--r--doc/user/project/clusters/runbooks/index.md2
-rw-r--r--doc/user/project/clusters/serverless/index.md2
-rw-r--r--doc/user/project/pipelines/settings.md2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 0797eb3b0de..e601d7b2ccc 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -92,7 +92,7 @@ To add an existing Kubernetes cluster to your project:
It's the URL that GitLab uses to access the Kubernetes API. Kubernetes
exposes several APIs, we want the "base" URL that is common to all of them,
e.g., `https://kubernetes.example.com` rather than `https://kubernetes.example.com/api/v1`.
- - **CA certificate** (requried) - A valid Kubernetes certificate is needed to authenticate to the EKS cluster. We will use the certificate created by default.
+ - **CA certificate** (required) - A valid Kubernetes certificate is needed to authenticate to the EKS cluster. We will use the certificate created by default.
- List the secrets with `kubectl get secrets`, and one should named similar to
`default-token-xxxxx`. Copy that token name for use below.
- Get the certificate by running this command:
diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md
index e1b8dc07b50..512a4cb32f4 100644
--- a/doc/user/project/clusters/runbooks/index.md
+++ b/doc/user/project/clusters/runbooks/index.md
@@ -23,7 +23,7 @@ runbooks. A sample runbook is provided, showcasing common operations.
**<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
Watch this [video](https://www.youtube.com/watch?v=Q_OqHIIUPjE)
-for an overview of how this is acomplished in GitLab!**
+for an overview of how this is accomplished in GitLab!**
## Requirements
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md
index 139579a88ff..f7e72efa2ba 100644
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -209,7 +209,7 @@ The sample function can now be triggered from any HTTP client using a simple `PO
```
2. Using a web-based tool (ie. postman, restlet, etc)
- ![function exection](img/function-execution.png)
+ ![function execution](img/function-execution.png)
## Deploying Serverless applications
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index cbc05bf73ca..4a989afad4d 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -23,7 +23,7 @@ in `.gitlab-ci.yml`.
## Timeout
Timeout defines the maximum amount of time in minutes that a job is able run.
-This is configureable under your project's **Settings > CI/CD > General pipelines settings**.
+This is configurable under your project's **Settings > CI/CD > General pipelines settings**.
The default value is 60 minutes. Decrease the time limit if you want to impose
a hard limit on your jobs' running time or increase it otherwise. In any case,
if the job surpasses the threshold, it is marked as failed.