From de5b36aa08772803900ff39077bbec3bedd74712 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 15:38:03 -0700 Subject: [PATCH 1/9] replaced code and asset statement with statement that only PHP is required to be licensed as GPLv2 --- git-repository-usage-policy.htm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index d078eb1..b5c9267 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -3,10 +3,11 @@ -

Read me first

-

General

+

General

This is a free service provided by the Drupal developers for the Drupal community. By using the repository you agree to the terms of services (see below).

-

All files checked into the repository (code and assets) must be licensed under GNU/GPL version 2 and later. If there is a problem with this, contact the repository administrators.

+

Always make sure there isn't already contributed code that does the same thing as your code. Instead, contact the maintainer of the other project and try to merge the projects into one.

Do not branch/"fork" Drupal modules/themes; instead, make patches and submit those for review. In case a patch is not approved, or very unlikely to be approved, contact the administrators of the contributions repository for advice.

DO NOT include code from a non-Drupal project in the repository. If your module requires non-Drupal code, such as a third-party JavaScript/PHP library, provide a link to where the other code can be downloaded and instructions on how to install it.

From 274cbb575bc5e79616871b0262810fd709c6a9e5 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 15:42:48 -0700 Subject: [PATCH 2/9] removed same thing statement. this is no longer part of PAR and hasn't been enfourced for years --- git-repository-usage-policy.htm | 1 - 1 file changed, 1 deletion(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index b5c9267..e98dfde 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -8,7 +8,6 @@

General

-

Always make sure there isn't already contributed code that does the same thing as your code. Instead, contact the maintainer of the other project and try to merge the projects into one.

Do not branch/"fork" Drupal modules/themes; instead, make patches and submit those for review. In case a patch is not approved, or very unlikely to be approved, contact the administrators of the contributions repository for advice.

DO NOT include code from a non-Drupal project in the repository. If your module requires non-Drupal code, such as a third-party JavaScript/PHP library, provide a link to where the other code can be downloaded and instructions on how to install it.

All code should comply to the coding standards. Any patch that fails to do this will generally be treated as unfinished work.

From ea096ca022cfda373fefb8ba7a96210eb09ba082 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 15:51:19 -0700 Subject: [PATCH 3/9] removed do not fork statement... patches in contrib is a drupalism we are hopefully moving away from with https://www.drupal.org/node/2488266 --- git-repository-usage-policy.htm | 1 - 1 file changed, 1 deletion(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index e98dfde..64f94f6 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -8,7 +8,6 @@

General

  • All PHP code committed to Drupal.org’s git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
-

Do not branch/"fork" Drupal modules/themes; instead, make patches and submit those for review. In case a patch is not approved, or very unlikely to be approved, contact the administrators of the contributions repository for advice.

DO NOT include code from a non-Drupal project in the repository. If your module requires non-Drupal code, such as a third-party JavaScript/PHP library, provide a link to where the other code can be downloaded and instructions on how to install it.

All code should comply to the coding standards. Any patch that fails to do this will generally be treated as unfinished work.

Drupal Contributions Repository - Terms of service

From f71cd097613d800a018a6d225b111eb7d7726c37 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 15:56:35 -0700 Subject: [PATCH 4/9] replaced 'code from a non-Drupal project' statement with LWG revisions --- git-repository-usage-policy.htm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index 64f94f6..f3463bf 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -7,8 +7,10 @@

General

This is a free service provided by the Drupal developers for the Drupal community. By using the repository you agree to the terms of services (see below).

  • All PHP code committed to Drupal.org’s git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
  • +
  • All code downloaded from Drupal.org is distributed as GPLv2+ and includes this license. Any permissively licensed 3rd party PHP code that allows relicensing is automatically relicensed and distributed as GPLv2+ when the code is granted an exception by the LWG to be included in Drupal.org’s Git repository.
    • +
  • Any third party materials you include must have their provenance, license and source documented in the file ASSETS.yml. Please see this document [link to be supplied] for more information.
    • +
  • The “and later” clause in the Drupal GPLv2+ license allows anyone to distribute a derivative work (i.e. a version of Drupal core, modules, themes) linked to a library under a license compatible with a later version of GPL, such as GPLv3. Distribution of such derivative works is not allowed from Drupal.org.
-

DO NOT include code from a non-Drupal project in the repository. If your module requires non-Drupal code, such as a third-party JavaScript/PHP library, provide a link to where the other code can be downloaded and instructions on how to install it.

All code should comply to the coding standards. Any patch that fails to do this will generally be treated as unfinished work.

Drupal Contributions Repository - Terms of service

The following terms of service represent the agreement between the Drupal Contributions Repository owners, hereafter the owner, and users of the Drupal Contributions Repository, hereafter the user.

From 6e029b8d74eb6816b8cc3e3409990c7283a4b319 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 16:03:44 -0700 Subject: [PATCH 5/9] moved coding standards into ul since that hasn't changed. Updated to reference PHP and javascript. 3rd party code does not need to be updated to conform to Drupal's standards --- git-repository-usage-policy.htm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index f3463bf..de4dec1 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -7,11 +7,12 @@

General

This is a free service provided by the Drupal developers for the Drupal community. By using the repository you agree to the terms of services (see below).

  • All PHP code committed to Drupal.org’s git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
  • +
  • All PHP and JavaScript should comply to the coding standards. Any patch or pull request that fails to do this will generally be treated as unfinished work.
  • All code downloaded from Drupal.org is distributed as GPLv2+ and includes this license. Any permissively licensed 3rd party PHP code that allows relicensing is automatically relicensed and distributed as GPLv2+ when the code is granted an exception by the LWG to be included in Drupal.org’s Git repository.
  • Any third party materials you include must have their provenance, license and source documented in the file ASSETS.yml. Please see this document [link to be supplied] for more information.
    • -
  • The “and later” clause in the Drupal GPLv2+ license allows anyone to distribute a derivative work (i.e. a version of Drupal core, modules, themes) linked to a library under a license compatible with a later version of GPL, such as GPLv3. Distribution of such derivative works is not allowed from Drupal.org.
    • +
  • The "and later" clause in the Drupal GPLv2+ license allows anyone to distribute a derivative work (i.e. a version of Drupal core, modules, themes) linked to a library under a license compatible with a later version of GPL, such as GPLv3. Distribution of such derivative works is not allowed from Drupal.org.
-

All code should comply to the coding standards. Any patch that fails to do this will generally be treated as unfinished work.

+

Drupal Contributions Repository - Terms of service

The following terms of service represent the agreement between the Drupal Contributions Repository owners, hereafter the owner, and users of the Drupal Contributions Repository, hereafter the user.

Acceptance of Terms

From 24f32ef3d0e39ba602db5f12491b160735f4d935 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 16:11:48 -0700 Subject: [PATCH 6/9] cleaning up HTML --- git-repository-usage-policy.htm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index de4dec1..815cb96 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -6,40 +6,47 @@

General

This is a free service provided by the Drupal developers for the Drupal community. By using the repository you agree to the terms of services (see below).

    -
  • All PHP code committed to Drupal.org’s git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
  • +
  • All PHP code committed to Drupal.org's git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
  • All PHP and JavaScript should comply to the coding standards. Any patch or pull request that fails to do this will generally be treated as unfinished work.
    • -
  • All code downloaded from Drupal.org is distributed as GPLv2+ and includes this license. Any permissively licensed 3rd party PHP code that allows relicensing is automatically relicensed and distributed as GPLv2+ when the code is granted an exception by the LWG to be included in Drupal.org’s Git repository.
    • +
  • All code downloaded from Drupal.org is distributed as GPLv2+ and includes this license. Any permissively licensed 3rd party PHP code that allows relicensing is automatically relicensed and distributed as GPLv2+ when the code is granted an exception by the LWG to be included in Drupal.org's Git repository.
  • Any third party materials you include must have their provenance, license and source documented in the file ASSETS.yml. Please see this document [link to be supplied] for more information.
  • The "and later" clause in the Drupal GPLv2+ license allows anyone to distribute a derivative work (i.e. a version of Drupal core, modules, themes) linked to a library under a license compatible with a later version of GPL, such as GPLv3. Distribution of such derivative works is not allowed from Drupal.org.
-

+

Drupal Contributions Repository - Terms of service

The following terms of service represent the agreement between the Drupal Contributions Repository owners, hereafter the owner, and users of the Drupal Contributions Repository, hereafter the user.

+

Acceptance of Terms

The Drupal Contributions repository is a public and free service provided to share various additions to Drupal. A user's use of this repository constitutes full acceptance of and agreement to the TOS; if a user does not accept the TOS, he or she is not granted rights to use the repository and should refrain from accessing the repository.

-

The owner reserves the right to modify or discontinue, temporarily or
-permanently any services or the TOS at any time, with prior notice to users, or without prior notice in the event of technical difficulties. The owner is not liable for any damage to any user or other third party that may result form any such modification, suspension or discontinuance of the service or of the TOS.

+

The owner reserves the right to modify or discontinue, temporarily or permanently any services or the TOS at any time, with prior notice to users, or without prior notice in the event of technical difficulties. The owner is not liable for any damage to any user or other third party that may result form any such modification, suspension or discontinuance of the service or of the TOS.

+

Registration Obligations

All users are granted unlimited read access to the repository. Write access is granted only to registered users. Each user will receive a password and account upon completion of the registration process and is responsible for maintaining confidentiality thereof and is wholly liable for all activities occurring thereunder.

-

All information gathered during the registration process will be kept
-confidential, and will not be distributed to third-parties, unless the owner is asked to do so by the appropriate authorities.

+

All information gathered during the registration process will be kept confidential, and will not be distributed to third-parties, unless the owner is asked to do so by the appropriate authorities.

+

Content

All information, data, text, software, music, sound, photographs, graphics, video, messages or any other materials whatsoever (collectively, "content"), whether publicly posted or privately transmitted, are the sole responsibility of the party from which such content originated.

All content submitted to the repository is automatically assumed to be licensed under the GNU/GPL. Any content that is not licensed under the GNU/GPL should not be added to the repository and when found it will be removed by the owner.

The repository maintainers can refuse or remove any content at their discretion and without prior notice to the affected party.

The owner is not responsible for the content maintained in the repository. All damages, physical, logical or other resulting from the use or abuse of the repository and its content are the user's sole responsibility. The owner is not liable in any way.

+

Termination

A user's account may be terminated without warning for reasons that include, but are not limited to:
-1.) violation of these TOS;
-2.) abuse of site resources or attempt to gain unauthorized entry to the site or site resources;
-3.) use of service in a manner inconsistent with the purpose;
-4.) a user's request for such termination;
-5.) requirement of applicable law, regulation, court or governing agency order.

+
    +
  1. violation of these TOS
    2. +
  2. abuse of site resources or attempt to gain unauthorized entry to the site or site resources
    3. +
  3. use of service in a manner inconsistent with the purpose
    4. +
  4. a user's request for such termination
    5. +
  5. requirement of applicable law, regulation, court or governing agency order
    6. +
+

Disclaimer

All content is provided as is, without any warrant or support. Except when otherwise stated in writing the copyright holders and/or other parties provide content "as is" without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the content is with you. Should the content prove defective, you assume the cost of all necessary servicing, repair or correction.

+

Copyrights

All content is copyrighted by the author of said content, unless otherwise stated in writing.

If a user or other third party believes that its Content has been copied in a way that constitutes copyright infringement, that user or third party should provide the repository maintainers with the following information: (a) an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright interest; (b) a description of the copyrighted work that has been infringed; (c) a description of where the allegedly infringing material is located on the Website; (d) the affected user or third party's address, telephone number and email address; (e) a statement by the affected user or third party that he or she has a good faith belief that the disputed use is not authorized by the copyright owner, its agent or the law; and (f) a statement by the affected user or third party, under penalty of perjury, that the above information is accurate and that such user or third party is the copyright owner or is otherwise authorized to act on the copyright owner's behalf.

+

Violations

Please report any violations of the TOS, any alleged copyright infringements or any other matters to abuse@drupal.org.

From 72716ec5a2c21f1186ddc1b553a735d5219b3563 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 16:25:28 -0700 Subject: [PATCH 7/9] generalized info about declaring 3rd party assets. This can be a README, a composer.js, or any file format as long as it informs the user of the asset --- git-repository-usage-policy.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index 815cb96..70cf99c 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -9,7 +9,7 @@

General

  • All PHP code committed to Drupal.org's git repository is licensed as GPLv2 and later (often abbreviated “GPLv2+”). This means that the code is licensed under GPLv2, and there exists an option that allows downstream recipients to re-license the code to be under a later version of GPL.
  • All PHP and JavaScript should comply to the coding standards. Any patch or pull request that fails to do this will generally be treated as unfinished work.
  • All code downloaded from Drupal.org is distributed as GPLv2+ and includes this license. Any permissively licensed 3rd party PHP code that allows relicensing is automatically relicensed and distributed as GPLv2+ when the code is granted an exception by the LWG to be included in Drupal.org's Git repository.
    • -
  • Any third party materials you include must have their provenance, license and source documented in the file ASSETS.yml. Please see this document [link to be supplied] for more information.
    • +
  • Any third party materials you include must have their provenance, license and source documented in a file included in the project.
  • The "and later" clause in the Drupal GPLv2+ license allows anyone to distribute a derivative work (i.e. a version of Drupal core, modules, themes) linked to a library under a license compatible with a later version of GPL, such as GPLv3. Distribution of such derivative works is not allowed from Drupal.org.
    • From 77fcb7e1237bd6d069bbcf511a2e7efbadce5542 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 16:26:07 -0700 Subject: [PATCH 8/9] added links to original, html of revision, and diff from pr --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 459aa79..e81f30b 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@

    HTML Versions of Drupal Licensing Policy Changes

    From 747f3c5eb899e5e1ce9b3440eac6ca750a19d578 Mon Sep 17 00:00:00 2001 From: Kevin Reynen Date: Tue, 26 Jan 2016 16:57:41 -0700 Subject: [PATCH 9/9] altered 'all content is GPL' statement --- git-repository-usage-policy.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-repository-usage-policy.htm b/git-repository-usage-policy.htm index 70cf99c..191551d 100644 --- a/git-repository-usage-policy.htm +++ b/git-repository-usage-policy.htm @@ -26,7 +26,7 @@

    Registration Obligations

    Content

    All information, data, text, software, music, sound, photographs, graphics, video, messages or any other materials whatsoever (collectively, "content"), whether publicly posted or privately transmitted, are the sole responsibility of the party from which such content originated.

    -

    All content submitted to the repository is automatically assumed to be licensed under the GNU/GPL. Any content that is not licensed under the GNU/GPL should not be added to the repository and when found it will be removed by the owner.

    +

    All content submitted to the repository is automatically assumed to be licensed under the GPLv2+ unless otherwise specified. Any content that is not licensed under the GPLv2+ or granted an exception by the LWG should not be added to the repository and when found it will be removed.

    The repository maintainers can refuse or remove any content at their discretion and without prior notice to the affected party.

    The owner is not responsible for the content maintained in the repository. All damages, physical, logical or other resulting from the use or abuse of the repository and its content are the user's sole responsibility. The owner is not liable in any way.