From 7a64f60902ead2c8c0a487139db9d27b65aee3b4 Mon Sep 17 00:00:00 2001 From: Elias Dorneles Date: Fri, 21 Oct 2016 11:58:21 -0200 Subject: [PATCH 1/3] add artwork license, show both licenses in the docs --- artwork/LICENSE | 11 +++++++++++ docs/index.rst | 4 ++++ docs/license.rst | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 artwork/LICENSE create mode 100644 docs/license.rst diff --git a/artwork/LICENSE b/artwork/LICENSE new file mode 100644 index 000000000..381d31b0a --- /dev/null +++ b/artwork/LICENSE @@ -0,0 +1,11 @@ +Copyright (c) by Scrapy developers. +Some rights reserved. + +This logo or a modified version may be used by anyone to refer to the Scrapy project, but does not indicate endorsement by the project. + +Redistribution and use in source (the Gimp file) and binary forms (rendered JPEG files etc.) of the image, with or without modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice and this list of conditions. +* The names of the contributors to the Scrapy software may not be used to endorse or promote products derived from this software without specific prior written permission. + +Note: we would appreciate that you make the image a link to https://scrapy.org if you use it on a web page. diff --git a/docs/index.rst b/docs/index.rst index 11aa5c9be..89db956c2 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -263,6 +263,7 @@ All the rest news contributing versioning + license :doc:`news` See what has changed in recent Scrapy versions. @@ -272,3 +273,6 @@ All the rest :doc:`versioning` Understand Scrapy versioning and API stability. + +:doc:`license` + Read licenses of Scrapy software and artwork. diff --git a/docs/license.rst b/docs/license.rst new file mode 100644 index 000000000..895da307c --- /dev/null +++ b/docs/license.rst @@ -0,0 +1,20 @@ +.. _license: + +License +======= + +Scrapy is licensed under a three clause BSD License. It basically means: do whatever you want with it as long as the copyright in Scrapy sticks around, the conditions are not modified and the disclaimer is present. Furthermore you must not use the names of the authors to promote derivatives of the software without written consent. + +The full license text can be found below (Scrapy License). For the documentation and artwork different licenses apply. + + +Scrapy License +-------------- + +.. include:: ../LICENSE + + +Scrapy Artwork License +---------------------- + +.. include:: ../artwork/LICENSE From 94c1cf437e3717bcc3b2c4502d021b814cc848d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 15 Apr 2020 18:38:59 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Add=20a=20Scrapy=20Trademark=20License=20ba?= =?UTF-8?q?sed=20on=20Django=E2=80=99s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- artwork/LICENSE | 19 +++-- docs/index.rst | 10 ++- docs/license.rst | 20 ------ docs/licenses.rst | 13 ++++ docs/trademarks.rst | 171 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 203 insertions(+), 30 deletions(-) delete mode 100644 docs/license.rst create mode 100644 docs/licenses.rst create mode 100644 docs/trademarks.rst diff --git a/artwork/LICENSE b/artwork/LICENSE index 381d31b0a..4af786d68 100644 --- a/artwork/LICENSE +++ b/artwork/LICENSE @@ -1,11 +1,16 @@ -Copyright (c) by Scrapy developers. -Some rights reserved. +Scrapy and the Scrapy logo are trademarks of Scrapinghub. Usage of the Scrapy +trademarks are subject to the `Scrapy Trademark License +`_. -This logo or a modified version may be used by anyone to refer to the Scrapy project, but does not indicate endorsement by the project. +As long as you follow the following logo standards, you do not need to contact +us if you just want to use the logo to link to the Scrapy website (site badges +are available for this purpose as well): -Redistribution and use in source (the Gimp file) and binary forms (rendered JPEG files etc.) of the image, with or without modification, are permitted provided that the following conditions are met: +- The logo should maintain the official logo colors (including when using + transparency and gradients). -* Redistributions of source code must retain the above copyright notice and this list of conditions. -* The names of the contributors to the Scrapy software may not be used to endorse or promote products derived from this software without specific prior written permission. +- Any scaling must retain the original proportions. -Note: we would appreciate that you make the image a link to https://scrapy.org if you use it on a web page. +- Additional text may not be added so that it appears to be part of the logo, + except as provided by the terms of the `Scrapy Trademark License + `_. diff --git a/docs/index.rst b/docs/index.rst index 89db956c2..581dcd05a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -263,7 +263,8 @@ All the rest news contributing versioning - license + licenses + trademarks :doc:`news` See what has changed in recent Scrapy versions. @@ -274,5 +275,8 @@ All the rest :doc:`versioning` Understand Scrapy versioning and API stability. -:doc:`license` - Read licenses of Scrapy software and artwork. +:doc:`licenses` + Read the licenses of the Scrapy software and artwork. + +:doc:`trademarks` + Learn the terms of use of the Scrapy trademarks. diff --git a/docs/license.rst b/docs/license.rst deleted file mode 100644 index 895da307c..000000000 --- a/docs/license.rst +++ /dev/null @@ -1,20 +0,0 @@ -.. _license: - -License -======= - -Scrapy is licensed under a three clause BSD License. It basically means: do whatever you want with it as long as the copyright in Scrapy sticks around, the conditions are not modified and the disclaimer is present. Furthermore you must not use the names of the authors to promote derivatives of the software without written consent. - -The full license text can be found below (Scrapy License). For the documentation and artwork different licenses apply. - - -Scrapy License --------------- - -.. include:: ../LICENSE - - -Scrapy Artwork License ----------------------- - -.. include:: ../artwork/LICENSE diff --git a/docs/licenses.rst b/docs/licenses.rst new file mode 100644 index 000000000..6a37fe5a1 --- /dev/null +++ b/docs/licenses.rst @@ -0,0 +1,13 @@ +License +======= + +Scrapy Software License +----------------------- + +.. include:: ../LICENSE + + +Scrapy Artwork License +---------------------- + +.. include:: ../artwork/LICENSE diff --git a/docs/trademarks.rst b/docs/trademarks.rst new file mode 100644 index 000000000..455041fbc --- /dev/null +++ b/docs/trademarks.rst @@ -0,0 +1,171 @@ +Scrapy Trademark License +======================== + +Scrapinghub_, as the owner of registered and common law trademarks in the +Scrapy name and logo, licenses the use of the Scrapy trademarks to the +community under the following conditions: + +.. _Scrapinghub: https://scrapinghub.com/ + +.. _trademark-service-identification: + +1. Service identification +------------------------- + +You may use the Scrapy name and logo on a list of services, tools, or supported +platforms, or as an identifier that a product or service is Scrapy-related, +provided that the usage of the logo does not imply that the organization is +official or otherwise endorsed by Scrapinghub, or by the Scrapy core team as +representatives of the Scrapy project, and the logo acts as a hyperlink to the +main `Scrapy project website`_ wherever technically possible. + +.. _Scrapy project website: https://scrapy.org + + +.. _trademark-related-software: + +2. Scrapy-related software projects +----------------------------------- + +You may use the Scrapy name in the form "SCRAPY-FOO" or "FOO-SCRAPY" in any +software library that can be used to augment or extend the capabilities of +official Scrapy project software, provided that: + +#. The project is distributed under the terms of an `OSI-approved open source + license`_; and + +#. The website for the project does not imply that it is official or otherwise + endorsed by Scrapinghub, or by the Scrapy core team as representatives of + the Scrapy project. + +.. _OSI-approved open source license: http://opensource.org/licenses + + +.. _trademark-groups-and-events: + +3. Groups and events +-------------------- + +#. You may incorporate the Scrapy name into the name of any group or event, + provided that: + + #. The purpose of the group or event is to educate, provide networking + opportunities, or provide a social outlet for Scrapy users; + + #. The name of the group or event is formed by combining the name “Scrapy” + with other words that qualify the geographical location, intended + audience, or the activities of the group or event. + + #. If the group or event requires fees for membership or attendance, it + must be made clear at time the fee is paid what income organizers will + be deriving from the event, and that Scrapinghub will not be deriving + any income from the event; and + + #. The website for the group or event does not imply that it is official + or otherwise endorsed by Scrapinghub, or by the Scrapy core team as + representatives of the Scrapy project; + +#. A group or event may use a logo that incorporates the Scrapy logo by adding + a word or picture that identifies the locality (for example, the name of a + city, or a stylized image of an identifiable city landmark), audience, or + activities of the group or event. + + +.. _trademark-merchandise: + +4. Merchandise +-------------- + +You may produce merchandise displaying the Scrapy name or logo, provided that: + +#. Artwork to be printed on merchandise has been formally approved by + Scrapinghub; + +#. The products on which the artwork is to appear has been formally approved + by Scrapinghub; and + +#. If the product is to be sold, the individual or organization producing the + product must make a clear statement declaring what proportion of the sale + price will be retained by the organizers, and that Scrapinghub will not + derive any income from the product. + +To obtain formal approval for your merchandise sale, please submit an +electronic copy of the proof artwork, plus a list of all products to be sold, +to opensource@scrapinghub.com. + + +.. _trademark-community-services: + +5. Products and services serving the community +---------------------------------------------- + +You may incorporate the Scrapy name into any website or product whose purpose +is to organize, educate or inform the Scrapy community, provided that: + +#. The website or product does not use the official Scrapy logo or color + palette in its design, except as provided for by :ref:`Section 1 of this + license `; + +#. The website or product does not imply that it is official or otherwise + endorsed by Scrapinghub, or by the Scrapy core team as representatives of + the Scrapy project; and + +#. If a fee is to be charged for the product, or for access to any or all of + the material on the website, a clear statement must exist declaring what + proportion of those fees will be retained by the authors, and that + Scrapinghub will not derive any income from those fees. A link to this + statement must be prominently displayed on the website or product. + + +6. Other commercial activity +---------------------------- + +You may *not* use the Scrapy name in the registered name of any company, +regardless of whether it offers Scrapy-related services. + +You may *not* incorporate the Scrapy name or logo into the name of any product +to be sold by a commercial entity, regardless of whether that product or +service is Scrapy-related. + + +7. Domain Names +--------------- + +You may use the Scrapy name in any internet domain or subdomain: + +#. For any Scrapy-related project meeting the requirements of :ref:`Section 2 + of this license `; + +#. For any group or event meeting the requirements of :ref:`Section 3 of this + license `; + +#. Any merchandise provider meeting the requirements of :ref:`Section 4 of + this license `, provided the products sold under + that domain are exclusively Scrapy merchandise; and + +#. Any website or product meeting the requirements of :ref:`Section 5 of this + license `. + + +8. Uses outside of this license +------------------------------- + +If your usage, or proposed usage, of the Scrapy name or trademark does not meet +these criteria, a specific license may be granted to your organization, at +Scrapinghub's discretion. Please contact opensource@scrapinghub.com with the +details of your proposed usage, and a license may be granted. + + +9. Community standards +---------------------- + +Notwithstanding the above, licensees of the Scrapy mark must not use that mark +to cast the Scrapy product or Scrapy community into disrepute, or engage in +business practices that reflect poorly on the Scrapy product or community. + + +10. Interpretation +------------------ + +Scrapinghub reserves the right to determine if a usage of the Scrapy trademark +meets the requirements and standards of this license. From c429226de7d42a49ee4ad1b2e083101a37d641e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 15 Apr 2020 19:52:07 +0200 Subject: [PATCH 3/3] Add bullet points regarding codes of conduct --- docs/trademarks.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/trademarks.rst b/docs/trademarks.rst index 455041fbc..e6dfc5eaf 100644 --- a/docs/trademarks.rst +++ b/docs/trademarks.rst @@ -59,17 +59,25 @@ official Scrapy project software, provided that: #. If the group or event requires fees for membership or attendance, it must be made clear at time the fee is paid what income organizers will be deriving from the event, and that Scrapinghub will not be deriving - any income from the event; and + any income from the event; #. The website for the group or event does not imply that it is official or otherwise endorsed by Scrapinghub, or by the Scrapy core team as representatives of the Scrapy project; + #. The group or event agrees to adhere to the `Scrapy contributor code of + conduct`_; and + + #. The group or event also adopts a specific code of conduct governing the + behavior of participants. + #. A group or event may use a logo that incorporates the Scrapy logo by adding a word or picture that identifies the locality (for example, the name of a city, or a stylized image of an identifiable city landmark), audience, or activities of the group or event. +.. _Scrapy contributor code of conduct: https://github.com/scrapy/scrapy/blob/master/CODE_OF_CONDUCT.md + .. _trademark-merchandise: