about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2020-06-23 15:59:14 +0200
committerAlyssa Ross <hi@alyssa.is>2020-07-13 23:41:22 +0000
commit92c980fdae4922d334ae1eccfa1d81dfce0b37b8 (patch)
tree0182f130298c701818c9d559703036524eb37784
parenta42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (diff)
downloadnixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar.gz
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar.bz2
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar.lz
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar.xz
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.tar.zst
nixlib-92c980fdae4922d334ae1eccfa1d81dfce0b37b8.zip
small treewide: his -> theirs/its
SJW brigade represent. ;)

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
(cherry picked from commit 517be841352ec3e6b236e7cdfb1fbd8e26bf49cb)
-rw-r--r--nixpkgs/nixos/modules/config/users-groups.nix2
-rw-r--r--nixpkgs/nixos/modules/services/networking/3proxy.nix2
-rw-r--r--nixpkgs/nixos/tests/sudo.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/pamixer/default.nix2
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 {
                   <literal>"iponly"</literal>: specifies no authentication. ACLs authorization is used.
                 </para></listitem>
                 <listitem><para>
-                  <literal>"strong"</literal>: authentication by username/password. If user is not registered his access is denied regardless of ACLs.
+                  <literal>"strong"</literal>: authentication by username/password. If user is not registered their access is denied regardless of ACLs.
                 </para></listitem>
               </itemizedlist>
 
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