Page MenuHomePhabricator

Reconsidering how we name things
Closed, ResolvedPublic

Assigned To
None
Authored By
Reedy
Jun 6 2020, 12:49 PM
Referenced Files
None
Tokens
"Love" token, awarded by Rexogamer."Y So Serious" token, awarded by valerio.bozzolan."Love" token, awarded by nshahquinn-wmf."Like" token, awarded by Lens0021."Love" token, awarded by mpopov."Love" token, awarded by kostajh."Love" token, awarded by Kormat."Like" token, awarded by MusikAnimal."Dislike" token, awarded by BEANS-X2."Like" token, awarded by Darren-M."Love" token, awarded by Ainali."Love" token, awarded by Jaideraf."Like" token, awarded by Kghbln."Like" token, awarded by apaskulin."Like" token, awarded by Jdforrester-WMF."Love" token, awarded by Krinkle."Like" token, awarded by Aklapper."Love" token, awarded by Ladsgroup."Like" token, awarded by Amire80.

Description

So, with the current climate I'm starting to see people reminding other people that the use of Blacklist and Whitelist are outdated, and shouldn't be used. Unfortunately MediaWiki and the ecosystem uses this in numerous places.

Similar for Master and Slave, though MW replaced Slave with Replica years ago (in 950cf6016c10953213e5f985dfc18a32d8673197 and T190395 is/was for some cleanup); see https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/thread/F7N6OH6DMHURB4PPKX235L22XWZEKLFQ/. I don't know if Master is offensive on its own (ie it's used as a title for young males rather than Mr, at least in the UK), potentially only when used with Slave as a label, but we could still replace this with primary. It might be worth checking if it's still used upstream for consistency (which seemed to be at least part of the introduction of DB_REPLICA). wfWaitForSlaves() is still around, but only ~80 usages as of writing, T181673.

Use Safe and Block. Use Allow and Deny. Use Inclusion and Exclusion. Use Permit and Deny. All of these can be used with a trailing List too

I'm not looking to bike shed, we should pick one and then move forward.

I understand in the case of a couple of extensions (that immediately come to mind, I've not grepped our codebases) this gets a bit awkward and takes some work. I think it's worth the effort. We can easily enough soft rename/fix wording. i18n strings are easily improved. Replacing i18n keys is a little harder, but if we ask translatewiki.net nicely we can do that (and can be done without renaming the extension just yet). Onwiki pages a little harder still, maybe we have some back compat for a while, checking both the old and new name to allow time for renaming/moving of pages, removing this in the near future.

The "hardest" is renaming the repos (at least, for WMF deployment purposes), which also allows us to actually rename the extensions (we know that the name attribute in the extension.json needs to make the directory it's in). Again, it's awkward, but git makes it relatively trivial, as we can just push all one remote to the other.

We can branch both for a couple of deployment cycles, and update the includes/references in CommonSettings.php and extension-list and then stop branching the old names and archive them as usual.

None of this is particularly dificult, just needs a bit of effort

Then obviously updating all Documentation to match

Based on P11408 (June 2020), the use of things that match (white|black) ?list is a lot higher than I expected. But for example, 1828 are in one of the named extensions, 1401 in another...

P14950 is a list from mid April 2021. P14956 is just for MW extensions, ordered by directory instead

P16698 is a list from late June 2021. P16697 is just for MW extensions

See also:

Details

SubjectRepoBranchLines +/-
mediawiki/services/parsoidmaster+24 -20
operations/puppetproduction+4 -4
operations/puppetproduction+23 -25
operations/puppetproduction+10 -10
operations/puppetproduction+14 -14
labs/privatemaster+16 -0
operations/puppetproduction+22 -26
mediawiki/tools/minus-xmaster+2 -2
mediawiki/coremaster+2 -2
mediawiki/extensions/SpamBlacklistmaster+14 -14
mediawiki/coremaster+824 -1 K
mediawiki/vendormaster+7 K -5 K
mediawiki/coremaster+4 -4
oojs/uimaster+6 -6
mediawiki/coremaster+13 -13
mediawiki/coremaster+7 -7
mediawiki/coremaster+56 -57
mediawiki/services/parsoidmaster+5 -5
mediawiki/libs/Shellboxmaster+1 -1
CLDRPluralRuleParsermaster+1 -1
mediawiki/libs/Minifymaster+1 -1
mediawiki/coremaster+9 -9
mediawiki/coremaster+126 -137
mediawiki/coremaster+140 -152
mediawiki/coremaster+102 -117
mediawiki/services/parsoidmaster+10 -10
mediawiki/tools/phan/SecurityCheckPluginmaster+1 -1
mediawiki/tools/codesniffermaster+1 -1
mediawiki/libs/RemexHtmlmaster+1 -1
mediawiki/libs/Minifymaster+1 -1
mediawiki/libs/Assertmaster+2 -2
cdbmaster+1 -1
mediawiki/extensions/GraphVizmaster+2 -2
mediawiki/extensions/TranslationNotificationsmaster+2 -2
mediawiki/extensions/Babelmaster+2 -2
mediawiki/extensions/Translatemaster+53 -53
mediawiki/extensions/AntiSpoofmaster+4 -4
mediawiki/extensions/ArticleFeedbackv5master+8 -8
mediawiki/extensions/Echomaster+38 -38
mediawiki/extensions/EventBusmaster+14 -14
mediawiki/coremaster+146 -146
mediawiki/extensions/CentralAuthmaster+124 -94
mediawiki/extensions/MachineVisionmaster+11 -11
mediawiki/extensions/CreditsSourcemaster+2 -2
mediawiki/extensions/UserMergemaster+4 -4
mediawiki/extensions/PropertySuggestermaster+3 -3
mediawiki/extensions/ShortUrlmaster+6 -6
mediawiki/extensions/ReadingListsmaster+14 -14
mediawiki/extensions/WikimediaEditorTasksmaster+8 -8
mediawiki/extensions/WikibaseQualityConstraintsmaster+5 -5
mediawiki/extensions/NSFileRepomaster+2 -2
mediawiki/coremaster+101 -101
mediawiki/coremaster+5 -5
mediawiki/extensions/TimedMediaHandlermaster+15 -15
mediawiki/coremaster+100 -60
mediawiki/coremaster+1 -1
mediawiki/coremaster+162 -162
operations/softwaremaster+12 -12
mediawiki/coremaster+1 -1
analytics/refinery/sourcemaster+194 -175
mediawiki/coremaster+3 -9
mediawiki/coremaster+33 -33
mediawiki/extensions/GrowthExperimentsmaster+464 -159
mediawiki/coremaster+29 -3
mediawiki/extensions/GlobalPreferencesmaster+11 -9
mediawiki/extensions/VisualEditormaster+1 -1
VisualEditor/VisualEditormaster+9 -9
operations/mediawiki-configmaster+1 -1
mediawiki/extensions/Echomaster+6 -6
operations/puppetproduction+24 -24
labs/privatemaster+0 -42
operations/mediawiki-configmaster+1 -1
operations/puppetproduction+3 -3
mediawiki/coremaster+2 -50
mediawiki/extensions/CirrusSearchmaster+71 -41
operations/puppetproduction+3 -3
operations/puppetproduction+26 -26
labs/privatemaster+42 -0
mediawiki/coremaster+32 -22
mediawiki/coremaster+36 -26
operations/puppetproduction+1 -1
operations/puppetproduction+1 -1
mediawiki/extensions/CentralAuthmaster+0 -19
mediawiki/coremaster+4 -3
mediawiki/coremaster+27 -27
mediawiki/extensions/Citemaster+1 -1
mediawiki/extensions/VisualEditormaster+1 -1
mediawiki/extensions/VisualEditormaster+6 -6
mediawiki/coremaster+0 -3
mediawiki/extensions/Flowmaster+1 -1
VisualEditor/VisualEditormaster+10 -8
mediawiki/extensions/DiscussionToolsmaster+1 -1
mediawiki/extensions/Echomaster+9 -9
mediawiki/extensions/GWToolsetmaster+1 -1
mediawiki/extensions/OAuthmaster+1 -1
mediawiki/extensions/FileImportermaster+1 -1
mediawiki/extensions/Renameusermaster+2 -2
mediawiki/extensions/WikimediaMaintenancemaster+3 -3
mediawiki/coremaster+8 -8
mediawiki/coremaster+4 -4
mediawiki/extensions/CentralAuthmaster+1 -1
mediawiki/skins/Daddiomaster+1 -1
mediawiki/extensions/AntiSpoofmaster+2 -2
mediawiki/extensions/Flowmaster+18 -18
mediawiki/skins/Modernmaster+1 -1
mediawiki/coremaster+7 -7
mediawiki/coremaster+7 -6
mediawiki/extensions/ArticlePlaceholdermaster+17 -17
mediawiki/extensions/VisualEditormaster+48 -49
mediawiki/extensions/VisualEditormaster+3 -3
mediawiki/extensions/VisualEditormaster+1 -1
VisualEditor/VisualEditormaster+2 -2
mediawiki/extensions/BetaFeaturesmaster+13 -8
VisualEditor/VisualEditormaster+10 -10
mediawiki/extensions/OAuthmaster+10 -8
mediawiki/extensions/FlaggedRevsmaster+9 -9
mediawiki/coremaster+6 -30
mediawiki/extensions/CentralAuthmaster+7 -7
mediawiki/extensions/PageTriagemaster+2 -2
mediawiki/extensions/CentralAuthmaster+24 -24
mediawiki/extensions/Echomaster+7 -7
mediawiki/coremaster+1 -1
mediawiki/coremaster+3 -3
mediawiki/coremaster+10 -10
mediawiki/extensions/SpamBlacklistmaster+8 -8
Show related patches Customize query in gerrit

Related Objects

StatusSubtypeAssignedTask
ResolvedNone
ResolvedReedy
Resolvedovasileva
ResolvedJdlrobson
ResolvedLucasWerkmeister
ResolvedReedy
ResolvedArlolra
ResolvedJdforrester-WMF
ResolvedAmmarpad
ResolvedHuji
DeclinedNone
Resolved MattCleinman
ResolvedItamarWMDE
Resolved MattCleinman
Resolved Mholloway
OpenNone
Resolvednshahquinn-wmf
ResolvedReedy
ResolvedJdforrester-WMF
OpenNone
InvalidNone
ResolvedReedy
ResolvedReedy
OpenNone
OpenNone
StalledNone
OpenNone
ResolvedReedy
Resolvedthiemowmde
OpenNone
OpenNone
StalledNone
OpenNone
OpenNone
ResolvedNone
DeclinedNone
ResolvedReedy
DeclinedNone
ResolvedReedy
ResolvedReedy
InvalidNone
ResolvedLGoto
ResolvedJdrewniak
Resolvedsimon04
ResolvedReedy
ResolvedReedy
ResolvedJdlrobson
ResolvedMPGuy2824
ResolvedReedy
ResolvedJdrewniak
OpenNone
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
Resolvedabi_
ResolvedReedy
OpenNone
ResolvedLadsgroup
OpenNone
OpenNone
ResolvedReedy
StalledNone
OpenNone
OpenNone
OpenNone
ResolvedReedy
ResolvedNone
DeclinedNone
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedJdforrester-WMF
OpenNone
OpenNone
StalledNone
Resolvedtaavi
StalledNone
OpenNone
ResolvedUmherirrender
OpenNone
OpenFeatureNone
OpenNone
OpenNone
ResolvedDaimona
ResolvedDaimona
ResolvedDaimona
ResolvedDaimona
ResolvedUrbanecm
DeclinedDaimona
ResolvedDaimona
ResolvedDaimona
ResolvedDaimona
ResolvedDaimona
Resolvedmatej_suchanek
ResolvedDaimona
ResolvedDaimona
Resolvedmatej_suchanek
Resolvedmatej_suchanek
ResolvedPRODUCTION ERRORDaimona
ResolvedDaimona
ResolvedUmherirrender
ResolvedDaimona
ResolvedMarostegui
Resolved Bstorm
ResolvedDaimona
ResolvedUrbanecm
ResolvedMarostegui
Resolvedrook
OpenFeatureNone
OpenLadsgroup
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
OpenNone
ResolvedDbrant
Resolvedthcipriani
OpenNone
InvalidNone
Resolvedthcipriani
OpenNone
ResolvedJdforrester-WMF
ResolvedNardog
DeclinedNone
ResolvedUniversal_Omega
ResolvedValerioBoz-WMCH
OpenNone

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

Change 740635 merged by jenkins-bot:

[mediawiki/core@master] Remove or replace usages of \"sane\"

https://gerrit.wikimedia.org/r/740635

Change 740342 merged by jenkins-bot:

[oojs/ui@master] docs: Remove or replace usages of \"sanity\"

https://gerrit.wikimedia.org/r/740342

Change 741107 had a related patch set uploaded (by Jforrester; author: Jforrester):

[mediawiki/core@master] tests/phpunit/unit/includes/tidy/html5lib-tests.json: Avoid use of 'insanely' in a comment

https://gerrit.wikimedia.org/r/741107

Change 741107 merged by jenkins-bot:

[mediawiki/core@master] tests/phpunit/unit/includes/tidy/html5lib-tests.json: Avoid use of 'insanely' in comments

https://gerrit.wikimedia.org/r/741107

Change 742570 had a related patch set uploaded (by Sbailey; author: Sbailey):

[mediawiki/vendor@master] Bump Parsoid to 0.15.0-a11

https://gerrit.wikimedia.org/r/742570

Change 742570 merged by jenkins-bot:

[mediawiki/vendor@master] Bump Parsoid to 0.15.0-a11

https://gerrit.wikimedia.org/r/742570

Is it desired to also update Phab tasks as part of this? e.g. I renamed/updated the description of T129093 before it occurred to me to actually check, but searching through this task's history, this question doesn't appear to have been asked or discussed before now.

@Dinoguy1000 I don't think you should do that- "SHOW REPLICA STATUS"; is not a valid mariadb command (yet- it started being accepted on 10.5), "SHOW SLAVE STATUS" is the working command that has to be sent- we don't have a choice on that. <strike>I think you should file an upstream bug instead to mariadb to ask to rename the command</strike> You can file a ticket to use SHOW REPLICA STATUS once we stop supporting <10.5, but as a separate ticket- otherwise those kind of edits would be confusing (they are not names we can chose to change- yet, unlike other identifiers).

@Dinoguy1000 I don't think you should do that- "SHOW REPLICA STATUS"; is not a valid mariadb command, "SHOW SLAVE STATUS" is the working command that has to be sent- we don't have a choice on that. I think you should file an upstream bug instead to mariadb to ask to rename the command, but otherwise those kind of edits would be confusing (they are not names we can chose to change- yet, unlike other identifiers).

Aah, I didn't realize those were commands rather than just text. I'll change the task back in that case.

I think your intentions were good :-). I edited my comment, it started to be supported since MariaDB 10.5 and once we can stop supporting other versions, we should use the new command- for the sake of consistency (primary/replica) :-D.

I had a look at https://inclusivenaming.org/ which was linked to recently in https://www.linuxfoundation.org/blog/addressing-diversity-equity-and-inclusion-in-2021-and-beyond/ Some recommendations they make that are not on this task yet: abort -> fail/cancel/close etc (Tier one list https://inclusivenaming.org/word-lists/tier-1/ ), segregate -> segment/separate (Tier three list https://inclusivenaming.org/word-lists/tier-3/ ). Noting those here so folks can decide whether to make those changes as well.

Is it desired to also update Phab tasks as part of this?

No one ever actually answered this question, either. I don't know if it would be worth going out of our way to find and update Phab tasks, but I'd at least like to know I wouldn't be stepping on any toes if I update tasks I happen to run across when catching up on email or looking for things or the like.

Is it desired to also update Phab tasks as part of this?

No one ever actually answered this question, either. I don't know if it would be worth going out of our way to find and update Phab tasks, but I'd at least like to know I wouldn't be stepping on any toes if I update tasks I happen to run across when catching up on email or looking for things or the like.

I think it would be good to update the wording in open tasks, as we naturally find them whilst doing other things/reading, but I agree it's not worth trying to do a mass change (manual or semi-automated) to all tasks especially closed ones (both for email-deluge reasons and historic-clarity reasons).

Is it desired to also update Phab tasks as part of this?

No one ever actually answered this question, either. I don't know if it would be worth going out of our way to find and update Phab tasks, but I'd at least like to know I wouldn't be stepping on any toes if I update tasks I happen to run across when catching up on email or looking for things or the like.

Also I don't think that the new language should be introduced retroactively into closed tasks. Rewriting of history sounds way too Orwellian.

I think it would be good to update the wording in open tasks, as we naturally find them whilst doing other things/reading

I agree with @Quiddity.

I don't think that the new language should be introduced retroactively into closed tasks. Rewriting of history sounds way too Orwellian.

I would not call editing Phab tasks (or, editing wiki pages) "rewriting of history". Both offer a public history of changes.

Change 753557 had a related patch set uploaded (by Jforrester; author: Jforrester):

[mediawiki/core@master] Update OOUI to v0.43.0

https://gerrit.wikimedia.org/r/753557

Change 753557 merged by jenkins-bot:

[mediawiki/core@master] Update OOUI to v0.43.0

https://gerrit.wikimedia.org/r/753557

Change 786933 had a related patch set uploaded (by Amire80; author: Amire80):

[mediawiki/extensions/SpamBlacklist@master] Replace "blacklist" with "block list" in messages

https://gerrit.wikimedia.org/r/786933

Change 786933 merged by jenkins-bot:

[mediawiki/extensions/SpamBlacklist@master] Replace "blacklist" with "block list" in messages

https://gerrit.wikimedia.org/r/786933

This shouldn't be a bikeshed discussion. We should use terminology that is clear, succinct, and literal.

Deny - Allow is a good combination because these are short, and can be turned into compound nouns: allowlist, denylist.

Original - Replica is better than Primary - Replica, because the latter is not parallel structure. Parallel structure would be Primary - Secondary, and that usage may imply additional meanings that are not always true.

I don’t believe anyone is bikeshedding.

I'm just curious if there is a subtask to change this configuration:

https://www.mediawiki.org/wiki/Manual:$wgWhitelistRead

(If yes, we can affix a {{tracked}})

I'm just curious if there is a subtask to change this configuration:

https://www.mediawiki.org/wiki/Manual:$wgWhitelistRead

(If yes, we can affix a {{tracked}})

T277987: Address Voice and Tone issues in MediaWiki Core is probably the closest.

Change 807154 had a related patch set uploaded (by DannyS712; author: DannyS712):

[mediawiki/core@master] FileModule: replace 'master' with 'primary' in comments

https://gerrit.wikimedia.org/r/807154

Change 807154 merged by jenkins-bot:

[mediawiki/core@master] FileModule: replace 'master' with 'primary' in comments

https://gerrit.wikimedia.org/r/807154

Hopefully this is the right place to ask. I am not an English native speaker, so while I can sometimes get technical terms, I don't necessarily get the nuances and context, and history of the words. Hopefully you can give me some advice:

I want to create a quick tool to do some debugging for a Wikipedia-related service. It is important to name the tool to make sure it is identified, not as a proper solution, but as a quick alternative to test a bug. I've heard in the past the expression "poor man's X", for example for Linux one-liners that substitute a proper built tool. However, that doesn't sound to me as very inclusive. The obvious change, "poor person's X" also doesn't look right to me. Can you suggest alternatives that don't refer the gender or economic level of a person, but still convey the quickly put together nature of it? Please apologies if I am making already a mistake while asking.

Hopefully this is the right place to ask. I am not an English native speaker, so while I can sometimes get technical terms, I don't necessarily get the nuances and context, and history of the words. Hopefully you can give me some advice:

I want to create a quick tool to do some debugging for a Wikipedia-related service. It is important to name the tool to make sure it is identified, not as a proper solution, but as a quick alternative to test a bug. I've heard in the past the expression "poor man's X", for example for Linux one-liners that substitute a proper built tool. However, that doesn't sound to me as very inclusive. The obvious change, "poor person's X" also doesn't look right to me. Can you suggest alternatives that don't refer the gender or economic level of a person, but still convey the quickly put together nature of it? Please apologies if I am making already a mistake while asking.

@jcrespo We recently used the word "makeshift" to describe something like this. https://english.stackexchange.com/questions/216073/alternatives-to-the-expression-poor-mans-noun also has some ideas.

Change 893412 had a related patch set uploaded (by Hashar; author: Hashar):

[operations/puppet@production] contint: Jenkins master > controller

https://gerrit.wikimedia.org/r/893412

Change 892969 had a related patch set uploaded (by Krinkle; author: Reedy):

[mediawiki/tools/minus-x@master] README.md: Replace usage of whitelist

https://gerrit.wikimedia.org/r/892969

Change 892969 merged by jenkins-bot:

[mediawiki/tools/minus-x@master] README.md: Replace usage of whitelist

https://gerrit.wikimedia.org/r/892969

Bolding resolving this task, a lot of work has progressed in the last ~three years since the original push of this task. Individual tasks relating to the goal can easily be tracked under Voice & Tone and means comments won't get missed in a stack of patchset comments.

Change 893412 merged by Jbond:

[operations/puppet@production] contint: Jenkins master > controller

https://gerrit.wikimedia.org/r/893412

Change 907885 had a related patch set uploaded (by Hashar; author: Hashar):

[operations/puppet@production] ci: rename ci::master role to ci::manager

https://gerrit.wikimedia.org/r/907885

Change 907898 had a related patch set uploaded (by Hashar; author: Hashar):

[labs/private@master] ci: add secreats for ci::manager and ci::worker roles

https://gerrit.wikimedia.org/r/907898

Change 907898 merged by Hashar:

[labs/private@master] ci: add secreats for ci::manager and ci::worker roles

https://gerrit.wikimedia.org/r/907898

Change 907885 merged by Jbond:

[operations/puppet@production] ci: rename ci::master role to ci

https://gerrit.wikimedia.org/r/907885

Change 922515 had a related patch set uploaded (by Hashar; author: Hashar):

[operations/puppet@production] contint: Jenkins slave > agent

https://gerrit.wikimedia.org/r/922515

Change 922554 had a related patch set uploaded (by Hashar; author: Hashar):

[operations/puppet@production] contint: set Jenkins agent username from hiera

https://gerrit.wikimedia.org/r/922554

Change 922555 had a related patch set uploaded (by Hashar; author: Hashar):

[operations/puppet@production] contint: rename jenkins-slave to jenkins-agent

https://gerrit.wikimedia.org/r/922555

Change 922515 merged by Jbond:

[operations/puppet@production] contint: Jenkins slave > agent

https://gerrit.wikimedia.org/r/922515

Change 922554 merged by Jbond:

[operations/puppet@production] contint: set Jenkins agent username from hiera

https://gerrit.wikimedia.org/r/922554

Change 922555 merged by Jelto:

[operations/puppet@production] contint: rename jenkins-slave to jenkins-agent

https://gerrit.wikimedia.org/r/922555

Mentioned in SAL (#wikimedia-operations) [2023-12-13T10:11:10Z] <hashar@deploy2002> Started deploy [releng/jenkins-deploy@77b3681] (releasing): Rename jenkins-slave to jenkins-agent - T254646

Mentioned in SAL (#wikimedia-operations) [2023-12-13T10:11:53Z] <hashar@deploy2002> Finished deploy [releng/jenkins-deploy@77b3681] (releasing): Rename jenkins-slave to jenkins-agent - T254646 (duration: 00m 42s)

Change 992813 had a related patch set uploaded (by C. Scott Ananian; author: C. Scott Ananian):

[mediawiki/services/parsoid@master] Replace use of deprecated tier 1 term in test title with neutral "bail"

https://gerrit.wikimedia.org/r/992813

Change 992813 merged by jenkins-bot:

[mediawiki/services/parsoid@master] Replace use of deprecated tier 1 term in test title with neutral "bail"

https://gerrit.wikimedia.org/r/992813