From: "Alex Legler" <a3li@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/
Date: Mon, 6 Jun 2016 11:47:44 +0000 (UTC) [thread overview]
Message-ID: <1465213670.881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8.a3li@gentoo> (raw)
[-- 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?
next reply other threads:[~2016-06-06 11:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 11:47 Alex Legler [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-06 11:45 [gentoo-commits] sites/www:master commit in: inside-gentoo/foundation/ Alex Legler
2015-06-28 12:24 Alex Legler
2015-06-11 14:33 Alex Legler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465213670.881a1a430e4c53d599a28c3a8bdf0b4d565b7dc8.a3li@gentoo \
--to=a3li@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox