Commit 2ccbc432 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'docs-aqualls-one-final-spell' into 'master'

Four final  spelling corrections

See merge request gitlab-org/gitlab!54629
parents 5b46d132 2ad1ed60
...@@ -57,6 +57,7 @@ backtracing ...@@ -57,6 +57,7 @@ backtracing
badging badging
Bamboo Bamboo
Bazel Bazel
Bhyve
Bitbucket Bitbucket
blockquote blockquote
blockquoted blockquoted
...@@ -90,6 +91,7 @@ Certbot ...@@ -90,6 +91,7 @@ Certbot
changeset changeset
changesets changesets
chai chai
ChaosKube
chatbot chatbot
chatbots chatbots
ChatOps ChatOps
...@@ -125,6 +127,8 @@ CrowdIn ...@@ -125,6 +127,8 @@ CrowdIn
CSV CSV
cybersecurity cybersecurity
Dangerfile Dangerfile
datasource
datasources
datetime datetime
Debian Debian
Decompressor Decompressor
...@@ -410,6 +414,7 @@ Poedit ...@@ -410,6 +414,7 @@ Poedit
polyfill polyfill
polyfills polyfills
pooler pooler
postfixed
postgres.ai postgres.ai
PostgreSQL PostgreSQL
precompile precompile
...@@ -550,6 +555,7 @@ Sidekiq ...@@ -550,6 +555,7 @@ Sidekiq
Silverlight Silverlight
Sisense Sisense
Sitespeed Sitespeed
skippable
Slack Slack
Slackbot Slackbot
Slony Slony
...@@ -575,6 +581,8 @@ strikethrough ...@@ -575,6 +581,8 @@ strikethrough
strikethroughs strikethroughs
stunnel stunnel
stylelint stylelint
subchart
subcharts
subfolder subfolder
subfolders subfolders
subgraph subgraph
...@@ -634,6 +642,7 @@ todos ...@@ -634,6 +642,7 @@ todos
tokenizer tokenizer
Tokenizers Tokenizers
tokenizing tokenizing
tolerations
toolchain toolchain
toolchains toolchains
toolkit toolkit
...@@ -740,6 +749,7 @@ unstash ...@@ -740,6 +749,7 @@ unstash
unstashed unstashed
unstashing unstashing
unsynced unsynced
unsynchronized
untarred untarred
untracked untracked
untrusted untrusted
......
...@@ -180,9 +180,16 @@ production: ...@@ -180,9 +180,16 @@ production:
| `allow_username_or_email_login` | If enabled, GitLab ignores everything after the first `@` in the LDAP username submitted by the user on sign-in. If you are using `uid: 'userPrincipalName'` on ActiveDirectory you need to disable this setting, because the userPrincipalName contains an `@`. | no | boolean | | `allow_username_or_email_login` | If enabled, GitLab ignores everything after the first `@` in the LDAP username submitted by the user on sign-in. If you are using `uid: 'userPrincipalName'` on ActiveDirectory you need to disable this setting, because the userPrincipalName contains an `@`. | no | boolean |
| `block_auto_created_users` | To maintain tight control over the number of billable users on your GitLab installation, enable this setting to keep new users blocked until they have been cleared by an administrator (default: false). | no | boolean | | `block_auto_created_users` | To maintain tight control over the number of billable users on your GitLab installation, enable this setting to keep new users blocked until they have been cleared by an administrator (default: false). | no | boolean |
| `base` | Base where we can search for users. | yes | `'ou=people,dc=gitlab,dc=example'` or `'DC=mydomain,DC=com'` | | `base` | Base where we can search for users. | yes | `'ou=people,dc=gitlab,dc=example'` or `'DC=mydomain,DC=com'` |
| `user_filter` | Filter LDAP users. Format: [RFC 4515](https://tools.ietf.org/search/rfc4515) Note: GitLab does not support `omniauth-ldap`'s custom filter syntax. | no | `'(employeeType=developer)'` or `'(&(objectclass=user)(|(samaccountname=momo)(samaccountname=toto)))'` | | `user_filter` | Filter LDAP users. Format: [RFC 4515](https://tools.ietf.org/search/rfc4515) Note: GitLab does not support `omniauth-ldap`'s custom filter syntax. | no | For examples, read [Examples of user filters](#examples-of-user-filters). |
| `lowercase_usernames` | If lowercase_usernames is enabled, GitLab converts the name to lower case. | no | boolean | | `lowercase_usernames` | If lowercase_usernames is enabled, GitLab converts the name to lower case. | no | boolean |
#### Examples of user filters
Some examples of the `user_filter` field syntax:
- `'(employeeType=developer)'`
- `'(&(objectclass=user)(|(samaccountname=momo)(samaccountname=toto)))'`
### SSL Configuration Settings **(FREE SELF)** ### SSL Configuration Settings **(FREE SELF)**
| Setting | Description | Required | Examples | | Setting | Description | Required | Examples |
......
...@@ -34,7 +34,7 @@ GET /projects/:id/templates/:type ...@@ -34,7 +34,7 @@ GET /projects/:id/templates/:type
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| ---------- | ------ | -------- | ----------- | | ---------- | ------ | -------- | ----------- |
| `id` | integer / string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) | | `id` | integer / string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
| `type` | string | yes | The type `(dockerfiles|gitignores|gitlab_ci_ymls|licenses|issues|merge_requests)` of the template | | `type` | string | yes | The type of the template. Accepted values are: `dockerfiles`, `gitignores`, `gitlab_ci_ymls`, `licenses`, `issues`, `merge_requests` |
Example response (licenses): Example response (licenses):
......
...@@ -197,7 +197,7 @@ There are a few tools that can produce JUnit report format XML files in C/C++. ...@@ -197,7 +197,7 @@ There are a few tools that can produce JUnit report format XML files in C/C++.
#### GoogleTest #### GoogleTest
In the following example, `gtest` is used to generate the test reports. In the following example, `gtest` is used to generate the test reports.
If there are multiple gtest executables created for different architectures (`x86`, `x64` or `arm`), If there are multiple `gtest` executables created for different architectures (`x86`, `x64` or `arm`),
you will be required to run each test providing a unique filename. The results you will be required to run each test providing a unique filename. The results
will then be aggregated together. will then be aggregated together.
......
...@@ -141,7 +141,7 @@ configure your SSH client to point to the directory where the private key is sto ...@@ -141,7 +141,7 @@ configure your SSH client to point to the directory where the private key is sto
IdentityFile ~/.ssh/example_com_rsa IdentityFile ~/.ssh/example_com_rsa
``` ```
For more information on these settings, see the [`man ssh_config` (SSH config manual)](https://man.openbsd.org/ssh_config) page. For more information on these settings, see the [`man ssh_config`](https://man.openbsd.org/ssh_config) page in the SSH configuration manual.
Public SSH keys must be unique to GitLab because they bind to your account. Public SSH keys must be unique to GitLab because they bind to your account.
Your SSH key is the only identifier you have when you push code with SSH. Your SSH key is the only identifier you have when you push code with SSH.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment