4 files changed, 18 insertions, 29 deletions
diff --git a/docs/developers.html b/docs/developers.html
index 410f1ac5e8e..8960e7cb48b 100644
--- a/docs/developers.html
+++ b/docs/developers.html
@@ -12,12 +12,14 @@
 Both professional and volunteer developers contribute to Mesa.
 </p>
 <p>
-<a href="http://www.tungstengraphics.com/" target="_parent">Tungsten Graphics</a>
+<a href="http://www.vmware.com/" target="_parent">VMware</a>
 employs several of the main Mesa developers including Brian Paul
 and Keith Whitwell.
-Much of the on-going work in Mesa is done through Tungsten Graphics engineering
-contracts.
-Prominent examples of this work includes:
+</p>
+
+<p>
+In the past, Tungsten Graphics contracts implemented many Mesa features
+including:
 </p>
 <ul>
 <li>DRI drivers for Intel i965, i945, i915 and other chips
@@ -29,23 +31,19 @@ Prominent examples of this work includes:
 <p>
 Other companies including
 <a href="http://www.intellinuxgraphics.org/index.html" target="_parent">Intel</a>
-and IBM also actively contribute to the project.
+and RedHat also actively contribute to the project.
+Intel has recently contributed the new GLSL compiler in Mesa 7.9.
 </p>
 
 <p>
-Volunteers have made significant contributions to all parts of Mesa, including
-complete device drivers.
+<a href="http://www.lunarg.com/" target="_parent">LunarG</a> can be contacted
+for custom Mesa / 3D graphics development.
 </p>
 
-
-<H1>Custom Development</H1>
 <p>
-Contact <a href="http://www.tungstengraphics.com/" target="_parent">
-Tungsten Graphics</a>
-for information about custom development in Mesa, OpenGL, X and other
-graphics technologies.
+Volunteers have made significant contributions to all parts of Mesa, including
+complete device drivers.
 </p>
 
-
 </body>
 </html>
diff --git a/docs/intro.html b/docs/intro.html
index aae2e6e1928..0806caf388e 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -111,11 +111,9 @@ It implements the OpenGL 1.3 specification.
 
 
 <p>
-November 2001: I cofound <a href="http://www.tungstengraphics.com" target="_parent">
-Tungsten Graphics, Inc.</a> with Keith Whitwell, Jens Owen, David Dawes and
-Frank LaMonica.
-I continue to develop Mesa as part of my resposibilities with Tungsten
-Graphics and as a spare-time project.
+November 2001: I cofounded Tungsten Graphics, Inc. with Keith Whitwell,
+Jens Owen, David Dawes and Frank LaMonica.
+Tungsten Graphics was acquired by VMware in December 2008.
 </p>
 
 <p>
diff --git a/docs/news.html b/docs/news.html
index b7731cdaf3f..0a30d853118 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -157,9 +157,6 @@ Added a new page describing the <a href="cell.html">Mesa Cell driver</a>.
 <p>
 Gallium3D is the codename for the new Mesa device driver architecture
 which is currently under development.
-A <a href="http://wiki.freedesktop.org/wiki/Software/gallium"
-target="_parent"> summary</a> of the architecture can be found on the
-Tungsten Graphics website.
 </p>
 <p>
 Gallium3D development is taking place on the <em>gallium-0.1</em> branch
@@ -210,11 +207,8 @@ shading language and built-in functions.
 
 <h2>April 2007</h2>
 <p>
-Thomas Hellstr&ouml;m of
-<a href="http://www.tungstengraphics.com" target="_parent">
-Tungsten Graphics</a> has written a whitepaper describing the new
-<a href="http://www.tungstengraphics.com/mm.pdf">DRI memory management
-system</a>.
+Thomas Hellstr&ouml;m of Tungsten Graphics has written a whitepaper
+describing the new DRI memory management system</a>.
 </p>
 
 <h2>December 5, 2006</h2>
diff --git a/docs/subset-A.html b/docs/subset-A.html
index dac66a61bae..d576bb67440 100644
--- a/docs/subset-A.html
+++ b/docs/subset-A.html
@@ -16,8 +16,7 @@
 </h3>
 </center>
 </h2>
-<p> Copyright &copy; 2002-2003 by <a
- href="http://www.tungstengraphics.com/">Tungsten Graphics, Inc.</a>,
+<p> Copyright &copy; 2002-2003 by Tungsten Graphics, Inc.,
 Cedar Park, Texas. All Rights Reserved. <br>
 <br>
 Permission is granted to make and distribute verbatim copies of this