Commit bf0f8409 authored by Craig Norris's avatar Craig Norris

Merge branch 'docs-aqualls-20200528-spelling2' into 'master'

Docs: more spelling fixes

See merge request gitlab-org/gitlab!33354
parents d593f57c fa2e8a9f
...@@ -56,6 +56,7 @@ CAS ...@@ -56,6 +56,7 @@ CAS
CentOS CentOS
Chatops Chatops
Citrix Citrix
clonable
Cloudwatch Cloudwatch
Cobertura Cobertura
Cognito Cognito
......
...@@ -22,7 +22,7 @@ Based on your installation, choose a section below that fits your needs. ...@@ -22,7 +22,7 @@ Based on your installation, choose a section below that fits your needs.
source](upgrading_from_source.md) - The guidelines for upgrading Community source](upgrading_from_source.md) - The guidelines for upgrading Community
Edition and Enterprise Edition from source. Edition and Enterprise Edition from source.
- [Patch versions](patch_versions.md) guide includes the steps needed for a - [Patch versions](patch_versions.md) guide includes the steps needed for a
patch version, eg. 6.2.0 to 6.2.1, and apply to both Community and Enterprise patch version, such as 6.2.0 to 6.2.1, and apply to both Community and Enterprise
Editions. Editions.
In the past we used separate documents for the upgrading instructions, but we In the past we used separate documents for the upgrading instructions, but we
...@@ -178,7 +178,7 @@ If you wish to upgrade your GitLab installation from Community to Enterprise ...@@ -178,7 +178,7 @@ If you wish to upgrade your GitLab installation from Community to Enterprise
Edition, follow the guides below based on the installation method: Edition, follow the guides below based on the installation method:
- [Source CE to EE update guides](upgrading_from_ce_to_ee.md) - The steps are very similar - [Source CE to EE update guides](upgrading_from_ce_to_ee.md) - The steps are very similar
to a version upgrade: stop the server, get the code, update config files for to a version upgrade: stop the server, get the code, update configuration files for
the new functionality, install libraries and do migrations, update the init the new functionality, install libraries and do migrations, update the init
script, start the application and check its status. script, start the application and check its status.
- [Omnibus CE to EE](https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus - [Omnibus CE to EE](https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus
......
...@@ -258,7 +258,7 @@ build: ...@@ -258,7 +258,7 @@ build:
- docker push $CI_REGISTRY/group/project/image:latest - docker push $CI_REGISTRY/group/project/image:latest
``` ```
You can also make use of [other variables](../../../ci/variables/README.md) to avoid hardcoding: You can also make use of [other variables](../../../ci/variables/README.md) to avoid hard-coding:
```yaml ```yaml
build: build:
......
...@@ -134,7 +134,7 @@ This example code does the following: ...@@ -134,7 +134,7 @@ This example code does the following:
#### Setting up your AWS credentials with your GitLab account #### Setting up your AWS credentials with your GitLab account
In order to interact with your AWS account, the GitLab CI/CD pipelines require both `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` to be defined in your GitLab settings under **Settings > CI/CD > Variables**. In order to interact with your AWS account, the GitLab CI/CD pipelines require both `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` to be defined in your GitLab settings under **Settings > CI/CD > Variables**.
For more information please see: <https://docs.gitlab.com/ee/ci/variables/README.html#via-the-ui> For more information please see [Create a custom variable in the UI](../../../../ci/variables/README.md#create-a-custom-variable-in-the-ui).
NOTE: **Note:** NOTE: **Note:**
The AWS credentials you provide must include IAM policies that provision correct access control to AWS Lambda, API Gateway, CloudFormation, and IAM resources. The AWS credentials you provide must include IAM policies that provision correct access control to AWS Lambda, API Gateway, CloudFormation, and IAM resources.
...@@ -288,7 +288,7 @@ automated testing of both local and deployed serverless function. ...@@ -288,7 +288,7 @@ automated testing of both local and deployed serverless function.
The example code is available: The example code is available:
- As a [cloneable repository](https://gitlab.com/gitlab-org/serverless/examples/serverless-framework-js). - As a [clonable repository](https://gitlab.com/gitlab-org/serverless/examples/serverless-framework-js).
- In a version with [tests and secret variables](https://gitlab.com/gitlab-org/project-templates/serverless-framework/). - In a version with [tests and secret variables](https://gitlab.com/gitlab-org/project-templates/serverless-framework/).
You can also use a [template](../../../../gitlab-basics/create-project.md#project-templates) You can also use a [template](../../../../gitlab-basics/create-project.md#project-templates)
...@@ -416,7 +416,7 @@ production: ...@@ -416,7 +416,7 @@ production:
environment: production environment: production
``` ```
Let’s examine the config file more closely: Let’s examine the configuration file more closely:
- `image` specifies the Docker image to use for this build. This is the latest Python - `image` specifies the Docker image to use for this build. This is the latest Python
image since the sample application is written in Python. image since the sample application is written in Python.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment