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] 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: