diff --git a/CHANGELOG.md b/CHANGELOG.md index dfe70718b3..f196545517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -148,9 +148,8 @@ This will also affect the way you - User gRPC/API [#2261](https://github.com/juanfont/headscale/pull/2261): - If you depend on a Headscale Web UI, you should wait with this update until the UI have been updated to match the new API. - - `GET /api/v1/user/{name}` and `GetUser` have been removed in favour of - `ListUsers` with and ID parameter - - `RenameUser` and `DeleteUser` now requires and ID instead of a name. + - `GET /api/v1/user/{name}` and `GetUser` have been removed in favour of `ListUsers` with an ID parameter + - `RenameUser` and `DeleteUser` now require an ID instead of a name. ### Changes diff --git a/config-example.yaml b/config-example.yaml index b083091ffb..529a80edbf 100644 --- a/config-example.yaml +++ b/config-example.yaml @@ -58,8 +58,8 @@ noise: # IPv4: https://github.com/tailscale/tailscale/blob/22ebb25e833264f58d7c3f534a8b166894a89536/net/tsaddr/tsaddr.go#L33 # Any other range is NOT supported, and it will cause unexpected issues. prefixes: - v6: fd7a:115c:a1e0::/48 v4: 100.64.0.0/10 + v6: fd7a:115c:a1e0::/48 # Strategy used for allocation of IPs to nodes, available options: # - sequential (default): assigns the next free IP from the previous given IP. @@ -366,7 +366,7 @@ unix_socket_permission: "0770" # # to force them using the unique identifier from the OIDC and to give them a # # proper display name and picture if available. # # Note that this will only work if the username from the legacy user is the same -# # and ther is a posibility for account takeover should a username have changed +# # and there is a possibility for account takeover should a username have changed # # with the provider. # # Disabling this feature will cause all new logins to be created as new users. # # Note this option will be removed in the future and should be set to false