Correct grammar (setup to set-up) in Docs (Port CE to EE)

CHANGELOG.md

@@ -845,7 +845,7 @@ entry.
 - Add `Squash and merge` to GitLab Core (CE). !18956 (@blackst0ne)
 - Adds keyboard shortcut `g k` for Kubernetes on Project pages. !19002
 - Adds keyboard shortcut `g e` for Environments on Project pages. !19002
-- Setup graphql with initial project & merge request query. !19008
+- Set up graphql with initial project & merge request query. !19008
 - Adds JupyterHub to cluster applications. !19019
 - Added ability to search by wiki titles. !19112
 - Add Avatar API. !19121 (Imre Farkas)

README.md

@@ -101,7 +101,7 @@ All Documentation content that resides under the `doc/` directory of this reposi
 ## Install a development environment
 To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
-If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone.
+If you do not use the GitLab Development Kit you need to install and set up all the dependencies yourself, this is a lot of work and error prone.
 One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:
     cp config/unicorn.rb.example.development config/unicorn.rb

changelogs/archive.md

@@ -1615,7 +1615,7 @@
   - Don't render discussion notes when requesting diff tab through AJAX
   - Add basic system information like memory and disk usage to the admin panel
   - Don't garbage collect commits that have related DB records like comments
-  - Allow to setup event by channel on slack service
+  - Allow to set up event by channel on slack service
   - More descriptive message for git hooks and file locks
   - Aliases of award emoji should be stored as original name. !5060 (dixpac)
   - Handle custom Git hook result in GitLab UI
@@ -3685,7 +3685,7 @@
 - Fix final line in EmailsOnPush email diff being rendered as error.
 - Prevent duplicate Buildkite service creation.
 - Fix git over ssh errors 'fatal: protocol error: bad line length character'
-- Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled
+- Automatically set up GitLab CI project for forks if origin project has GitLab CI enabled
 - Bust group page project list cache when namespace name or path changes.
 - Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded
 - Allow user to choose a public email to show on public profile
@@ -4683,7 +4683,7 @@
 - Replaced gitolite with gitlab-shell
 - Removed gitolite-related libraries
 - State machine added
-- Setup gitlab as git user
+- Set up gitlab as git user
 - Internal API
 - Show team tab for empty projects
 - Import repository feature

doc/README.md

@@ -215,7 +215,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

@@ -133,7 +133,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/geo/disaster_recovery/bring_primary_back.md

@@ -14,7 +14,7 @@ Since the former primary will be out of sync with the current primary, the first
 to bring the former primary up to date. Note, deletion of data stored on disk like
 repositories and uploads will not be replayed when bringing the former primary in back
 into sync, which may result in increased disk usage.
-Alternatively, you can [setup a new secondary GitLab instance][setup-geo] to avoid this.
+Alternatively, you can [set up a new secondary GitLab instance][setup-geo] to avoid this.
 To bring the former primary up to date:
@@ -28,7 +28,7 @@ To bring the former primary up to date:
     > **Note 1:** If you [disabled primary permanently][disaster-recovery-disable-primary],
     > you need to undo those steps now. For Debian/Ubuntu you just need to run
     > `sudo systemctl enable gitlab-runsvdir`. For CentOS 6, you need to install
-    > the GitLab instance from scratch and setup it as a secondary node by
+    > the GitLab instance from scratch and set it up as a secondary node by
     > following [Setup instructions][setup-geo].  In this case you don't need to follow the next step.
     >
     > **Note 2:** If you [changed the DNS records](index.md#step-4-optional-updating-the-primary-domains-dns-record)

doc/administration/geo/replication/database.md

@@ -520,7 +520,7 @@ the instructions below:
 1. Configure the [PostgreSQL FDW][FDW] connection and credentials:
     Save the script below in a file, ex. `/tmp/geo_fdw.sh` and modify the connection
-    params to match your environment. Execute it to setup the FDW connection.
+    params to match your environment. Execute it to set up the FDW connection.
     
     ```bash
     #!/bin/bash

doc/administration/geo/replication/database_source.md

@@ -264,7 +264,7 @@ node.
 1. Configure the [PostgreSQL FDW][FDW] connection and credentials:
     Save the script below in a file, ex. `/tmp/geo_fdw.sh` and modify the connection
-    params to match your environment. Execute it to setup the FDW connection.
+    params to match your environment. Execute it to set up the FDW connection.
     
     ```bash
     #!/bin/bash

doc/administration/geo/replication/docker_registry.md

 # Docker Registry for a secondary node
-You can setup a [Docker Registry] on your
+You can set up a [Docker Registry] on your
 secondary Geo node that mirrors the one on the primary Geo node.
 ## Storage support
@@ -14,7 +14,7 @@ distributed storage (`azure`, `gcs`, `s3`, `swift`, or `oss`) for your Docker
 Registry on a primary Geo node, you can use the same storage for a secondary
 Docker Registry as well. For more information, read the
 [Load balancing considerations][registry-load-balancing]
-when deploying the Registry, and how to setup the storage driver for GitLab's
+when deploying the Registry, and how to set up the storage driver for GitLab's
 integrated [Container Registry][registry-storage].
 [ee]: https://about.gitlab.com/pricing/

doc/administration/geo/replication/high_availability.md

@@ -85,7 +85,7 @@ the [gitlab.rb configuration][gitlab-rb-template].
 After making these changes be sure to run `sudo gitlab-ctl reconfigure` so that they take effect.
-### Step 3: Setup the LoadBalancer
+### Step 3: Set up the LoadBalancer
 In this topology there will need to be a load balancers at each geographical location
 to route traffic to the application servers.

doc/administration/geo/replication/index.md

@@ -144,7 +144,7 @@ If you installed GitLab using the Omnibus packages (highly recommended):
    secondary node.
 1. [Upload the GitLab License][upload-license] on the **primary**
    Geo node to unlock Geo.
-1. [Setup the database replication][database] (`primary (read-write) <->
+1. [Set up the database replication][database] (`primary (read-write) <->
    secondary (read-only)` topology).
 1. [Configure fast lookup of authorized SSH keys in the database][fast-ssh-lookup],
    this step is required and needs to be done on both the primary AND secondary nodes.
@@ -162,7 +162,7 @@ If you installed GitLab from source:
    to the new secondary node.
 1. [Upload the GitLab License][upload-license] on the **primary**
    Geo node to unlock Geo.
-1. [Setup the database replication][database-source] (`primary (read-write)
+1. [Set up the database replication][database-source] (`primary (read-write)
    <-> secondary (read-only)` topology).
 1. [Configure fast lookup of authorized SSH keys in the database][fast-ssh-lookup],
    do this step for both primary AND secondary nodes.

doc/administration/high_availability/database.md

@@ -21,7 +21,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.
@@ -371,7 +371,7 @@ Select one node as a primary node.
 ##### Secondary nodes
-1. Setup the repmgr standby:
+1. Set up the repmgr standby:
     ```sh
     gitlab-ctl repmgr standby setup MASTER_NODE_NAME

doc/administration/high_availability/nfs_host_client_setup.md

@@ -14,7 +14,7 @@ to read from and write to a central NFS server(host).
 ## NFS Server Setup
-> Follow  the instructions below to setup and confire your NFS server.
+> Follow the instructions below to set up and configure your NFS server.
 #### Step 1 - Install NFS Server on Host
@@ -86,7 +86,7 @@ $ mount <host_ip_address>:/home
 $ df -h
 ```
-#### Step 3 - Setup Automatic Mounts on Boot
+#### Step 3 - Set up Automatic Mounts on Boot
 Edit `/etc/fstab` on client as below to mount the remote shares automatically at boot. 
 Note that GitLab requires advisory file locking, which is only supported natively in
@@ -99,7 +99,7 @@ We recommend using version 4 and do not specifically test NFSv3.
 ```
 Reboot the client and confirm that the mount point is mounted automatically.
-#### Step 4 - Setup Gitlab to Use NFS mounts
+#### Step 4 - Set up Gitlab to Use NFS mounts
 When using the default Omnibus configuration you will need to share 5 data locations
 between all GitLab cluster nodes. No other locations should be shared. Changing the

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
@@ -374,7 +374,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.
 ---
@@ -539,7 +539,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: