From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-197970-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1N9pWH-0001mL-MG
	for garchives@archives.gentoo.org; Mon, 16 Nov 2009 00:32:37 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 44EE8E08B0;
	Mon, 16 Nov 2009 00:32:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 06104E08B0
	for <gentoo-commits@lists.gentoo.org>; Mon, 16 Nov 2009 00:32:36 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 8F95267990
	for <gentoo-commits@lists.gentoo.org>; Mon, 16 Nov 2009 00:32:35 +0000 (UTC)
Received: from dabbott by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <dabbott@gentoo.org>)
	id 1N9pWF-0005jn-32
	for gentoo-commits@lists.gentoo.org; Mon, 16 Nov 2009 00:32:35 +0000
From: "David Abbott (dabbott)" <dabbott@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, dabbott@gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/main/en: stores.xml
X-VCS-Repository: gentoo
X-VCS-Files: stores.xml
X-VCS-Directories: xml/htdocs/main/en
X-VCS-Committer: dabbott
X-VCS-Committer-Name: David Abbott
Content-Type: text/plain; charset=utf8
Message-Id: <E1N9pWF-0005jn-32@stork.gentoo.org>
Sender: David Abbott <dabbott@stork.gentoo.org>
Date: Mon, 16 Nov 2009 00:32:35 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: d4292a9d-1a59-4b9d-a0b7-3ec3a612c51c
X-Archives-Hash: aa6bdaaf1e303748a434435e0c67cd22

dabbott     09/11/16 00:32:35

  Modified:             stores.xml
  Log:
  Moving Links from vendors from Get Gentoo page

Revision  Changes    Path
1.3                  xml/htdocs/main/en/stores.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/sto=
res.xml?rev=3D1.3&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/sto=
res.xml?rev=3D1.3&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/main/en/sto=
res.xml?r1=3D1.2&r2=3D1.3

Index: stores.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stores.xml	26 Jul 2009 12:31:27 -0000	1.2
+++ stores.xml	16 Nov 2009 00:32:35 -0000	1.3
@@ -1,13 +1,19 @@
-=EF=BB=BF<?xml version=3D'1.0' encoding=3D'UTF-8'?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v 1.2 20=
09/07/26 12:31:27 neddyseagoon Exp $-->
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!DOCTYPE mainpage SYSTEM "/dtd/guide.dtd">
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/stores.xml,v 1.3 20=
09/11/16 00:32:35 dabbott Exp $ -->
=20
 <mainpage>
 <title>Gentoo Stores</title>
+
 <author title=3D"Author">
-  <mail link=3D"robbat2">Robin H. Johnson</mail>
+  <mail link=3D"robbit2">Robin H. Johnson</mail>
 </author>
=20
+<author title=3D"Author">
+  <mail link=3D"dabbott">David Abbott</mail>
+</author>
+
+
 <abstract>
 This document lists the places that Gentoo merchandise may be purchased.
 </abstract>
@@ -15,7 +21,27 @@
 <license/>
=20
 <version>1.1</version>
-<date>2009-07-26</date>
+<date>2009-11-15</date>
+
+<chapter>
+<title>Vendor Information</title>
+<section>
+<body>
+
+<p>
+There are many types of business that are providing solutions based on G=
entoo,
+from a simple pre-load of Gentoo for a desktop PC, to a complex multi-ve=
ndor
+application environment.=20
+</p>
+
+<p>
+If you simply don't have the ability to download the large DVD or CD ima=
ges,
+then you may wish to purchase a Gentoo DVD or CD.=20
+</p>
+
+</body>
+</section>
+</chapter>
=20
 <chapter>
 <title>Approved Vendors</title>
@@ -47,8 +73,8 @@
 </p>
 <p></p>
 <p>
-<uri link=3D"http://www.case-badges.com/gentoo-logo-3d-domed-computer-ca=
se-badges-p-212.html">Techiant, LLC</uri> for Case and Laptop Badges
-located in the USA
+<uri link=3D"http://www.case-badges.com/gentoo-logo-3d-domed-computer-ca=
se-badges-p-212.html">
+	Techiant, LLC</uri> for Case and Laptop Badges located in the USA
 </p>
 </body>
 </section>
@@ -76,25 +102,203 @@
 </p>
 </body>
 </section>
+
+<section>
+<title>Gentoo Linux DVDs</title>
+<body>
+<p>
+<b>North America:</b>
+</p>
+<p>
+	<uri link=3D"http://www.jbox.ca/software/linux-distributions/gentoo/">=20
+		Stormfront Gentoo Section</uri>
+</p>
+</body>
+</section>
 </chapter>
=20
 <chapter>
 <title>Unlicenced Vendors</title>
 <section>
+<title>Information</title>
+<body>
+<p>
+If you would like a listing here please email the <mail
+	link=3D"trustees@gentoo.org">trustees</mail> A listing on this page is =
included
+in the <uri link=3D"name-logo.xml"> license. </uri>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>
+</body>
+</section>
+
+<section>
+<title>Gentoo Linux CDs</title>
 <body>
+
+<p>
+	<b>North America:</b>
+</p>
+<p>
+<uri link=3D"http://www.cheapbytes.com">CheapBytes</uri>
+</p>
+<p>
+<uri link=3D"http://edmunds-enterprises.com">Edmunds Enterprises</uri>
+</p>
+<p>
+<uri link=3D"http://store.madtux.org">MadTux</uri>
+</p>
+<p>
+<uri link=3D"http://www.frozentech.com">Frozentech</uri>
+</p>
+<p>
+<uri link=3D"http://www.osdisc.com/cgi-bin/view.cgi/products/linux/gento=
o">OSDisc.com</uri>
+</p>
+<p>
+<uri link=3D"http://www.thelinuxstore.ca">The Linux Store</uri>
+</p>
 <p>
-If you would like a listing here please email the <mail link=3D"trustees=
@gentoo.org">trustees</mail>
+<uri link=3D"http://onedollarlinux.com/index.php?cPath=3D21_30">OneDolla=
rLinux</uri>
 </p>
 <p>
-A listing on this page is included in the licence.
+	<b>Europe:</b>
 </p>
 <p>
-Gentoo has to defend its registered marks to prevent them becoming publi=
c domain and we try to do=20
-it in the friendy way that is the hallmark of the open source community.
+<uri link=3D"http://www.linuxpusher.dk/gentoo.php">LinuxPusher.dk (Denma=
rk)</uri>
 </p>
 <p>
+<uri link=3D"http://www.liniso.de">LinISO.de (Germany)</uri>
 </p>
+<p>
+<uri link=3D"http://www.eexi.net/content/anoikto_logismiko.php">Eexi.gr =
(Greece)</uri>
+</p>
+<p>
+<uri link=3D"http://www.munnikes.nl/cd/">Munnikes.nl (The Netherlands)</=
uri>
+</p>
+<p>
+<uri link=3D"http://www.maxtux.co.uk">MaxTux (UK)</uri>
+</p>
+<p>
+<uri link=3D"http://getlinux.leprado.com">Getlinux (FR)</uri>
+</p>
+<p>
+<uri link=3D"http://www.linux2go.de">Linux2Go (DE)</uri>
+</p>
+<p>
+<uri link=3D"http://www.cd-dvd-linux-bsd.com">CD/DVD/Linux/BSD (FR)</uri=
>
+</p>
+<p>
+<uri link=3D"http://www.cheaplinux.de/systeme/gentoo.php">CheapLinux (DE=
)</uri>
+</p>
+<p>
+<uri link=3D"http://www.tuxdiscs.com">TuxDiscs (UK)</uri>
+</p>
+<p>
+<uri link=3D"http://www.linux-distro.co.uk">Linux-Distro (UK)</uri>
+</p>
+<p>
+	<uri link=3D"http://www.linuxshoppen.dk/products.php?showgroup_id=3D14#=
Gentoo%20Linux">
+		linuxshoppen.dk (Denmark)</uri>
+</p>
+<p>
+<uri link=3D"http://www.ikarios.com/p24-Gentoo.html">Ikarios (FR)</uri>
+</p>
+<p>
+	<b>Brazil</b>
+</p>
+<p>
+<uri link=3D"http://www.distribuicoeslinux.com.br/">Brazilian Store of L=
inux Media</uri>
+</p>
+<p>
+	<b>Oceania:</b>
+</p>
+<p>
+<uri link=3D"http://www.lankum.com">lankum.com - The Australian Linux/BS=
D Online Store</uri>
+</p>
+<p>
+<uri link=3D"http://shop.linuxit.com.au/">Linux Information Technology (=
Australia)</uri>
+</p>
+<p>
+<uri link=3D"http://www.lsl.com.au/">Linux System Labs Australia</uri>
+</p>
+<p>
+<uri link=3D"http://www.linuxcdmall.com/gentoo.html">Linux CD Mall (New =
Zealand)</uri>
+</p>
+<p>
+	<b>Asia:</b>
+</p>
+<p>
+<uri link=3D"http://linuxflavour.cjb.in/zen/">Linux Flavour (India)</uri=
>
+</p>
+
+</body>
+</section>
+
+<section>
+<title>Computers with Gentoo Linux pre-installed</title>
+<body>
+
+<p>
+The following companies sell computers that come pre-installed with Gent=
oo=20
+Linux.
+</p>
+
+<p>
+	<b>North America:</b>
+</p>
+<p>
+<uri link=3D"http://linuxcertified.com/gentoo-laptop.html">Linux Certifi=
ed, Inc.</uri>
+</p>
+<p>
+<uri link=3D"http://www.micronux.com">Micronux</uri>
+</p>
+<p>
+<uri link=3D"http://www.rayservers.com/">rayServers</uri>
+</p>
+<p>
+<uri link=3D"http://www.microway.com">Microway, Inc.</uri>
+</p>
+<p>
+<uri link=3D"http://www.bestekpc.ca">BestekPC</uri>
+</p>
+
+<p>
+	<b>Australia:</b>
+</p>
+<p>
+<uri link=3D"http://www.vgcomputing.com.au">VG Computing</uri>
+</p>
+
+<p>
+	<b>Europe:</b>
+</p>
+<p>
+<uri link=3D"http://www.linux-service.be">Linux Service (Belgium)</uri>
+</p>
+
+</body>
+</section>
+
+<section>
+<title>Want to be listed on this page?</title>
+<body>
+
+<p>
+For vendor listing on this page, Gentoo requires that you sell our media=
=20
+at no "profit" as described by the GPL (reasonable cost to cover=20
+expenses) or make an agreement with Gentoo for the listing. That=20
+agreement could be one where you donate some amount to Gentoo or could=20
+be free, at Gentoo's discretion. Vendors supporting open source will be=20
+considered heavily for free listing. We do not list commercial vendors=20
+who do not give back to Gentoo because we already have a Gentoo store.=20
+If you are making a profit, contact the <mail=20
+link=3D"trustees@gentoo.org">Gentoo foundation</mail> to negotiate an=20
+agreement.
+</p>
+
 </body>
 </section>
 </chapter>
 </mainpage>
+
+