From 92c980fdae4922d334ae1eccfa1d81dfce0b37b8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 23 Jun 2020 15:59:14 +0200 Subject: small treewide: his -> theirs/its SJW brigade represent. ;) Co-authored-by: Jan Tojnar (cherry picked from commit 517be841352ec3e6b236e7cdfb1fbd8e26bf49cb) --- nixpkgs/nixos/modules/config/users-groups.nix | 2 +- nixpkgs/nixos/modules/services/networking/3proxy.nix | 2 +- nixpkgs/nixos/tests/sudo.nix | 2 +- nixpkgs/pkgs/applications/audio/pamixer/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixpkgs/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix index 7fbbfcec7510..8defa86818ab 100644 --- a/nixpkgs/nixos/modules/config/users-groups.nix +++ b/nixpkgs/nixos/modules/config/users-groups.nix @@ -626,7 +626,7 @@ in { then '' The password hash of user "${name}" may be invalid. You must set a - valid hash or the user will be locked out of his account. Please + valid hash or the user will be locked out of their account. Please check the value of option `users.users."${name}".hashedPassword`. '' else null diff --git a/nixpkgs/nixos/modules/services/networking/3proxy.nix b/nixpkgs/nixos/modules/services/networking/3proxy.nix index ae8a4958ca96..37a48657c1cc 100644 --- a/nixpkgs/nixos/modules/services/networking/3proxy.nix +++ b/nixpkgs/nixos/modules/services/networking/3proxy.nix @@ -124,7 +124,7 @@ in { "iponly": specifies no authentication. ACLs authorization is used. - "strong": authentication by username/password. If user is not registered his access is denied regardless of ACLs. + "strong": authentication by username/password. If user is not registered their access is denied regardless of ACLs. diff --git a/nixpkgs/nixos/tests/sudo.nix b/nixpkgs/nixos/tests/sudo.nix index 5bbec3d57269..8c38f1b47ef0 100644 --- a/nixpkgs/nixos/tests/sudo.nix +++ b/nixpkgs/nixos/tests/sudo.nix @@ -74,7 +74,7 @@ in with subtest("test5 user should not be able to run commands under root"): machine.fail("sudo -u test5 sudo -n -u root true") - with subtest("test5 user should be able to keep his environment"): + with subtest("test5 user should be able to keep their environment"): machine.succeed("sudo -u test5 sudo -n -E -u test1 true") with subtest("users in group 'barfoo' should not be able to keep their environment"): diff --git a/nixpkgs/pkgs/applications/audio/pamixer/default.nix b/nixpkgs/pkgs/applications/audio/pamixer/default.nix index 71d852485991..3e2192c04148 100644 --- a/nixpkgs/pkgs/applications/audio/pamixer/default.nix +++ b/nixpkgs/pkgs/applications/audio/pamixer/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Pulseaudio command line mixer"; longDescription = '' Features: - - Get the current volume of the default sink, the default source or a selected one by his id + - Get the current volume of the default sink, the default source or a selected one by its id - Set the volume for the default sink, the default source or any other device - List the sinks - List the sources -- cgit 1.4.1