From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BD27913829C for ; Mon, 6 Jun 2016 11:47:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0498521C01D; Mon, 6 Jun 2016 11:47:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96A8E21C01D for ; Mon, 6 Jun 2016 11:47:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E755340A5D for ; Mon, 6 Jun 2016 11:47:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 713C9963 for ; Mon, 6 Jun 2016 11:47:44 +0000 (UTC) From: "Alex Legler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alex Legler" Message-ID: <1465213670.881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8.a3li@gentoo> Subject: [gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/ X-VCS-Repository: sites/www X-VCS-Files: inside-gentoo/foundation/name-logo-guidelines.md X-VCS-Directories: inside-gentoo/foundation/ X-VCS-Committer: a3li X-VCS-Committer-Name: Alex Legler X-VCS-Revision: 881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8 X-VCS-Branch: master Date: Mon, 6 Jun 2016 11:47:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 042cd42b-16ea-49d0-9010-70b229e12228 X-Archives-Hash: 75eb32dcf0eed24268c99b764d593ffc commit: 881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8 Author: Alex Legler a3li li> AuthorDate: Mon Jun 6 11:47:50 2016 +0000 Commit: Alex Legler gentoo 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?