Conscious language

[Michael Musgrove]

The Narayana project will soon move to its' next major version and I'd like to use that as an opportunity to ensure that we are following best practices and recommendations in relation to the use of Conscious Language.

The primary change will be the renaming of the main branch to `main`.

[Manuel Finelli]

That is amazing news! Thanks Michael for taking action on this!

On Tue, 8 Nov 2022 at 13:59, Michael Musgrove <michael....@gmail.com> wrote:

The Narayana project will soon move to its' next major version and I'd like to use that as an opportunity to ensure that we are following best practices and recommendations in relation to the use of Conscious Language.

The primary change will be the renaming of the main branch to `main`.

--
You received this message because you are subscribed to the Google Groups "narayana-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to narayana-user...@googlegroups.com.
To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/79981847-f164-4c4c-b73d-d70cbd101f58n%40googlegroups.com.

[Michael Musgrove]

The issue number is https://issues.redhat.com/browse/JBTM-3718. It's currently unassigned (but we need to make the change before releasing 6.0.0.Final).

[Marco Sappe Griot]

Thanks @Michael Musgrove, that sounds great!

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/CAG9sn3Oe%2BrqWo1fJnCj701ReV3cL-Z6gvvqoPEoMMhijKB7TCQ%40mail.gmail.com.

[Marco Sappe Griot]

Hi,
I can take care of that issue, but tomorrow I will be on PTO so I could start working on it on Thursday. Is that ok with everybody?

Marco

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/3b918f55-4fb4-497c-9fa4-fb5330c66b33n%40googlegroups.com.

[Manuel Finelli]

It works for me. Thanks Marco!

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/CANCZ8Wwx-_jcOergy5KUGGNctTqMftJn6d%3Dt4ujrGBjmK93ZRw%40mail.gmail.com.

[Michael Musgrove]

The issue number for this work is https://issues.redhat.com/browse/JBTM-3718 and the target version is 6.next so please don't rename the branch until we have released the last version in the 5.x series. The plan is to release Narayana version `5.13.1.Final` next week and that should be the last 5.x release.

Any other work (beyond the branch rename) relating to the use of Conscious Language can proceed at any time, although resolving JBTM-3718 in one go would make more sense.

[Marco Sappe Griot]

Thanks @Michael Musgrove for the information. I am starting to study the guidelines/recommendations [1][2][3].

I will note all the changes it would be nice to have together with master -> main branch rename and I will discuss them with all of you before proceeding.

The main change might be replace 'master', 'slave', 'whitelist' and 'blacklist' words (when it's appropriate) from narayana, quickstart and performance repos.

My personal choice would be to apply these replacements:

'master' -> main/primary

'slave' -> secondary

'whitelist' -> passlist/allowlist
'blacklist' -> denylist/blocklist

If you would like to adopt a more conscious/inclusive language on these terms, or others I did not mention, please reach out to me (i.e. opening a PR and mentioning me might be a nice way) or discuss it here .

Thanks,

Marco

[1] https://github.com/conscious-lang/conscious-lang-docs/blob/main/recommendations.md

[2] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

[3] https://lkml.org/lkml/2020/7/4/229

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/4c74235a-98e8-41ff-a7d7-3b2931f68bfan%40googlegroups.com.

[Tom Jenkinson]

I think the documentation and website repos should be included too please, Marco.

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/CANCZ8Wx4s9AD98FU1k4YvaXTU0a2wP4%3DLBOuemSHR-fNsv-1Ww%40mail.gmail.com.

[Manuel Finelli]

Great news Marco! Thank you very much for taking care of this! Personally, I like:

'master' -> main

'slave' -> secondary

'whitelist' -> passlist
'blacklist' -> blocklist

On Fri, 11 Nov 2022 at 10:19, Marco Sappe Griot <msap...@redhat.com> wrote:

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/CANCZ8Wx4s9AD98FU1k4YvaXTU0a2wP4%3DLBOuemSHR-fNsv-1Ww%40mail.gmail.com.

[Marco Sappe Griot]

Thanks Manuel and Tom for your input!

I will also check the documentation and website repo!

Regards,

Marco

[Michael Musgrove]

The only branch we use for the website repo is `develop` so I'd say that does not need to change.

[Marco Sappe Griot]

Good morning,

I am glad to announce that all default branches named 'master' of repositories present in https://github.com/jbosstm were renamed this morning into 'main'.

Note that all PRs targeting the 'master' branch were updated, now they are targeting the 'main' branch.

The branch protection rule (if present) was updated.

But this change did not update members' local environments!

If you want to update your local environments you can execute the following commands (thes are the github suggestions):

git branch -m master main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a

In environment using 'upstream' remote instead of 'origin' (if using upstream as a remote name -> check it out with the command 'git remote -vv'):

git branch -m master main
git fetch upstream
git branch -u upstream/main main
git remote set-head upstream -a

The following repositories' branches were updated:

• https://github.com/jbosstm/narayana
• https://github.com/jbosstm/quickstart
• https://github.com/jbosstm/narayana-openshift-tools
• https://github.com/jbosstm/artifacts
• https://github.com/jbosstm/performance
• https://github.com/jbosstm/documentation
• https://github.com/jbosstm/conferences
• https://github.com/jbosstm/jboss-transaction-spi
• https://github.com/jbosstm/transaction-analyser
• https://github.com/jbosstm/jboss-dockerfiles
• https://github.com/jbosstm/project-metadata
• https://github.com/jbosstm/narayana-tomcat
• https://github.com/jbosstm/quarkus
• https://github.com/jbosstm/incubator

For any questions you can answer to this mail or write on zulip https://narayana.zulipchat.com/#narrow/stream/323715-developers/topic/JBTM-3718.3A.20branch.20renaming

Best Regards,

Marco

To view this discussion on the web, visit https://groups.google.com/d/msgid/narayana-users/2a535410-7b98-4a3c-bc6c-330939d5c743n%40googlegroups.com.