Merge branch 'docs-fix-setup-grammar-marcel-contribution-2'

Correct grammar (setup to set-up) in Docs

See merge request gitlab-org/gitlab-ce!21857

doc/README.md

@@ -191,7 +191,7 @@ instant how code changes impact your production environment.
 ### User account
 
 - [User account](user/profile/index.md): Manage your account
-  - [Authentication](topics/authentication/index.md): Account security with two-factor authentication, setup your ssh keys and deploy keys for secure access to your projects.
+  - [Authentication](topics/authentication/index.md): Account security with two-factor authentication, set up your ssh keys and deploy keys for secure access to your projects.
   - [Profile settings](user/profile/index.md#profile-settings): Manage your profile settings, two factor authentication and more.
 - [User permissions](user/permissions.md): Learn what each role in a project (external/guest/reporter/developer/maintainer/owner) can do.
 

doc/administration/auth/ldap.md

@@ -132,7 +132,7 @@ main:
   ## Enables SSL certificate verification if encryption method is
   ## "start_tls" or "simple_tls". Defaults to true since GitLab 10.0 for
   ## security. This may break installations upon upgrade to 10.0, that did
-  ## not know their LDAP SSL certificates were not setup properly.
+  ## not know their LDAP SSL certificates were not set up properly.
   ##
   verify_certificates: true
 

doc/administration/external_database.md

@@ -9,7 +9,7 @@ separate from the GitLab Omnibus package.
 
 If you use a cloud-managed service, or provide your own PostgreSQL instance:
 
-1. Setup PostgreSQL according to the
+1. Set up PostgreSQL according to the
    [database requirements document](../install/requirements.md#database).
 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user
    needs privileges to create the `gitlabhq_production` database.

doc/administration/high_availability/database.md

@@ -13,7 +13,7 @@ Database Service (RDS) that runs PostgreSQL.
 
 If you use a cloud-managed service, or provide your own PostgreSQL:
 
-1. Setup PostgreSQL according to the
+1. Set up PostgreSQL according to the
    [database requirements document](../../install/requirements.md#database).
 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user
    needs privileges to create the `gitlabhq_production` database.

doc/administration/high_availability/redis.md

@@ -81,7 +81,7 @@ When a **Master** fails to respond, it's the application's responsibility
 (in our case GitLab) to handle timeout and reconnect (querying a **Sentinel**
 for a new **Master**).
 
-To get a better understanding on how to correctly setup Sentinel, please read
+To get a better understanding on how to correctly set up Sentinel, please read
 the [Redis Sentinel documentation](http://redis.io/topics/sentinel) first, as
 failing to configure it correctly can lead to data loss or can bring your
 whole cluster down, invalidating the failover effort.
@@ -217,7 +217,7 @@ Pick the one that suits your needs.
   and configure Sentinel, jump directly to the Sentinel section in the
   [Redis HA installation from source](redis_source.md#step-3-configuring-the-redis-sentinel-instances) documentation.
 - [Omnibus GitLab **Enterprise Edition** (EE) package][ee]: Both Redis and Sentinel
-  are bundled in the package, so you can use the EE package to setup the whole
+  are bundled in the package, so you can use the EE package to set up the whole
   Redis HA infrastructure (master, slave and Sentinel) which is described in
   this document.
 - If you have installed GitLab using the Omnibus GitLab packages (CE or EE),
@@ -228,7 +228,7 @@ Pick the one that suits your needs.
 
 ## Configuring Redis HA
 
-This is the section where we install and setup the new Redis instances.
+This is the section where we install and set up the new Redis instances.
 
 > **Notes:**
 > - We assume that you have installed GitLab and all HA components from scratch. If you
@@ -370,7 +370,7 @@ You must have at least `3` Redis Sentinel servers, and they need to
 be each in an independent machine. You can configure them in the same
 machines where you've configured the other Redis servers.
 
-With GitLab Enterprise Edition, you can use the Omnibus package to setup
+With GitLab Enterprise Edition, you can use the Omnibus package to set up
 multiple machines with the Sentinel daemon.
 
 ---
@@ -535,7 +535,7 @@ In this example we consider that all servers have an internal network
 interface with IPs in the `10.0.0.x` range, and that they can connect
 to each other using these IPs.
 
-In a real world usage, you would also setup firewall rules to prevent
+In a real world usage, you would also set up firewall rules to prevent
 unauthorized access from other machines and block traffic from the
 outside (Internet).
 

doc/administration/high_availability/redis_source.md

@@ -24,7 +24,7 @@ the Omnibus Redis HA documentation.
 
 ## Configuring your own Redis server
 
-This is the section where we install and setup the new Redis instances.
+This is the section where we install and set up the new Redis instances.
 
 ### Prerequisites
 
@@ -204,7 +204,7 @@ In this example we consider that all servers have an internal network
 interface with IPs in the `10.0.0.x` range, and that they can connect
 to each other using these IPs.
 
-In a real world usage, you would also setup firewall rules to prevent
+In a real world usage, you would also set up firewall rules to prevent
 unauthorized access from other machines, and block traffic from the
 outside ([Internet][it]).
 

doc/administration/operations/ssh_certificates.md

@@ -31,7 +31,7 @@ uploading user SSH keys to GitLab entirely.
 
 ## Setting up SSH certificate lookup via GitLab Shell
 
-How to fully setup SSH certificates is outside the scope of this
+How to fully set up SSH certificates is outside the scope of this
 document. See [OpenSSH's
 PROTOCOL.certkeys](https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD)
 for how it works, and e.g. [RedHat's documentation about
@@ -132,7 +132,7 @@ message about this being an invalid user.
 ## Interaction with the `authorized_keys` file
 
 SSH certificates can be used in conjunction with the `authorized_keys`
-file, and if setup as configured above the `authorized_keys` file will
+file, and if set up as configured above the `authorized_keys` file will
 still serve as a fallback.
 
 This is because if the `AuthorizedPrincipalsCommand` can't

doc/administration/raketasks/maintenance.md

@@ -56,7 +56,7 @@ Runs the following rake tasks:
 - `gitlab:sidekiq:check`
 - `gitlab:app:check`
 
-It will check that each component was setup according to the installation guide and suggest fixes for issues found.
+It will check that each component was set up according to the installation guide and suggest fixes for issues found.
 
 You may also have a look at our Trouble Shooting Guides:
 - [Trouble Shooting Guide (GitLab)](http://docs.gitlab.com/ee/README.html#troubleshooting)

doc/administration/reply_by_email.md

@@ -5,7 +5,7 @@ replying to notification emails.
 
 ## Requirement
 
-Make sure [incoming email](incoming_email.md) is setup.
+Make sure [incoming email](incoming_email.md) is set up.
 
 ## How it works?
 

doc/administration/reply_by_email_postfix_setup.md

@@ -245,7 +245,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
         220 gitlab.example.com ESMTP Postfix (Ubuntu)
         ```
 
-        If you get a `Connection refused` error instead, make sure your firewall is setup to allow inbound traffic on port 25.
+        If you get a `Connection refused` error instead, make sure your firewall is set up to allow inbound traffic on port 25.
 
     1. Send the `incoming` user a dummy email to test SMTP, by entering the following into the SMTP prompt:
 

doc/api/settings.md

@@ -193,7 +193,7 @@ are listed in the descriptions of the relevant settings.
 | `metrics_port`                           | integer          | required by: `metrics_enabled`       | The UDP port to use for connecting to InfluxDB. |
 | `metrics_sample_interval`                | integer          | required by: `metrics_enabled`       | The sampling interval in seconds. |
 | `metrics_timeout`                        | integer          | required by: `metrics_enabled`       | The amount of seconds after which InfluxDB will time out. |
-| `mirror_available`                       | boolean          | no                                   | Allow mirrors to be setup for projects. If disabled, only admins will be able to setup mirrors in projects. |
+| `mirror_available`                       | boolean          | no                                   | Allow mirrors to be set up for projects. If disabled, only admins will be able to set up mirrors in projects. |
 | `pages_domain_verification_enabled`      | boolean          | no                                   | Require users to prove ownership of custom domains. Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled. |
 | `password_authentication_enabled_for_git` | boolean         | no                                   | Enable authentication for Git over HTTP(S) via a GitLab account password. Default is `true`. |
 | `password_authentication_enabled_for_web` | boolean         | no                                   | Enable authentication for the web interface via a GitLab account password. Default is `true`. |

doc/ci/autodeploy/quick_start_guide.md

@@ -11,7 +11,7 @@ We made a minimal [Ruby application](https://gitlab.com/gitlab-examples/minimal-
 
 Let’s start by forking our sample application. Go to [the project page](https://gitlab.com/gitlab-examples/minimal-ruby-app) and press the `Fork` button. Soon you should have a project under your namespace with the necessary files.
 
-## Setup your own cluster on Google Kubernetes Engine
+## Set up your own cluster on Google Kubernetes Engine
 
 If you do not already have a Google Cloud account, create one at https://console.cloud.google.com.
 
@@ -71,7 +71,7 @@ Use this IP address to configure your DNS. This part heavily depends on your pre
 
 Use `nslookup minimal-ruby-app-staging.<yourdomain>` to confirm that domain is assigned to the cluster IP.
 
-## Setup Auto Deploy
+## Set up Auto Deploy
 
 Visit the home page of your GitLab.com project and press "Set up Auto Deploy" button.
 

doc/ci/environments.md

@@ -370,7 +370,7 @@ review_app:
     url: https://$CI_COMMIT_REF_SLUG.example.com
 ```
 
-It is assumed that the user has already setup NGINX and GitLab Runner in the
+It is assumed that the user has already set up NGINX and GitLab Runner in the
 server this job will run on.
 
 >**Note:**

doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md

@@ -520,7 +520,7 @@ a lot of breathing room in quickly getting changes to players.
 Here are some ideas to further investigate that can speed up or improve your pipeline:
 
 - [Yarn](https://yarnpkg.com) instead of npm
-- Setup a custom [Docker](../../../ci/docker/using_docker_images.md#define-image-and-services-from-gitlab-ci-yml) image that can preload dependencies and tools (like AWS CLI)
+- Set up a custom [Docker](../../../ci/docker/using_docker_images.md#define-image-and-services-from-gitlab-ci-yml) image that can preload dependencies and tools (like AWS CLI)
 - Forward a [custom domain](http://docs.aws.amazon.com/AmazonS3/latest/dev/website-hosting-custom-domain-walkthrough.html) to your game's S3 static website
 - Combine jobs if you find it unnecessary for a small project
 - Avoid the queues and set up your own [custom GitLab CI/CD runner](https://about.gitlab.com/2016/03/01/gitlab-runner-with-docker/)

doc/ci/examples/laravel_with_gitlab_and_envoy/index.md

@@ -13,7 +13,7 @@ date: 2017-08-31
 
 GitLab features our applications with Continuous Integration, and it is possible to easily deploy the new code changes to the production server whenever we want.
 
-In this tutorial, we'll show you how to initialize a [Laravel](http://laravel.com/) application and setup our [Envoy](https://laravel.com/docs/envoy) tasks, then we'll jump into see how to test and deploy it with [GitLab CI/CD](../README.md) via [Continuous Delivery](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/).
+In this tutorial, we'll show you how to initialize a [Laravel](http://laravel.com/) application and set up our [Envoy](https://laravel.com/docs/envoy) tasks, then we'll jump into see how to test and deploy it with [GitLab CI/CD](../README.md) via [Continuous Delivery](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/).
 
 We assume you have a basic experience with Laravel, Linux servers,
 and you know how to use GitLab.
@@ -23,7 +23,7 @@ It has a great community with a [fantastic documentation](https://laravel.com/do
 Aside from the usual routing, controllers, requests, responses, views, and (blade) templates, out of the box Laravel provides plenty of additional services such as cache, events, localization, authentication and many others.
 
 We will use [Envoy](https://laravel.com/docs/master/envoy) as an SSH task runner based on PHP.
-It uses a clean, minimal [Blade syntax](https://laravel.com/docs/blade) to setup tasks that can run on remote servers, such as, cloning your project from the repository, installing the Composer dependencies, and running [Artisan commands](https://laravel.com/docs/artisan).
+It uses a clean, minimal [Blade syntax](https://laravel.com/docs/blade) to set up tasks that can run on remote servers, such as, cloning your project from the repository, installing the Composer dependencies, and running [Artisan commands](https://laravel.com/docs/artisan).
 
 ## Initialize our Laravel app on GitLab
 
@@ -372,7 +372,7 @@ At the end, our `Envoy.blade.php` file will look like this:
 
 One more thing we should do before any deployment is to manually copy our application `storage` folder to the `/var/www/app` directory on the server for the first time.
 You might want to create another Envoy task to do that for you.
-We also create the `.env` file in the same path to setup our production environment variables for Laravel.
+We also create the `.env` file in the same path to set up our production environment variables for Laravel.
 These are persistent data and will be shared to every new release.
 
 Now, we would need to deploy our app by running `envoy run deploy`, but it won't be necessary since GitLab can handle that for us with CI's [environments](../../environments.md), which will be described [later](#setting-up-gitlab-ci-cd) in this tutorial.
@@ -587,7 +587,7 @@ unit_test:
   script:
     # Install app dependencies
     - composer install
-    # Setup .env
+    # Set up .env
     - cp .env.example .env
     # Generate an environment key
     - php artisan key:generate

doc/ci/examples/php.md

@@ -199,7 +199,7 @@ pecl install <extension>
 ```
 
 It's not advised to add this to `.gitlab-ci.yml`. You should execute this
-command once, only to setup the build environment.
+command once, only to set up the build environment.
 
 ## Extend your tests
 

doc/ci/runners/README.md

@@ -29,7 +29,7 @@ are:
 - **Specific Runners** are useful for jobs that have special requirements or for
   projects with a specific demand. If a job has certain requirements, you can set
   up the specific Runner with this in mind, while not having to do this for all
-  Runners. For example, if you want to deploy a certain project, you can setup
+  Runners. For example, if you want to deploy a certain project, you can set up
   a specific Runner to have the right credentials for this. The [usage of tags](#using-tags)
   may be useful in this case. Specific Runners process jobs using a [FIFO] queue.
 - **Group Runners** are useful when you have multiple projects under one group
@@ -222,7 +222,7 @@ should keep in mind.
 
 ### Using tags
 
-You must setup a Runner to be able to run all the different types of jobs
+You must set up a Runner to be able to run all the different types of jobs
 that it may encounter on the projects it's shared over. This would be
 problematic for large amounts of projects, if it wasn't for tags.
 
@@ -298,7 +298,7 @@ and using more secure [Runner Executors](https://docs.gitlab.com/runner/executor
 ### Forks
 
 Whenever a project is forked, it copies the settings of the jobs that relate
-to it. This means that if you have shared Runners setup for a project and
+to it. This means that if you have shared Runners set up for a project and
 someone forks that project, the shared Runners will also serve jobs of this
 project.
 

doc/development/README.md

@@ -7,7 +7,7 @@ description: 'Learn how to contribute to GitLab.'
 
 ## Get started!
 
-- Setup GitLab's development environment with [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/README.md)
+- Set up GitLab's development environment with [GitLab Development Kit (GDK)](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/README.md)
 - [GitLab contributing guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md)
 - [Architecture](architecture.md) of GitLab
 - [Rake tasks](rake_tasks.md) for development

doc/development/automatic_ce_ee_merge.md

@@ -63,7 +63,7 @@ EE version of your CE merge request.
 For each commit (except on `master`), the `ee_compat_check` CI job tries to
 detect if the current branch's changes will conflict during the CE->EE merge.
 
-The job reports what files are conflicting and how to setup a merge request
+The job reports what files are conflicting and how to set up a merge request
 against EE.
 
 #### How the job works

doc/development/contributing/issue_workflow.md

@@ -224,7 +224,7 @@ on those issues. Please select someone with relevant experience from the
 the commit history for the affected files to find someone.
 
 We also use [GitLab Triage] to automate some triaging policies. This is
-currently setup as a [scheduled pipeline] running on [quality/triage-ops]
+currently set up as a [scheduled pipeline] running on [quality/triage-ops]
 project.
 
 [described in our handbook]: https://about.gitlab.com/handbook/engineering/issue-triage/

doc/development/database_debugging.md

@@ -33,7 +33,7 @@ If your test DB is giving you problems, it is safe to nuke it because it doesn't
  - `bundle exec rake db:migrate RAILS_ENV=development`: Execute any pending migrations that you may have picked up from a MR
  - `bundle exec rake db:migrate:status RAILS_ENV=development`: Check if all migrations are `up` or `down`
  - `bundle exec rake db:migrate:down VERSION=20170926203418 RAILS_ENV=development`: Tear down a migration
- - `bundle exec rake db:migrate:up VERSION=20170926203418 RAILS_ENV=development`: Setup a migration
+ - `bundle exec rake db:migrate:up VERSION=20170926203418 RAILS_ENV=development`: Set up a migration
  - `bundle exec rake db:migrate:redo VERSION=20170926203418 RAILS_ENV=development`: Re-run a specific migration
 
 

doc/development/module_with_instance_variables.md

@@ -60,7 +60,7 @@ as long as it's contained in the same module; that is, no other modules or
 objects are touching them, then it would be an acceptable use.
 
 We especially allow the case where a single instance variable is used with
-`||=` to setup the value. This would look like:
+`||=` to set up the value. This would look like:
 
 ``` ruby
 module M

doc/development/rake_tasks.md

 # Rake tasks for developers
 
-## Setup db with developer seeds
+## Set up db with developer seeds
 
 Note that if your db user does not have advanced privileges you must create the db manually before running this command.
 

doc/development/ux_guide/users.md

@@ -154,7 +154,7 @@ He credits himself as being entirely responsible for moving his company to GitLa
 #### Updating to the latest release
 Matthieu introduced his company to GitLab. He is responsible for maintaining and managing the company's installation in addition to his day job. He feels updates are too frequent and he doesn't always have sufficient time to update GitLab. As a result, he's not up to date with releases. 
 
-Matthieu tried to set up automatic updates, however, as he isn't a Systems Administrator, he wasn't confident in his set-up. He feels he should be able to "upgrade without users even noticing" but hasn't figured out how to do this yet. Matthieu would like the "update process to be triggered from the Admin Panel, perhaps accompanied with a changelog and the option to skip updates."
+Matthieu tried to set up automatic updates, however, as he isn't a Systems Administrator, he wasn't confident in his setup. He feels he should be able to "upgrade without users even noticing" but hasn't figured out how to do this yet. Matthieu would like the "update process to be triggered from the Admin Panel, perhaps accompanied with a changelog and the option to skip updates."
 
 Matthieu is looking for confirmation that his update procedure is "secure and efficient" so more tutorials related to this topic would be useful to him.
 

doc/install/azure/index.md

@@ -74,7 +74,7 @@ The first items we need to configure are the basic settings of the underlying vi
     > **Note:** if you're unsure which authentication type to use, select **Password**
 
     1. If you chose **SSH public key** - enter your `SSH public key` into the field provided 
-    _(read the [SSH documentation][GitLab-Docs-SSH] to learn more about how to setup SSH 
+    _(read the [SSH documentation][GitLab-Docs-SSH] to learn more about how to set up SSH 
     public keys)_
     1. If you chose **Password** - enter the password you wish to use _(this is the password that you 
     will use later in this tutorial to [SSH] into the VM, so make sure it's a strong password/passphrase)_
@@ -154,7 +154,7 @@ on the Azure Dashboard (you may need to refresh the page):
 The new VM can also be accessed by clicking the `All resources` or `Virtual machines` icons in the 
 Azure Portal sidebar navigation menu.
 
-## Setup a domain name
+## Set up a domain name
 
 The VM will have a public IP address (static by default), but Azure allows us to assign a friendly 
 DNS name to the VM, so let's go ahead and do that.
@@ -296,7 +296,7 @@ homepage for the project:
 ![GitLab - Empty Project](img/gitlab-project-home-empty.png)
 
 If you scroll further down the project's home page, you'll see some basic instructions on how to 
-setup a local clone of your new repository and push and pull from it:
+set up a local clone of your new repository and push and pull from it:
 
 ![GitLab - Empty Project - Basic Instructions](img/gitlab-project-home-instructions.png)
 
@@ -347,7 +347,7 @@ If you're running [SSH] from the command-line (terminal), then type in the follo
 connect to your VM, substituting `username` and `your-azure-domain-name.com` for the correct values. 
 
 Again, remember that your Azure VM domain name will be the one you 
-[setup previously in the tutorial](#set-up-a-domain-name). If you didn't setup a domain name for 
+[set up previously in the tutorial](#set-up-a-domain-name). If you didn't set up a domain name for 
 your VM, you can use the IP address in its place in the following command:
 
 ```bash
@@ -401,7 +401,7 @@ is now showing **"up-to-date"**:
 Naturally, we believe that GitLab is a great git repository tool. However, GitLab is a whole lot 
 more than that too. GitLab unifies issues, code review, CI and CD into a single UI, helping you to 
 move faster from idea to production, and in this tutorial we showed you how quick and easy it is to 
-setup and run your own instance of GitLab on Azure, Microsoft's cloud service. 
+set up and run your own instance of GitLab on Azure, Microsoft's cloud service. 
 
 Azure is a great way to experiment with GitLab, and if you decide (as we hope) that GitLab is for 
 you, you can continue to use Azure as your secure, scalable cloud provider or of course run GitLab
@@ -424,7 +424,7 @@ Check out our other [Technical Articles][GitLab-Technical-Articles] or browse th
     - [Azure - Properly Shutdown an Azure VM][Azure-Properly-Shutdown-VM]
 - [SSH], [PuTTY] and [Using SSH in PuTTY][Using-SSH-In-Putty]
 
-[Original-Blog-Post]: https://about.gitlab.com/2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/ "How to Setup a GitLab Instance on Microsoft Azure"
+[Original-Blog-Post]: https://about.gitlab.com/2016/07/13/how-to-setup-a-gitlab-instance-on-microsoft-azure/ "How to Set up a GitLab Instance on Microsoft Azure"
 [GitLab-Docs]: https://docs.gitlab.com/ce/README.html "GitLab Documentation"
 [GitLab-Technical-Articles]: https://docs.gitlab.com/ce/articles/index.html "GitLab Technical Articles"
 [GitLab-Docs-SSH]: https://docs.gitlab.com/ce/ssh/README.html "GitLab Documentation: SSH"

doc/install/database_mysql.md

@@ -79,7 +79,7 @@ After installation or upgrade, remember to [convert any new tables](#tables-and-
 
 ---
 
-GitLab 8.14 has introduced [a feature](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7420) requiring `utf8mb4` encoding to be supported in your GitLab MySQL Database, which is not the case if you have setup your database before GitLab 8.16.
+GitLab 8.14 has introduced [a feature](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7420) requiring `utf8mb4` encoding to be supported in your GitLab MySQL Database, which is not the case if you have set up your database before GitLab 8.16.
 
 Follow the below instructions to ensure you use the most up to date requirements for your GitLab MySQL Database.
 

doc/install/digitaloceandocker.md

@@ -87,7 +87,7 @@ You can add this to your `~/.bash_profile` file to ensure the `docker` client us
 + Container name: `gitlab-test-8.10`
 + GitLab version: **EE** `8.10.8-ee.0`
 
-#####  Setup container settings
+#####  Set up container settings
 
 ```
 export SSH_PORT=2222

doc/install/installation.md

@@ -515,7 +515,7 @@ Make GitLab start on boot:
 
     sudo update-rc.d gitlab defaults 21
 
-### Setup Logrotate
+### Set up Logrotate
 
     sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 

doc/install/openshift_and_gitlab/index.md

@@ -80,7 +80,7 @@ This will download the VirtualBox image and fire up the VM with some preconfigur
 values as you can see in the Vagrantfile. As you may have noticed, you need
 plenty of RAM (5GB in our example), so make sure you have enough.
 
-Now that OpenShift is setup, let's see how the web console looks like.
+Now that OpenShift is set up, let's see how the web console looks like.
 
 ### Explore the OpenShift web console
 

doc/install/relative_url.md

@@ -124,5 +124,5 @@ To disable the relative URL:
 1.  Follow the same as above starting from 2. and set up the
     GitLab URL to one that doesn't contain a relative path.
 
-[omnibus-rel]: http://docs.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab"
+[omnibus-rel]: http://docs.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to set up relative URL in Omnibus GitLab"
 [restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"

doc/integration/gmail_action_buttons_for_gitlab.md

@@ -2,7 +2,7 @@
 
 GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
 
-If correctly setup, emails that require an action will be marked in Gmail.
+If correctly set up, emails that require an action will be marked in Gmail.
 
 ![gmail_actions_button.png](img/gmail_action_buttons_for_gitlab.png)
 

doc/security/two_factor_authentication.md

@@ -11,7 +11,7 @@ You can read more about it here:
 ## Enforcing 2FA for all users
 
 Users on GitLab, can enable it without any admin's intervention. If you want to
-enforce everyone to setup 2FA, you can choose from two different ways:
+enforce everyone to set up 2FA, you can choose from two different ways:
 
  1. Enforce on next login
  2. Suggest on next login, but allow a grace period before enforcing.

doc/topics/authentication/index.md

@@ -44,6 +44,6 @@ This page gathers all the resources for the topic **Authentication** within GitL
 
 - [Kanboard Plugin GitLab Authentication](https://kanboard.net/plugin/gitlab-auth)
 - [Jenkins GitLab OAuth Plugin](https://wiki.jenkins-ci.org/display/JENKINS/GitLab+OAuth+Plugin)
-- [Setup Gitlab CE with Active Directory authentication](https://www.caseylabs.com/setup-gitlab-ce-with-active-directory-authentication/)
+- [Set up Gitlab CE with Active Directory authentication](https://www.caseylabs.com/setup-gitlab-ce-with-active-directory-authentication/)
 - [How to customize GitLab to support OpenID authentication](http://eric.van-der-vlist.com/blog/2013/11/23/how-to-customize-gitlab-to-support-openid-authentication/)
 - [Openshift - Configuring Authentication and User Agent](https://docs.openshift.org/latest/install_config/configuring_authentication.html#GitLab)

doc/university/glossary/README.md

@@ -395,7 +395,7 @@ Allow you to [organize issues](../../user/project/milestones/index.md) and merge
 
 ### Mirror Repositories
 
-A project that is setup to automatically have its branches, tags, and commits [updated from an upstream repository](https://docs.gitlab.com/ee/workflow/repository_mirroring.html). This is useful when a repository you're interested in is located on a different server, and you want to be able to browse its content and activity using the familiar GitLab interface.
+A project that is set up to automatically have its branches, tags, and commits [updated from an upstream repository](https://docs.gitlab.com/ee/workflow/repository_mirroring.html). This is useful when a repository you're interested in is located on a different server, and you want to be able to browse its content and activity using the familiar GitLab interface.
 
 ### MIT License
 
@@ -673,7 +673,7 @@ Version control is a system that records changes to a file or set of files over
 
 ### Virtual Private Cloud (VPC)
 
-A [VPC](https://docs.gitlab.com/ce/university/glossary/README.html#virtual-private-cloud-vpc) is an on demand configurable pool of shared computing resources allocated within a public cloud environment, providing some isolation between the different users using the resources. GitLab users need to create a new Amazon VPC in order to [setup High Availability](https://docs.gitlab.com/ce/university/high-availability/aws/).
+A [VPC](https://docs.gitlab.com/ce/university/glossary/README.html#virtual-private-cloud-vpc) is an on demand configurable pool of shared computing resources allocated within a public cloud environment, providing some isolation between the different users using the resources. GitLab users need to create a new Amazon VPC in order to [set up High Availability](https://docs.gitlab.com/ce/university/high-availability/aws/).
 
 ### Virtual private server (VPS)
 

doc/university/high-availability/aws/README.md

@@ -286,7 +286,7 @@ to make the EFS integration easier to manage.
     gitlab_rails['redis_port'] = 6379
 
 Finally run reconfigure, you might find it useful to run a check and
-a service status to make sure everything has been setup correctly.
+a service status to make sure everything has been set up correctly.
 
     sudo gitlab-ctl reconfigure  
     sudo gitlab-rake gitlab:check  

doc/university/support/README.md

@@ -37,7 +37,7 @@ Continue to look over remaining portions of the [University Overview](../README.
 Get your development machine ready to familiarize yourself with the codebase, the components, and to be prepared to reproduce issues that our users encounter
 
 - Install the [GDK](https://gitlab.com/gitlab-org/gitlab-development-kit)
-  - [Setup OpenLDAP as part of this](https://gitlab.com/gitlab-org/gitlab-development-kit#openldap)
+  - [Set up OpenLDAP as part of this](https://gitlab.com/gitlab-org/gitlab-development-kit#openldap)
 
 #### Become comfortable with the Installation processes that we support
 

doc/university/training/end-user/README.md

@@ -80,7 +80,7 @@ git config --global user.name "Your Name"
 git config --global user.email you@example.com
 ```    
 
-- If you don't use the global flag you can setup a different author for
+- If you don't use the global flag you can set up a different author for
   each project
 - Check settings with:
 

doc/update/4.2-to-5.0.md

@@ -32,7 +32,7 @@ cd /home/git/
 sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git /home/git/gitlab-shell
 ```
 
-## 3. setup gitlab-shell
+## 3. set up gitlab-shell
 
 ```bash
 # chmod all repos and files under git

doc/update/7.5-to-7.6.md

@@ -82,7 +82,7 @@ git diff origin/7-5-stable:config/gitlab.yml.example origin/7-6-stable:config/gi
 * HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as [`lib/support/nginx/gitlab`][nginx] but with your settings
 * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your setting
 
-#### Setup time zone (optional)
+#### Set up time zone (optional)
 
 Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 

doc/update/7.6-to-7.7.md

@@ -82,7 +82,7 @@ git diff origin/7-6-stable:config/gitlab.yml.example origin/7-7-stable:config/gi
 * HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as [`lib/support/nginx/gitlab`][nginx] but with your settings
 * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your setting
 
-#### Setup time zone (optional)
+#### Set up time zone (optional)
 
 Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 

doc/update/7.7-to-7.8.md

@@ -83,7 +83,7 @@ git diff origin/7-7-stable:config/gitlab.yml.example origin/7-8-stable:config/gi
 * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
 * A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
-#### Setup time zone (optional)
+#### Set up time zone (optional)
 
 Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 

doc/update/7.8-to-7.9.md

@@ -85,7 +85,7 @@ git diff origin/7-8-stable:config/gitlab.yml.example origin/7-9-stable:config/gi
 * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
 * A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
-#### Setup time zone (optional)
+#### Set up time zone (optional)
 
 Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 

doc/update/7.9-to-7.10.md

@@ -81,7 +81,7 @@ git diff origin/7-9-stable:config/gitlab.yml.example origin/7-10-stable:config/g
 * HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`][nginx-ssl] but with your settings.
 * A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 
-#### Setup time zone (optional)
+#### Set up time zone (optional)
 
 Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`][app] (unlikely), unset it.
 

doc/user/profile/account/two_factor_authentication.md

@@ -69,7 +69,7 @@ of recovery codes.
 1. Go to **Account**.
 1. Click **Enable Two-Factor Authentication**.
 1. Plug in your U2F device.
-1. Click on **Setup New U2F Device**.
+1. Click on **Set up New U2F Device**.
 1. A light will start blinking on your device. Activate it by pressing its button.
 
 You will see a message indicating that your device was successfully set up.

doc/user/project/container_registry.md

@@ -245,7 +245,7 @@ This will run mitmproxy on port `9000`. In another window, run:
 curl --proxy http://localhost:9000 https://httpbin.org/status/200
 ```
 
-If everything is setup correctly, you will see information on the mitmproxy window and
+If everything is set up correctly, you will see information on the mitmproxy window and
 no errors from the curl commands.
 
 #### Running the Docker daemon with a proxy

doc/user/project/integrations/hangouts_chat.md

@@ -15,7 +15,7 @@ See also [the Hangouts Chat documentation for configuring incoming webhooks](htt
 
 ## On GitLab
 
-When you have the **Webhook URL** for your Hangouts Chat room webhook, you can setup the GitLab service.
+When you have the **Webhook URL** for your Hangouts Chat room webhook, you can set up the GitLab service.
 
 1. Navigate to the [Integrations page](project_services.md#accessing-the-project-services) in your project's settings, i.e. **Project > Settings > Integrations**.
 1. Select the **Hangouts Chat** project service to configure it.

doc/user/project/integrations/jira.md

@@ -49,7 +49,7 @@ We have split this stage in steps so it is easier to follow.
 
 1. The next step is to create a new user (e.g., `gitlab`) who has write access
    to projects in JIRA. Enter the user's name and a _valid_ e-mail address
-   since JIRA sends a verification e-mail to set-up the password.
+   since JIRA sends a verification e-mail to set up the password.
    _**Note:** JIRA creates the username automatically by using the e-mail
    prefix. You can change it later if you want._
 

doc/user/project/integrations/mattermost.md

@@ -38,7 +38,7 @@ At the end, fill in your Mattermost details:
 
 | Field | Description |
 | ----- | ----------- |
-| **Webhook**  | The incoming webhook URL which you have to setup on Mattermost, it will be something like: http://mattermost.example/hooks/5xo… |
+| **Webhook**  | The incoming webhook URL which you have to set up on Mattermost, it will be something like: http://mattermost.example/hooks/5xo… |
 | **Username** | Optional username which can be on messages sent to Mattermost. Fill this in if you want to change the username of the bot. |
 | **Notify only broken pipelines** | If you choose to enable the **Pipeline** event and you want to be only notified about failed pipelines. |
 

doc/user/project/integrations/mattermost_slash_commands.md

@@ -102,7 +102,7 @@ in a new slash command.
 
     ![Mattermost add command configuration](img/mattermost_slash_command_configuration.png)
 
-1. After you setup all the values, copy the token (we will use it below) and
+1. After you set up all the values, copy the token (we will use it below) and
    click **Done**.
 
     ![Mattermost slash command token](img/mattermost_slash_command_token.png)

doc/user/project/integrations/microsoft_teams.md

@@ -25,7 +25,7 @@ At the end fill in your Microsoft Teams details:
 
 | Field | Description |
 | ----- | ----------- |
-| **Webhook** | The incoming webhook URL which you have to setup on Microsoft Teams. |
+| **Webhook** | The incoming webhook URL which you have to set up on Microsoft Teams. |
 | **Notify only broken pipelines** | If you choose to enable the **Pipeline** event and you want to be only notified about failed pipelines. |
 
 After you are all done, click **Save changes** for the changes to take effect.

doc/user/project/integrations/mock_ci.md

@@ -2,7 +2,7 @@
 
 **NB: This service is only listed if you are in a development environment!**
 
-To setup the mock CI service server, respond to the following endpoints
+To set up the mock CI service server, respond to the following endpoints
 
 - `commit_status`: `#{project.namespace.path}/#{project.path}/status/#{sha}.json`
    - Have your service return `200 { status: ['failed'|'canceled'|'running'|'pending'|'success'|'success_with_warnings'|'skipped'|'not_found'] }`

doc/user/project/integrations/prometheus.md

@@ -8,7 +8,7 @@ within the GitLab interface.
 
 ![Environment Dashboard](img/prometheus_dashboard.png)
 
-There are two ways to setup Prometheus integration, depending on where your apps are running:
+There are two ways to set up Prometheus integration, depending on where your apps are running:
 * For deployments on Kubernetes, GitLab can automatically [deploy and manage Prometheus](#managed-prometheus-on-kubernetes)
 * For other deployment targets, simply [specify the Prometheus server](#manual-configuration-of-prometheus).
 

doc/user/project/issues/issues_functionalities.md

@@ -69,7 +69,7 @@ Learn more on the [Time Tracking documentation](../../../workflow/time_tracking.
 #### 6. Due date
 
 When you work on a tight schedule, and it's important to
-have a way to setup a deadline for implementations and for solving
+have a way to set up a deadline for implementations and for solving
 problems. This can be facilitated by the [due date](due_dates.md)). Due dates
 can be changed as many times as needed.
 

doc/workflow/lfs/lfs_administration.md

@@ -54,7 +54,7 @@ to offload local hard disk R/W operations, and free up disk space significantly.
 GitLab is tightly integrated with `Fog`, so you can refer to its [documentation](http://fog.io/about/provider_documentation.html)
 to check which storage services can be integrated with GitLab.
 You can also use external object storage in a private local network. For example,
-[Minio](https://www.minio.io/) is a standalone object storage service, is easy to setup, and works well with GitLab instances.
+[Minio](https://www.minio.io/) is a standalone object storage service, is easy to set up, and works well with GitLab instances.
 
 GitLab provides two different options for the uploading mechanism: "Direct upload" and "Background upload".