Skip to content

Conversation

@richsalz
Copy link
Contributor

Following the style of man7.org, update find-doc-nits to find 'terms to avoid' and suggest their
official replacements.

Do we want to do this? There are about 70 errors found.

Copy link
Member

Choose a reason for hiding this comment

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

Hehehe, is this a US English vs The Queen's English thing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I know policy is UK English, so are there anything to fix in that list? man7.org says to use US English.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not about sure the zeroes to zeros change. The Oxford dictionary notes that zeros is plural and zeroes is a verb.

Make sure your function zeroes memory by filling it with zeros. 😁

Copy link
Member

Choose a reason for hiding this comment

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

Ah, considering we might potentially use the word in both forms, this line should go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Given this:

; g grep -i zeroes     
man1/openssl-ts.pod:seconds, that  need to be included in the time field. The trailing zeroes
man3/BN_bn2bin.pod:B<to>. The result is padded with zeroes if necessary. If B<tolen> is less than
man3/EVP_PKEY_CTX_ctrl.pod:If B<OSSL_EXCHANGE_PARAM_PAD> is 1 then the  shared secret is padded with zeroes
man3/EVP_PKEY_CTX_ctrl.pod:If B<pad> is 1 the shared secret is padded with zeroes up to the size of the DH
man3/HMAC.pod:HMAC_CTX_reset() zeroes an existing B<HMAC_CTX> and associated
man3/d2i_X509.pod:The encoded data is in binary form and may contain embedded zeroes.

And since we can replace the one correct instance with "fills the context with zeros" I'd like to leave it so we catch the five typo's.

Copy link
Member

Choose a reason for hiding this comment

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

I'm ambivalent, frankly. Please do fix the errors, but consider giving a warning instead of an error on zeroes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Another option is to use "zeroise" (sic) instead of "zeroes". But I'll fix the errors and mull it over a bit.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that zeroise is evil.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I used "clear" instead. The main point is that of six instances found, five were wrong. We want to optimize to catch the error.

levitte
levitte previously approved these changes Sep 26, 2019
Copy link
Member

@levitte levitte left a comment

Choose a reason for hiding this comment

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

\b matches \w\W and \W\w boundaries

@richsalz
Copy link
Contributor Author

I updated the commit to add @levitte's regexp fixes. I'll make the actual changes and take this out of WIP once I get feedback on the zeroe?s sub-thread above.

@richsalz
Copy link
Contributor Author

Oh yeah: travis failures are expected until I make the doc fixes. Look at the travis build log if you want to see what it finds.

@levitte levitte dismissed their stale review September 26, 2019 20:31

That wasn't meant as an approval...

@richsalz
Copy link
Contributor Author

Fixed all the errors found, taking this out of WIP.

@richsalz richsalz changed the title WIP: Add wordlist from man7.org Add wordlist from man7.org Sep 27, 2019
@richsalz richsalz mentioned this pull request Sep 27, 2019
@levitte
Copy link
Member

levitte commented Sep 29, 2019

You missed one 😉

doc/internal/man3/ossl_cmp_asn1_octet_string_set1.pod:1: found 'file name' should use 'filename'

@richsalz
Copy link
Contributor Author

yeah it got overwritten by a rebase of your other man/*/internal fixes. :)

@richsalz
Copy link
Contributor Author

richsalz commented Oct 1, 2019

rebased and pushed. doc-nits errors are from the TYPE stuff, which @levitte is going to fix.

@t8m t8m added branch: master Applies to master branch approval: done This pull request has the required number of approvals labels Oct 2, 2019
@richsalz
Copy link
Contributor Author

richsalz commented Oct 2, 2019

I'll have to rebase after the build-breaking PR goes in, so wait on this.

@levitte
Copy link
Member

levitte commented Oct 2, 2019

after the build-breaking PR goes in

Eh... isn't that already merged? 😉

@richsalz
Copy link
Contributor Author

richsalz commented Oct 2, 2019

Yes, I typed too soon. The point is once Travis doc-nits is fixed, I'll have to rebase this. Same for #10039.

Also patch find-doc-nits to ignore a Microsoft trademark and not
flag it as a spelling error.
@richsalz
Copy link
Contributor Author

richsalz commented Oct 2, 2019

Rebased and pushed. I don't know if this needs another review round or not.

@levitte
Copy link
Member

levitte commented Oct 2, 2019

Rebased and pushed. I don't know if this needs another review round or not.

Not if it was a clean rebase

@richsalz
Copy link
Contributor Author

richsalz commented Oct 2, 2019

There were merge issues in find-doc-nits, as to be expected.

@levitte
Copy link
Member

levitte commented Oct 2, 2019

In that case, then yeah

@richsalz
Copy link
Contributor Author

richsalz commented Oct 2, 2019

Thanks. Matt will be pleased because once this is merged I'll do his favourite UK spelling :) PR

@levitte levitte removed the approval: done This pull request has the required number of approvals label Oct 2, 2019
@levitte levitte requested a review from t8m October 2, 2019 20:59
@paulidale paulidale added the approval: done This pull request has the required number of approvals label Oct 2, 2019
levitte pushed a commit that referenced this pull request Oct 3, 2019
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from #10023)
levitte pushed a commit that referenced this pull request Oct 3, 2019
Also patch find-doc-nits to ignore a Microsoft trademark and not
flag it as a spelling error.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from #10023)
@paulidale
Copy link
Contributor

Merged to master. Thanks @richsalz

@paulidale paulidale closed this Oct 3, 2019
@richsalz richsalz deleted the nits-bad-words branch October 3, 2019 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants