From: "Roy Bamford (neddyseagoon)" <neddyseagoon@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/main/en: stores.xml
Date: Sun, 26 Jul 2009 12:31:27 +0000 [thread overview]
Message-ID: <E1MV2sx-0007dY-Ix@stork.gentoo.org> (raw)
neddyseagoon 09/07/26 12:31:27
Modified: stores.xml
Log:
began updating stores page - need add more vendors
Revision Changes Path
1.2 xml/htdocs/main/en/stores.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/stores.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/stores.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/stores.xml?r1=1.1&r2=1.2
Index: stores.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stores.xml 14 Jun 2009 20:15:30 -0000 1.1
+++ stores.xml 26 Jul 2009 12:31:27 -0000 1.2
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v 1.1 2009/06/14 20:15:30 robbat2 Exp $-->
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v 1.2 2009/07/26 12:31:27 neddyseagoon Exp $-->
<!DOCTYPE mainpage SYSTEM "/dtd/guide.dtd">
<mainpage>
@@ -15,26 +15,86 @@
<license/>
<version>1.1</version>
-<date>2009-06-14</date>
+<date>2009-07-26</date>
<chapter>
<title>Approved Vendors</title>
<section>
<body>
<p>
-Gentoo merchanise may be purchased through the following vendors.
+Gentoo merchanise may be purchased from the following vendors
+who have been licenced to use the Gentoo Logo by either the
+<uri link="http://www.gentoo.org/foundation/en/">Gentoo Foundation Inc</uri>
+ (in the USA) or <uri link="http://www.gentoo-ev.org/de/">Friends of Gentoo eV</uri>
+ within the European Union
+</p>
+<p>
+Approved Vendors make a small contribution to Gentoo from sales of Gentoo related merchandise.
+</p>
+<p>
+Please do not buy from unlicenced vendors but we would like to hear about any that you spot.
+Please email the <mail link="trustees@gentoo.org">trustees</mail>
+</p>
+</body>
+</section>
+
+<section>
+<title>Americas</title>
+<body>
+<p>
+<uri link="http://www.cafepress.com/officialgentoo/">Offical Gentoo Cafepress Store</uri>
+located in the USA
+</p>
+<p></p>
+<p>
+<uri link="http://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html">Techiant, LLC</uri> for Case and Laptop Badges
+located in the USA
+</p>
+</body>
+</section>
+
+<section>
+<title>Europe</title>
+<body>
+<p>
+<uri link="http://22258.spreadshirt.net/de/DE/Shop">Offical Friends of Gentoo e.V Store</uri>
+located in Germany
</p>
</body>
</section>
<section>
-<title>Worldwide</title>
<body>
<p>
-<uri link="http://www.cafepress.com/officialgentoo/">Offical Gentoo Cafepress Store</uri><br />
+If you buy something from a licenced vendor and you like it, tell all your friends.
+</p>
+<p>
+If you have problems with quality or the vendor, please tell
+<mail link="trustees@gentoo.org">us</mail> and the vendor.
+We do not undertake to resolve individual issues but we take the quality of goods bearing
+ our logo very seriously indeed.
</p>
</body>
</section>
</chapter>
+<chapter>
+<title>Unlicenced Vendors</title>
+<section>
+<body>
+<p>
+If you would like a listing here please email the <mail link="trustees@gentoo.org">trustees</mail>
+</p>
+<p>
+A listing on this page is included in the licence.
+</p>
+<p>
+Gentoo has to defend its registered marks to prevent them becoming public domain and we try to do
+it in the friendy way that is the hallmark of the open source community.
+</p>
+<p>
+</p>
+</body>
+</section>
+</chapter>
</mainpage>
next reply other threads:[~2009-07-26 12:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-26 12:31 Roy Bamford (neddyseagoon) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-24 1:34 [gentoo-commits] gentoo commit in xml/htdocs/main/en: stores.xml David Abbott (dabbott)
2012-10-21 19:37 David Abbott (dabbott)
2012-09-16 20:04 David Abbott (dabbott)
2012-02-25 0:56 David Abbott (dabbott)
2012-02-01 15:11 David Abbott (dabbott)
2011-10-15 17:43 David Abbott (dabbott)
2011-08-21 20:10 Robin H. Johnson (robbat2)
2011-05-15 21:37 David Abbott (dabbott)
2011-03-21 15:28 David Abbott (dabbott)
2011-03-21 14:42 David Abbott (dabbott)
2011-03-20 22:21 David Abbott (dabbott)
2011-02-27 18:29 Joshua Saddler (nightmorph)
2010-07-25 14:46 David Abbott (dabbott)
2010-07-25 14:40 David Abbott (dabbott)
2010-06-07 21:16 David Abbott (dabbott)
2009-11-16 1:58 David Abbott (dabbott)
2009-11-16 1:40 David Abbott (dabbott)
2009-11-16 1:22 Robin H. Johnson (robbat2)
2009-11-16 0:54 David Abbott (dabbott)
2009-11-16 0:32 David Abbott (dabbott)
2009-06-14 20:15 Robin H. Johnson (robbat2)
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=E1MV2sx-0007dY-Ix@stork.gentoo.org \
--to=neddyseagoon@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