-
-
Notifications
You must be signed in to change notification settings - Fork 11k
Add UK/US warnings and fix them #10079
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
Conversation
|
BTW ping @mattcaswell |
util/find-doc-nits
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both sides the same?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
forgot to commit before pushing; updated commit.
util/find-doc-nits
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
surely initialisation must be used somewhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wow, good catch. will add it and push a new commit.
|
Other possible words: center -> centre |
|
Try this: Does this change the view that we want UK wording? |
|
Added Matt's list, fixed the errors, pushed a new commit. |
|
The apropos should make difference... quite a lot of manuals go for US English, so... plus, you gotta spell "initialis" right 😉 |
mattcaswell
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
Rather than typing it in, here's a cut/paste of real output on my machine (Debian something) Is OpenSSL going in the wrong direction by using UK spelling? |
|
After all, we just went through a lot of trouble to follow the man7 recommendations... |
Do you have a reference/link to spelling recommendations on man7.org? |
|
Never mind, I found it ( |
|
I just sent email to openssl-project asking the OMC to formally decide on a policy. |
|
Someone please mark this on HOLD until the decision. |
|
Apropos: all these recent man7 changes have not been backported to 1.1.1. Shouldn't that be done in order to avoid a cherry-picking nightmare for 1.1.1 LTS? |
I see nothing wrong with that. Making it a popularity contest is not a good reason not to, all it shows is that US folks have so far produced the majority of the documentation (for all sorts of reasons) |
|
It is quite possible doing the cherry-pick will be a nightmare. What I would do is take the PR's and get the diff (via GitHub's Or, you could wait until problems actually happen and fix those files. Lucky for me, this topic came up after most of the changes were done. |
No, it doesn't show that. It shows that US spelling has dominated, not that the people writing things were all US people. |
|
My take is that policing the choice of UK/US spelling is probably not a good use of our time. What we need is more documentation. Nobody is confused merely because the spelling happens to be US, UK or even a mixture of the two in different sections of the same document. I'm not opposed to commits that address inconsistencies in spelling within the same sentence or paragraph, variations in spelling can be tolerated, but should not be jarring. I am not in favour of automated normalisation. Even outdated spelling like connexion has its harmless charms if that's what makes the author feel good about writing more text. |
You're right... sorry, tired... |
Heh. Hard to be active in all timezones (europe, us, australia) without some snoozing :) |
Great fear and anxiousness I sense, Padavan. Trust in the force of git you must. The power of automatic rename detection strong is within git. IOW: You will practically never need to save or edit patches, because git can do the job for you much faster. Just do a normal rebase or cherry-pick. Whenever git needs to fall back to 3-way merges, it will do an automatic rename detection. How far it goes back and forth in history (from head-of-master via common-merge-base to head-of-1.1.1) to detect the rename depends on the rename limit. You can increase it if necessary (git will tell you when that's the case). Here are my settings HTH, P.S: No need for GitHub pro-tips to create diffs or patches: you can simply use (Edit: it's |
|
I guess you can teach an old dog new tricks :) But I'm still glad I'm not on the hook for doing it. |
Just name the pr numbers. I'll take care of the backport ;-) |
Ah, don't bother. git will tell me anyway. |
|
There are more coming still waiting for review/merge, but looking at There were various other PR's that impacted the docs which aren't mentioned above, as presumably they had their "backport?" question resolved in the PR. |
|
I have to say I am with @vdukhovni on this. |
|
Was this discussed at the recent F2F? Should I just close this? |
|
We have decided to not shift to US spelling. |
|
And do you want to shift/enforce UK spelling? Should I close this? |
|
Just close I think. |
Update find-doc-nits to report an error when using US instead of UK spelling.
I am not sure if this catches everything, perhaps a subject of the Crown would want to take a look?