[gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/

[gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/

[Alex Legler]

commit:     d74397c173fd68fe3546958dde11e9e910ff342f
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Thu Jun 11 14:33:33 2015 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 14:33:33 2015 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=d74397c1

Update Foundation links as per dabbott's updates

 inside-gentoo/foundation/index.md | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/inside-gentoo/foundation/index.md b/inside-gentoo/foundation/index.md
index 834f2c5..5d70822 100644
--- a/inside-gentoo/foundation/index.md
+++ b/inside-gentoo/foundation/index.md
@@ -105,13 +105,14 @@ on the Gentoo development to make sure it adheres to the [Gentoo Social Contract
 
 ### Board Minutes
 
-* [2008 Minutes](https://wwwold.gentoo.org/foundation/en/minutes08/index.xml)
-* [2009 Minutes](https://wwwold.gentoo.org/foundation/en/minutes09/index.xml)
-* [2010 Minutes](https://wwwold.gentoo.org/foundation/en/minutes/2010/index.xml)
-* [2011 Minutes](https://wwwold.gentoo.org/foundation/en/minutes/2011/index.xml)
-* [2012 Minutes](https://wwwold.gentoo.org/foundation/en/minutes/2012/index.xml)
-* [2013 Minutes](https://wwwold.gentoo.org/foundation/en/minutes/2013/index.xml)
-* [2014 Minutes](https://wwwold.gentoo.org/foundation/en/minutes/2014/index.xml)
+* [2008 Minutes](https://projects.gentoo.org/foundation/2008/)
+* [2009 Minutes](https://projects.gentoo.org/foundation/2009/)
+* [2010 Minutes](https://projects.gentoo.org/foundation/2010/)
+* [2011 Minutes](https://projects.gentoo.org/foundation/2011/)
+* [2012 Minutes](https://projects.gentoo.org/foundation/2012/)
+* [2013 Minutes](https://projects.gentoo.org/foundation/2013/)
+* [2014 Minutes](https://projects.gentoo.org/foundation/2014/)
+* [2015 Minutes](https://projects.gentoo.org/foundation/2015/)
 
 ### Election Process
 
@@ -153,22 +154,12 @@ Meanwhile, the trustees also fulful most of the roles of officers, current appoi
 
 The following are links to other pages of information regarding the Gentoo Foundation and its tasks:
 
-* [Bylaws for the Gentoo Foundation](https://wwwold.gentoo.org/foundation/en/BylawsAdopted.xml)
-* [Cash Sponsor Policy](https://wwwold.gentoo.org/foundation/en/cash-sponsors-policy.xml)
-* [Requesting funds from the Gentoo Foundation](https://wwwold.gentoo.org/foundation/en/funding-request-policy.xml)
+* [Bylaws for the Gentoo Foundation](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_ByLaws)
+* [Requesting funds from the Gentoo Foundation](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Funding_Request)
 * [Gentoo Foundation, Inc. Status](https://portal.sos.state.nm.us/corps/Corplookup/Details.aspx?Nmscc=2463313)
-* [Foundation Activity Tracker](https://wwwold.gentoo.org/foundation/en/secretary/activities/activity_tracker.xml)
-* [Gentoo Foundation Members List 20140614](https://wwwold.gentoo.org/foundation/en/20140614_member_list.xml)
-* [Vendors Selling CD/DVD Guidelines](https://wwwold.gentoo.org/foundation/en/cd-dvd-guidelines.xml)
-* [Sponsorship and Advertising Guide](https://wwwold.gentoo.org/foundation/en/sponsorship-and-advertising-guide.xml)
-* [Financial Reports](https://wwwold.gentoo.org/foundation/en/finances/index.xml)
-
-#### Gentoo Consultants
-
-As a service to the Gentoo community and to advance the use of Gentoo in the corporate sector the Gentoo Trustees Maintain a referral page for your convenience.
-The companies and individual consultants are not officially endorsed by the Gentoo Foundation.
-
-* [Consultants](https://wwwold.gentoo.org/foundation/en/consultants.xml)
+* [Foundation Activity Tracker](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Activity_Tracker)
+* [Gentoo Foundation Members List](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_20150412_Member_List)
+* [Financial Reports](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Finances)
 
 ### Contact
 

[gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/

[Alex Legler]

commit:     9fe8e6db32caf49ec873298a84f8c3e8c8ab9af2
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Sun Jun 28 12:24:28 2015 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 12:24:28 2015 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=9fe8e6db

Link to wiki for most of the foundation info

 inside-gentoo/foundation/index.md | 126 +-------------------------------------
 1 file changed, 2 insertions(+), 124 deletions(-)

diff --git a/inside-gentoo/foundation/index.md b/inside-gentoo/foundation/index.md
index 5d70822..b540c0e 100644
--- a/inside-gentoo/foundation/index.md
+++ b/inside-gentoo/foundation/index.md
@@ -39,128 +39,6 @@ In other words, the Gentoo Foundation will:
 * sponsor Gentoo-related conferences and technical development resources
 * oversee development so it adheres to the social contract
 
-## Principles of the Gentoo Foundation
+## Find out more
 
-### Introduction
-
-The Gentoo Foundation keeps four pillars in mind:
-
-1. Gentoo provides choices
-2. Gentoo is open
-3. Gentoo lives for the community, by the community
-4. Gentoo is independent
-
-### Gentoo provides choices
-
-Gentoo is a metadistribution, providing choices to its users. This important idea forms the basis of Gentoo's development:
-not a single feature will be dismissed in favor of a different one when both can be maintained.
-Skills learned today will still be relevant in the future.
-
-### Gentoo is open
-
-Every aspect of Gentoo is and remains open.
-Gentoo does not benefit from hiding any of its development processes (whether it is source code or documentation, decisions or discussions, coordination or management).
-
-### Gentoo lives for the community, by the community
-
-Gentoo strives to please its users. The Gentoo community is Gentoo's goal of life.
-Without community there is no Gentoo.
-To help Gentoo's development, the community provides a continuous stream of feedback and contributes to the various aspects of the Gentoo distribution.
-This cooperative model will remain valid for Gentoo's entire lifespan.
-
-### Gentoo is independent
-
-Gentoo will never be reigned by a company nor be dictated by an organisation.
-
-## Tasks of the Gentoo Foundation
-
-### Intellectual Property Protection
-
-The Gentoo Foundation is the legal owner of the Gentoo trademark and logo.
-To protect Gentoo it will oversee the use of the Gentoo name and logo and take appropriate action when the Gentoo Foundation feels that the name or logo is wrongfully used.
-
-### Support the Gentoo Development
-
-The Gentoo Foundation has revenues gathered from donations, sold Gentoo items and other sources.
-This financial income will be used to support the Gentoo development in any way possible, as decided by the trustees.
-
-The primary use of the funds are to support Gentoo's infrastructure as it is the backbone of the project.
-
-### Oversee adherence to the Social Contract
-
-To keep the spirit of Openness and Freedom alive within Gentoo, the Gentoo Foundation continues to keep an active eye
-on the Gentoo development to make sure it adheres to the [Gentoo Social Contract](/get-started/philosophy/social-contract.html).
-
-## The Board of Trustees
-
-### Current Board Members
-
-(alphabetical order by last name)
-
-* David Abbott, dabbott
-* Roy Bamford, NeddySeagoon
-* Petteri Räty, Betelgeuse
-* Matthew Summers, quantumsummers
-* Sven Vermeulen, SwifT
-
-### Board Minutes
-
-* [2008 Minutes](https://projects.gentoo.org/foundation/2008/)
-* [2009 Minutes](https://projects.gentoo.org/foundation/2009/)
-* [2010 Minutes](https://projects.gentoo.org/foundation/2010/)
-* [2011 Minutes](https://projects.gentoo.org/foundation/2011/)
-* [2012 Minutes](https://projects.gentoo.org/foundation/2012/)
-* [2013 Minutes](https://projects.gentoo.org/foundation/2013/)
-* [2014 Minutes](https://projects.gentoo.org/foundation/2014/)
-* [2015 Minutes](https://projects.gentoo.org/foundation/2015/)
-
-### Election Process
-
-The mathematical election method the Gentoo Foundation uses is called the [Condorcet Voting](http://en.wikipedia.org/wiki/Condorcet_method).
-
-Each member of the Gentoo Foundation at the moment the roll for the election closes may vote.
-Each member is able to rank all candidates in the preferred order of election.
-Multiple entries for the same position are allowed.
-Currently, all who have ever voted in any Foundation election are members of the Foundation unless they have officially resigned.
-If you are not a member (or do not know if you are a member), you may petition the Trustees for admittance.
-Please see the [Bylaws](https://wwwold.gentoo.org/foundation/en/BylawsAdopted.xml) Article IV for a complete explanation of membership in the Foundation.
-
-The Condorcet Voting then takes two candidates and counts how many times candidate A was ranked higher than candidate B and vice versa.
-Then, based on this numbers, it looks for the candidate that is not beaten by any other candidate and ranks him on top.
-It then removes this candidate from the list and starts the process again to find the subsequent "winners".
-
-When no candidate in a set of candidates is unbeaten, the least decisive defeat is dropped, again and again,
-until either one candidate remains (who is then marked as a "winner") or a true tie exists.
-In case of the Gentoo Foundation, only when a true tie exists for the final (5th) position the President of the board
-has the final saying (otherwise both candidates are welcomed as "winners").
-
-### Trustee Responsibilities
-
-As a group, the Trustees each have an equal vote to decide upon issues outlined in the tasks above.
-A majority vote (3 of 5) is required for all decisions.
-The trustees must uphold the principles of the Gentoo Foundation, its bylaws, and help to maintain a good reputation for the Foundation.
-
-In common with the organisation of other corporations the Gentoo Foundation Inc has directors (the trustees) and officers that work at the direction of the trustees.
-Meanwhile, the trustees also fulful most of the roles of officers, current appointments being:
-
-* President - Roy Bamford, NeddySeagoon
-* Vice President - Matthew Summers, quantumsummers
-* Treasurer - Matthew Summers, quantumsummers
-* Secretary - David Abbott, dabbott
-
-## Resources
-
-### Links
-
-The following are links to other pages of information regarding the Gentoo Foundation and its tasks:
-
-* [Bylaws for the Gentoo Foundation](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_ByLaws)
-* [Requesting funds from the Gentoo Foundation](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Funding_Request)
-* [Gentoo Foundation, Inc. Status](https://portal.sos.state.nm.us/corps/Corplookup/Details.aspx?Nmscc=2463313)
-* [Foundation Activity Tracker](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Activity_Tracker)
-* [Gentoo Foundation Members List](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_20150412_Member_List)
-* [Financial Reports](https://wiki.gentoo.org/wiki/Foundation:Gentoo_Foundation_Finances)
-
-### Contact
-
-You may contact the Board of Trustees by e-mailing trustees at gentoo.org.
\ No newline at end of file
+The Gentoo Foundation maintains a [presence on the Gentoo Wiki](https://wiki.gentoo.org/wiki/Foundation:Main_Page) where you can learn more.
\ No newline at end of file

[gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/

[Alex Legler]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 14944 bytes --]

commit:     e4f27fe004a36e62928744f4ceaaa2068802fa82
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Fri Jun  3 16:58:29 2016 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 11:44:36 2016 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=e4f27fe0

Update Gentoo name and logo usage guidelines

On May 15th, 2016, the Gentoo Foundation trustees agreed to publish the
new trademark license document. This document reflects a more suitable
approach to allow the use of the Gentoo name and logo within our
community, while protecting the trademarks.

Historically, the new license was first discussed on the gentoo-nfp
mailinglists on December 20th, 2013 and later revisited on August 5th, 2014.
It was then announced on the gentoo-dev-announce mailinglist on October
2nd, 2014 and got its last review on gentoo-nfp in March 31, 2016.

 inside-gentoo/foundation/name-logo-guidelines.md | 193 ++++++++++++++++++-----
 1 file changed, 151 insertions(+), 42 deletions(-)

diff --git a/inside-gentoo/foundation/name-logo-guidelines.md b/inside-gentoo/foundation/name-logo-guidelines.md
index 8ef779c..5d5ff68 100644
--- a/inside-gentoo/foundation/name-logo-guidelines.md
+++ b/inside-gentoo/foundation/name-logo-guidelines.md
@@ -10,75 +10,184 @@ layout: page-nav3
 body_class: nav-align-h2
 ---
 
-## Preliminaries
+## Preamble
+
+The Gentoo Foundation, Inc. is the owner of the Gentoo trademark (for the United
+States of America and other regions that recognize a U.S.A. registration), and
+as such, it is necessary for us to protect this mark. Part of this protection is
+to clearly define criteria that must be satisfied in order to use the Gentoo
+trademark.
+
+The Gentoo Project is a Free Software project, and as such it is important to
+the Gentoo Foundation, Inc. that the uses of the Gentoo trademark are in the
+spirit of Free Software. This license attempts to codify the practices generally
+accepted in a Free Software community regarding the use of a trademark. Broadly
+speaking, this means that the community should be allowed to use the trademark
+to identify related products, libraries, community organizations, events, or
+education and training materials, as long as that activity doesn't violate the
+spirit of Free Software. The license also attempts to place some light social
+pressure on those directly using the Gentoo trademark to make money. Anyone
+making a profit by using the Gentoo trademark is required to report what
+proportion of that money will be contributed back to the community.
+
+It is also important to note that this license only applies if you intend to use
+(or are already using) a trademark of your own that incorporates the Gentoo name,
+and/or incorporates the official logo/colors of the Gentoo project. If your usage
+of the Gentoo name is purely nominative, you don't need to license the Gentoo
+trademark - nominative use is an allowed use under trademark law. 
+
+## Gentoo trademark license
+
+The Gentoo Foundation, Inc., as the owner of registered and common law trademarks
+of the Gentoo name and logo (in the United States of America and other regions
+recognizing its registrations), licenses the use of the Gentoo trademarks to the
+community under the following conditions.
 
-This document describes proper use of the Gentoo name, the "g" logo and any other associated marks for software and computer-related efforts that are not under the direction of the Gentoo Foundation, Inc. If you have any questions about these guidelines, please contact [Gentoo Foundation, Inc](mailto:trustees@gentoo.org).
-
-Gentoo Foundation, Inc. reserve the right to change these terms from time to time at their sole discretion. For that reason, we encourage you to review this statement periodically.
+![Gentoo Logo](/assets/img/logo/gentoo-3d-small.png)
 
-##  Definitions
+### Service identification
+
+You may use the Gentoo name and logo on a list of services, tools, or supported
+platforms, or as an identifier that a product or service is Gentoo-related,
+provided that the usage of the name and/or logo does not imply that the
+organization is official or otherwise endorsed by the Gentoo Foundation, Inc.,
+or by the Gentoo project, and that the name and/or logo acts as a hyperlink to
+the main [Gentoo project](https://www.gentoo.org) website wherever technically
+possible.
+
+### Gentoo-related software projects
+
+You may not use the Gentoo name in any software project that can be used to
+augment or extend the capabilities of official Gentoo project software (hosted
+on the gentoo.org domain).
+
+The use of the Gentoo name or logo for repositories, overlays or projects that
+solely focus on the official Gentoo project software and documentation is seen
+as [service identification](#service-identification) and is governed under that
+section.
+
+### Groups and events
+
+You may incorporate the Gentoo 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 Gentoo users;
+* the name of the group or event is formed by combining the name "Gentoo" 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 of attendance, it must be
+  made clear at the time the fee is paid what income organizers will be
+  deriving from the event, and what proportion of event profits, if any, will
+  be returned to the Gentoo Foundation, Inc. as a donation.
+* the website for the group or event does not imply that it is official or
+  otherwise endorsed by the Gentoo Foundation, Inc.
+* the group or event agrees to adhere to the
+  [Gentoo Community Code of Conduct](https://wiki.gentoo.org/wiki/Project:Council/Code_of_conduct).
+* the group or event also adopts a specific Code of Conduct governing the
+  behavior of participants.
 
-### The Gentoo project
+A group or event may use a logo that incorporates the Gentoo 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 of event.
 
-The volunteer development efforts currently directed by Gentoo Foundation, Inc., a not-for-profit corporation.
+### Merchandise
 
-### Works produced by the Gentoo project
+You may produce merchandise displaying the Gentoo name or logo, provided that:
 
-Any works that are copyright Gentoo Foundation, Inc.
+* artwork to be printed on merchandise has been formally approved by the Gentoo
+  Foundation, Inc.
+* the products on which the artwork is to appear has been formally approved by
+  the Gentoo Foundation, Inc.
+* 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 what proportion, if any, will be
+  contributed back to the Gentoo Foundation, Inc.
 
-### The "g" logo
+To obtain format approval for your merchandise sale, please submit an electronic
+copy of the proof artwork, plus a list of all products to be sold, to
+[trustees@gentoo.org](mailto:trustees@gentoo.org).
 
-![Gentoo Logo](/assets/img/logo/gentoo-3d-small.png)
+We will not approve any variations of the Gentoo logo that change the aspect
+ratio or otherwise distort the shape.
 
-### Gentoo artwork
+### Products and services serving the community
 
-All artwork produced by the Gentoo project (see above definition).
+You may incorporate the Gentoo name into any website or product whose purpose is
+to organize, educate or inform the Gentoo community, provided that:
 
-### Gentoo community site
+* the website or product does not use the Gentoo logo or mimic the official
+  sites in its design, except as provided for by earlier sections in this
+  license;
+* the website or product does not imply that it is official or otherwise
+  endorsed by the Gentoo Foundation, Inc.
+* 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 what proportion,
+  if any, will be contributed back to the Gentoo Foundation, Inc. A link to this
+  statement must be prominently displayed on the website or product.
 
-A non-profit website whose primary objective is to provide any Gentoo user with additional information on Gentoo and Gentoo-related topics.
+### Other commercial activity
 
-## Ownership of marks
+You may *not* use the Gentoo name in the registered name of any company that
+offers Gentoo project related services.
 
-The name "Gentoo" and the "g" logo are currently trademarks of Gentoo Foundation, Inc.
+You may *not* incorporate the Gentoo name or logo into the name of any product to
+be sold by a commercial entity when that product or entity is Gentoo project
+related.
 
-## Use of Gentoo name
+### Domain names
 
-You are permitted to use the Gentoo name in computer-related works, provided that:
+You may use the Gentoo name in any Internet domain or subdomain:
 
-1. You acknowledge that the name "Gentoo" is a trademark of Gentoo Foundation, Inc., and
-2. you do not entitle any software project or computer-related product "Gentoo" or have "Gentoo" appear within its name, and
-3. the fully-qualified domain name for your software project or computer-related products does not contain "Gentoo", and
-4. you clearly state that the works, project, site, product or any other type of item with which the "Gentoo" name is associated is not part of the Gentoo project and is not directed or managed by Gentoo Foundation, Inc.
+* for any group or event meeting the requirements of the section on [Groups and
+  events](#groups-and-events).
+* any merchandise provider meeting the requirements of the section on
+  [Merchandise](#merchandise), provided the products sold under that domain are
+  exclusively Gentoo merchandise
+* any website or product meeting the requirements of the section on [Products and
+  services serving the community](#products-and-services-serving-the-community).
 
-We do not consider these restrictions to apply to the [Gentoo file manager](http://www.obsession.se/gentoo/) project, developed by Emil Bink, as it is not an operating system project.
+### Uses outside of this license
 
-##  Use of Gentoo Logo and artwork
+If your usage, or proposed usage, of the Gentoo name or trademark does not meet
+these criteria, a specific license may be granted to your organization, at the
+Gentoo Foundation, Inc. discretion. Please contact
+[trustees@gentoo.org](mailto:trustees@gentoo.org) with the
+details or your proposed usage, and a license may be granted.
 
-You are permitted to use the Gentoo "g" logo and artwork copyright Gentoo Foundation, Inc. (hereafter called "Gentoo artwork") under the following conditions:
+The restrictions about using the "Gentoo" name do not apply to the [Gentoo File
+Manager](http://www.obsession.se/gentoo) project, developed by Emil Bink.
 
-### Commercial Use
+### Community standards
 
-Commercial use of the Gentoo "g" logo and Gentoo artwork is allowed for any software or computer hardware product that contains or is based upon works produced by the Gentoo project, or any project or service referencing Gentoo or the Gentoo Project, provided that the following conditions are met:
+Notwithstanding the above, licensees of the Gentoo mark must not use that mark
+to cast the Gentoo project, Gentoo Foundation, Inc., or Gentoo community into
+disrepute, or engage in business practices that reflect poorly on the Gentoo
+project, Gentoo Foundation, Inc., or Gentoo community.
 
-You acknowledge that the "g" logo is a trademark of Gentoo Foundation, Inc. and that any Gentoo artwork is copyright Gentoo Foundation, Inc., and
-the artwork used is not the primary (largest) mark displayed on the product, and is thus intended to convey that the product contains "works produced by the Gentoo project", but is not itself a product being sold or supported by Gentoo Foundation, Inc.
-Commercial use of the Gentoo "g" logo and Gentoo artwork for any other purpose is expressly denied.
+### Interpretation
 
-### Non-Commercial Use
+The Gentoo Foundation, Inc. reserves the right to determine if a usage of the
+Gentoo trademark meets the requirements and standards of this license.
+
+## Frequently Asked Questions
 
-Non-commercial use of the "g" logo and Gentoo artwork is permitted provided that the following conditions are met:
+### What about earlier name/logo usage guidelines?
 
-1. You acknowledge that the "g" logo is a trademark of Gentoo Foundation, Inc., and that any Gentoo artwork is copyright Gentoo Foundation, Inc, and,
-2. the "g" logo and Gentoo artwork are used in works that pertain to "the Gentoo project", as directed by the Gentoo Foundation, Inc., and not any effort outside or beyond the authority of the Gentoo Foundation, Inc., and
-3. you clearly state that the works, project, site, product or any other type of item with which the "g" logo or Gentoo artwork is associated is not part of the Gentoo project and is not directed or managed by Gentoo Foundation, Inc.
+The [previous name/logo usage
+guidelines](https://web.archive.org/web/20160420043020/https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html)
+as published by the Gentoo Foundation, Inc. remain available for those
+applications granted before the publication of this new license.
 
-## Gentoo Community Projects
+### What about non-USA trademarks?
 
-Gentoo Foundation, Inc. grant Gentoo community sites, as defined above, the right to use the Gentoo name in their project name and fully qualified domain name provided that:
+The [Lizensierung der Marke "Gentoo"](https://www.gentoo-ev.org/wiki/Marke) as
+published by the Förderverein Gentoo e.V. (who also owns the trademarks in
+Europe) defines the usage rights of the name and logo inside Europe.
 
-1. the website clearly states, on each page, that the project is no official Gentoo project by labelling itself as a "news site", "fan site", "unofficial site" or "community site", and
-2. the website does not closely mimic the name or layout of one of our official websites, and
-3. you acknowledge that the name "Gentoo" is a trademark of Gentoo Foundation, Inc.
+### What is this license based on?
 
-Any other use of the Gentoo name, logo and artwork remains bound by the beforementioned guidelines.
\ No newline at end of file
+The new License has been based on the [Django Trademark License Agreement](https://www.djangoproject.com/trademarks/)
+and is, as such, also released under the [Creative Commons Attribution-ShareAlike 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/).

[gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/

[Alex Legler]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 1691 bytes --]

commit:     881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8
Author:     Alex Legler <alex <AT> a3li <DOT> li>
AuthorDate: Mon Jun  6 11:47:50 2016 +0000
Commit:     Alex Legler <a3li <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 11:47:50 2016 +0000
URL:        https://gitweb.gentoo.org/sites/www.git/commit/?id=881a1a43

Fix whitespace and convert to UTF-8

 inside-gentoo/foundation/name-logo-guidelines.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inside-gentoo/foundation/name-logo-guidelines.md b/inside-gentoo/foundation/name-logo-guidelines.md
index 5d5ff68..c18b6c1 100644
--- a/inside-gentoo/foundation/name-logo-guidelines.md
+++ b/inside-gentoo/foundation/name-logo-guidelines.md
@@ -34,7 +34,7 @@ It is also important to note that this license only applies if you intend to use
 (or are already using) a trademark of your own that incorporates the Gentoo name,
 and/or incorporates the official logo/colors of the Gentoo project. If your usage
 of the Gentoo name is purely nominative, you don't need to license the Gentoo
-trademark - nominative use is an allowed use under trademark law. 
+trademark - nominative use is an allowed use under trademark law.
 
 ## Gentoo trademark license
 
@@ -184,7 +184,7 @@ applications granted before the publication of this new license.
 ### What about non-USA trademarks?
 
 The [Lizensierung der Marke "Gentoo"](https://www.gentoo-ev.org/wiki/Marke) as
-published by the Förderverein Gentoo e.V. (who also owns the trademarks in
+published by the Förderverein Gentoo e.V. (who also owns the trademarks in
 Europe) defines the usage rights of the name and logo inside Europe.
 
 ### What is this license based on?