Gentoo Archives: gentoo-commits

From: Matthew Marchese <maffblaster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] sites/www:master commit in: inside-gentoo/stores/
Date: Tue, 06 Jun 2017 06:44:54
Message-Id: 1496731412.f44928c018ee2656a2bffd7ccf74faa593b422b9.maffblaster@gentoo
1 commit: f44928c018ee2656a2bffd7ccf74faa593b422b9
2 Author: Matthew Marchese <maffblaster <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 6 06:43:32 2017 +0000
4 Commit: Matthew Marchese <maffblaster <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 6 06:43:32 2017 +0000
6 URL: https://gitweb.gentoo.org/sites/www.git/commit/?id=f44928c0
7
8 Add sticker vendor (#608088).
9
10 Upgrade some links on Stores page to HTTPS.
11 Describe vendor offerings (except India, which is down currently).
12
13 Signed-off-by: Matthew Marchese <maffblaster <AT> gentoo.org>
14
15 inside-gentoo/stores/index.md | 19 ++++++++++---------
16 1 file changed, 10 insertions(+), 9 deletions(-)
17
18 diff --git a/inside-gentoo/stores/index.md b/inside-gentoo/stores/index.md
19 index 57af4b4..fc9a192 100644
20 --- a/inside-gentoo/stores/index.md
21 +++ b/inside-gentoo/stores/index.md
22 @@ -14,25 +14,26 @@ Or, if you simply don't have the ability to download the large DVD or CD images,
23 ## Approved Vendors
24
25 Gentoo merchanise may be purchased from the following vendors who have been licensed to use the
26 -Gentoo Logo by either the [Gentoo Foundation Inc](http://foundation.gentoo.org) (in the USA) or
27 -[Friends of Gentoo e.V.](http://www.gentoo-ev.org) within the European Union.
28 +Gentoo Logo by either the [Gentoo Foundation Inc](https://foundation.gentoo.org) (in the USA) or
29 +[Friends of Gentoo e.V.](https://www.gentoo-ev.org) within the European Union.
30
31 Approved Vendors make a small contribution to Gentoo from sales of Gentoo related merchandise.
32
33 ### Americas
34
35 -* [Offical Gentoo Cafepress Store](http://www.cafepress.com/officialgentoo/) located in the USA
36 -* [Techiant, LLC](http://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) for Case Badges located in the USA
37 -* [Stormfront Gentoo Section](http://www.jbox.ca/product-category/computers-tablets/software/linux-cds-dvds/gentoo-cds-dvds/) for DVDs located in Canada
38 +* [Offical Gentoo Cafepress Store](http://www.cafepress.com/officialgentoo/) - Clothing and schwag. Located in the USA.
39 +* [Techiant, LLC](https://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) - Case badges (stickers). Located in the USA
40 +* [Stickermule (by tecknicaltom)](https://www.stickermule.com/user/1070792095/stickers) - Case badges (stickers). Located in the USA.
41 +* [Stormfront Gentoo Section](https://www.jbox.ca/product-category/computers-tablets/software/linux-cds-dvds/gentoo-cds-dvds/) - DVDs. Located in Canada.
42
43 ### Asia
44
45 -* [Zyxware Technologies](http://www.zyxware.com/requestcd?title=gentoo) located in India
46 +* [Zyxware Technologies](http://www.zyxware.com/requestcd?title=gentoo) - Located in India.
47
48 ### Europe
49
50 -* [Offical Friends of Gentoo e.V Store](http://22258.spreadshirt.net/de/DE/Shop) located in Germany
51 -* [LinuxPusher](http://www.linuxpusher.com/distributions/Gentoo-Linux) located in Denmark
52 +* [Offical Friends of Gentoo e.V Store](https://22258.spreadshirt.net/de/DE/Shop) - Tee shirts, keychains, and mugs. Located in Germany.
53 +* [LinuxPusher](http://www.linuxpusher.com/distributions/Gentoo-Linux) - Stickers, keychains, and mugs. Located in Denmark.
54
55 If you buy something from a licenced vendor and you like it, tell all your friends.
56
57 @@ -60,4 +61,4 @@ or make an agreement with Gentoo for the listing.
58 That agreement could be one where you donate some amount to Gentoo or could be free, at Gentoo's discretion.
59 Vendors supporting open source will be considered heavily for free listing.
60 We do not list commercial vendors who do not give back to Gentoo because we already have a Gentoo store.
61 -If you are making a profit, contact the Gentoo foundation to negotiate an agreement.
62 \ No newline at end of file
63 +If you are making a profit, contact the Gentoo foundation to negotiate an agreement.