From 5232aacf6850eb5eb57243fb257514f5fd9ae0d0 Mon Sep 17 00:00:00 2001 From: Christine Belzie <105683440+CBID2@users.noreply.github.com> Date: Wed, 21 Jun 2023 07:37:17 -0400 Subject: [PATCH 1/4] feat: Add advice on naming the default branch in an inclusive way. --- en-US/Language.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en-US/Language.xml b/en-US/Language.xml index d0d2035..0e9fe97 100644 --- a/en-US/Language.xml +++ b/en-US/Language.xml @@ -1017,6 +1017,8 @@ Do not use "master" when it is paired with "slave". Such use diminishes the horror of the dehumanizing practice of slavery. Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill. + The master and slave mount propagation terminology that is used in Linux is problematic and divisive, and needs to be changed. + When naming the default branch name for a GitHub repository, use "main" instead of "master. Avoid gender bias. From dce3be681eff6f6db954e3638947a1dd8f0e1c0b Mon Sep 17 00:00:00 2001 From: Christine Belzie <105683440+CBID2@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:20:51 -0400 Subject: [PATCH 2/4] Update en-US/Language.xml Co-authored-by: julian-cable <79939933+julian-cable@users.noreply.github.com> --- en-US/Language.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en-US/Language.xml b/en-US/Language.xml index 0e9fe97..94f6c28 100644 --- a/en-US/Language.xml +++ b/en-US/Language.xml @@ -1018,7 +1018,8 @@ Such use diminishes the horror of the dehumanizing practice of slavery. Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill. The master and slave mount propagation terminology that is used in Linux is problematic and divisive, and needs to be changed. - When naming the default branch name for a GitHub repository, use "main" instead of "master. + When naming the default branch name for a GitHub repository, use "main" instead of "master". + Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill. Avoid gender bias. From 20f999c0063db5623bf406ccf824441fce8508ea Mon Sep 17 00:00:00 2001 From: Christine Belzie <105683440+CBID2@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:20:58 -0400 Subject: [PATCH 3/4] Update en-US/Language.xml Co-authored-by: julian-cable <79939933+julian-cable@users.noreply.github.com> --- en-US/Language.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/en-US/Language.xml b/en-US/Language.xml index 94f6c28..39a0137 100644 --- a/en-US/Language.xml +++ b/en-US/Language.xml @@ -1015,7 +1015,6 @@ Do not use "master" when it is paired with "slave". - Such use diminishes the horror of the dehumanizing practice of slavery. Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill. The master and slave mount propagation terminology that is used in Linux is problematic and divisive, and needs to be changed. When naming the default branch name for a GitHub repository, use "main" instead of "master". From b522fa2358858d84a2c38f9d8fbdec4e134eb6e0 Mon Sep 17 00:00:00 2001 From: Christine Belzie <105683440+CBID2@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:21:08 -0400 Subject: [PATCH 4/4] Update en-US/Language.xml Co-authored-by: julian-cable <79939933+julian-cable@users.noreply.github.com> --- en-US/Language.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/en-US/Language.xml b/en-US/Language.xml index 39a0137..f7f15ee 100644 --- a/en-US/Language.xml +++ b/en-US/Language.xml @@ -1015,7 +1015,6 @@ Do not use "master" when it is paired with "slave". - Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill. The master and slave mount propagation terminology that is used in Linux is problematic and divisive, and needs to be changed. When naming the default branch name for a GitHub repository, use "main" instead of "master". Use of "master" is acceptable in other contexts, such as to refer to mastery of a skill.