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?