Skip to content
This repository has been archived by the owner on Sep 30, 2020. It is now read-only.

Use American spelling of behavior in en-US #1062

Merged
merged 1 commit into from
Mar 6, 2018
Merged

Use American spelling of behavior in en-US #1062

merged 1 commit into from
Mar 6, 2018

Conversation

dphm
Copy link
Contributor

@dphm dphm commented Mar 6, 2018

I personally don't use the American spelling (as a Canadian), but I did a double-take when I read behaviour on an en-US page. 😅

r? @steveklabnik

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @steveklabnik (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. Thanks a ton!

@steveklabnik steveklabnik merged commit 0b9f71c into rust-lang:master Mar 6, 2018
@dphm dphm deleted the american-spelling branch March 6, 2018 16:51
davidalber added a commit to davidalber/rust-conduct-conformulator that referenced this pull request Mar 7, 2018
davidalber added a commit to davidalber/rustfmt that referenced this pull request Mar 7, 2018
davidalber added a commit to davidalber/rustfmt that referenced this pull request Mar 7, 2018
davidalber added a commit to davidalber/rust that referenced this pull request Mar 7, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 12, 2018
…labnik

Propagating upstream code of conduct changes

[This repository's code of conduct](https://github.com/rust-lang/rust/blob/master/CODE_OF_CONDUCT.md) is out of sync with the [rust-www code of conduct](https://github.com/rust-lang/rust-www/blob/master/en-US/conduct.md) due changes from rust-lang/prev.rust-lang.org#1062. This PR propagates those changes and brings the files back into sync.

r? @steveklabnik
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants