Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wording changes #25314

Closed
wants to merge 1 commit into from
Closed

Conversation

Buzzardo
Copy link
Contributor

@Buzzardo Buzzardo commented Jun 24, 2020

Replace potentially insensitive language with more neutral language.

Note that there are lots of code items (method names, for example) that
also need to change.

Changed the language of oppression and violence to more neutral terms.

Note that there are lots of code items (method names, for example) that
also need to change.
@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged or decided on label Jun 24, 2020
@sbrannen sbrannen self-assigned this Jun 24, 2020
@sbrannen sbrannen added type: documentation A documentation task and removed status: waiting-for-triage An issue we've not yet triaged or decided on labels Jun 24, 2020
@sbrannen sbrannen added this to the 5.2.8 milestone Jun 24, 2020
@sbrannen
Copy link
Member

Thanks for the PR!

We'll get this merged in for 5.2.x and consider backporting.

Do you have plans to make a pass through the Javadoc as well (perhaps in a follow up PR)?

@Buzzardo
Copy link
Contributor Author

Buzzardo commented Jun 24, 2020

I forgot about the Javadoc. Thanks for the reminder, Sam. I'll add it to my todo list. Edit to add: So, yes, a separate PR.

@jhoeller
Copy link
Contributor

@sbrannen @Buzzardo While finding a neutral tone for such statements in the documentation is certainly a worthwhile goal, we need to pay attention that we're not making the javadocs less clear. What I mean here is in particular the term "execute" (as commonly handled in this PR); that term is very common in many core Java APIs. Our own use of the term is almost always connected to its use in core Java, so there isn't much we can do about it in our own code-level language either. All in all, arguably we should preserve the use of "execute" where it directly refers to API artifacts (which is in particular the case in javadocs), keeping the language in the javadoc in line with the language of the API itself.

@sbrannen sbrannen closed this in 1c83b3f Jul 20, 2020
sbrannen pushed a commit that referenced this pull request Jul 20, 2020
Replace potentially insensitive language with more neutral language.

See gh-25314
FelixFly pushed a commit to FelixFly/spring-framework that referenced this pull request Aug 16, 2020
Replace potentially insensitive language with more neutral language.

Closes spring-projectsgh-25314
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: documentation A documentation task
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants