From patchwork Wed Jun 9 13:54:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee X-Patchwork-Id: 12310165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7CEEC48BD1 for ; Wed, 9 Jun 2021 13:55:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83B8E61364 for ; Wed, 9 Jun 2021 13:55:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236513AbhFIN5i (ORCPT ); Wed, 9 Jun 2021 09:57:38 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:53148 "EHLO mail-wm1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234326AbhFIN5g (ORCPT ); Wed, 9 Jun 2021 09:57:36 -0400 Received: by mail-wm1-f41.google.com with SMTP id f17so4084980wmf.2 for ; Wed, 09 Jun 2021 06:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=CblJ3OfMeVETAhnc8n/9uVF841+kXTAaqtBApW37/yQ=; b=blX3VMB6n8QDS1bZXy8sbn+EC282jWhROARrof7403HazVGS/DctPPX0Q2GDIPZTqo UxyAGgQ4+SVHcbEse6eH+HaBvYk7gDlBa3yY/BPLSh9enBWIPkjhKVvX/xeF9t06K70l +icp7xSHAQHKjSykHZHKKIsdK0CjVJtSjLk/BYeZbiIuXbICm+stCEfTUnPzZhekUsMI o7XMyiCavjmCJIhlNGyTd9DpB/ifcAtPuLYbWyU676Dz2ZlOPY0kxEtWvMca2FwJ/NBS MHirpN35ivfNXNDPsN1H+Qauee+F31Cp8hfq1qnFgJv3fPhiSjW1L6UDtwGL2mECRPni cL8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=CblJ3OfMeVETAhnc8n/9uVF841+kXTAaqtBApW37/yQ=; b=dGJOIUuBnM+vA5EYO0ryZtegztmBWXH1X38jIAQW1rZ81RbnxQV0/6dLYgHEdxSa1q k66fQRFgOyWgDPQmHoOQNHUELvpi54iCByKSdrg45N6RLYpQPuGAPuadaV53f05kg4k7 Wa5c+CQs3TWrhAGvVuVXO2S0auu6EDPZK3Z7TKBMe8mDi5vX+8/irg7J7b2ag/uj6LDL SyBHl+AsuRACKaBnhx/M1Y6K6Vm8UmpSvgBANKjSR1Nqa+zeQB6j/0OXNf/fpy32MQYK lFDVJTp2UkyMpwye4yhTaKilzttl2kHdz9Qa2IkfhXQhy8bpdUwRok0PSc8em763u2J/ fjFQ== X-Gm-Message-State: AOAM531raxnawMMoP5HOaKZ57cSHGp37j7J4x/RqdO6WzBLW9UybvrY4 y7TSVOaN9H5T684PXrrwRij53ZyjHSQ= X-Google-Smtp-Source: ABdhPJwTOHU+wgDmWCrhsEBNmgutlkm0g6LNhIrgrt5s2LOPCA50meFHIkSGLF6a8BQERGV7iaS17Q== X-Received: by 2002:a7b:c0cb:: with SMTP id s11mr28080719wmh.21.1623246880918; Wed, 09 Jun 2021 06:54:40 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z19sm6152355wmf.31.2021.06.09.06.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:54:40 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 09 Jun 2021 13:54:35 +0000 Subject: [PATCH v2 1/4] Documentation: use singular they when appropriate Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: gitster@pobox.com, sandals@crustytoothpaste.net, stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Andrei Rybak , Felipe Contreras , Robert Karszniewicz , Jeff King , "Kerry, Richard" , Derrick Stolee , Derrick Stolee Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee From: Derrick Stolee There are several instances in our documentation where we refer to an anonymous user as "a contributor" or "an integrator" or similar. To avoid repeating this role, pronouns are used. Previous examples chose a gender for this user, using "he/him" or "she/her" arbitrarily. Replace these uses with "they/them" to ensure that these documentation examples apply to all potential users without exception. Helped-by: Richard Kerry Helped-by: Junio C Hamano Signed-off-by: Derrick Stolee --- Documentation/SubmittingPatches | 8 ++++---- Documentation/git-push.txt | 4 ++-- Documentation/user-manual.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 55287d72e0ef..f519a8dfff7c 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -372,10 +372,10 @@ If you like, you can put extra tags at the end: the patch attempts to fix. . `Acked-by:` says that the person who is more familiar with the area the patch attempts to modify liked the patch. -. `Reviewed-by:`, unlike the other tags, can only be offered by the - reviewer and means that she is completely satisfied that the patch - is ready for application. It is usually offered only after a - detailed review. +. `Reviewed-by:`, unlike the other tags, can only be offered by a + reviewer when they are completely satisfied with the patch. It is + offered only after reviews by reviewers who are known to be experts + in the affected area by the community members. . `Tested-by:` is used to indicate that the person applied the patch and found it to have the desired effect. diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index a953c7c38790..2f25aa3a291b 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are -rebasing, the tip of the branch at the remote may advance with her -commit, and blindly pushing with `--force` will lose her work. +rebasing, the tip of the branch at the remote may advance with their +commit, and blindly pushing with `--force` will lose their work. + This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f9e54b867417..4fe9be117c4a 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2792,7 +2792,7 @@ A fast-forward looks something like this: In some cases it is possible that the new head will *not* actually be a descendant of the old head. For example, the developer may have -realized she made a serious mistake, and decided to backtrack, +realized they made a serious mistake, and decided to backtrack, resulting in a situation like: ................................................ From patchwork Wed Jun 9 13:54:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee X-Patchwork-Id: 12310161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE9D8C48BCD for ; Wed, 9 Jun 2021 13:55:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E55461285 for ; Wed, 9 Jun 2021 13:55:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236892AbhFIN4y (ORCPT ); Wed, 9 Jun 2021 09:56:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234326AbhFIN4x (ORCPT ); Wed, 9 Jun 2021 09:56:53 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13D54C061574 for ; Wed, 9 Jun 2021 06:54:43 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id b145-20020a1c80970000b029019c8c824054so4340970wmd.5 for ; Wed, 09 Jun 2021 06:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Qldbng1At8975bUUmMegsEkSH3mVCBszRelsv5etKoM=; b=XXZrgBkHvzM/AE3RjvJZ+mNDoFAtwyoK2uDZ+TOk7JnZuWdo4WLZhAF/fJ98KPTjO5 3QQXnsdTfpCV2aCwh11M2t8/O557GcHqfCgpGgF+P4YRri7zMU9+4MdKiyz3M931xK1e gCbbCpPku0rGsMa2Al1+SdNCSf436vd124oxBzDox53EuswAuWFYFO0rt35/vmqRGF/P Fy7aR9aLebR+BKcgVBB0CnJzVtyBouXuArvJJ2C7fyPVlfvD2dtyR8vVkqOkwQgBdyFT TwrYQPPK4q6xsRTwAV8fUiJMovM0nfX4S/xbzAPyGGTYV5Pxz2/n0pVjT/Yd8kQNMOe4 5PfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Qldbng1At8975bUUmMegsEkSH3mVCBszRelsv5etKoM=; b=k94c3GGK12xU7ZTxKny+cylsVlrabiNqMlne6HxOEvLt8LYkU7UnW72gxStUnNcZ9v 5ygWCz9UZyoq+z8nWwimFBH8aiFArWEX90vnsDd0xVYKyj52Aqij884K53HGYYWePiFB e3x7oKxlUlD45h6cwvMY965NM59kPgFBqPvFHlNwqsuPOGgkbzYa6qVtcerp3uaQMdGg TL8DXHoVvES2gyjKkwxxFvaSV9iCKu9SOVTuioKsr41TjvrLZ/Sy2VsD56xgJae0JR6V 0xFS3gizE6PNEIMGJgGwVA82pR7wgesqa8RTODLvZRQiUlUdScU/1cuY0RTQKR+mQ7Hi BWwg== X-Gm-Message-State: AOAM530YBmxQLXkQrDwt1MEvE9cH7Fu1BskMEKXwAiWRg26u2PuxpD5i fcPwAzb7j4y5QCuJ37oalPAw2ESAguU= X-Google-Smtp-Source: ABdhPJx4SM7Pwekl3rbHB9wikngyOPLkxPsvXIHIyG3rQ85tm11dXDQzjY4JHcDsMXN5JKxuIiAykQ== X-Received: by 2002:a05:600c:35c1:: with SMTP id r1mr16695713wmq.13.1623246881543; Wed, 09 Jun 2021 06:54:41 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o18sm6357952wmh.38.2021.06.09.06.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:54:41 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 09 Jun 2021 13:54:36 +0000 Subject: [PATCH v2 2/4] *: use singular they in comments Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: gitster@pobox.com, sandals@crustytoothpaste.net, stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Andrei Rybak , Felipe Contreras , Robert Karszniewicz , Jeff King , "Kerry, Richard" , Derrick Stolee , Derrick Stolee Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee From: Derrick Stolee Several comments in our code refer to an anonymous user with "he/him" or "she/her" pronouns, and the choice between the two is arbitrary. Replace these uses with "they/them" which universally includes all potential readers. Helped-by: Felipe Contreras Signed-off-by: Derrick Stolee --- commit.c | 2 +- config.h | 2 +- date.c | 2 +- pathspec.h | 2 +- strbuf.h | 2 +- wt-status.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index 8ea55a447fa9..143f472c0f24 100644 --- a/commit.c +++ b/commit.c @@ -1178,7 +1178,7 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header /* * We could verify this signature and either omit the tag when * it does not validate, but the integrator may not have the - * public key of the signer of the tag he is merging, while a + * public key of the signer of the tag being merged, while a * later auditor may have it while auditing, so let's not run * verify-signed-buffer here for now... * diff --git a/config.h b/config.h index 9038538ffdcb..7107b41a8933 100644 --- a/config.h +++ b/config.h @@ -451,7 +451,7 @@ void git_configset_init(struct config_set *cs); * Parses the file and adds the variable-value pairs to the `config_set`, * dies if there is an error in parsing the file. Returns 0 on success, or * -1 if the file does not exist or is inaccessible. The user has to decide - * if he wants to free the incomplete configset or continue using it when + * if they want to free the incomplete configset or continue using it when * the function returns -1. */ int git_configset_add_file(struct config_set *cs, const char *filename); diff --git a/date.c b/date.c index f9ea807b3a9f..2da0f80b9bfa 100644 --- a/date.c +++ b/date.c @@ -908,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp) /* * We take over "now" here, which usually translates * to the current timestamp. This is because the user - * really means to expire everything she has done in + * really means to expire everything they have done in * the past, and by definition reflogs are the record * of the past, and there is nothing from the future * to be kept. diff --git a/pathspec.h b/pathspec.h index fceebb876f7a..6e84099bea22 100644 --- a/pathspec.h +++ b/pathspec.h @@ -108,7 +108,7 @@ struct pathspec { * * A similar process is applied when a new pathspec magic is added. The designer * lifts the GUARD_PATHSPEC restriction in the functions that support the new - * magic. At the same time (s)he has to make sure this new feature will be + * magic. At the same time they have to make sure this new feature will be * caught at parse_pathspec() in commands that cannot handle the new magic in * some cases. grepping parse_pathspec() should help. */ diff --git a/strbuf.h b/strbuf.h index 223ee2094af8..b543e354f0ed 100644 --- a/strbuf.h +++ b/strbuf.h @@ -338,7 +338,7 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc, * * In order to facilitate caching and to make it possible to give * parameters to the callback, `strbuf_expand()` passes a context pointer, - * which can be used by the programmer of the callback as she sees fit. + * which can be used by the programmer of the callback as they see fit. */ typedef size_t (*expand_fn_t) (struct strbuf *sb, const char *placeholder, diff --git a/wt-status.c b/wt-status.c index 42b673571696..bd7ef3e4fd02 100644 --- a/wt-status.c +++ b/wt-status.c @@ -639,7 +639,7 @@ static void wt_status_collect_changes_index(struct wt_status *s) * mode by passing a command line option we do not ignore any * changed submodule SHA-1s when comparing index and HEAD, no * matter what is configured. Otherwise the user won't be - * shown any submodules she manually added (and which are + * shown any submodules they manually added (and which are * staged to be committed), which would be really confusing. */ handle_ignore_submodules_arg(&rev.diffopt, "dirty"); From patchwork Wed Jun 9 13:54:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee X-Patchwork-Id: 12310159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 426BAC48BCD for ; Wed, 9 Jun 2021 13:54:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 287DA61285 for ; Wed, 9 Jun 2021 13:54:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236882AbhFIN4u (ORCPT ); Wed, 9 Jun 2021 09:56:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236881AbhFIN4t (ORCPT ); Wed, 9 Jun 2021 09:56:49 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E785C06175F for ; Wed, 9 Jun 2021 06:54:43 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 3-20020a05600c0243b029019f2f9b2b8aso4284850wmj.2 for ; Wed, 09 Jun 2021 06:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=rlU16Argot/ypcOGcNIltKha5884Rr4csMMq3SHgObo=; b=sv3/gtnZjC9Y0Y7WiKAF7x1pd1uTNHlptp2FzYqix/GJgbtbGLikTQDtRp5l43S0xL nNOVOHzBzO9o8tlSfVUMfckQwN6147+pafVkLuuJiq3kOUWYbIIq73lyMzlC4Ux4W3TU 5PPTIgSfxHRoKkv1MD6IW6nofiQL2B2STL0an+aWjNu16GbmDg5/yrm3XlXFPkeHj5yp 32cfREfFqRIQGBn1t59saOujJRuwLmtVxsZk+2gKsPbepxEoJMilcDEo8E35nJsWvNvz EjD5Zgr4E2VPD6wd2U9U/y01COTQO3VbTd1G23Wy/KRUaERQeDSCDYHpMhuOdGWSfRTN sv6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=rlU16Argot/ypcOGcNIltKha5884Rr4csMMq3SHgObo=; b=fRG6ejRR7MbFoDKMBHtz78R6J86GzoLe+EHSPgTXgzwIVYjCx5egAk37GUrEHb3HkM xS/fzs2TXlqidPp/kwHJ0h5DMH8goXaEEXxH2LypL4r7bWKFh5gXLxaQ5BGN54mACIxi keTtJq9T0D1Bfdu+LmLbtHm1m032L+Tetw0UJCxcOENJnFlGYwkk9xYJz+75chWgc9Rs cDYMZnhqQ5wuCuyluwtDjisgk91YYmfoOz+qSyTOtYcla7OZLsaqk2N8uU7a7bPOXWgY uuKzsw5JuZOYUaxaB+Z33IFCdbrBAWa8ay/twmQq03MLy9P8aIpRqT7r/OzrfuJS1Ov2 1pqg== X-Gm-Message-State: AOAM533PvyE3BJNAMiivmTU7nVYehMkmTesqyWmUBQjYfKiZLl8o9IwI /Y/uIgjxuxIC8e7LQoWRv0g8m9DflMI= X-Google-Smtp-Source: ABdhPJyJL5qNOMQhszOoTZZMiRobvcu4yEn4s1svClLIsbse8OyU2+o/ZU4+jSI8ZLBpxKrpity08Q== X-Received: by 2002:a05:600c:410a:: with SMTP id j10mr9702916wmi.6.1623246882130; Wed, 09 Jun 2021 06:54:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i21sm6235289wmq.12.2021.06.09.06.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:54:41 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 09 Jun 2021 13:54:37 +0000 Subject: [PATCH v2 3/4] *: fix typos Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: gitster@pobox.com, sandals@crustytoothpaste.net, stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Andrei Rybak , Felipe Contreras , Robert Karszniewicz , Jeff King , "Kerry, Richard" , Derrick Stolee , Derrick Stolee Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee From: Derrick Stolee These typos were found while searching the codebase for gendered pronouns. Signed-off-by: Derrick Stolee --- config.c | 2 +- t/t9300-fast-import.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index f9c400ad3062..7bb96f8f7124 100644 --- a/config.c +++ b/config.c @@ -2837,7 +2837,7 @@ static void maybe_remove_section(struct config_store_data *store, begin = store->parsed[i].begin; /* - * Next, make sure that we are removing he last key(s) in the section, + * Next, make sure that we are removing the last key(s) in the section, * and that there are no comments that are possibly about the current * section. */ diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5c47ac4465cb..7039b5c6028d 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1538,7 +1538,7 @@ test_expect_success 'O: comments are all skipped' ' commit refs/heads/O1 # -- ignore all of this text committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - # $GIT_COMMITTER_NAME has inserted here for his benefit. + # $GIT_COMMITTER_NAME has inserted here for this benefit. data < X-Patchwork-Id: 12310157 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1F06C48BCD for ; Wed, 9 Jun 2021 13:54:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA1BB61351 for ; Wed, 9 Jun 2021 13:54:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236874AbhFIN4j (ORCPT ); Wed, 9 Jun 2021 09:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234326AbhFIN4i (ORCPT ); Wed, 9 Jun 2021 09:56:38 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3721FC061760 for ; Wed, 9 Jun 2021 06:54:44 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id q5so25628181wrm.1 for ; Wed, 09 Jun 2021 06:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=eSwTqLxlz//8yRp07gls5fQcj/wK9ouflgr+iT5pjGU=; b=YJEZWJFJp90CSeTwzbTluAyhWQLQwtVhpnO/5oVTcYrORFdjetRpR4oh5iWX5N3ojp SY8E2EhfOg8h8PtbG9zGaQAkfsPEK6Dv6UhFkUhrxxB0l5Qj8eCH41y4WgHH6w523oQ9 bP3R09OkeHT9Ik8gmaf1hqkHgjVdY7tHGzH69NvWqnhewxsVTylRP7rVatB+CPDTj5N0 5U1ohNctuT8sqLmDZHvvnVyKiHBBtYVcSkTILU+5R+i2I4W8+XtMWRv4MK8zGg2OX3rV ointNVvIY2o1N7LQ646lZCdV+UD0daRFzv6K9Qn0w1BVKV7KzTw4wiSRvm1rwhoaD2VG jXuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=eSwTqLxlz//8yRp07gls5fQcj/wK9ouflgr+iT5pjGU=; b=gZyrq05g9PttG5k1Ud57XiIYnA2PejKj0MN806v0o1oTV1QqXyJsW1prORkXm/JwR4 ZDDgl74sEkb6LFt2EuSTxuk2nW22FH/8DC3Somb3ZzoARSVmLS6P7fFhZmMkZq6WiM5i YpUQBg7Ng/FTVpuyMGSDhQu1CD8+26RbI5vnshLWooa3ZP6URnlw0QsOvQrXsyb0wT6V W05ei12q8oTwEfTLSLJud+a8dm7CQP5GgH2YR5JPM2Fpu4fX6OSrWCIVU+9W7sAtXKd5 Dvm6zyN7TnJRgFv5LI9HsStG776dfUkuhHO3d/cARE+w0y7jur6jFgpHR696HgE2jsSt eGiQ== X-Gm-Message-State: AOAM5307fI3QgC/m9wgsMGtPwnHIG+2Mjxz6UsqnbzhiC5FEoQcyQlHp ZjWnhA+B4fzmN9riaawZLBwda9Mpljc= X-Google-Smtp-Source: ABdhPJzVtWZMzHh9SsXpHTplthp0MGPW5697js0rorhoUnYP2iaMO4GYtK07arNoufWwhYRjyIpwrg== X-Received: by 2002:a5d:6e92:: with SMTP id k18mr28647866wrz.94.1623246882742; Wed, 09 Jun 2021 06:54:42 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k5sm8697083wmk.11.2021.06.09.06.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:54:42 -0700 (PDT) Message-Id: <065e2fdeb151b1672954a1133795b0e7744c465e.1623246879.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 09 Jun 2021 13:54:38 +0000 Subject: [PATCH v2 4/4] CodingGuidelines: recommend singular they Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: gitster@pobox.com, sandals@crustytoothpaste.net, stolee@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7A=?= Bjarmason , Andrei Rybak , Felipe Contreras , Robert Karszniewicz , Jeff King , "Kerry, Richard" , Derrick Stolee , Derrick Stolee Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee From: Derrick Stolee Technical writing seeks to convey information with minimal friction. One way that a reader can experience friction is if they encounter a description of "a user" that is later simplified using a gendered pronoun. If the reader does not consider that pronoun to apply to them, then they can experience cognitive dissonance that removes focus from the information. If we use singular "they/them" pronouns instead of "he/him" or "she/her" pronouns, then we can avoid this congitive load on the reader. Using singular "they" is also incredibly efficient. Choosing a gendered pronoun is usually arbitrary between "he" or "she". Using constructs such as "he or she", "s/he", or "(s)he" are more complicated than singular "they". When choosing a gendered pronoun, that pronoun no longer applies to nearly half of possible readers. Even if we alternated between "he/him" and "she/her" perfectly evenly, we would still expect male and female readers to experience an incorrect pronoun half the time. However, some readers will not prescribe to either of these binary genders. Those readers hence suffer an incorrect pronoun the entire time. Singular "they" applies to every reader. Perhaps due to similar reasons, official style guides have changed their stance on singuler "they" in recent years. For example, the APA style guide changed their official recommendation in 2019 [1]. The MLA handbook also references helpful ways to use singular "they" [2]. While not fully endorsing it, the Chicago Manual of Style has removed its blanket ban on singular "they" [3] (the previous recommendation was to only use "it" as a singular non-gendered pronoun). [1] https://apastyle.apa.org/blog/singular-they [2] https://style.mla.org/using-singular-they/ [3] https://libraries.indiana.edu/chicago-manual-style-singular-pronoun-they While not all styleguides are updating their recommendations, we can make a choice as a project to adopt the concept because of the efficiencies above, as well as the benefits of increased inclusion. To futher justify singular "they" as an acceptable grammatical concept, I include the careful research of brian m. carlson who collected their thoughts on this matter [4] (lightly edited): Singular "they" has been used by native English speakers as part of the language for over half a millennium and is widely used and understood. This usage is specified in Merriam Webster[5]: The use of they, their, them, and themselves as pronouns of indefinite gender and indefinite number is well established in speech and writing, even in literary and formal contexts. Wiktionary notes[6] (references omitted): Usage of they as a singular pronoun began in the 1300s and has been common ever since, despite attempts by some grammarians, beginning in 1795, to condemn it as a violation of traditional (Latinate) agreement rules. Some other grammarians have countered that criticism since at least 1896. Fowler's Modern English Usage (third edition) notes that it "is being left unaltered by copy editors" and is "not widely felt to lie in a prohibited zone." Some authors compare use of singular they to widespread use of singular you instead of thou. Linguists fit roughly into two camps: prescriptive and descriptive. The former specify rules for people to use, and the latter document language as it is actually used without forming a judgment. Some prescriptivists think it is acceptable, and some do not. But descriptivists will rightly note that it is and has been commonly used in English across countries, cultures, and contexts for an extended period of time and is therefore generally accepted by most English speakers as a normal part of the language. Since we are writing text for an English language audience who are mostly not linguists, we should probably consider using the language that most people will use in this context. [4] https://lore.kernel.org/git/YKrk4dEjEm6+48ji@camp.crustytoothpaste.net/ [5] https://www.merriam-webster.com/dictionary/they [6] https://en.wiktionary.org/wiki/they Since singular "they" might be unfamiliar to some, we also list an option to rephrase writing to use singular "you" or plural "they". We can use singular "you" to refer to the reader instead of an abstract user. Plural "they" works if we refer to multiple abstract users instead of one. The English language does not have gendered versions of these terms. If we refer to a specific person, then using a gendered pronoun is appropriate. There can also be other cases where it is inappropriate for us to update the existing examples within the Git codebase, such as: * References to real people (e.g. Linus Torvalds, "the Git maintainer"). Do not misgender real people. If there is any doubt to the gender of a person, then use singular "they". * References to fictional people with clear genders (e.g. Alice and Bob). * Sample text used in test cases (e.g t3702, t6432). * The official text of the GPL license contains uses of "he or she", but modifying the license this way is not within the scope of the Git project. * Literal email messages in Documentation/howto/ should not be edited for grammatical concerns such as this, unless we update the entire document to fit the standard documentation format. If such an effort is taken on, then the authorship would change and no longer refer to the exact mail message. * External projects consumed in contrib/ should not deviate solely for style reasons. Recommended edits should be contributed to those projects directly. Other cases within the Git project were cleaned up by the previous changes. Helped-by: Junio C Hamano Signed-off-by: Derrick Stolee --- Documentation/CodingGuidelines | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index e3af089ecf26..c75da9d131cb 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -648,3 +648,10 @@ Writing Documentation: inline substituted text+ instead of `monospaced literal text`, and with the former, the part that should not get substituted must be quoted/escaped. + + Refer to an anonymous user in a gender neutral way. Singular "they/them" + pronouns are preferred over "he/him" and "she/her". Do not use more + complicated constructs such as "he or she" or "s/he". When in doubt about + how to use this pronoun, then change your sentence to use singular "you" + (e.g. "When you want to do X, do Y") or plural "they" (e.g. "When users + want to do X, they can do Y.").