Skip to content

Commit d01a3ab

Browse files
committed
Attempt to reduce the number of white-space changes
1 parent 0827fc7 commit d01a3ab

File tree

3 files changed

+177
-136
lines changed

3 files changed

+177
-136
lines changed

license/contrib-guidelines-code.php

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,33 @@
66
<h2>PHP Contributor Guidelines for Code Developers</h2>
77

88
<p>
9-
Before you contribute code to PHP, you must understand and accept the principles under which PHP itself is
10-
developed. These are summarized in the next paragraph.
9+
Before you contribute code to PHP, you must understand and accept the
10+
principles under which PHP itself is developed. These are summarized in the
11+
next paragraph.
1112
</p>
1213

1314
<p>
14-
Any code contributed to PHP must be contributed under the terms of the Modified BSD License or other compatible,
15-
permissive license. PHP is distributed under the <a href="/license/#bsd-3-clause">Modified BSD License</a>. This
16-
includes implementation code, test cases, utility scripts and tools&mdash;that is, all code associated with the PHP
17-
project. If you contribute code that isn't entirely your own (for example, it may be partially derived from other
18-
Open Source software), you should add a comment to the source code indicating the origin and license of the original
19-
code. If you are unsure of the license, you must confirm with the owner that they grant permission to contribute it
20-
to PHP under the terms of the Modified BSD License or other compatible license.
15+
Any code contributed to PHP must be contributed under the terms of the
16+
Modified BSD License or other compatible, permissive license. PHP is
17+
distributed under the <a href="/license/#bsd-3-clause">Modified BSD
18+
License</a>. This includes implementation code, test cases, utility scripts
19+
and tools&mdash;that is, all code associated with the PHP project. If you
20+
contribute code that isn't entirely your own (for example, it may be
21+
partially derived from other Open Source software), you should add a comment
22+
to the source code indicating the origin and license of the original code.
23+
If you are unsure of the license, you must confirm with the owner that they
24+
grant permission to contribute it to PHP under the terms of the Modified BSD
25+
License or other compatible license.
2126
</p>
2227

2328
<p>
24-
Specifically regarding source code licensed under the GNU General Public License (GPL):
29+
Specifically regarding source code licensed under the GNU General Public
30+
License (GPL):
2531
</p>
2632

2733
<ul>
28-
<li>GPL-licensed code cannot be used as a basis for any work contributed to PHP.</li>
29-
<li>Extensions which link to GPL-licensed libraries will not be accepted.</li>
34+
<li>GPL-licensed code cannot be used as a basis for any work contributed to PHP.</li>
35+
<li>Extensions which link to GPL-licensed libraries will not be accepted.</li>
3036
</ul>
3137

3238
<?php site_footer();

license/distrib-guidelines-code.php

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,55 @@
66
<h2>PHP Code Distribution Guidelines</h2>
77

88
<p>
9-
The PHP code can be redistributed in source or binary form provided that
10-
you respect the terms of the <a href="/license/#bsd-3-clause">license</a>.
9+
The PHP code can be redistributed in source or binary form provided that
10+
you respect the terms of the <a href="/license/#bsd-3-clause">license</a>.
1111
</p>
1212
<p>
13-
In plain English, this means that you have to include the full license text
14-
in human-readable form with every distributed copy of PHP, whether in source
15-
or binary form. One way of doing this is to put a copy of the license in a
16-
text file that you include with the source or binary package before distribution.
17-
This ensures that the license information can be read properly even when a
18-
binary is shipped instead of source code. A text file containing license and
19-
copyright information is sometimes given the filename "Notice" or "NOTICE,"
20-
and may be referred to as a "notice file."
13+
In plain English, this means that you have to include the full license text
14+
in human-readable form with every distributed copy of PHP, whether in source
15+
or binary form. One way of doing this is to put a copy of the license in a
16+
text file that you include with the source or binary package before
17+
distribution. This ensures that the license information can be read properly
18+
even when a binary is shipped instead of source code. A text file containing
19+
license and copyright information is sometimes given the filename "Notice"
20+
or "NOTICE," and may be referred to as a "notice file."
2121
</p>
2222
<p>
23-
Some files in the PHP codebase have been contributed under other licenses.
24-
If you want to distribute these files, you must also respect the terms of
25-
their licenses. Look for the terms in the license/copyright comment block at
26-
the top of the source file. Sometimes the license terms are included in a
27-
separate license file in the same directory as the source file. The license
28-
terms may require that its own license and copyright information be included
29-
with every distributed copy (including binaries). This is a common requirement,
30-
which may be satisfied by adding the appropriate license text to a text file
31-
for distribution purposes, like the notice file suggested above.
23+
Some files in the PHP codebase have been contributed under other licenses.
24+
If you want to distribute these files, you must also respect the terms of
25+
their licenses. Look for the terms in the license/copyright comment block at
26+
the top of the source file. Sometimes the license terms are included in a
27+
separate license file in the same directory as the source file. The license
28+
terms may require that its own license and copyright information be included
29+
with every distributed copy (including binaries). This is a common
30+
requirement, which may be satisfied by adding the appropriate license text
31+
to a text file for distribution purposes, like the notice file suggested
32+
above.
3233
</p>
3334
<p>
34-
A single notice file may list all the licenses and copyright information
35-
applicable to the entire codebase you are distributing. It is good practice to
36-
indicate which source file(s) a particular license applies to.
35+
A single notice file may list all the licenses and copyright information
36+
applicable to the entire codebase you are distributing. It is good practice
37+
to indicate which source file(s) a particular license applies to.
3738
</p>
3839

3940
<h3>Modified products derived from PHP</h3>
4041

4142
<p>
42-
You may distribute your own software product derived from PHP, in source or
43-
binary form, provided that relevant copyright information and license(s) from
44-
the PHP codebase are distributed in human-readable form with every copy, as
45-
described above.
43+
You may distribute your own software product derived from PHP, in source or
44+
binary form, provided that relevant copyright information and license(s)
45+
from the PHP codebase are distributed in human-readable form with every
46+
copy, as described above.
4647
</p>
4748
<p>
48-
In accordance with the <a href="/license/#bsd-3-clause">license</a>, you may
49-
not use the name of any copyright holders or contributors to endorse or
50-
promote products derived from PHP without specific prior written permission.
49+
In accordance with the <a href="/license/#bsd-3-clause">license</a>, you may
50+
not use the name of any copyright holders or contributors to endorse or
51+
promote products derived from PHP without specific prior written permission.
5152
</p>
5253
<p>
53-
Please do not use "PHP" in the names of products derived from PHP. This
54-
creates confusion and implies a relationship between your product and the PHP
55-
project that may not exist. However, you may indicate that your product works
56-
with, is compatible with, or is intended for use with PHP.
54+
Please do not use "PHP" in the names of products derived from PHP. This
55+
creates confusion and implies a relationship between your product and the
56+
PHP project that may not exist. However, you may indicate that your product
57+
works with, is compatible with, or is intended for use with PHP.
5758
</p>
5859

5960
<?php site_footer();

0 commit comments

Comments
 (0)