nayafia / lemonade-stand

A handy guide to financial support for open source
Creative Commons Zero v1.0 Universal
7.36k stars 346 forks source link

various edits throughout #56

Closed wolftune closed 6 years ago

wolftune commented 6 years ago

Hi,

Rather than get into discussing any of the details, I just did edits throughout while reading. Several of my changes are plainly appropriate (Gratipay is gone for example). Others you may not agree with (though I don't think any ought to be controversial) but I think all of them are improvements. I'll consider updating the PR if you have specific concerns but are willing to consider these changes otherwise.

nayafia commented 6 years ago

Hey @wolftune, thanks for these great edits! I made a bunch of comments. LMK what you think.

wolftune commented 6 years ago

I made edits, a couple things I commented on and didn't address yet

nayafia commented 6 years ago

@wolftune made a suggestion for Dual License section, otherwise LGTM!

wolftune commented 6 years ago

@nayafia I made a new commit to try to make clearer wording about dual-licensing but avoid the misunderstanding you had (dual licensing is copyleft+proprietary, not copyleft+permissive).

wolftune commented 6 years ago

@nayafia I've never before used the built-in GitHub conflict-resolution tool, but I did it just now to make sure this PR is already in-line with edits made to master since it was opened. I'm not sure if it rebased or what, but it seems to have done the trick. I'll read up on that tool sometime to understand it.

Anyway, this should be good to go. I hope you can accept it soon so any further contributions from others are built on top of the larger things here (like having moved and renamed some sections).

nayafia commented 6 years ago

@wolftune merged! thanks for these great contributions :sparkles: