Skip to content
Snippets Groups Projects
Commit 5f4d1641 authored by Marcel Amirault's avatar Marcel Amirault Committed by Douwe Maan
Browse files

Correct "setup" and "set up" grammar sitewide

parent 56178c7f
No related branches found
No related tags found
No related merge requests found
Showing
with 11 additions and 11 deletions
Loading
Loading
@@ -27,9 +27,9 @@ access them directly through a terminal in GitLab (shown in the video at [5:18](
We want to give the power of containers, continuous integration and deployment,
review apps and container schedulers to everyone. With GitLab 8.15, we
take away all the hard work without hiding anything. In the demonstration we
setup and deploy a Ruby application with review apps, multiple environments,
set up and deploy a Ruby application with review apps, multiple environments,
chatops to a Kubernetes cluster in about 12 minutes. This typically takes days,
if not weeks to setup and use without GitLab.
if not weeks to set up and use without GitLab.
 
For many people, December is a month of celebration and gift giving.
This month, GitLab was again so lucky to receive many great contributions.
Loading
Loading
Loading
Loading
@@ -74,7 +74,7 @@ The image below shows both `CNAME` and `A` records
(for the purposes of this demo), but of course, you will only
need one of them. For this example, I used the `CNAME` record pointing `gitlab-tests.gitlab.io` to my subdomain `cloudflare.marcia.ml`:
 
![setup CloudFlare DNS](/images/blogimages/setting-up-gitlab-pages-with-cloudflare-certificates/cloudflare-dns-settings.jpg){:.shadow}
![set up CloudFlare DNS](/images/blogimages/setting-up-gitlab-pages-with-cloudflare-certificates/cloudflare-dns-settings.jpg){:.shadow}
 
For projects on GitLab.com, the DNS `A` record should point your custom
domain to [GitLab Pages][pages-ip]' server IP address `35.185.44.232`.
Loading
Loading
Loading
Loading
@@ -37,7 +37,7 @@ Thanks Horacio!
 
## GitLab Pages in Community Edition
 
Hardcoded static websites take a long time to setup and maintain for everyone
Hardcoded static websites take a long time to set up and maintain for everyone
but the invested web developer. Static Site Generators are the best solution to
[this problem][pages-ssgs-1]. [GitLab Pages][pages] allows you to
[host static websites][post-pages-setup] straight from GitLab, with
Loading
Loading
Loading
Loading
@@ -52,7 +52,7 @@ For most teams, measurement and monitoring are tedious tasks in software develop
 
#### Prometheus Environment Monitoring (CE)
 
To address the tedious set-up of application performance monitoring, with 9.0 we will activate [monitoring by default](https://docs.gitlab.com/ee/user/project/integrations/prometheus.html). Users can now measure the performance of their application and measure the performance of GitLab.
To address the tedious setup of application performance monitoring, with 9.0 we will activate [monitoring by default](https://docs.gitlab.com/ee/user/project/integrations/prometheus.html). Users can now measure the performance of their application and measure the performance of GitLab.
 
We are a company that ships a new version of our product every month so while the milestone 9.0 is a big deal for us, it is also just marks the beginning of the amazing things we have to come. We're a open company so you can always follow our product direction, click into open issues, and contribute your ideas and feedback!
 
Loading
Loading
Loading
Loading
@@ -370,7 +370,7 @@ GitLab 9.1 ships with improvements to the Disaster Recovery feature
that we've released in [GitLab 9.0 in Alpha](/2017/03/22/gitlab-9-0-released/#disaster-recovery-alpha-eep).
 
We've made it easier for [developers to work on the feature itself](https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/270).
We've also reduced the number of [steps required to setup Geo](https://gitlab.com/gitlab-org/gitlab-ee/issues/1664).
We've also reduced the number of [steps required to set up Geo](https://gitlab.com/gitlab-org/gitlab-ee/issues/1664).
 
Finally, we've added support for replicating the following types of files saved on disk: issue, merge request, and comment attachments, as well as user, group, and project avatars. We plan to [continue working actively on Disaster Recovery](https://gitlab.com/gitlab-org/gitlab-ee/issues/846) in the coming releases.
 
Loading
Loading
Loading
Loading
@@ -94,7 +94,7 @@ to choose from:
- [Remmina](http://www.remmina.org/wp/ "Remmina website") (GNU/Linux)
- [RealVNC](https://www.realvnc.com/ "RealVNC website") (Multi-platform)
 
When you connect with VNC, you can use the same password that is setup for the
When you connect with VNC, you can use the same password that is set up for the
user on the Mac mini.
 
<i class="fas fa-info-circle" aria-hidden="true" style="color: rgb(49, 112, 143);"></i>
Loading
Loading
Loading
Loading
@@ -23,7 +23,7 @@ You can follow more discussion around the integration [on the issue](https://git
 
![GitLab Trello Power-Up gif](/images/blogimages/trello-power-up-gif.gif){: .shadow}<br>
 
1. When viewing one of your boards in Trello, simply go to Power-Ups and select the GitLab Power-Up. After set-up, you can search GitLab merge requests from within a Trello card and attach one to the card.
1. When viewing one of your boards in Trello, simply go to Power-Ups and select the GitLab Power-Up. After setup, you can search GitLab merge requests from within a Trello card and attach one to the card.
 
2. Click through to the attached merge request directly from the card.
 
Loading
Loading
Loading
Loading
@@ -123,7 +123,7 @@ CI jobs to run only on the specified branch(es), in this case `master`.
`allow_failure` simply allows the CI job to fail but still passing the pipeline.
 
Since we are going to clone a copy of ourselves (the repository checked out in
CI) we need SSH and SSH keys setup. We’ll use ssh-agent with a password-less key
CI) we need SSH and SSH keys set up. We’ll use ssh-agent with a password-less key
to authenticate. Generate a key using ssh-keygen, for example:
 
```
Loading
Loading
Loading
Loading
@@ -124,7 +124,7 @@ Login to your existing GitLab instance as the admin user, then click the wrench
 
On the left of your screen, hover over **Overview** and select **Runners** from the list that appears.
 
On the Runners page under the **How to setup a shared Runner for a new project** section, copy the token shown in Step 3, and make a note of it along with the publicly accessible URL of your GitLab instance from Step 2. If you are using HTTPS for Gitlab, make sure it is not a self-signed certificate, or GitLab Runner will fail to start.
On the Runners page under the **How to set up a shared Runner for a new project** section, copy the token shown in Step 3, and make a note of it along with the publicly accessible URL of your GitLab instance from Step 2. If you are using HTTPS for Gitlab, make sure it is not a self-signed certificate, or GitLab Runner will fail to start.
 
## Step 5: Configure GitLab on the Bastion Droplet
 
Loading
Loading
Loading
Loading
@@ -101,7 +101,7 @@ extra_js:
but GitLab does more.
 
First off – GitLab is a single application that has everything you need to go from planning to
shipping to production and even monitoring. There is no more need to setup up integrations,
shipping to production and even monitoring. There is no more need to set up up integrations,
worry about authentication and authorization between the various applications.
 
[See all DevOps stages that GitLab has built-in](/product)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment