diff --git a/.markdownlint.json b/.markdownlint.json
index a78f393444138b5893ed40ce43322271b3d98d12_Lm1hcmtkb3dubGludC5qc29u..a7b61f86cb0036f706a7c0179e1bdce23099dda7_Lm1hcmtkb3dubGludC5qc29u 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -43,6 +43,7 @@
       "Consul",
       "Debian",
       "DevOps",
+      "Docker",
       "Elasticsearch",
       "Facebook",
       "GDK",
@@ -46,6 +47,7 @@
       "Elasticsearch",
       "Facebook",
       "GDK",
+      "Geo",
       "Git LFS",
       "git-annex",
       "Git",
@@ -102,6 +104,7 @@
       "PostgreSQL",
       "Prometheus",
       "Puma",
+      "puma-worker-killer",
       "Python",
       "Rake",
       "Redis",
diff --git a/doc/build/prepare-build-environment.md b/doc/build/prepare-build-environment.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2J1aWxkL3ByZXBhcmUtYnVpbGQtZW52aXJvbm1lbnQubWQ=..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2J1aWxkL3ByZXBhcmUtYnVpbGQtZW52aXJvbm1lbnQubWQ= 100644
--- a/doc/build/prepare-build-environment.md
+++ b/doc/build/prepare-build-environment.md
@@ -1,6 +1,6 @@
 # Setting up a build environment
 
-Omnibus GitLab provides docker images for all the OS versions that it
+Omnibus GitLab provides Docker images for all the OS versions that it
 supports and these are available in the
 [Container Registry](https://gitlab.com/gitlab-org/omnibus-gitlab/container_registry).
 Users can use these images to setup the build environment. The steps are as
@@ -54,7 +54,7 @@
    `.custom_sources.yml` file and specify them as `alternate` and set the
    `ALTERNATIVE_SOURCES` variable to `true`.
 
-1. By default, Omnibus GitLab uses a docker image containing pre-compiled assets for the `config/software/gitlab-rails.rb`
+1. By default, Omnibus GitLab uses a Docker image containing pre-compiled assets for the `config/software/gitlab-rails.rb`
    1. If you are building from a mirror of the GitLab application on the same instance, you should not need to do anything.
    1. To use the upstream assets, set the `ASSET_REGISTRY` environment variable to `registry.gitlab.com`
    1. To compile your own, set the `COMPILE_ASSETS` environment variable to `true`
diff --git a/doc/common_installation_problems/README.md b/doc/common_installation_problems/README.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2NvbW1vbl9pbnN0YWxsYXRpb25fcHJvYmxlbXMvUkVBRE1FLm1k..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2NvbW1vbl9pbnN0YWxsYXRpb25fcHJvYmxlbXMvUkVBRE1FLm1k 100644
--- a/doc/common_installation_problems/README.md
+++ b/doc/common_installation_problems/README.md
@@ -713,5 +713,5 @@
 
 In this case, consider uninstalling Plymouth.
 
-## Init daemon detection in non-docker container
+## Init daemon detection in non-Docker container
 
@@ -717,6 +717,6 @@
 
-In docker containers, GitLab package detects existence of `/.dockerenv` file and
-skips automatic detection of an init system. However, in non-docker containers
+In Docker containers, GitLab package detects existence of `/.dockerenv` file and
+skips automatic detection of an init system. However, in non-Docker containers
 (like containerd, cri-o, etc.), that file does not exist and package falls back
 to sysvinit, and this can cause issues with installation. To prevent this, users
 can explicitly disable init daemon detection by adding the following setting in
diff --git a/doc/development/openshift/README.md b/doc/development/openshift/README.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2RldmVsb3BtZW50L29wZW5zaGlmdC9SRUFETUUubWQ=..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2RldmVsb3BtZW50L29wZW5zaGlmdC9SRUFETUUubWQ= 100644
--- a/doc/development/openshift/README.md
+++ b/doc/development/openshift/README.md
@@ -23,9 +23,9 @@
 
 Next you need to setup an OpenShift Origin environment. To setup the environment you can use the production installer
 on a cloud machine, use minishift on your local machine (uses kvm or xhyve), or setup an instance
-using docker for the master, and your own machine as the slave using `oc cluster up`
+using Docker for the master, and your own machine as the slave using `oc cluster up`
 
 ### Minishift
 
 Installation instructions for Minishift can be found at <http://docs.okd.io/3.11/minishift/getting-started/installing.html>
 
@@ -27,9 +27,9 @@
 
 ### Minishift
 
 Installation instructions for Minishift can be found at <http://docs.okd.io/3.11/minishift/getting-started/installing.html>
 
-1. Before installing Minishift you need to install the proper docker machine driver.
+1. Before installing Minishift you need to install the proper Docker machine driver.
    - For Linux, install the [kvm driver](http://docs.okd.io/3.11/minishift/getting-started/setting-up-virtualization-environment.html#setting-up-kvm-driver)
    - For Mac OSX, install the [xhyve driver](http://docs.okd.io/3.11/minishift/getting-started/setting-up-virtualization-environment.html#setting-up-xhyve-driver)
 
@@ -52,7 +52,7 @@
 
 If you have Docker installed, you can setup OpenShift Origin on your local machine: <https://github.com/openshift/origin/blob/77bf0a926c045142570bb50a9a83086a370506a8/docs/cluster_up_down.md>
 
-`**Note:`this currently does not start if you are using docker-ce/ee with the new version scheme (17.xx)
+`**Note:`this currently does not start if you are using `docker-ce`/`ee` with the new version scheme (17.xx)
 
 1. On your terminal call `oc cluster up  --host-data-dir='/srv/openshift'`
    - Note that oc cluster needs access to port 80 on your host, so you may need to stop any webserver while using OpenShift
@@ -151,7 +151,7 @@
 
 Add the GitLab template to OpenShift (The next release of the VM includes GitLab, so this may not be required):
 
-- `oc login -u system:admin` for the docker cluster up
+- `oc login -u system:admin` for the Docker cluster up
 - From the root of your Omnibus GitLab repo, `oc create -f docker/openshift-template.json -n openshift`
 
 ## Install GitLab
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2RldmVsb3BtZW50L3BpcGVsaW5lcy5tZA==..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2RldmVsb3BtZW50L3BpcGVsaW5lcy5tZA== 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -37,5 +37,5 @@
 
 In [Release mirror](https://dev.gitlab.org/gitlab/omnibus-gitlab), there are two scheduled pipelines
 
-1. `CE nightly` - Pipeline to build nightly packages and docker images for
+1. `CE nightly` - Pipeline to build nightly packages and Docker images for
    GitLab CE
@@ -41,5 +41,5 @@
    GitLab CE
-1. `EE nightly` - Pipeline to build nightly packages and docker images for
+1. `EE nightly` - Pipeline to build nightly packages and Docker images for
    GitLab EE
 
 Other mirrors doesn't have any scheduled pipelines
@@ -63,7 +63,7 @@
 their changes in addition to automatically doing a QA run against these
 artifacts. It also provides an option to do a QA run against an HA instance spun
 up using these artifacts, and to run a memory measurement job to measure the
-resource usage by GitLab using the docker image.
+resource usage by GitLab using the Docker image.
 
 ## CI Jobs
 
@@ -139,7 +139,7 @@
 
 This is a manual job which when played triggers a pipeline in the [QA mirror](https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror) to
 run a package build and QA for development purposes. This can be used by
-developers to get a package or docker image for testing, or to run a full QA
+developers to get a package or Docker image for testing, or to run a full QA
 suite against their MR's changes.
 
 This job is run only on [Development repository](https://gitlab.com/gitlab-org/omnibus-gitlab) and [Security mirror](https://gitlab.com/gitlab-org/security/omnibus-gitlab) on branch
@@ -157,7 +157,7 @@
 For building packages, we make use of the Rails assets that are already compiled
 by the [GitLab](https://gitlab.com/gitlab-org/gitlab) or
 [GitLab-FOSS](https://gitlab.com/gitlab-org/gitlab-foss) pipelines. Those
-pipelines push it as a docker image, which we pull in here and copy the assets
+pipelines push it as a Docker image, which we pull in here and copy the assets
 themselves to a predefined location.
 
 This job is run only on [Release mirror](https://dev.gitlab.org/gitlab/omnibus-gitlab) and [QA mirror](https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror) on branch, tag and
diff --git a/doc/development/setup.md b/doc/development/setup.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2RldmVsb3BtZW50L3NldHVwLm1k..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2RldmVsb3BtZW50L3NldHVwLm1k 100644
--- a/doc/development/setup.md
+++ b/doc/development/setup.md
@@ -9,6 +9,6 @@
 
    To provide isolation and to prevent rebuilding of the package for each and
    every change, it is preferred to use a Container for development. The
-   following example uses docker on a Debian host with a Debian Jessie image.
+   following example uses Docker on a Debian host with a Debian Jessie image.
    The steps are similar for other OSs; only the commands differ.
 
@@ -13,6 +13,6 @@
    The steps are similar for other OSs; only the commands differ.
 
-   1. Install docker for your OS as per [official Docker installation docs](https://docs.docker.com/install/).
+   1. Install Docker for your OS as per [official Docker installation docs](https://docs.docker.com/install/).
 
    1. Pulling a Debian Jessie image
 
@@ -20,9 +20,9 @@
       docker pull debian:jessie
       ```
 
-   1. Running docker image with a shell prompt
+   1. Running Docker image with a shell prompt
 
       ```shell
       docker run -it debian:jessie bash
       ```
 
@@ -24,10 +24,10 @@
 
       ```shell
       docker run -it debian:jessie bash
       ```
 
-    This will cause the docker to run the jessie image and you will fall into a
-    bash prompt, where the following steps are applied to.
+      This will cause the Docker to run the jessie image and you will fall into a
+      bash prompt, where the following steps are applied to.
 
 1. Install basic necessary tools
 
diff --git a/doc/docker/README.md b/doc/docker/README.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2RvY2tlci9SRUFETUUubWQ=..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2RvY2tlci9SRUFETUUubWQ= 100644
--- a/doc/docker/README.md
+++ b/doc/docker/README.md
@@ -292,7 +292,7 @@
 ### Pre-configure Docker container
 
 You can pre-configure the GitLab Docker image by adding the environment
-variable `GITLAB_OMNIBUS_CONFIG` to docker run command. This variable can
+variable `GITLAB_OMNIBUS_CONFIG` to Docker run command. This variable can
 contain any `gitlab.rb` setting and will be evaluated before loading the
 container's `gitlab.rb` file. That way you can easily configure GitLab's
 external URL, make any database configuration or any other option from the
@@ -426,7 +426,7 @@
 web browser under `<hostIP>:8929` and push using SSH under the port `2289`.
 
 A `docker-compose.yml` example that uses different ports can be found in the
-[docker-compose](#install-gitlab-using-docker-compose) section.
+[Docker compose](#install-gitlab-using-docker-compose) section.
 
 ## Update
 
@@ -566,7 +566,7 @@
 
 ### Linux ACL issues
 
-If you are using file ACLs on the docker host, the `docker` group requires full access to the volumes in order for GitLab to work:
+If you are using file ACLs on the Docker host, the `docker` group requires full access to the volumes in order for GitLab to work:
 
 ```shell
 getfacl $GITLAB_HOME/gitlab
diff --git a/doc/installation/index.md b/doc/installation/index.md
index a78f393444138b5893ed40ce43322271b3d98d12_ZG9jL2luc3RhbGxhdGlvbi9pbmRleC5tZA==..a7b61f86cb0036f706a7c0179e1bdce23099dda7_ZG9jL2luc3RhbGxhdGlvbi9pbmRleC5tZA== 100644
--- a/doc/installation/index.md
+++ b/doc/installation/index.md
@@ -40,5 +40,5 @@
   Set up the Prometheus monitoring included in the Omnibus GitLab package.
 - [GitLab High Availability Roles](../roles/README.md).
 
-## Using docker image
+## Using Docker image
 
@@ -44,3 +44,3 @@
 
-You can also use the docker images provided by GitLab to install and configure a GitLab instance.
+You can also use the Docker images provided by GitLab to install and configure a GitLab instance.
 Check the [documentation](../docker/README.md) to know more.