degendered terms

diff --git a/docs/hacking-howto b/docs/hacking-howto
index a591047ede3986f6235d1e9ba301292902c9932a..12d6b14ee1b2da3406d4b78e7960c66288207749 100644 (file)
--- a/docs/hacking-howto
+++ b/docs/hacking-howto
@@ -1012,7 +1012,7 @@ gets started in any way) and the window(s) which appear.
 
 Imagine for example using dmenu: The user starts dmenu by pressing Mod+d, dmenu
 gets started with PID 3390. The user then decides to launch Firefox, which
-takes a long time. So he enters firefox into dmenu and presses enter. Firefox
+takes a long time. So they enter firefox into dmenu and press enter. Firefox
 gets started with PID 4001. When it finally finishes loading, it creates an X11
 window and uses MapWindow to make it visible. This is the first time i3
 actually gets in touch with Firefox. It decides to map the window, but it has

diff --git a/i3-dmenu-desktop b/i3-dmenu-desktop
index 2c54233d02501a57bb776cf7dad0260aea777a4f..a941ce1b6bd79ec684e2f0acd505a3a49f19e8bf 100755 (executable)
--- a/i3-dmenu-desktop
+++ b/i3-dmenu-desktop
@@ -306,7 +306,7 @@ for my $app (keys %apps) {
 #   };
 
 # ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃ Run dmenu to ask the user for her choice                                  ┃
+# ┃ Run dmenu to ask the user for their choice                                  ┃
 # ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 # open2 will just make dmenu’s STDERR go to our own STDERR.

diff --git a/i3-migrate-config-to-v4 b/i3-migrate-config-to-v4
index ae5bf4deb02811e715885dc622c741dcf114a6cd..b78378be1c65a68225a38d8ebace7b5be0845a3d 100755 (executable)
--- a/i3-migrate-config-to-v4
+++ b/i3-migrate-config-to-v4
@@ -341,7 +341,7 @@ sub convert_command {
             # NOTE: This is not 100% accurate, as it only works for one level
             # of nested containers. As this is a common use case, we use 'focus
             # parent; $command' nevertheless. For advanced use cases, the user
-            # has to modify his config.
+            # has to modify their config.
             print "$statement $key focus parent; $command\n";
         }
         return;

diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index bdf6582bd04f917fe642892702c90349249d7e6c..b501ff6a304536437e02525d9f4846bd860922a8 100644 (file)
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -5,7 +5,7 @@
  * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-nagbar is a utility which displays a nag message, for example in the case
- * when the user has an error in his configuration file.
+ * when the user has an error in their configuration file.
  *
  */
 #include <stdio.h>

diff --git a/i3.config b/i3.config
index c53ecadf5f0d654af1d32b1f6b42cf7a1122bd10..f7722d361957c5d48b8aedc42c3d2033bba89d36 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -169,7 +169,7 @@ bar {
 
 #######################################################################
 # automatically start i3-config-wizard to offer the user to create a
-# keysym-based config which used his favorite modifier (alt or windows)
+# keysym-based config which used their favorite modifier (alt or windows)
 #
 # i3-config-wizard will not launch if there already is a config file
 # in ~/.i3/config.

diff --git a/include/config.h b/include/config.h
index dea26d96344548a5573ebdb6de2813b4a1ccc32e..afafb64be0cb8da35017684d0ec354e7cd03f50c 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -105,7 +105,7 @@ struct Config {
 
     /** By default, focus follows mouse. If the user explicitly wants to
      * turn this off (and instead rely only on the keyboard for changing
-     * focus), we allow him to do this with this relatively special option.
+     * focus), we allow them to do this with this relatively special option.
      * It is not planned to add any different focus models. */
     bool disable_focus_follows_mouse;
 

diff --git a/include/data.h b/include/data.h
index 8f2c197df3e11e4a9234323a5fd8b3fd6049b289..eba0f968088363202eb519130e05f4bee0ad30e3 100644 (file)
--- a/include/data.h
+++ b/include/data.h
@@ -450,7 +450,7 @@ struct Match {
 /**
  * An Assignment makes specific windows go to a specific workspace/output or
  * run a command for that window. With this mechanism, the user can -- for
- * example -- assign his browser to workspace "www". Checking if a window is
+ * example -- assign their browser to workspace "www". Checking if a window is
  * assigned works by comparing the Match data structure with the window (see
  * match_matches_window()).
  *

diff --git a/include/key_press.h b/include/key_press.h
index 9712e8b9eda608542ff331ca39bd148726568f89..86cc6836f1300402ad29a26c3cddcc62968c4ff2 100644 (file)
--- a/include/key_press.h
+++ b/include/key_press.h
@@ -19,7 +19,7 @@ void handle_key_press(xcb_key_press_event_t *event);
 /**
  * Kills the commanderror i3-nagbar process, if any.
  *
- * Called when reloading/restarting, since the user probably fixed his wrong
+ * Called when reloading/restarting, since the user probably fixed their wrong
  * keybindings.
  *
  * If wait_for_it is set (restarting), this function will waitpid(), otherwise,

diff --git a/libi3/font.c b/libi3/font.c
index df478fb4fc87f69e6a7d659b4bec7ab8cee4a10d..cb92d52fbd29bc8281cb9beabcc269f2c5fca93b 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -455,7 +455,7 @@ static int xcb_query_text_width(const xcb_char2b_t *text, size_t text_len) {
                                                                          cookie, &error);
     if (reply == NULL) {
         /* We return a safe estimate because a rendering error is better than
-         * a crash. Plus, the user will see the error in his log. */
+         * a crash. Plus, the user will see the error in their log. */
         fprintf(stderr, "Could not get text extents (X error code %d)\n",
                 error->error_code);
         return savedFont->specific.xcb.info->max_bounds.character_width * text_len;

diff --git a/man/i3-sensible-editor.man b/man/i3-sensible-editor.man
index 2a0448813ecb48ecb97624cc4717b5df8f7ab540..19b0f3a59267378ec30c54e146d19da93a3f8c07 100644 (file)
--- a/man/i3-sensible-editor.man
+++ b/man/i3-sensible-editor.man
@@ -30,7 +30,7 @@ It tries to start one of the following (in that order):
 * gedit
 * mc-edit
 
-Please don’t complain about the order: If the user has any preference, he will
+Please don’t complain about the order: If the user has any preference, they will
 have $VISUAL or $EDITOR set.
 
 == SEE ALSO

diff --git a/man/i3-sensible-pager.man b/man/i3-sensible-pager.man
index 6b04c4316fda10d0f8fe7a1876ad356df1db5984..22754c0bd96686e74e5cb372384b9381db9b8ef4 100644 (file)
--- a/man/i3-sensible-pager.man
+++ b/man/i3-sensible-pager.man
@@ -23,7 +23,7 @@ It tries to start one of the following (in that order):
 * w3m
 * i3-sensible-editor(1)
 
-Please don’t complain about the order: If the user has any preference, he will
+Please don’t complain about the order: If the user has any preference, they will
 have $PAGER set.
 
 == SEE ALSO

diff --git a/man/i3-sensible-terminal.man b/man/i3-sensible-terminal.man
index d1ad5198edaa8bd9fa30f63f3056d5f93a34149e..6fa91ac893900c61d077fba66a60a453fed3a5b6 100644 (file)
--- a/man/i3-sensible-terminal.man
+++ b/man/i3-sensible-terminal.man
@@ -33,8 +33,8 @@ It tries to start one of the following (in that order):
 * roxterm
 * xfce4-terminal
 
-Please don’t complain about the order: If the user has any preference, she will
-have $TERMINAL set or modified her i3 configuration file.
+Please don’t complain about the order: If the user has any preference, they will
+have $TERMINAL set or modified their i3 configuration file.
 
 == SEE ALSO
 

diff --git a/src/config_parser.c b/src/config_parser.c
index 24cebcece9707755087d83928a49030629ecea63..b229b445ba24ae71358cfcc891e4fafa06d40490 100644 (file)
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -823,11 +823,11 @@ static char *migrate_config(char *input, off_t size) {
         fprintf(stderr, "Migration process exit code was != 0\n");
         if (returncode == 2) {
             fprintf(stderr, "could not start the migration script\n");
-            /* TODO: script was not found. tell the user to fix his system or create a v4 config */
+            /* TODO: script was not found. tell the user to fix their system or create a v4 config */
         } else if (returncode == 1) {
             fprintf(stderr, "This already was a v4 config. Please add the following line to your config file:\n");
             fprintf(stderr, "# i3 config file (v4)\n");
-            /* TODO: nag the user with a message to include a hint for i3 in his config file */
+            /* TODO: nag the user with a message to include a hint for i3 in their config file */
         }
         return NULL;
     }

diff --git a/src/handlers.c b/src/handlers.c
index 1e6b634c6cfd33de2f9367525deaa8b91b5e7f04..0cd397fd0669e6f855dc80e6a4957498f3c8c1b6 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -106,7 +106,7 @@ static void check_crossing_screen_boundary(uint32_t x, uint32_t y) {
         return;
     }
 
-    /* Focus the output on which the user moved his cursor */
+    /* Focus the output on which the user moved their cursor */
     Con *old_focused = focused;
     Con *next = con_descend_focused(output_get_content(output->con));
     /* Since we are switching outputs, this *must* be a different workspace, so
@@ -149,7 +149,7 @@ static void handle_enter_notify(xcb_enter_notify_event_t *event) {
         enter_child = true;
     }
 
-    /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */
+    /* If not, then the user moved their cursor to the root window. In that case, we adjust c_ws */
     if (con == NULL) {
         DLOG("Getting screen at %d x %d\n", event->root_x, event->root_y);
         check_crossing_screen_boundary(event->root_x, event->root_y);
@@ -1315,7 +1315,7 @@ void handle_event(int type, xcb_generic_event_t *event) {
             handle_motion_notify((xcb_motion_notify_event_t *)event);
             break;
 
-        /* Enter window = user moved his mouse over the window */
+        /* Enter window = user moved their mouse over the window */
         case XCB_ENTER_NOTIFY:
             handle_enter_notify((xcb_enter_notify_event_t *)event);
             break;

diff --git a/src/main.c b/src/main.c
index 708df38e0af57f77fe0a655adf5c2884c709dad7..8b514178bbbf3283fc9391f11ef5c6f42643ba1a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -778,7 +778,7 @@ int main(int argc, char *argv[]) {
         ELOG("Could not setup signal handler");
 
     /* Ignore SIGPIPE to survive errors when an IPC client disconnects
-     * while we are sending him a message */
+     * while we are sending them a message */
     signal(SIGPIPE, SIG_IGN);
 
     /* Autostarting exec-lines */