[xiph-commits] r9669 - websites/xiph.org/contact

[giles at svn.xiph.org]

Author: giles
Date: 2005-07-30 17:38:33 -0700 (Sat, 30 Jul 2005)
New Revision: 9669

Modified:
   websites/xiph.org/contact/index.shtml.en
Log:
Merge the two committed versions of the contact page.


Modified: websites/xiph.org/contact/index.shtml.en
===================================================================
--- websites/xiph.org/contact/index.shtml.en	2005-07-31 00:06:06 UTC (rev 9668)
+++ websites/xiph.org/contact/index.shtml.en	2005-07-31 00:38:33 UTC (rev 9669)
@@ -1,50 +1,61 @@
-<!--#include virtual="/ssi/header.include" -->
-<!--  Enter custom page information and styles here -->
-
-<title>Xiph.org: Contact Information</title>
-<style type="text/css">
-<!--
-
--->
-</style>
-
-<!--#include virtual="/ssi/xiphbar.include" -->
-<!--#include virtual="/ssi/pagetop.include" -->
-<!--  All your page content goes here  -->
-<h1>Xiph.org: Contact Information</h1>
-
-<p>Xiph.org are:</p>
-
-<div class="vcard">
-	<a class="email fn" href="mailto:monty at xiph.org">Christopher Montgomery</a>
-	<div class="role"><span>Founder</span> and <span>Lead Programmer</span></div>
-</div>
-
-<div class="vcard">
-	<a class="email fn" href="mailto:jack at xiph.org">Jack Moffitt</a>
-	<div class="role"><span>Executive Contact</span></div>
-</div>
-
-<div class="vcard">
-	<a class="email fn" href="mailto:manuel at xiph.org">Manuel Lora</a>
-	<div class="role"><span>Project Manager</span></div>
-</div>
-
-<div class="vcard">
-	<a class="email fn" href="mailto:comatoast at xiph.org">Nathan Sharfi</a>
-	<div class="role"><span>Webmaster</span></div>
-</div>
-
-<div class="vcard">
-	<a class="email fn" href="mailto:trosedale at brllegal.com">Tom Rosedale</a>
-	<div class="role"><span>Legal Counsel</span></div>
-	<div class="org"><a class="url" href="http://www.brllegal.com/">Browne, Rosedale, &amp; Lanouette LLP<a></div>
-</div>
-
-<div class="vcard">
- <a class="email fn" href="mailto:"></a>
- <div class="role"><span></span></div>
-</div>
-
-
-<!--#include virtual="/ssi/pagebottom.include" -->
\ No newline at end of file
+<!--#include virtual="/ssi/header.include" -->
+<!--  Enter custom page information and styles here -->
+
+<title>Xiph.org: Contact Information</title>
+<style type="text/css">
+<!--
+
+.vcard {
+	padding-bottom: 1.2em;
+}
+
+-->
+</style>
+
+<!--#include virtual="/ssi/xiphbar.include" -->
+<!--#include virtual="/ssi/pagetop.include" -->
+<!--  All your page content goes here  -->
+
+<h1>Getting in touch</h1>
+<p>
+The best way to contact members of the Xiph.org Foundation and community 
+is to post to one of the <a 
+href="http://lists.xiph.org/mailman/listinfo/">mailing lists</a> or find
+us on IRC on <a href="http://freenode.net/">irc.freenode.net</a>.
+Try the channels <tt>#xiph</tt> for general information, or the 
+general project channels: <tt>#vorbis</tt>, <tt>#theora</tt>, 
+<tt>#icecast</tt> and <tt>#speex</tt>.
+</p>
+
+<p>
+Below are some point contacts for particular people in the organization.
+</p>
+
+<div class="vcard">
+	<a class="email fn" href="mailto:webmaster at xiph.org">Webmaster</a>
+	<div class="role"><span>contact for website-related issues</span></div>
+</div>
+
+<div class="vcard">
+	<a class="email fn" href="mailto:monty at xiph.org">Christopher Montgomery</a>
+	<div class="role"><span>Founder</span> and <span>Executive Contact</span></div>
+</div>
+
+<div class="vcard">
+	<a class="email fn" href="mailto:manuel at xiph.org">Manuel Lora</a>
+	<div class="role"><span>Project Manager</span></div>
+</div>
+
+<div class="vcard">
+	<a class="email fn" href="mailto:trosedale at brllegal.com">Tom Rosedale</a>
+	<div class="role"><span>Legal Counsel</span></div>
+	<div class="org"><a class="url" href="http://www.brllegal.com/">Browne, Rosedale, &amp; Lanouette LLP<a></div>
+</div>
+
+<div class="vcard">
+ <a class="email fn" href="mailto:"></a>
+ <div class="role"><span></span></div>
+</div>
+
+
+<!--#include virtual="/ssi/pagebottom.include" -->