xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012

17 files changed, 101 insertions, 80 deletions

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 89b46c0a4..36d24725d 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -72,15 +72,16 @@ GLX_ARB_create_context_profile                        DONE
 
 GL 3.3:
 
-GLSL 3.30                                             not started
+GLSL 3.30                                             new features in this version pretty much done
 GL_ARB_blend_func_extended                            DONE (i965, r600, softpipe)
 GL_ARB_explicit_attrib_location                       DONE (i915, i965, r300, r600, swrast)
 GL_ARB_occlusion_query2                               DONE (r300, r600, swrast)
 GL_ARB_sampler_objects                                DONE (i965, r300, r600)
+GL_ARB_shader_bit_encoding                            DONE
 GL_ARB_texture_rgb10_a2ui                             DONE (r600)
 GL_ARB_texture_swizzle                                DONE (same as EXT version) (i965, r300, r600, swrast)
 GL_ARB_timer_query                                    ~60% done (the EXT variant)
-GL_ARB_instanced_arrays                               DONE (r300, r600)
+GL_ARB_instanced_arrays                               DONE (i965, r300, r600)
 GL_ARB_vertex_type_2_10_10_10_rev                     DONE (r600)
 
 
diff --git a/mesalib/docs/autoconf.html b/mesalib/docs/autoconf.html
index 4f1ad8d64..4fa96c3c6 100644
--- a/mesalib/docs/autoconf.html
+++ b/mesalib/docs/autoconf.html
@@ -10,18 +10,18 @@
 <h1>Compilation and Installation using Autoconf</h1>
 
 <ol>
-<li><p ><a href="#basic">Basic Usage</a></li>
-<li><p ><a href="#driver">Driver Options</a>
+<li><p><a href="#basic">Basic Usage</a></li>
+<li><p><a href="#driver">Driver Options</a>
   <ul>
   <li><a href="#xlib">Xlib Driver Options</a></li>
   <li><a href="#dri">DRI Driver Options</a></li>
   <li><a href="#osmesa">OSMesa Driver Options</a></li>
   </ul>
-<li><p ><a href="#library">Library Options</a>
+<li><p><a href="#library">Library Options</a>
   <ul>
   <li><a href="#glu">GLU</a></li>
   </ul>
-<li><p ><a href="#demos">Demo Program Options</a>
+<li><p><a href="#demos">Demo Program Options</a>
 </ol>
 
 
@@ -149,13 +149,13 @@ configure option --with-driver. There are currently three supported
 options in the configure script.
 </p>
 
-<h3 id="xlib">Xlib</h3 ><p >This is the default mode for building Mesa.
+<h3 id="xlib">Xlib</h3><p>This is the default mode for building Mesa.
 It uses Xlib as a software renderer to do all rendering. It corresponds
 to the option <code>--with-driver=xlib</code>. The libX11 and libXext
 libraries, as well as the X11 development headers, will be need to
 support the Xlib driver.
 
-<h3 id="dri">DRI </h3 ><p >This mode uses the DRI hardware drivers for
+<h3 id="dri">DRI</h3><p>This mode uses the DRI hardware drivers for
 accelerated OpenGL rendering. Enable the DRI drivers with the option
 <code>--with-driver=dri</code>. See the <a href="install.html">basic
 installation instructions</a> for details on prerequisites for the DRI
@@ -163,12 +163,12 @@ drivers.
 
 <!-- DRI specific options -->
 <dl>
-<dt><code>--with-dri-driverdir=DIR</code> 
-<dd ><p > This option specifies the
+<dt><code>--with-dri-driverdir=DIR</code>
+<dd><p> This option specifies the
 location the DRI drivers will be installed to and the location libGL
 will search for DRI drivers. The default is <code>${libdir}/dri</code>.
-<dt><code>--with-dri-drivers=DRIVER,DRIVER,...</code> 
-<dd ><p > This option
+<dt><code>--with-dri-drivers=DRIVER,DRIVER,...</code>
+<dd><p> This option
 allows a specific set of DRI drivers to be built. For example,
 <code>--with-dri-drivers="swrast,i965,radeon,nouveau"</code>. By
 default, the drivers will be chosen depending on the target platform.
@@ -177,16 +177,16 @@ for available drivers. Beware that the swrast DRI driver is used by both
 libGL and the X.Org xserver GLX module to do software rendering, so you
 may run into problems if it is not available.
 <!-- This explanation might be totally bogus. Kristian? -->
-<dt><code>--disable-driglx-direct</code> 
-<dd ><p > Disable direct rendering in
+<dt><code>--disable-driglx-direct</code>
+<dd><p> Disable direct rendering in
 GLX. Normally, direct hardware rendering through the DRI drivers and
 indirect software rendering are enabled in GLX. This option disables
 direct rendering entirely. It can be useful on architectures where
 kernel DRM modules are not available.
-<dt><code>--enable-glx-tls</code> <dd ><p > 
+<dt><code>--enable-glx-tls</code> <dd><p>
 Enable Thread Local Storage (TLS) in
 GLX.
-<dt><code>--with-expat=DIR</code> <dd > The DRI-enabled libGL uses expat to
+<dt><code>--with-expat=DIR</code> <dd> The DRI-enabled libGL uses expat to
 parse the DRI configuration files in <code>/etc/drirc</code> and
 <code>~/.drirc</code>. This option allows a specific expat installation
 to be used. For example, <code>--with-expat=/usr/local</code> will
@@ -201,7 +201,7 @@ page for more details.
 
 <!-- OSMesa specific options -->
 <dl>
-<dt><code>--with-osmesa-bits=BITS</code> 
+<dt><code>--with-osmesa-bits=BITS</code>
 <dd><p> This option allows the size
 of the color channel in bits to be specified. By default, an 8-bit
 channel will be used, and the driver will be named libOSMesa. Other
@@ -235,7 +235,7 @@ the programs will be built depending on the driver and library options
 chosen. See the directory <code>progs</code> for the full set of demos.
 
 <dl>
-<dt><code>--with-demos=DEMOS,DEMOS,...</code> 
+<dt><code>--with-demos=DEMOS,DEMOS,...</code>
 <dd><p> This option allows a
 specific set of demo programs to be built. For example,
 <code>--with-demos="xdemos,slang"</code>. Beware that if this option is
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html
index 4828cc61d..a469cbaa6 100644
--- a/mesalib/docs/devinfo.html
+++ b/mesalib/docs/devinfo.html
@@ -163,36 +163,33 @@ branch is relevant.
 
 
 <h3>Verify and update version info</h3>
-<p>
-Create/edit the docs/relnotes-x.y.html file to document what's new in the release.
-Add the new relnotes-x.y.html file to <a href="relnotes.html">relnotes.html</a>.
-</p>
 
-<p>
-Update the MESA_MAJOR, MESA_MINOR and MESA_TINY version numbers in
-configs/default.
-Also update the VERSION line in the top-level Makefile.
-</p>
-
-<p>
-Make sure the values in src/mesa/main/version.h are correct.
-</p>
-
-<p>
-Update docs/news.html.
-</p>
+<dl>
+  <dt>configs/default</dt>
+  <dd>MESA_MAJOR, MESA_MINOR and MESA_TINY</dd>
+  <dt>Makefile.am</dt>
+  <dd>PACKAGE_VERSION</dd>
+  <dt>autoconf.ac</dt>
+  <dd>AC_INIT</dd>
+  <dt>src/mesa/main/version.h</dt>
+  <dd>MESA_MAJOR, MESA_MINOR, MESA_PATCH and MESA_VERSION_STRING</dd>
+</dl>
 
 <p>
 Create a docs/relnotes-x.y.z.html file.
 The bin/shortlog_mesa.sh script can be used to create a HTML-formatted list
 of changes to include in the file.
-Link the new docs/relnotes-x.y.z.html file into the main relnotes.html file.
+Link the new docs/relnotes-x.y.z.html file into the main <a href="relnotes.html">relnotes.html</a> file.
+</p>
+
+<p>
+Update <a href="news.html">docs/news.html</a>.
 </p>
 
 <p>
-Tag the files with the release name (in the form <b>mesa_X_Y</b>)
-with: <code>git tag -a mesa_X_Y</code>
-Then: <code>git push origin mesa_X_Y</code>
+Tag the files with the release name (in the form <b>mesa-x.y</b>)
+with: <code>git tag -a mesa-x.y</code>
+Then: <code>git push origin mesa-x.y</code>
 </p>
 
 
@@ -206,7 +203,7 @@ Make the distribution files.  From inside the Mesa directory:
 <p>
 After the tarballs are created, the md5 checksums for the files will
 be computed.
-Add them to the docs/relnotes-X.Y.html file.
+Add them to the docs/relnotes-x.y.html file.
 </p>
 
 <p>
diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html
index fffb50a47..89f71739c 100644
--- a/mesalib/docs/envvars.html
+++ b/mesalib/docs/envvars.html
@@ -42,6 +42,8 @@ sometimes be useful for debugging end-user issues.
    printed to stderr.<br>
    If the value of MESA_DEBUG is 'FP' floating point arithmetic errors will
    generate exceptions.
+<li>MESA_LOG_FILE - specifies a file name for logging all errors, warnings,
+etc., rather than stderr
 <li>MESA_TEX_PROG - if set, implement conventional texture env modes with
 fragment programs (intended for developers only)
 <li>MESA_TNL_PROG - if set, implement conventional vertex transformation
@@ -119,6 +121,8 @@ Mesa EGL supports different sets of environment variables.  See the
 <h2>Gallium environment variables</h2>
 
 <ul>
+<li>GALLIUM_LOG_FILE - specifies a file for logging all errors, warnings, etc.
+    rather than stderr.
 <li>GALLIUM_PRINT_OPTIONS - if non-zero, print all the Gallium environment
     variables which are used, and their current values.
 <li>GALLIUM_NOSSE - if non-zero, do not use SSE runtime code generation for
diff --git a/mesalib/docs/faq.html b/mesalib/docs/faq.html
index dbef6a58c..fa90d5bfe 100644
--- a/mesalib/docs/faq.html
+++ b/mesalib/docs/faq.html
@@ -389,7 +389,7 @@ algorithms).
 </p>
 <p>
 In the mean time, a 3rd party <a href=
-"http://homepage.hispeed.ch/rscheidegger/dri_experimental/s3tc_index.html"
+"http://dri.freedesktop.org/wiki/S3TC"
 target="_parent">plug-in library</a> is available.
 </p>
 
diff --git a/mesalib/docs/games.html b/mesalib/docs/games.html
index eaa7f4073..812c21d44 100644
--- a/mesalib/docs/games.html
+++ b/mesalib/docs/games.html
@@ -15,7 +15,7 @@
 	- battle game
 	</li><li><a href="http://bzflag.sourceforge.net/" target="_parent">BZFLAG</a> - 3-D tank
 	battle game
-	</li><li><a href="http://www.speakeasy.org/%7Emorse/copter-commander">Copter Commander</a> - 2d multiplayer side scroller
+	</li><li><a href="http://www.speakeasy.org/%7Emorse/copter-commander" target="_parent">Copter Commander</a> - 2d multiplayer side scroller
 	</li><li><a href="http://www.crystalspace.org/" target="_parent">CrystalSpace</a> - Free
 	3d game engine
 	</li><li><a href="http://www.afn.org/%7Ecthugha/" target="_parent">Cthugha</a> - music-sync'ed
@@ -40,7 +40,7 @@
 	</li><li><a href="http://jongl.home.pages.de/" target="_parent">JONGL</a> - Juggling simulator
 	</li><li><a href="http://samba.anu.edu.au/KnightCap/" target="_parent">KnightCap</a> -
 	chess game
-	</li><li><a href="http://www.hackcraft.de/games/linwarrior_3d/">LinWarrior 3D</a> - A Battle Mech Simulator
+	</li><li><a href="http://www.hackcraft.de/games/linwarrior_3d/" target="_parent">LinWarrior 3D</a> - A Battle Mech Simulator
 	</li><li><a href="http://www.nada.kth.se/%7Ef96-lfo/lunar/" target="_parent">Lunar Lander
 	2000</a> - 3D version of the classis lunar lander game
 	</li><li><a href="http://www.majik3d.org/" target="_parent">Majik 3D</a> - an online role-playing
diff --git a/mesalib/docs/helpwanted.html b/mesalib/docs/helpwanted.html
index 444c12b5a..6d6058eb5 100644
--- a/mesalib/docs/helpwanted.html
+++ b/mesalib/docs/helpwanted.html
@@ -17,36 +17,48 @@ Here are some specific ideas and areas where help would be appreciated:
 <ol>
 <li>
 <b>Driver patching and testing.</b>
-Patches are often posted to the mesa3d-dev mailing list, but aren't
+Patches are often posted to the <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_parent">mesa-dev mailing list</a>, but aren't
 immediately checked into git because not enough people are testing them.
 Just applying patches, testing and reporting back is helpful.
 <li>
 <b>Driver debugging.</b>
-There are plenty of open bugs in the bug database.
+There are plenty of open bugs in the <a href="https://bugs.freedesktop.org/describecomponents.cgi?product=Mesa" target="_parent">bug database</a>.
 <li>
 <b>Remove aliasing warnings.</b>
 Enable gcc -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
 issues in the code.
 <li>
 <b>Windows driver building, testing and maintenance.</b>
-The Visual Studio project files aren't always updated in a timely manner
-when new source files are added or old ones are removed.
-Fixing these tends to delay new Mesa releases.
+Fixing MSVC builds.
 <li>
 <b>Maintenance and testing of lesser-used drivers.</b>
-Drivers such as DOS/DJGPP, GGI, etc that aren't being maintained are being
-deprecated starting in Mesa 7.3.
+Drivers such as i810, mach64, mga, r128, savage, sis, tdfx, unichrome, etc that aren't being maintained are being
+deprecated starting in Mesa 8.0.<br>
+They have to be ported to DRI2 to be accepted in mesa master again.
 <li>
 <b>Contribute more tests to
-<a href="http://glean.sourceforge.net/" target="_parent">glean</a>.</b>
+<a href="http://people.freedesktop.org/~nh/piglit/" target="_parent">Piglit</a>.</b>
 <li>
 <b>Automatic testing.
 </b>
 It would be great if someone would set up an automated system for grabbing
-the latest Mesa code and run tests (such as glean) then report issues to
+the latest Mesa code and run tests (such as piglit) then report issues to
 the mailing list.
 </ol>
 
+<p>
+You can find some further To-do lists here:
+</p>
+<ul>
+  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/docs/GL3.txt"
+    target="_parent"><b>GL3.txt</b></a></li>
+  <li><a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/docs/llvm-todo.txt"
+    target="_parent"><b>LLVMpipe - todo</b></a></li>
+  <li><a href="http://dri.freedesktop.org/wiki/MissingFunctionality"
+    target="_parent"><b>MissingFunctionality</b></a></li>
+  <li><a href="http://dri.freedesktop.org/wiki/R300ToDo"
+    target="_parent"><b>R300ToDo</b></a></li>
+</ul>
 
 <p>
 If you want to do something new in Mesa, first join the Mesa developer's
diff --git a/mesalib/docs/libraries.html b/mesalib/docs/libraries.html
index e9db42790..b410bc1c2 100644
--- a/mesalib/docs/libraries.html
+++ b/mesalib/docs/libraries.html
@@ -10,7 +10,7 @@
 <h1>Libraries and Toolkits</h1>
 
 <ul>
-<li><a href="http://mrpowers.com/Apprentice/">Apprentice</a> - free OpenInventor work-alike
+<li><a href="http://mrpowers.com/Apprentice/" target="_parent">Apprentice</a> - free OpenInventor work-alike
 <li><a href="http://www.coin3d.org/coin.html" target="_parent">Coin</a> - OSS Open Inventor clone
 <li><a href="http://www.softintegration.com/products/toolkit/opengl/" target="_parent">Ch</a> - OpenGL bindings for the Ch C/C++ interpreter
 <li><a href="http://www.cfdrc.com/FOX/fox.html" target="_parent">FOX</a> - GUI Library
diff --git a/mesalib/docs/lists.html b/mesalib/docs/lists.html
index d89bcffbd..e415fc9b1 100644
--- a/mesalib/docs/lists.html
+++ b/mesalib/docs/lists.html
@@ -32,6 +32,9 @@ In general, people should not post to this list.</p>
 target="_parent">mesa-announce</a> - announcements of new Mesa
 versions are sent to this list.  Very low traffic.</p>
 </li>
+<li><p><a href="http://lists.freedesktop.org/mailman/listinfo/piglit"
+target="_parent">piglit</a> - for Piglit (OpenGL driver testing framework) discussion.</p>
+</li>
 </ul>
 
 <p>
diff --git a/mesalib/docs/perf.html b/mesalib/docs/perf.html
index ec400c613..82e6b5988 100644
--- a/mesalib/docs/perf.html
+++ b/mesalib/docs/perf.html
@@ -52,7 +52,7 @@ Performance tips for software rendering:
          GL_COLOR_MATERIAL is disabled
          No spot lights are used (all GL_SPOT_CUTOFFs are 180.0)
          No local lights are used (all position W's are 0.0)
-         All material and light coefficients are >= zero
+         All material and light coefficients are &gt;= zero
 <li> XFree86 users:  if you want to use 24-bit color try starting your
       X server in 32-bit per pixel mode for better performance.  That is,
       start your X server with
diff --git a/mesalib/docs/repository.html b/mesalib/docs/repository.html
index 3e05871fd..adbfcf909 100644
--- a/mesalib/docs/repository.html
+++ b/mesalib/docs/repository.html
@@ -10,7 +10,7 @@
 <h1>Code Repository</h1>
 
 <p>
-Mesa uses <a href="http://git.or.cz/"target="_parent">git</a>
+Mesa uses <a href="http://git-scm.com"target="_parent">git</a>
 as its source code management system.
 </p>
 
@@ -95,7 +95,7 @@ Once your account is established:
 <h2>Windows Users</h2>
 
 <p>
-If you're <a href="http://git.or.cz/gitwiki/WindowsInstall" target="_parent">
+If you're <a href="http://git.wiki.kernel.org/index.php/WindowsInstall" target="_parent">
 using git on Windows</a> you'll want to enable automatic CR/LF conversion in
 your local copy of the repository:
 </p>
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html
index 175e02460..a9b7cfc4b 100644
--- a/mesalib/docs/shading.html
+++ b/mesalib/docs/shading.html
@@ -209,30 +209,30 @@ struct gl_shader_state
 };
 </pre>
 
-<ul>
-<li>EmitHighLevelInstructions
-<br>
+<dl>
+<dt>EmitHighLevelInstructions</dt>
+<dd>
 This option controls instruction selection for loops and conditionals.
 If the option is set high-level IF/ELSE/ENDIF, LOOP/ENDLOOP, CONT/BRK
 instructions will be emitted.
 Otherwise, those constructs will be implemented with BRA instructions.
-</li>
+</dd>
 
-<li>EmitCondCodes
-<br>
+<dt>EmitCondCodes</dt>
+<dd>
 If set, condition codes (ala GL_NV_fragment_program) will be used for
 branching and looping.
 Otherwise, ordinary registers will be used (the IF instruction will
 examine the first operand's X component and do the if-part if non-zero).
 This option is only relevant if EmitHighLevelInstructions is set.
-</li>
+</dd>
 
-<li>EmitComments
-<br>
+<dt>EmitComments</dt>
+<dd>
 If set, instructions will be annoted with comments to help with debugging.
 Extra NOP instructions will also be inserted.
-</li>
-</ul>
+</dd>
+</dl>
 
 
 <h2 id="validation">Compiler Validation</h2>
@@ -243,7 +243,7 @@ regressions.
 </p>
 
 <p>
-The <a href="http://people.freedesktop.org/~nh/piglit/">Piglit</a> project
+The <a href="http://people.freedesktop.org/~nh/piglit/" target="_parent">Piglit</a> project
 has many GLSL tests and the
 <a href="http://glean.sf.net" target="_parent">Glean</a> glsl1 test 
 tests GLSL features.
diff --git a/mesalib/docs/sourcedocs.html b/mesalib/docs/sourcedocs.html
index 2b1633c67..898ecac74 100644
--- a/mesalib/docs/sourcedocs.html
+++ b/mesalib/docs/sourcedocs.html
@@ -24,7 +24,7 @@ the <code>doxygen</code> directory and run <code>make</code>.
 
 <p>
 For an example of Doxygen usage in Mesa, see a recent source file
-such as <a href="http://webcvs.freedesktop.org/mesa/Mesa/src/mesa/main/bufferobj.c?view=markup" target="_parent">bufferobj.c</a>.
+such as <a href="http://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/main/bufferobj.c" target="_parent">bufferobj.c</a>.
 </p>
 
 
diff --git a/mesalib/docs/sourcetree.html b/mesalib/docs/sourcetree.html
index abc5e3986..42675d9bb 100644
--- a/mesalib/docs/sourcetree.html
+++ b/mesalib/docs/sourcetree.html
@@ -43,6 +43,8 @@ each directory.
 	   <li><b>common</b> - code shared by all DRI drivers
 	   <li><b>i915</b> - driver for Intel i915/i945
 	   <li><b>i965</b> - driver for Intel i965
+	   <li><b>radeon</b> - driver for ATI R100
+	   <li><b>r200</b> - driver for ATI R200
 	   <li>XXX more
            </ul>
         <li><b>x11</b> - Xlib-based software driver
@@ -90,7 +92,9 @@ each directory.
       <li><b>i915</b> - Driver for Intel i915/i945.
       <li><b>llvmpipe</b> - Software driver using LLVM for runtime code generation.
       <li><b>nv*</b> - Drivers for NVIDIA GPUs.
-      <li><b>r300</b> - Driver for ATI/AMD R300.
+      <li><b>radeonsi</b> - Driver for AMD Southern Island.
+      <li><b>r300</b> - Driver for ATI R300 - R500.
+      <li><b>r600</b> - Driver for ATI/AMD R600 - Northern Island.
       <li><b>softpipe</b> - Software reference driver.
       <li><b>svga</b> - Driver for VMware's SVGA virtual GPU.
       <li><b>trace</b> - Driver for tracing Gallium calls.
@@ -127,9 +131,8 @@ each directory.
        <li><b>dri</b> - Meta state tracker for DRI drivers
        <li><b>egl</b> - Meta state tracker for EGL drivers
        <li><b>es</b> - OpenGL ES 1.x and 2.x state trackers
-       <li><b>g3dvl</b> -
        <li><b>glx</b> - Meta state tracker for GLX
-       <li><b>python</b> -
+       <li><b>vdpau</b> - VDPAU state tracker
        <li><b>vega</b> - OpenVG 1.x state tracker
        <li><b>wgl</b> -
        <li><b>xorg</b> - Meta state tracker for Xorg video drivers
@@ -137,7 +140,6 @@ each directory.
     <li><b>winsys</b> -
        <ul>
        <li><b>drm</b> -
-       <li><b>g3dvl</b> -
        <li><b>gdi</b> -
        <li><b>xlib</b> -
        </ul>
diff --git a/mesalib/docs/systems.html b/mesalib/docs/systems.html
index 999975183..171d12813 100644
--- a/mesalib/docs/systems.html
+++ b/mesalib/docs/systems.html
@@ -26,12 +26,14 @@ and ES 2, OpenVG and the EGL interface.
 Hardware drivers include:
 </p>
 <ul>
-<li>Intel i965, i945, i915.
+  <li>Intel i965, i945, i915.
     See <a href="http://intellinuxgraphics.org/index.html" target="_parent">
-    Intel's website</a>
-<li>AMD Radeon series
-<li>Some NVIDIA GPus.
-<li>VMware virtual GPU
+      Intel's website</a></li>
+  <li>AMD Radeon series.
+  See <a href="http://www.x.org/wiki/RadeonFeature" target="_parent">RadeonFeature</a></li>
+  <li>NVIDIA GPUs.
+  See <a href="http://nouveau.freedesktop.org" target="_parent">Nouveau Wiki</a></li>
+  <li><a href="http://www.x.org/wiki/vmware" target="_parent">VMware virtual GPU</a></li>
 </ul>
 
 <p>
diff --git a/mesalib/docs/thanks.html b/mesalib/docs/thanks.html
index b9a2b27cb..6b658e3b4 100644
--- a/mesalib/docs/thanks.html
+++ b/mesalib/docs/thanks.html
@@ -33,7 +33,7 @@ Tungsten Graphics, Inc. have supported the ongoing development of Mesa.
 <br>
 <br>
 <li>The
-<a href="http://sourceforge.net/projects/mesa3d" target="_parent">Mesa</a>
+<a href="http://www.mesa3d.org" target="_parent">Mesa</a>
 website is hosted by
 <a href="http://sourceforge.net" target="_parent">
 <img src="http://sourceforge.net/sflogo.php?group_id=3&amp;type=1"
diff --git a/mesalib/docs/utilities.html b/mesalib/docs/utilities.html
index c74816944..8dd1df08e 100644
--- a/mesalib/docs/utilities.html
+++ b/mesalib/docs/utilities.html
@@ -17,7 +17,7 @@ progs/util/ directory
 <li>Allen Akin's <a href="http://glean.sourceforge.net/"
 target="_parent">glean</a> is a framework for OpenGL testing.
 
-<li><a href="http://developer.kde.org/~sewardj/"
+<li><a href="http://www.valgrind.org"
 target="_parent">Valgrind</a> is a very useful tool for tracking down
 memory-related problems in your code.