Skip to content
This repository was archived by the owner on Sep 10, 2024. It is now read-only.

Commit eebbf2f

Browse files
sandhosewrjlewis
andcommitted
Apply suggestions from code review
Co-authored-by: Will Lewis <[email protected]>
1 parent ef23b06 commit eebbf2f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

docs/setup/sso.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ A Jinja2 template is used as mapping for each attribute. The template currently
5252
The following default templates are used:
5353

5454
- `localpart`: `{{ user.preferred_username }}`
55-
- `display_name`: `{{ user.name }}`
55+
- `displayname`: `{{ user.name }}`
5656
- `email`: `{{ user.email }}`
5757

5858
## Multiple providers behaviour
5959

60-
Mutiple authentication methods can be configured at the same time, in which case the authentication service will let the user choose which one to use.
60+
Multiple authentication methods can be configured at the same time, in which case the authentication service will let the user choose which one to use.
6161
This is true if both the local password database and an upstream provider are configured, or if multiple upstream providers are configured.
6262
In such cases, the `human_name` parameter of the provider configuration is used to display a human-readable name for the provider, and the `brand_name` parameter is used to show a logo for well-known providers.
6363

@@ -93,7 +93,7 @@ upstream_oauth2:
9393
localpart:
9494
action: require
9595
template: "{{ user.preferred_username }}"
96-
display_name:
96+
displayname:
9797
action: suggest
9898
template: "{{ user.name }}"
9999
email:
@@ -144,7 +144,7 @@ upstream_oauth2:
144144
```
145145

146146

147-
## GitLab
147+
### GitLab
148148

149149
1. Create a [new application](https://gitlab.com/profile/applications).
150150
2. Add the `openid` scope. Optionally add the `profile` and `email` scope if you want to import the user's name and email.
@@ -288,7 +288,7 @@ upstream_oauth2:
288288
localpart:
289289
action: require
290290
template: "{{ (user.preferred_username | split('@'))[0] }}"
291-
display_name:
291+
displayname:
292292
action: suggest
293293
template: "{{ user.name }}"
294294
email:

docs/usage/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ http:
7878

7979
The following additional resources are available, although it is recommended to serve them on a separate listener, not exposed to the public internet:
8080

81-
- `name: prometheus`: serves the a Prometheus-compatible metrics endpoint on `/metrics`, if the Prometheus exporter is enabled in `telemetry.metrics.exporter`.
81+
- `name: prometheus`: serves a Prometheus-compatible metrics endpoint on `/metrics`, if the Prometheus exporter is enabled in `telemetry.metrics.exporter`.
8282
- `name: health`: serves the health check endpoint on `/health`.
8383

8484
## `database`

0 commit comments

Comments
 (0)