license-update: update website with new license info#1762
license-update: update website with new license info#1762ramsey wants to merge 4 commits intophp:masterfrom
Conversation
|
🚀 Preview for commit 2c14ed2 can be found at https://web-php-pr-1762.preview.thephp.foundation |
|
🚀 Regression report for commit 2c14ed2 is at https://web-php-regression-report-pr-1762.preview.thephp.foundation |
| This ensures that the license information can be read properly even when a | ||
| binary is shipped instead of source code. A text file containing license and | ||
| copyright information is sometimes given the filename "Notice" or "NOTICE," | ||
| and may be referred to as a "notice file." |
There was a problem hiding this comment.
nit: The , in "NOTICE," and the . in "notice file." should be outside the "'s
There was a problem hiding this comment.
Those silly American style guides! 😉
I generally follow the MLA style guide in writing, but the APA style guide and AP stylebook also agree that commas and periods should be placed inside closing quotation marks.
However, I'm aware that British English generally places them outside closing quotation marks. Is it the style of php.net to follow the British style?
f42e1f4 to
e6d8db9
Compare
e6d8db9 to
7b6ff0d
Compare
7b6ff0d to
7a1b921
Compare
|
|
||
| 3. The name "PHP" must not be used to endorse or promote products | ||
| derived from this software without prior permission from the | ||
| PHP Group. This does not apply to add-on libraries or tools |
There was a problem hiding this comment.
can we leave the whitespace changes to a separate PR (if needed at all)?
There was a problem hiding this comment.
actually, can all of the cleanup of the old licenses (commas, removal of "very", etc.) be done separate from the changes to add the new license?
There was a problem hiding this comment.
I've removed the whitespace changes and other clean-up from the older license files.
7a1b921 to
643d4d9
Compare
This PR encompasses the changes proposed in the PHP License Update RFC, for the PHP website.
Discussion is available on the internals mailing list.
Changes proposed for php-src are available at php/php-src#20904.