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 46bc079971d8d5e2f7da8f3427763541d847c837..d7b32c8a92a2fb84edcadda68431fa2e6faf6cb7 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 @@ -8,7 +8,7 @@ This article expands on [How to Configure LDAP with GitLab CE](../how_to_configu ## GitLab Enterprise Edition - LDAP features -[GitLab Enterprise Edition (EE)](https://about.gitlab.com/pricing/) has a number of advantages when it comes to integrating with Active Directory (LDAP): +[GitLab Enterprise Edition (EE)](https://about.gitlab.com/pricing/) has several advantages when it comes to integrating with Active Directory (LDAP): - [Administrator Sync](../ldap-ee.md#administrator-sync): As an extension of group sync, you can automatically manage your global GitLab administrators. Specify a group CN for `admin_group` and all members of the LDAP group will be given administrator privileges. - [Group Sync](#group-sync): This allows GitLab group membership to be automatically updated based on LDAP group members. @@ -16,7 +16,7 @@ This article expands on [How to Configure LDAP with GitLab CE](../how_to_configu - Daily user synchronization: Once a day, GitLab will run a synchronization to check and update GitLab users against LDAP. This process updates all user details automatically. -On the following section, you'll find a description for each of these features. Read through [LDAP GitLab EE docs](../ldap-ee.md) for complementary information. +In the following section, you'll find a description of each of these features. Read through [LDAP GitLab EE docs](../ldap-ee.md) for complementary information.  @@ -28,7 +28,7 @@ Group syncing allows AD (LDAP) groups to be mapped to GitLab groups. This provid #### Creating group links - example -As an example, let's suppose we have a "UKGov" GitLab group, which deals with confidential government information. Therefore, it is important that users of this group are given the correct permissions to projects contained within the group. Granular group permissions can be applied based on the AD group. +As an example, let's suppose we have a "UKGov" GitLab group, which deals with confidential government information. Therefore, users of this group must be given the correct permissions to projects contained within the group. Granular group permissions can be applied based on the AD group. **UK Developers** of our "UKGov" group are given **"developer"** permissions. diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 74c03c8ee4ec44b3f2c1c5326e23f15745123c48..09ad5f9afd7bb8ef0e2d7dc2135d0a304cb4fdcd 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -19,7 +19,7 @@ as the hardware requirements that are needed to install and use GitLab. - Scientific Linux (please use the CentOS packages and instructions) - Oracle Linux (please use the CentOS packages and instructions) -For the installations options, see [the main installation page](README.md). +For the installation options, see [the main installation page](README.md). ### Unsupported Linux distributions and Unix-like operating systems @@ -68,7 +68,7 @@ GitLab uses [webpack](https://webpack.js.org/) to compile frontend assets, which version of Node.js 10.13.0. You can check which version you are running with `node -v`. If you are running -a version older than `v10.13.0`, you need to update to a newer version. You +a version older than `v10.13.0`, you need to update it to a newer version. You can find instructions to install from community maintained packages or compile from source at the [Node.js website](https://nodejs.org/en/download/). @@ -126,7 +126,7 @@ available when needed. Our [Memory Team](https://about.gitlab.com/handbook/engineering/development/enablement/memory/) is actively working to reduce the memory requirement. -NOTE: **Note:** The 25 workers of Sidekiq will show up as separate processes in your process overview (such as `top` or `htop`) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about how many you need of those. +NOTE: **Note:** The 25 workers of Sidekiq will show up as separate processes in your process overview (such as `top` or `htop`) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about how many you need for those. ## Database diff --git a/doc/user/snippets.md b/doc/user/snippets.md index 00014dc32eebaf367a7493030bcff80efe523eef..96c8dba11e5845ff969b522d16a278dd7a0e1ba5 100644 --- a/doc/user/snippets.md +++ b/doc/user/snippets.md @@ -148,7 +148,7 @@ snippet was created using the GitLab web interface the original line ending is W > Introduced in GitLab 10.8. Public snippets can not only be shared, but also embedded on any website. This -allows to reuse a GitLab snippet in multiple places and any change to the source +allows us to reuse a GitLab snippet in multiple places and any change to the source is automatically reflected in the embedded snippet. To embed a snippet, first make sure that: @@ -172,6 +172,6 @@ Here's how an embedded snippet looks like: <script src="https://gitlab.com/gitlab-org/gitlab-foss/snippets/1717978.js"></script> -Embedded snippets are displayed with a header that shows the file name if defined, +Embedded snippets are displayed with a header that shows the file name is defined, the snippet size, a link to GitLab, and the actual snippet content. Actions in the header allow users to see the snippet in raw format and download it.