Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 4 deletions

diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md
index f0eb6c5180b..eab093c1949 100644
--- a/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md
+++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md
@@ -108,7 +108,7 @@ gitlab_rails['ldap_servers'] = {
 ## Conclusion
 
 Integration of GitLab with Active Directory (LDAP) reduces the complexity of user management.
-It has the advantage of improving user permission controls, whilst easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers.
+It has the advantage of improving user permission controls, while easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers.
 
 With the assistance of the [GitLab Support](https://about.gitlab.com/support/) team, setting up GitLab with an existing AD/LDAP solution will be a smooth and painless process.
 
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index d716325f332..672ae5e7b27 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -835,7 +835,7 @@ information on managing page-specific JavaScript within EE.
 
 To separate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
 
-Doing this allows for us to load the correct component in EE whilst in CE
+Doing this allows for us to load the correct component in EE while in CE
 we can load a empty component that renders nothing. This code **should**
 exist in the CE repository as well as the EE repository.
 
diff --git a/doc/development/fe_guide/droplab/plugins/ajax.md b/doc/development/fe_guide/droplab/plugins/ajax.md
index 4b76b207d88..77ba6f739e6 100644
--- a/doc/development/fe_guide/droplab/plugins/ajax.md
+++ b/doc/development/fe_guide/droplab/plugins/ajax.md
@@ -33,6 +33,6 @@ droplab.addHook(trigger, list, [Ajax], {
 ```
 
 Optionally you can set `loadingTemplate` to a HTML string. This HTML string will
-replace the dropdown list whilst the request is pending.
+replace the dropdown list while the request is pending.
 
 Additionally, you can set `onError` to a function to catch any XHR errors.
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index 5baaec79048..764b95299cf 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -105,7 +105,7 @@ ahead and select this one, but please choose the size which best meets your own
 
 ![Azure - Create Virtual Machine - Size](img/azure-create-virtual-machine-size.png)
 
-> **Note:** be aware that whilst your VM is active (known as "allocated"), it will incur
+> **Note:** be aware that while your VM is active (known as "allocated"), it will incur
 "compute charges" which, ultimately, you will be billed for. So, even if you're using the
 free trial credits, you'll likely want to learn
 [how to properly shutdown an Azure VM to save money](https://buildazure.com/properly-shutdown-azure-vm-to-save-money/).