diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 06:09:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 06:09:31 +0300 |
commit | e2ee1eec50aa8df8543d7ecc585ec0ba5ee544ac (patch) | |
tree | 7998650d27ada12ee7d06a21cbb3b5e89f298378 /doc/administration | |
parent | 060c842402c00f830a810702600cbe39dfa6cf62 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
5 files changed, 6 insertions, 6 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 3d790fa659e..46bc079971d 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 @@ -44,7 +44,7 @@ _The reporter permission allows support staff to manage issues, labels, and revi > Guest permissions allows people ops staff to review and lodge new issues while allowing no read or write access to project code or [confidential issues](../../../user/project/issues/confidential_issues.md#permissions-and-access-to-confidential-issues) created by other users. -See the [permission list](../../../user/permissions.md) for complementary info. +See the [permission list](../../../user/permissions.md) for complementary information. #### Group permissions - example diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md index 4734df324e0..71d483128b9 100644 --- a/doc/administration/high_availability/README.md +++ b/doc/administration/high_availability/README.md @@ -273,7 +273,7 @@ On different cloud vendors a best effort like for like can be used. [^8]: The architectures were built and tested with the [Intel Xeon E5 v3 (Haswell)](https://cloud.google.com/compute/docs/cpu-platforms) CPU platform on GCP. On different hardware you may find that adjustments, either lower - or higher, are required for your CPU or Node counts accordingly. For more info a + or higher, are required for your CPU or Node counts accordingly. For more information, a [Sysbench](https://github.com/akopytov/sysbench) benchmark of the CPU can be found [here](https://gitlab.com/gitlab-org/quality/performance/-/wikis/Reference-Architectures/GCP-CPU-Benchmarks). diff --git a/doc/administration/troubleshooting/diagnostics_tools.md b/doc/administration/troubleshooting/diagnostics_tools.md index 97b367dc353..5912981ba6e 100644 --- a/doc/administration/troubleshooting/diagnostics_tools.md +++ b/doc/administration/troubleshooting/diagnostics_tools.md @@ -13,7 +13,7 @@ before attempting to use these tools. ## gitlabsos The [gitlabsos](https://gitlab.com/gitlab-com/support/toolbox/gitlabsos/) utility -provides a unified method of gathering info and logs from GitLab and the system it's +provides a unified method of gathering information and logs from GitLab and the system it's running on. ## strace-parser diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 0471c7b7ffd..ba2224e3fc7 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -751,7 +751,7 @@ This content has been moved to the [Troubleshooting Sidekiq docs](./sidekiq.md). ## LFS -### Get info about LFS objects and associated project +### Get information about LFS objects and associated project ```ruby o=LfsObject.find_by(oid: "<oid>") diff --git a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md index 0a4e65add4f..30ef3da3a99 100644 --- a/doc/administration/troubleshooting/kubernetes_cheat_sheet.md +++ b/doc/administration/troubleshooting/kubernetes_cheat_sheet.md @@ -168,7 +168,7 @@ and they will assist you with any issues you are having. kubectl exec -it <task-runner-pod-name> -- /srv/gitlab/bin/rails dbconsole -p ``` -- How to get info about Helm installation status: +- How to get information about Helm installation status: ```shell helm status name-of-installation @@ -199,7 +199,7 @@ and they will assist you with any issues you are having. helm upgrade <release name> <chart path> -f gitlab.yaml ``` -- How to get the manifest for a release. It can be useful because it contains the info about +- How to get the manifest for a release. It can be useful because it contains the information about all Kubernetes resources and dependent charts: ```shell |