6 files changed, 11 insertions, 13 deletions
diff --git a/src/gallium/auxiliary/driver_rbug/README b/src/gallium/auxiliary/driver_rbug/README
index 0edf0ad89de..6db94810fc7 100644
--- a/src/gallium/auxiliary/driver_rbug/README
+++ b/src/gallium/auxiliary/driver_rbug/README
@@ -22,7 +22,7 @@ information is in that directory. Also for a gui see:
 
 = Integrating =
 
-You can integrate the rbug pipe driver either inside the state tracker or the 
+You can integrate the rbug pipe driver either inside the gallium frontend or the 
 target. The procedure on both cases is the same. Let's assume you have a 
 pipe_screen obtained by the usual means (variable and function names are just
 for illustration purposes):
diff --git a/src/gallium/auxiliary/driver_trace/README b/src/gallium/auxiliary/driver_trace/README
index fbad26c4498..a4d1b98d2b1 100644
--- a/src/gallium/auxiliary/driver_trace/README
+++ b/src/gallium/auxiliary/driver_trace/README
@@ -33,7 +33,7 @@ For remote debugging see:
 
 = Integrating =
 
-You can integrate the trace pipe driver either inside the state tracker or the 
+You can integrate the trace pipe driver either inside the gallium frontend or the 
 target. The procedure on both cases is the same. Let's assume you have a 
 pipe_screen obtained by the usual means (variable and function names are just
 for illustration purposes):
diff --git a/src/gallium/auxiliary/postprocess/ADDING b/src/gallium/auxiliary/postprocess/ADDING
index 67e6bdf9c1f..c7c6084dc8b 100644
--- a/src/gallium/auxiliary/postprocess/ADDING
+++ b/src/gallium/auxiliary/postprocess/ADDING
@@ -6,7 +6,7 @@ These shaders may be written in any supported language, but are added here in TG
 assembly.
 
 You can translate GLSL/ARB fairly easily via llvmpipe (LP_DEBUG=tgsi). I don't know the
-status of the D3D state tracker, but if/when that works, I'd assume HLSL would be possible
+status of the D3D gallium frontend, but if/when that works, I'd assume HLSL would be possible
 too.
 
 
diff --git a/src/gallium/frontends/README b/src/gallium/frontends/README
deleted file mode 100644
index 28dd27bbd50..00000000000
--- a/src/gallium/frontends/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory is a placeholder for incubating state-trackers. Mesa's
-state-tracker is in src/mesa.
diff --git a/src/gallium/frontends/nine/README b/src/gallium/frontends/nine/README
index 34e928d4da3..4f478de1d6c 100644
--- a/src/gallium/frontends/nine/README
+++ b/src/gallium/frontends/nine/README
@@ -49,7 +49,7 @@ ID3DAdapter9 is completely devoid of window system code, meaning this can be
 provided by wine, Xlib, Wayland, etc. It's inadvisible to write a non-Windows
 backend though, as we don't want to encourage linux developers to use this API.
 
-The state tracker is compiled, along with pipe-loader, into a library called
+The gallium frontend is compiled, along with pipe-loader, into a library called
 libd3dadapter9.so. This library loads pipe_[driver].so drivers on demand and
 exports a single symbol for getting a subsystem driver. Currently only DRM is
 supported.
@@ -68,7 +68,7 @@ The former is the global on-switch. The latter is per-exe.
 The driver search path can be set at configure time with
 --with-gallium-driver-dir and overridden at runtime with D3D9_DRIVERS_PATH.
 Debugging information can be gotten with the WINEDEBUG channels d3d9 and
-d3dadapter, and state_tracker debug information can be gotten with NINE_DEBUG.
+d3dadapter, and gallium frontend debug information can be gotten with NINE_DEBUG.
 Help on NINE_DEBUG is shown through NINE_DEBUG=help
 
 Finally, the ID3DPresent[Group] and ID3DAdapter9 interfaces are not set in
diff --git a/src/gallium/frontends/xa/README b/src/gallium/frontends/xa/README
index 1f08861588c..14ccba90b7a 100644
--- a/src/gallium/frontends/xa/README
+++ b/src/gallium/frontends/xa/README
@@ -27,11 +27,11 @@
  * Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
 
-The XA state tracker is intended as a versioned interface to gallium for
+The XA gallium frontend is intended as a versioned interface to gallium for
 xorg driver writers. Initially it's mostly based on Zack Rusin's
-composite / video work for the Xorg state tracker.
+composite / video work for the Xorg gallium frontend.
 
-The motivation behind this state tracker is that the Xorg state tracker has
+The motivation behind this gallium frontend is that the Xorg gallium frontend has
 a number of interfaces to work with:
 
 1) The Xorg sdk (versioned)
@@ -39,11 +39,11 @@ a number of interfaces to work with:
 3) KMS modesetting (versioned)
 4) Driver-private (hopefully versioned)
 
-Since Gallium3D is not versioned, the Xorg state tracker needs to be compiled
+Since Gallium3D is not versioned, the Xorg gallium frontend needs to be compiled
 with Gallium, but it's really beneficial to be able to compile xorg drivers
 standalone.
 
-Therefore the xa state tracker is intended to supply the following
+Therefore the xa gallium frontend is intended to supply the following
 functionality:
 
 1) Versioning.
@@ -56,7 +56,7 @@ functionality:
 
 The first user will be the vmwgfx xorg driver. When there are more users,
 we need to be able to load the appropriate gallium pipe driver, and we
-should investigate sharing the loadig mechanism with the EGL state tracker.
+should investigate sharing the loadig mechanism with the EGL gallium frontend.
 
 IMPORTANT:
 Version compatibilities: