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

Eliminate more spelling differences between American and British English #3392

Merged
merged 8 commits into from
Feb 23, 2024

Conversation

lgoettgens
Copy link
Member

Follow-up to #3367 with even more things I found.

This introduces two new deprecations, namely:

  • labelled_matrix_formatted -> labeled_matrix_formatted
  • recognise -> recognize (in the SolveRadical submodule)

Can someone with access to the book please check, if these deprecations are an issue?

@lgoettgens lgoettgens added the backport 1.0.x Should be backported to the release 1.0 branch label Feb 19, 2024
@joschmitt
Copy link
Member

The functions are not used in the book. But a general question: I understand that we want to have consistency with function names, but is the policy now to enforce American spelling in the documentation too?

@aaruni96 aaruni96 mentioned this pull request Feb 20, 2024
33 tasks
Copy link
Member

@fingolfin fingolfin left a comment

Choose a reason for hiding this comment

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

I am fine with that, but if this is now the standard, we should document it at such, too, if we don't already (not a blocker for this PR, though)

@lgoettgens
Copy link
Member Author

If we want to have these two function renamings in 1.0, please go ahead with merging.

@benlorenz benlorenz merged commit 898f41a into oscar-system:master Feb 23, 2024
20 checks passed
benlorenz pushed a commit that referenced this pull request Feb 23, 2024
…ish (#3392)

* `behaviour` -> `behavior`

* `labelled` -> `labeled`

* `modelled` -> `modeled`

* `cancelled` -> `canceled`

* `cancellation` -> `cancelation`

* `regocnise` -> `recognize`

* More `-ise-` -> `-ize-`

* `-re` -> `-er`

(cherry picked from commit 898f41a)
@lgoettgens lgoettgens deleted the lg/spelling branch February 23, 2024 09:17
@benlorenz benlorenz removed the backport 1.0.x Should be backported to the release 1.0 branch label Feb 23, 2024
benlorenz added a commit that referenced this pull request Feb 23, 2024
### Backported PRs

- [x] #3367
- [x] #3379 
- [x] #3369
- [x] #3291
- [x] #3325
- [x] #3350 
- [x] #3351
- [x] #3365 
- [x] #3366
- [x] #3382
- [x] #3373
- [x] #3341
- [x] #3346
- [x] #3381
- [x] #3385
- [x] #3387 
- [x] #3398 
- [x] #3399 
- [x] #3374 
- [x] #3406 
- [x] #2823
- [x] #3298
- [x] #3386 
- [x] #3412 
- [x] #3392 
- [x] #3415 
- [x] #3394
- [x] #3391
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants