| 1 |
nightmorph 10/09/10 14:49:41 |
| 2 |
|
| 3 |
Modified: contact.xml |
| 4 |
Log: |
| 5 |
move www further down the list. we get lots of wrong messages; make it more obvious that financial/legal queries should be sent to trustees, not www |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.6 xml/htdocs/main/en/contact.xml |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/contact.xml?rev=1.6&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/contact.xml?rev=1.6&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/main/en/contact.xml?r1=1.5&r2=1.6 |
| 13 |
|
| 14 |
Index: contact.xml |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/main/en/contact.xml,v |
| 17 |
retrieving revision 1.5 |
| 18 |
retrieving revision 1.6 |
| 19 |
diff -u -r1.5 -r1.6 |
| 20 |
--- contact.xml 22 Jul 2010 08:55:27 -0000 1.5 |
| 21 |
+++ contact.xml 10 Sep 2010 14:49:41 -0000 1.6 |
| 22 |
@@ -1,5 +1,7 @@ |
| 23 |
<?xml version="1.0" encoding="UTF-8"?> |
| 24 |
<!DOCTYPE mainpage SYSTEM "/dtd/guide.dtd"> |
| 25 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/main/en/contact.xml,v 1.6 2010/09/10 14:49:41 nightmorph Exp $ --> |
| 26 |
+ |
| 27 |
<mainpage> |
| 28 |
<title>Gentoo Linux Contacts</title> |
| 29 |
|
| 30 |
@@ -15,8 +17,8 @@ |
| 31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
| 32 |
<license/> |
| 33 |
|
| 34 |
-<version>2</version> |
| 35 |
-<date>2010-07-22</date> |
| 36 |
+<version>3</version> |
| 37 |
+<date>2010-09-10</date> |
| 38 |
|
| 39 |
<chapter> |
| 40 |
<title>Who do I contact?</title> |
| 41 |
@@ -27,8 +29,9 @@ |
| 42 |
<ul> |
| 43 |
<li><uri link="#intro">Introduction</uri></li> |
| 44 |
<li><uri link="#pr">Public Relations/Events</uri></li> |
| 45 |
- <li><uri link="#www">Webmaster</uri></li> |
| 46 |
<li><uri link="#trustees">The Gentoo Foundation</uri></li> |
| 47 |
+ <li><uri link="#www">Webmaster</uri></li> |
| 48 |
+ |
| 49 |
</ul> |
| 50 |
|
| 51 |
</body> |
| 52 |
@@ -60,15 +63,16 @@ |
| 53 |
</impo> |
| 54 |
|
| 55 |
<p> |
| 56 |
-For information regarding this website, or any other Gentoo website hosted on a |
| 57 |
-<c>gentoo.org</c> domain, you will likely want to speak with Gentoo's <uri |
| 58 |
-link="#www">Webmasters</uri>. |
| 59 |
+For information about donations, The Gentoo Foundation, or anything else related |
| 60 |
+to Gentoo intellectual property, trademarks, and copyrights, you will likely |
| 61 |
+want to speak to the Gentoo Foundation's <uri link="#trustees">Board of |
| 62 |
+Trustees</uri>. |
| 63 |
</p> |
| 64 |
|
| 65 |
<p> |
| 66 |
-For information about The Gentoo Foundation, or anything else related to Gentoo |
| 67 |
-intellectual property, trademarks, and copyrights, you will likely want to |
| 68 |
-speak to the Gentoo Foundation's <uri link="#trustees">Board of Trustees</uri>. |
| 69 |
+For information regarding this website, or any other Gentoo website hosted on a |
| 70 |
+<c>gentoo.org</c> domain, you will likely want to speak with Gentoo's <uri |
| 71 |
+link="#www">Webmasters</uri>. |
| 72 |
</p> |
| 73 |
|
| 74 |
<p> |
| 75 |
@@ -109,36 +113,37 @@ |
| 76 |
</body> |
| 77 |
</section> |
| 78 |
|
| 79 |
-<section id="www"> |
| 80 |
-<title>Webmasters</title> |
| 81 |
+<section id="trustees"> |
| 82 |
+<title>The Gentoo Foundation Board of Trustees</title> |
| 83 |
<body> |
| 84 |
|
| 85 |
<p> |
| 86 |
-Maintaining Gentoo's presence on the web is a daunting task. Gentoo has a |
| 87 |
-dedicated team of webmasters who keep our site looking sharp and up-to-date. If |
| 88 |
-you have a question or comment about any Gentoo web site, then this team is |
| 89 |
-what you are looking for. They can be contacted by sending an email to |
| 90 |
-<mail>www@g.o</mail>. |
| 91 |
+<uri link="/foundation/en/">The Gentoo Foundation</uri> is a non-profit |
| 92 |
+organization that was formed to be the protector of Gentoo's intellectual |
| 93 |
+property. The Board of Trustees are the elected keepers of the legal entity that |
| 94 |
+is Gentoo within the United States. If your question is financial or legal in |
| 95 |
+nature, then you will want to send an email to <mail>trustees@g.o</mail> |
| 96 |
+and a member of the board will get back to you as soon as possible. |
| 97 |
</p> |
| 98 |
|
| 99 |
</body> |
| 100 |
</section> |
| 101 |
|
| 102 |
-<section id="trustees"> |
| 103 |
-<title>The Gentoo Foundation Board of Trustees</title> |
| 104 |
+<section id="www"> |
| 105 |
+<title>Webmasters</title> |
| 106 |
<body> |
| 107 |
|
| 108 |
<p> |
| 109 |
-<uri link="/foundation/en/">The Gentoo Foundation</uri> is a non-profit |
| 110 |
-organization that was formed to be the protector of Gentoo's intellectual |
| 111 |
-property. The Board of Trustees are the elected keepers of the legal entity |
| 112 |
-that is Gentoo within the United States. If your question is legal in nature, |
| 113 |
-then you will want to send an email to <mail>trustees@g.o</mail> and a |
| 114 |
-member of the board will get back to you as soon as possible. |
| 115 |
+Maintaining Gentoo's presence on the web is a daunting task. Gentoo has a |
| 116 |
+dedicated team of webmasters who keep our site looking sharp and up-to-date. If |
| 117 |
+you have a question or comment about any Gentoo web site, then this team is |
| 118 |
+what you are looking for. They can be contacted by sending an email to |
| 119 |
+<mail>www@g.o</mail>. |
| 120 |
</p> |
| 121 |
|
| 122 |
</body> |
| 123 |
</section> |
| 124 |
|
| 125 |
+ |
| 126 |
</chapter> |
| 127 |
</mainpage> |
Archives