aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Marchese <maffblaster@gentoo.org>2017-06-05 23:43:32 -0700
committerMatthew Marchese <maffblaster@gentoo.org>2017-06-05 23:43:32 -0700
commitf44928c018ee2656a2bffd7ccf74faa593b422b9 (patch)
tree8bae616e6e95770726b48e9daa5ef4c5b6332418 /inside-gentoo
parentConfidential contacts update (#616772). (diff)
downloadwww-f44928c018ee2656a2bffd7ccf74faa593b422b9.tar.gz
www-f44928c018ee2656a2bffd7ccf74faa593b422b9.tar.bz2
www-f44928c018ee2656a2bffd7ccf74faa593b422b9.zip
Add sticker vendor (#608088).
Upgrade some links on Stores page to HTTPS. Describe vendor offerings (except India, which is down currently). Signed-off-by: Matthew Marchese <maffblaster@gentoo.org>
Diffstat (limited to 'inside-gentoo')
-rw-r--r--inside-gentoo/stores/index.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/inside-gentoo/stores/index.md b/inside-gentoo/stores/index.md
index 57af4b4..fc9a192 100644
--- a/inside-gentoo/stores/index.md
+++ b/inside-gentoo/stores/index.md
@@ -14,25 +14,26 @@ Or, if you simply don't have the ability to download the large DVD or CD images,
## Approved Vendors
Gentoo merchanise may be purchased from the following vendors who have been licensed to use the
-Gentoo Logo by either the [Gentoo Foundation Inc](http://foundation.gentoo.org) (in the USA) or
-[Friends of Gentoo e.V.](http://www.gentoo-ev.org) within the European Union.
+Gentoo Logo by either the [Gentoo Foundation Inc](https://foundation.gentoo.org) (in the USA) or
+[Friends of Gentoo e.V.](https://www.gentoo-ev.org) within the European Union.
Approved Vendors make a small contribution to Gentoo from sales of Gentoo related merchandise.
### Americas
-* [Offical Gentoo Cafepress Store](http://www.cafepress.com/officialgentoo/) located in the USA
-* [Techiant, LLC](http://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) for Case Badges located in the USA
-* [Stormfront Gentoo Section](http://www.jbox.ca/product-category/computers-tablets/software/linux-cds-dvds/gentoo-cds-dvds/) for DVDs located in Canada
+* [Offical Gentoo Cafepress Store](http://www.cafepress.com/officialgentoo/) - Clothing and schwag. Located in the USA.
+* [Techiant, LLC](https://www.case-badges.com/gentoo-logo-3d-domed-computer-case-badges-p-212.html) - Case badges (stickers). Located in the USA
+* [Stickermule (by tecknicaltom)](https://www.stickermule.com/user/1070792095/stickers) - Case badges (stickers). Located in the USA.
+* [Stormfront Gentoo Section](https://www.jbox.ca/product-category/computers-tablets/software/linux-cds-dvds/gentoo-cds-dvds/) - DVDs. Located in Canada.
### Asia
-* [Zyxware Technologies](http://www.zyxware.com/requestcd?title=gentoo) located in India
+* [Zyxware Technologies](http://www.zyxware.com/requestcd?title=gentoo) - Located in India.
### Europe
-* [Offical Friends of Gentoo e.V Store](http://22258.spreadshirt.net/de/DE/Shop) located in Germany
-* [LinuxPusher](http://www.linuxpusher.com/distributions/Gentoo-Linux) located in Denmark
+* [Offical Friends of Gentoo e.V Store](https://22258.spreadshirt.net/de/DE/Shop) - Tee shirts, keychains, and mugs. Located in Germany.
+* [LinuxPusher](http://www.linuxpusher.com/distributions/Gentoo-Linux) - Stickers, keychains, and mugs. Located in Denmark.
If you buy something from a licenced vendor and you like it, tell all your friends.
@@ -60,4 +61,4 @@ or make an agreement with Gentoo for the listing.
That agreement could be one where you donate some amount to Gentoo or could be free, at Gentoo's discretion.
Vendors supporting open source will be considered heavily for free listing.
We do not list commercial vendors who do not give back to Gentoo because we already have a Gentoo store.
-If you are making a profit, contact the Gentoo foundation to negotiate an agreement. \ No newline at end of file
+If you are making a profit, contact the Gentoo foundation to negotiate an agreement.