Merge branch 'master' into gallium-texture-transfer

Conflicts:

	src/mesa/state_tracker/st_cb_accum.c
	src/mesa/state_tracker/st_cb_drawpixels.c

1 files changed, 10 insertions, 12 deletions

diff --git a/docs/cell.html b/docs/cell.html
index 7fbbba7c7e..49b62cac7b 100644
--- a/docs/cell.html
+++ b/docs/cell.html
@@ -30,13 +30,9 @@ The second phase is now underway.
 <H2>Source Code</H2>
 
 <p>
-The latest Cell driver source code is on the <code>gallium-0.2</code> branch
-of the Mesa git repository.
-After you've cloned the repository, check out the branch with:
+The latest Cell driver source code is on the master branch of the Mesa
+git repository.
 </p>
-<pre>
-   git-checkout -b gallium-0.2 origin/gallium-0.2
-</pre>
 <p>
 To build the driver you'll need the IBM Cell SDK (version 2.1 or 3.0).
 To use the driver you'll need a Cell system, such as a PS3 running Linux,
@@ -50,17 +46,19 @@ special changes.
 
 <p>
 To compile the code, run <code>make linux-cell</code>.
-To build in debug mode, run <code>make linux-cell-debug</code>.
+Or to build in debug mode, run <code>make linux-cell-debug</code>.
 </p>
 
 <p>
-To use the library, make sure <code>LD_LIBRARY_PATH</code> points the Mesa/lib/
-directory that contains <code>libGL.so</code>.
-</p>
+To use the library, make sure your current directory is the top of the
+Mesa tree, then set <code>LD_LIBRARY_PATH</code> like this:
+<pre>
+  export LD_LIBRARY_PATH=$PWD/lib/gallium:$PWD/lib/
+</pre>
 
 <p>
-Verify that the Cell driver is being used by running <code>glxinfo</code>
-and looking for:
+Verify that the Cell driver is being used by running
+<code>progs/xdemos/glxinfo</code> and looking for:
 <pre>
   OpenGL renderer string: Gallium 0.2, Cell on Xlib
 </pre>