Skip to content

Conversation

@gustafn
Copy link
Contributor

@gustafn gustafn commented Jul 16, 2020

CLA: trivial

This change applies the recommendation of the Linux Documentation Project
to the documentation files of OpenSSL. Additionally, util/find-doc-nits
was updated accordingly.

The change follows a suggestion of mspncp on #12370

Checklist
  • documentation is added or updated

Copy link
Contributor

@mspncp mspncp left a comment

Choose a reason for hiding this comment

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

LGTM

@mspncp mspncp added approval: review pending This pull request needs review by a committer branch: master Applies to master branch labels Jul 16, 2020
@t-j-h
Copy link
Member

t-j-h commented Jul 16, 2020

This is not a trivial change IMHO. It requires a CLA. I would otherwise approve it.

@t-j-h t-j-h added the hold: cla required The contributor needs to submit a license agreement label Jul 16, 2020
@mspncp
Copy link
Contributor

mspncp commented Jul 16, 2020

Hmm... I thought it was consensus to consider spelling corrections as not copyrightable?

@t-j-h
Copy link
Member

t-j-h commented Jul 16, 2020

These aren't spelling corrections ... and it does come to the scope of a change moving from trivial to non-trivial.

'file name' => 'filename',
'file system' => 'filesystem',
'host name' => 'hostname',
'host name' => 'hostname',
Copy link
Member

Choose a reason for hiding this comment

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

Look like a duplicate?

'non-blocking' => 'nonblocking',
'non-default' => 'nondefault',
'non-empty' => 'nonempty',
'non-negative' => 'non-negative',
Copy link
Member

Choose a reason for hiding this comment

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

??

'super-user' => 'superuser',
'sub-system' => 'subsystem',
'super block' => 'superblock',
'super user' => 'superuser',
Copy link
Member

Choose a reason for hiding this comment

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

move this down one.

'useable' => 'usable',
'userspace' => 'user space',
'user name' => 'username',
'user name' => 'username',
Copy link
Member

Choose a reason for hiding this comment

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

duplicate again?

Copy link
Member

@slontis slontis left a comment

Choose a reason for hiding this comment

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

util/find-doc-nits needs some changes..
I also think a CLA is required.

Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

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

Agreed a CLA is required.

gustafn added a commit to gustafn/openssl that referenced this pull request Jul 17, 2020
This change addresses the issues in the pull request
openssl#12460
by essentially removing duplicate lines, changed order
of lines (actually away from a lexicographical order)
and fixed one false positive.

An ICLA is filed.
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jul 17, 2020
@gustafn
Copy link
Contributor Author

gustafn commented Jul 17, 2020

Although i share the opinion of mspncp (how can the application of publicly accepted spelling rules create a copyright infringement claim?) i know as main contributor of a larger long-term projects with many contributors that e.g. license updates can be a pain in such project. So i have filed an ICLA via email to the requested address.

It is my understanding that

  • sooner or later you will have my email-address on file such that
  • a "CLA: trivial" or some other explicit reference to a "CLA" will be needed in the future.

All requested changes are addressed in the updated branch

@t-j-h
Copy link
Member

t-j-h commented Jul 17, 2020

Remove the CLA: trivial header and once your CLA is registered (I saw it come in) then you just close and open the case to trigger a recheck and it will be good to proceed. Thanks for taking that step quickly - the change and your CLA are very much appreciated.

@gustafn gustafn force-pushed the master-linux-doc-compatibility branch from 57b3023 to 763b1e2 Compare July 17, 2020 10:15
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Jul 17, 2020
@gustafn
Copy link
Contributor Author

gustafn commented Jul 17, 2020

Remove the CLA: trivial header

In order change the previous commit message, i did a "git reset" in the feature branch to the change before my first commit, did a new commit without the "CLA: trivial" and a "git push -f". I hope, this is what was intended.

you just close and open the case to trigger a recheck.

Ok, i will close and reopen this pull request after some time (e.g. this evening).

This change applies the recommendation of the Linux Documentation Project
to the documentation files of OpenSSL. Additionally, util/find-doc-nits
was updated accordingly.

The change follows a suggestion of mspncp on openssl#12370
and incoporates the requested changes on the pull request
@gustafn gustafn force-pushed the master-linux-doc-compatibility branch from 763b1e2 to 09794ea Compare July 17, 2020 10:33
@gustafn gustafn closed this Jul 17, 2020
@gustafn gustafn reopened this Jul 17, 2020
@slontis
Copy link
Member

slontis commented Jul 18, 2020

In order change the previous commit message, i did a "git reset

FYI:
If you only need to fix the last commit like this you can just do

git commit --amend

It still requires the force push..

For multiple commits you can use

git rebase -i master

And then edit the commit line you need to change to use 'r' (reword)

@gustafn gustafn closed this Jul 18, 2020
@gustafn gustafn reopened this Jul 18, 2020
@mspncp
Copy link
Contributor

mspncp commented Jul 18, 2020

@gustafn it seems like your email address hasn’t been added to the database yet. Whoever does it will reopen your ticket to kick the CLA bot, so you need not worry about it.

@mattcaswell
Copy link
Member

Close/reopen to kick CLA bot.

@mattcaswell mattcaswell reopened this Jul 20, 2020
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jul 20, 2020
@slontis slontis added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jul 20, 2020
@openssl-machine openssl-machine removed the approval: done This pull request has the required number of approvals label Jul 22, 2020
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@openssl-machine openssl-machine added the approval: ready to merge The 24 hour grace period has passed, ready to merge label Jul 22, 2020
openssl-machine pushed a commit that referenced this pull request Jul 22, 2020
This change applies the recommendation of the Linux Documentation Project
to the documentation files of OpenSSL. Additionally, util/find-doc-nits
was updated accordingly.

The change follows a suggestion of mspncp on #12370
and incoporates the requested changes on the pull request

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from #12460)
@mspncp
Copy link
Contributor

mspncp commented Jul 22, 2020

Merged to master in 490c871. Thank you @gustafn!

@mspncp mspncp closed this Jul 22, 2020
@gustafn gustafn deleted the master-linux-doc-compatibility branch July 23, 2020 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants