From c24359215c38764dffe1cbdcb11baf1b074b4e08 Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Sun, 29 Dec 2024 05:01:48 +0500
Subject: [PATCH] shader manual: crosslink, improve

---
 docs/shaderManual/alpha-channels.html         |   2 +-
 docs/shaderManual/contents.html               | 288 +++++++++---------
 docs/shaderManual/decal-tricks.html           |   4 +-
 docs/shaderManual/foghull.html                |   6 +-
 docs/shaderManual/fur.html                    |   2 +-
 docs/shaderManual/general-directives.html     |  34 +--
 docs/shaderManual/light-emitting-shaders.html |  12 +-
 docs/shaderManual/lightstyles.html            |   6 +-
 docs/shaderManual/preface.html                |   1 +
 .../shaderManual/q3map-global-directives.html | 146 +++++----
 .../q3map-surface-parameter-directives.html   |  38 +--
 .../quake-editor-radiant-directives.html      |   6 +-
 docs/shaderManual/shader-concepts.html        |  17 +-
 docs/shaderManual/stage-directives.html       |  56 ++--
 .../terrain-and-alphamod-blends.html          |  26 +-
 docs/shaderManual/texture-creation.html       |  11 +-
 radiant/gtkdlgs.cpp                           |   1 -
 17 files changed, 335 insertions(+), 321 deletions(-)

diff --git a/docs/shaderManual/alpha-channels.html b/docs/shaderManual/alpha-channels.html
index b736290bb..661fff8c0 100644
--- a/docs/shaderManual/alpha-channels.html
+++ b/docs/shaderManual/alpha-channels.html
@@ -91,7 +91,7 @@ <h1>Alpha Channels</h1>
 
 <p>Start with a TGA file image. In this case, a pentagram on a plain white field (figure 1A). The color of the field surrrounding the image to be merged is not relevant to this process (although having a hard-edged break between the image to be isolated and the field makes the mask making process easier). Make an alpha channel. The area of the image to be merged with another image is masked off in white. The area to be masked out (notused) is pure black (figure 1B). The image to be merged into is greenfloor.tga (figure 1C).</p>
 
-<p>Make a qer_editorimage of greenfloor.tga. This is placed in the frame buffer as the map image for the texture. By using GL_SRC_ALPHA as the source part of the blend equation, the shader adds in only the non-black parts of the pentagram. Using GL_MINUS_ONE_SRC_ALPHA, the shader inverts the pentagram's alpha channel and adds in only the non-black parts of the green floor.</p>
+<p>Make a <a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a> of greenfloor.tga. This is placed in the frame buffer as the map image for the texture. By using GL_SRC_ALPHA as the source part of the blend equation, the shader adds in only the non-black parts of the pentagram. Using GL_MINUS_ONE_SRC_ALPHA, the shader inverts the pentagram's alpha channel and adds in only the non-black parts of the green floor.</p>
 
 <p>In a like manner, the alpha channel can be used to blend the textures more evenly. A simple experiment involves using a linear gradiant in the alpha channel (white to black) and merging two textures so they appear to cross fade into each other.</p>
 
diff --git a/docs/shaderManual/contents.html b/docs/shaderManual/contents.html
index 9b4aabf47..2f2f6d89a 100644
--- a/docs/shaderManual/contents.html
+++ b/docs/shaderManual/contents.html
@@ -57,171 +57,171 @@ <h1>Contents</h1>
 <ul>
 	<li><h3>Introduction</h3>
 		<ul>
-			<li><a href="preface.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html">Preface</a>
+			<li><a href="preface.html">Preface</a>
 				<ul>
-					<li><a href="preface.html#q3map2edition" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html#q3map2edition">The Q3Map2 Edition</a></li>
-					<li><a href="preface.html#usingthemanual" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html#usingthemanual">Using the Manual</a></li>
-					<li><a href="preface.html#credits" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html#credits">Credits</a></li>
-					<li><a href="preface.html#contact" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html#contact">Contact</a></li>
-					<li><a href="preface.html#legal" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/preface.html#legal">Legal</a></li>
+					<li><a href="preface.html#q3map2edition">The Q3Map2 Edition</a></li>
+					<li><a href="preface.html#usingthemanual">Using the Manual</a></li>
+					<li><a href="preface.html#credits">Credits</a></li>
+					<li><a href="preface.html#contact">Contact</a></li>
+					<li><a href="preface.html#legal">Legal</a></li>
 				</ul>
 			</li>
-			<li><a href="shader-concepts.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html">Shader Concepts</a>
+			<li><a href="shader-concepts.html">Shader Concepts</a>
 				<ul>
-					<li><a href="shader-concepts.html#whatisashader" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#whatisashader">What is a Shader?</a></li>
-					<li><a href="shader-concepts.html#shadername&fileconventions" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#shadername&fileconventions">Shader Name &amp; File Conventions</a></li>
-					<li><a href="shader-concepts.html#keyconcepts" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#keyconcepts">Key Concepts</a></li>
-					<li><a href="shader-concepts.html#specialcasesyntax" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#specialcasesyntax">Special Case Syntax (Comments &amp; :q3map Suffix)</a></li>
-					<li><a href="shader-concepts.html#directivetypes" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#directivetypes">Directive Types</a></li>
+					<li><a href="shader-concepts.html#whatisashader">What is a Shader?</a></li>
+					<li><a href="shader-concepts.html#shadername&fileconventions">Shader Name &amp; File Conventions</a></li>
+					<li><a href="shader-concepts.html#keyconcepts">Key Concepts</a></li>
+					<li><a href="shader-concepts.html#specialcasesyntax">Special Case Syntax (Comments &amp; :q3map Suffix)</a></li>
+					<li><a href="shader-concepts.html#directivetypes">Directive Types</a></li>
 				</ul>
 			</li>
 		</ul>
 	</li><!-- end Introduction -->
 	<li><h3>Directives</h3>
 		<ul>
-			<li><a href="general-directives.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html">General Directives</a>
+			<li><a href="general-directives.html">General Directives</a>
 				<ul>
-					<li><a href="general-directives.html#skyParms" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#skyParms">skyParms</a></li>
-					<li><a href="general-directives.html#cull" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#cull">cull</a></li>
-					<li><a href="general-directives.html#deformVertexes" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#deformVertexes">deformVertexes</a></li>
-					<li><a href="general-directives.html#fogParms" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#fogParms">fogParms</a></li>
-					<li><a href="general-directives.html#noPicMip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#noPicMip">noPicMip</a></li>
-					<li><a href="general-directives.html#noMipMaps" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#noMipMaps">noMipMaps</a></li>
-					<li><a href="general-directives.html#polygonOffset" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#polygonOffset">polygonOffset</a></li>
-					<li><a href="general-directives.html#portal" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#portal">portal</a></li>
-					<li><a href="general-directives.html#sort" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/general-directives.html#sort">sort</a></li>
+					<li><a href="general-directives.html#skyParms">skyParms</a></li>
+					<li><a href="general-directives.html#cull">cull</a></li>
+					<li><a href="general-directives.html#deformVertexes">deformVertexes</a></li>
+					<li><a href="general-directives.html#fogParms">fogParms</a></li>
+					<li><a href="general-directives.html#noPicMip">noPicMip</a></li>
+					<li><a href="general-directives.html#noMipMaps">noMipMaps</a></li>
+					<li><a href="general-directives.html#polygonOffset">polygonOffset</a></li>
+					<li><a href="general-directives.html#portal">portal</a></li>
+					<li><a href="general-directives.html#sort">sort</a></li>
 				</ul>
 			</li>
-			<li><a href="q3map-global-directives.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html">Q3Map Global Directives</a>
+			<li><a href="q3map-global-directives.html">Q3Map Global Directives</a>
 				<ul>
 					<li><a href="q3map-global-directives.html#light">light</a></li>
-					<li><a href="q3map-global-directives.html#q3map_alphaGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_alphaGen">q3map_alphaGen</a></li>
-					<li><a href="q3map-global-directives.html#q3map_alphaMod" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_alphaMod">q3map_alphaMod</a></li>
-					<li><a href="q3map-global-directives.html#q3map_backShader" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_backShader">q3map_backShader</a></li>
-					<li><a href="q3map-global-directives.html#q3map_backSplash" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_backSplash">q3map_backSplash</a></li>
-					<li><a href="q3map-global-directives.html#q3map_baseShader" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_baseShader">q3map_baseShader</a></li>
-					<li><a href="q3map-global-directives.html#q3map_bounce" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_bounce">q3map_bounce</a></li>
-					<li><a href="q3map-global-directives.html#q3map_bounceScale" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_bounceScale">q3map_bounceScale</a></li>
-					<li><a href="q3map-global-directives.html#q3map_clipModel" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_clipModel">q3map_clipModel</a></li>
-					<li><a href="q3map-global-directives.html#q3map_cloneShader" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_cloneShader">q3map_cloneShader</a></li>
-					<li><a href="q3map-global-directives.html#q3map_colorGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_colorGen">q3map_colorGen</a></li>
-					<li><a href="q3map-global-directives.html#q3map_colorMod" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_colorMod">q3map_colorMod</a></li>
+					<li><a href="q3map-global-directives.html#q3map_alphaGen">q3map_alphaGen</a></li>
+					<li><a href="q3map-global-directives.html#q3map_alphaMod">q3map_alphaMod</a></li>
+					<li><a href="q3map-global-directives.html#q3map_backShader">q3map_backShader</a></li>
+					<li><a href="q3map-global-directives.html#q3map_backSplash">q3map_backSplash</a></li>
+					<li><a href="q3map-global-directives.html#q3map_baseShader">q3map_baseShader</a></li>
+					<li><a href="q3map-global-directives.html#q3map_bounce">q3map_bounce</a></li>
+					<li><a href="q3map-global-directives.html#q3map_bounceScale">q3map_bounceScale</a></li>
+					<li><a href="q3map-global-directives.html#q3map_clipModel">q3map_clipModel</a></li>
+					<li><a href="q3map-global-directives.html#q3map_cloneShader">q3map_cloneShader</a></li>
+					<li><a href="q3map-global-directives.html#q3map_colorGen">q3map_colorGen</a></li>
+					<li><a href="q3map-global-directives.html#q3map_colorMod">q3map_colorMod</a></li>
 					<li><a href="q3map-global-directives.html#q3map_deprecateShader">q3map_deprecateShader</a></li>
 					<li><a href="q3map-global-directives.html#q3map_flare">q3map_flare</a></li>
 					<li><a href="q3map-global-directives.html#q3map_flareShader">q3map_flareShader</a></li>
 					<li><a href="q3map-global-directives.html#q3map_floodLight">q3map_floodLight</a></li>
-					<li><a href="q3map-global-directives.html#q3map_fogDir" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_fogDir">q3map_fogDir</a></li>
+					<li><a href="q3map-global-directives.html#q3map_fogDir">q3map_fogDir</a></li>
 					<li><a href="q3map-global-directives.html#q3map_foliage">q3map_foliage</a></li>
-					<li><a href="q3map-global-directives.html#q3map_forceMeta" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_forceMeta">q3map_forceMeta</a></li>
-					<li><a href="q3map-global-directives.html#q3map_forceSunlight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_forceSunlight">q3map_forceSunlight</a></li>
-					<li><a href="q3map-global-directives.html#q3map_fur" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_fur">q3map_fur</a></li>
-					<li><a href="q3map-global-directives.html#q3map_globalTexture" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_globalTexture">q3map_globalTexture</a></li>
-					<li><a href="q3map-global-directives.html#q3map_indexed" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_indexed">q3map_indexed</a></li>
-					<li><a href="q3map-global-directives.html#q3map_invert" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_invert">q3map_invert</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightImage" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightImage">q3map_lightImage</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapAxis" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapAxis">q3map_lightmapAxis</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapBrightness" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapBrightness">q3map_lightmapBrightness</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapFilterRadius" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapFilterRadius">q3map_lightmapFilterRadius</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapGamma" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapGamma">q3map_lightmapGamma</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapMergable" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapMergable">q3map_lightmapMergable</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapSampleOffset" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapSampleOffset">q3map_lightmapSampleOffset</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapSampleSize" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapSampleSize">q3map_lightmapSampleSize</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightmapSize" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightmapSize">q3map_lightmapSize</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightRGB" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightRGB">q3map_lightRGB</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightStyle" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightStyle">q3map_lightStyle</a></li>
-					<li><a href="q3map-global-directives.html#q3map_lightSubdivide" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_lightSubdivide">q3map_lightSubdivide</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noClip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noClip">q3map_noClip</a></li>
+					<li><a href="q3map-global-directives.html#q3map_forceMeta">q3map_forceMeta</a></li>
+					<li><a href="q3map-global-directives.html#q3map_forceSunlight">q3map_forceSunlight</a></li>
+					<li><a href="q3map-global-directives.html#q3map_fur">q3map_fur</a></li>
+					<li><a href="q3map-global-directives.html#q3map_globalTexture">q3map_globalTexture</a></li>
+					<li><a href="q3map-global-directives.html#q3map_indexed">q3map_indexed</a></li>
+					<li><a href="q3map-global-directives.html#q3map_invert">q3map_invert</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightImage">q3map_lightImage</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapAxis">q3map_lightmapAxis</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapBrightness">q3map_lightmapBrightness</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapFilterRadius">q3map_lightmapFilterRadius</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapGamma">q3map_lightmapGamma</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapMergable">q3map_lightmapMergable</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapSampleOffset">q3map_lightmapSampleOffset</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapSampleSize">q3map_lightmapSampleSize</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightmapSize">q3map_lightmapSize</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightRGB">q3map_lightRGB</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightStyle">q3map_lightStyle</a></li>
+					<li><a href="q3map-global-directives.html#q3map_lightSubdivide">q3map_lightSubdivide</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noClip">q3map_noClip</a></li>
 					<li><a href="q3map-global-directives.html#q3map_noDirty">q3map_noDirty</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noFast" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noFast">q3map_noFast</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noFog" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noFog">q3map_noFog</a></li>
-					<li><a href="q3map-global-directives.html#q3map_nonPlanar" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_nonPlanar">q3map_nonPlanar</a></li>
-					<li><a href="q3map-global-directives.html#q3map_normalImage" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_normalImage">q3map_normalImage</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noTJunc" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noTJunc">q3map_noTJunc</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noVertexLight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noVertexLight">q3map_noVertexLight</a></li>
-					<li><a href="q3map-global-directives.html#q3map_noVertexShadows" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_noVertexShadows">q3map_noVertexShadows</a></li>
-					<li><a href="q3map-global-directives.html#q3map_offset" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_offset">q3map_offset</a></li>
-					<li><a href="q3map-global-directives.html#q3map_patchShadows" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_patchShadows">q3map_patchShadows</a></li>
-					<li><a href="q3map-global-directives.html#q3map_remapShader" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_remapShader">q3map_remapShader</a></li>
-					<li><a href="q3map-global-directives.html#q3map_rgbGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_rgbGen">q3map_rgbGen</a></li>
-					<li><a href="q3map-global-directives.html#q3map_rgbMod" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_rgbMod">q3map_rgbMod</a></li>
-					<li><a href="q3map-global-directives.html#q3map_shadeAngle" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_shadeAngle">q3map_shadeAngle</a></li>
-					<li><a href="q3map-global-directives.html#q3map_skylight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_skylight">q3map_skylight</a></li>
-					<li><a href="q3map-global-directives.html#q3map_splotchFix" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_splotchFix">q3map_splotchFix</a></li>
-					<li><a href="q3map-global-directives.html#q3map_styleMarker" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_styleMarker">q3map_styleMarker</a></li>
-					<li><a href="q3map-global-directives.html#q3map_styleMarker2" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_styleMarker2">q3map_styleMarker2</a></li>
-					<li><a href="q3map-global-directives.html#q3map_sun" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_sun">q3map_sun</a></li>
-					<li><a href="q3map-global-directives.html#q3map_sunExt" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a></li>
-					<li><a href="q3map-global-directives.html#q3map_surfaceLight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a></li>
-					<li><a href="q3map-global-directives.html#q3map_surfaceModel" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_surfaceModel">q3map_surfaceModel</a></li>
-					<li><a href="q3map-global-directives.html#q3map_tcGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_tcGen">q3map_tcGen</a></li>
-					<li><a href="q3map-global-directives.html#q3map_tcMod" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_tcMod">q3map_tcMod</a></li>
-					<li><a href="q3map-global-directives.html#q3map_terrain" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_terrain">q3map_terrain</a></li>
-					<li><a href="q3map-global-directives.html#q3map_tessSize" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_tessSize">q3map_tessSize</a></li>
-					<li><a href="q3map-global-directives.html#q3map_textureSize" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_textureSize">q3map_textureSize</a></li>
-					<li><a href="q3map-global-directives.html#q3map_vertexScale" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_vertexScale">q3map_vertexScale</a></li>
-					<li><a href="q3map-global-directives.html#q3map_vertexShadows" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-global-directives.html#q3map_vertexShadows">q3map_vertexShadows</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noFast">q3map_noFast</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noFog">q3map_noFog</a></li>
+					<li><a href="q3map-global-directives.html#q3map_nonPlanar">q3map_nonPlanar</a></li>
+					<li><a href="q3map-global-directives.html#q3map_normalImage">q3map_normalImage</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noTJunc">q3map_noTJunc</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noVertexLight">q3map_noVertexLight</a></li>
+					<li><a href="q3map-global-directives.html#q3map_noVertexShadows">q3map_noVertexShadows</a></li>
+					<li><a href="q3map-global-directives.html#q3map_offset">q3map_offset</a></li>
+					<li><a href="q3map-global-directives.html#q3map_patchShadows">q3map_patchShadows</a></li>
+					<li><a href="q3map-global-directives.html#q3map_remapShader">q3map_remapShader</a></li>
+					<li><a href="q3map-global-directives.html#q3map_rgbGen">q3map_rgbGen</a></li>
+					<li><a href="q3map-global-directives.html#q3map_rgbMod">q3map_rgbMod</a></li>
+					<li><a href="q3map-global-directives.html#q3map_shadeAngle">q3map_shadeAngle</a></li>
+					<li><a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a></li>
+					<li><a href="q3map-global-directives.html#q3map_splotchFix">q3map_splotchFix</a></li>
+					<li><a href="q3map-global-directives.html#q3map_styleMarker">q3map_styleMarker</a></li>
+					<li><a href="q3map-global-directives.html#q3map_styleMarker2">q3map_styleMarker2</a></li>
+					<li><a href="q3map-global-directives.html#q3map_sun">q3map_sun</a></li>
+					<li><a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a></li>
+					<li><a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a></li>
+					<li><a href="q3map-global-directives.html#q3map_surfaceModel">q3map_surfaceModel</a></li>
+					<li><a href="q3map-global-directives.html#q3map_tcGen">q3map_tcGen</a></li>
+					<li><a href="q3map-global-directives.html#q3map_tcMod">q3map_tcMod</a></li>
+					<li><a href="q3map-global-directives.html#q3map_terrain">q3map_terrain</a></li>
+					<li><a href="q3map-global-directives.html#q3map_tessSize">q3map_tessSize</a></li>
+					<li><a href="q3map-global-directives.html#q3map_textureSize">q3map_textureSize</a></li>
+					<li><a href="q3map-global-directives.html#q3map_vertexScale">q3map_vertexScale</a></li>
+					<li><a href="q3map-global-directives.html#q3map_vertexShadows">q3map_vertexShadows</a></li>
 				</ul>
 			</li><!-- end Q3Map Global Directives -->
-			<li><a href="q3map-surface-parameter-directives.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html">Q3Map Surface Parameter Directives</a>
+			<li><a href="q3map-surface-parameter-directives.html">Q3Map Surface Parameter Directives</a>
 				<ul>
-					<li><a href="q3map-surface-parameter-directives.html#alphashadow" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#alphashadow">surfaceparm alphashadow</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#antiportal" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#antiportal">surfaceparm antiportal</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#areaportal" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#areaportal">surfaceparm areaportal</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#botclip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#botclip">surfaceparm botclip</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#clusterportal" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#clusterportal">surfaceparm clusterportal</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#detail" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#detail">surfaceparm detail</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#donotenter" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#donotenter">surfaceparm donotenter</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#dust" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#dust">surfaceparm dust</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#flesh" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#flesh">surfaceparm flesh</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#fog" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#fog">surfaceparm fog</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#hint" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#hint">surfaceparm hint</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#ladder" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#ladder">surfaceparm ladder</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#lava" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#lava">surfaceparm lava</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#lightfilter" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#lightfilter">surfaceparm lightfilter</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#lightgrid" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#lightgrid">surfaceparm lightgrid</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#metalsteps" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#metalsteps">surfaceparm metalsteps</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#monsterclip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#monsterclip">surfaceparm monsterclip</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nodamage" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nodamage">surfaceparm nodamage</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nodlight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nodlight">surfaceparm nodlight</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nodraw" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nodraw">surfaceparm nodraw</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nodrop" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nodrop">surfaceparm nodrop</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#noimpact" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#noimpact">surfaceparm noimpact</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nomarks" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nomarks">surfaceparm nomarks</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nolightmap" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nolightmap">surfaceparm nolightmap</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nosteps" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nosteps">surfaceparm nosteps</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#nonsolid" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#nonsolid">surfaceparm nonsolid</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#origin" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#origin">surfaceparm origin</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#playerclip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#playerclip">surfaceparm playerclip</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#pointlight" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#pointlight">surfaceparm pointlight</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#skip" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#skip">surfaceparm skip</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#sky" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#sky">surfaceparm sky</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#slick" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#slick">surfaceparm slick</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#slime" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#slime">surfaceparm slime</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#structural" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#structural">surfaceparm structural</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#trans" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#trans">surfaceparm trans</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#alphashadow">surfaceparm alphashadow</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#antiportal">surfaceparm antiportal</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#areaportal">surfaceparm areaportal</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#botclip">surfaceparm botclip</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#clusterportal">surfaceparm clusterportal</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#detail">surfaceparm detail</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#donotenter">surfaceparm donotenter</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#dust">surfaceparm dust</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#flesh">surfaceparm flesh</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#fog">surfaceparm fog</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#hint">surfaceparm hint</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#ladder">surfaceparm ladder</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#lava">surfaceparm lava</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#lightfilter">surfaceparm lightfilter</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#lightgrid">surfaceparm lightgrid</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#metalsteps">surfaceparm metalsteps</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#monsterclip">surfaceparm monsterclip</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nodamage">surfaceparm nodamage</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nodlight">surfaceparm nodlight</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nodraw">surfaceparm nodraw</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nodrop">surfaceparm nodrop</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#noimpact">surfaceparm noimpact</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nomarks">surfaceparm nomarks</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nolightmap">surfaceparm nolightmap</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nosteps">surfaceparm nosteps</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#nonsolid">surfaceparm nonsolid</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#origin">surfaceparm origin</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#playerclip">surfaceparm playerclip</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#pointlight">surfaceparm pointlight</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#skip">surfaceparm skip</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#sky">surfaceparm sky</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#slick">surfaceparm slick</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#slime">surfaceparm slime</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#structural">surfaceparm structural</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#trans">surfaceparm trans</a></li>
 					<li><a href="q3map-surface-parameter-directives.html#trigger">surfaceparm trigger</a></li>
-					<li><a href="q3map-surface-parameter-directives.html#water" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/q3map-surface-parameter-directives.html#water">surfaceparm water</a></li>
+					<li><a href="q3map-surface-parameter-directives.html#water">surfaceparm water</a></li>
 				</ul>
 			</li>
-			<li><a href="quake-editor-radiant-directives.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/quake-editor-radiant-directives.html">Quake Editor Radiant Directives</a>
+			<li><a href="quake-editor-radiant-directives.html">Quake Editor Radiant Directives</a>
 				<ul>
-					<li><a href="quake-editor-radiant-directives.html#qer_editorImage" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/quake-editor-radiant-directives.html#editorImage">qer_editorImage</a></li>
-					<li><a href="quake-editor-radiant-directives.html#qer_trans" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/quake-editor-radiant-directives.html#trans">qer_trans</a></li>
-					<li><a href="quake-editor-radiant-directives.html#qer_alphaFunc" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/quake-editor-radiant-directives.html#alphaFunc">qer_alphaFunc</a></li>
+					<li><a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a></li>
+					<li><a href="quake-editor-radiant-directives.html#qer_trans">qer_trans</a></li>
+					<li><a href="quake-editor-radiant-directives.html#qer_alphaFunc">qer_alphaFunc</a></li>
 				</ul>
 			</li>
-			<li><a href="stage-directives.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html">Stage Directives</a>
+			<li><a href="stage-directives.html">Stage Directives</a>
 				<ul>
-					<li><a href="stage-directives.html#map" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#map">Texture Map Specification</a></li>
-					<li><a href="stage-directives.html#blendFunc" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#blendFunc">blendFunc</a></li>
-					<li><a href="stage-directives.html#rgbGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#rgbGen">rgbGen</a></li>
-					<li><a href="stage-directives.html#alphaGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#alphaGen">alphaGen</a></li>
-					<li><a href="stage-directives.html#tcGen" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#tcGen">tcGen</a></li>
-					<li><a href="stage-directives.html#tcMod" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#tcMod">tcMod</a></li>
-					<li><a href="stage-directives.html#depthFunc" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#depthFunc">depthFunc</a></li>
-					<li><a href="stage-directives.html#depthWrite" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#depthWrite">depthWrite</a></li>
-					<li><a href="stage-directives.html#detail" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#detail">detail</a></li>
-					<li><a href="stage-directives.html#alphaFunc" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/stage-directives.html#alphaFunc">alphaFunc</a></li>
+					<li><a href="stage-directives.html#map">Texture Map Specification</a></li>
+					<li><a href="stage-directives.html#blendFunc">blendFunc</a></li>
+					<li><a href="stage-directives.html#rgbGen">rgbGen</a></li>
+					<li><a href="stage-directives.html#alphaGen">alphaGen</a></li>
+					<li><a href="stage-directives.html#tcGen">tcGen</a></li>
+					<li><a href="stage-directives.html#tcMod">tcMod</a></li>
+					<li><a href="stage-directives.html#depthFunc">depthFunc</a></li>
+					<li><a href="stage-directives.html#depthWrite">depthWrite</a></li>
+					<li><a href="stage-directives.html#detail">detail</a></li>
+					<li><a href="stage-directives.html#alphaFunc">alphaFunc</a></li>
 				</ul>
 			</li>
 		</ul>
@@ -230,27 +230,27 @@ <h1>Contents</h1>
 		<ul>
 			<li>Shader Basics
 				<ul>
-					<li><a href="texture-creation.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/texture-creation.html">Texture Creation</a></li>
-					<li><a href="alpha-channels.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/alpha-channels.html">Alpha Channels</a></li>
+					<li><a href="texture-creation.html">Texture Creation</a></li>
+					<li><a href="alpha-channels.html">Alpha Channels</a></li>
 					<li>Troubleshooting Tips</li>
 				</ul>
 			</li>
 			<li>Lighting Effects
 				<ul>
-					<li><a href="light-emitting-shaders.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/light-emitting-shaders.html">Light Emitting Shaders</a></li>
+					<li><a href="light-emitting-shaders.html">Light Emitting Shaders</a></li>
 					<li>Normalmaps</li>
-					<li><a href="lightstyles.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/lightstyles.html">Lightstyles</a></li>
+					<li><a href="lightstyles.html">Lightstyles</a></li>
 					<li>Model Lighting</li>
 				</ul>
 			</li>
 			<li>Special Effects
 				<ul>
-					<li><a href="cel-shading.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/cel-shading.html">Cel Shading</a></li>
-					<li><a href="decal-tricks.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/decal-tricks.html">Decal Tricks</a></li>
-					<li><a href="foghull.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/foghull.html">Foghull</a></li>
-					<li><a href="fur.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/fur.html">Fur</a></li>
-					<li><a href="terrain-and-alphamod-blends.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/terrain-and-alphamod-blends.html">Terrain and alphaMod Blends</a></li>
-					<li><a href="triggerable-shader-entities.html" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/triggerable-shader-entities.html">Triggerable Shader Entities</a></li>
+					<li><a href="cel-shading.html">Cel Shading</a></li>
+					<li><a href="decal-tricks.html">Decal Tricks</a></li>
+					<li><a href="foghull.html">Foghull</a></li>
+					<li><a href="fur.html">Fur</a></li>
+					<li><a href="terrain-and-alphamod-blends.html">Terrain and alphaMod Blends</a></li>
+					<li><a href="triggerable-shader-entities.html">Triggerable Shader Entities</a></li>
 					<!--
 					Portal Skies
 					-->
diff --git a/docs/shaderManual/decal-tricks.html b/docs/shaderManual/decal-tricks.html
index e17a70c07..486c6ccc0 100644
--- a/docs/shaderManual/decal-tricks.html
+++ b/docs/shaderManual/decal-tricks.html
@@ -100,7 +100,7 @@ <h2>Inverse Multiplicative Shadows</h2>
 }
 </pre>
 
-<h2>Using _decal Entities</h2>
+<h2 id="_decal">Using _decal Entities</h2>
 
 <p>Sometimes laying out perfect patch meshes aligned with geometry is too much of a pain in the ass. Enter _decal entities. Add the following to your entities.def (Enemy Territory mappers should already have it):</p>
 
@@ -121,7 +121,7 @@ <h2>Using _decal Entities</h2>
 
 <p>Make sure you compile with a recent (post-2.5) version of Q3Map2 with _decal support.</p>
 
-<p>It will project onto terrain, brushes, models, patches, whatever. To suppress decals on particular shaders, use surfaceparm nomarks.</p>
+<p>It will project onto terrain, brushes, models, patches, whatever. To suppress decals on particular shaders, use <a href="q3map-surface-parameter-directives.html#nomarks">surfaceparm nomarks</a>.</p>
 
 <p>Happy decaling!</p>
 
diff --git a/docs/shaderManual/foghull.html b/docs/shaderManual/foghull.html
index 1dcbb4b81..9988cdcb6 100644
--- a/docs/shaderManual/foghull.html
+++ b/docs/shaderManual/foghull.html
@@ -61,12 +61,12 @@ <h2>What is a Foghull?</h2>
 <p>Since distance clipping is not a feature natively built into Quake III Arena, using distance culling would result in a hall of mirrors (HOM) effect where the culled geometry begins, since nothing is being drawn in the frame buffer. To compensate for this, the foghull feature uses a series of six skybox images that are drawn in place of the absent culled geometry, thus preventing the HOM effect.</p>
 
 <h2>Skybox Images</h2>
-<p>The skybox images used with the foghull feature should never be actually seen since the idea is to use the fog to obscure the maximum distance that the player can see. It only exists to prevent the HOM effect. To pull this off in a convincing manner, the skybox images should be six identical 8x8 pixel (to save on texture memory) textures each filled with a flat color matching the exact color of the fog. The six skybox images must be named in accordance to the skyParms farbox convention, using the _ft, _rt, _bk, _lf, _up, _dn suffixes.</p>
+<p>The skybox images used with the foghull feature should never be actually seen since the idea is to use the fog to obscure the maximum distance that the player can see. It only exists to prevent the HOM effect. To pull this off in a convincing manner, the skybox images should be six identical 8x8 pixel (to save on texture memory) textures each filled with a flat color matching the exact color of the fog. The six skybox images must be named in accordance to the <a href="general-directives.html#skyParms">skyParms</a> farbox convention, using the _ft, _rt, _bk, _lf, _up, _dn suffixes.</p>
 
 <h2>Foghull Shaders</h2>
 <p>Two shaders are required when using the foghull feature, a fog volume shader and a skybox shader, both of which are simple, standard shaders.</p>
 
-<p>The color of the fog used must match the color used in the skybox images. Any decent image editing software will give you the three RGB color values of your skybox images, which must be normalized by dividing by 255. As with any other fog shader, the fogParms and surfaceparm fog keywords must be present.</p>
+<p>The color of the fog used must match the color used in the skybox images. Any decent image editing software will give you the three RGB color values of your skybox images, which must be normalized by dividing by 255. As with any other fog shader, the <a href="general-directives.html#fogParms">fogParms</a> and <a href="q3map-surface-parameter-directives.html#fog">surfaceparm fog</a> keywords must be present.</p>
 
 <pre>
 textures/env/fog1024
@@ -84,7 +84,7 @@ <h2>Foghull Shaders</h2>
 }
 </pre>
 
-<p>The skyParms and surfaceparm sky keywords must be used to create the skybox "hull" of the map. The skyParms farbox value must point to the base name of the skybox images (sans suffix). Optional surface emitted sun lighting can be added using q3map_skylight with q3map_sun or q3map_sunExt (see Appendix I: Light Emitting Shaders).</p>
+<p>The <a href="general-directives.html#skyParms">skyParms</a> and <a href="q3map-surface-parameter-directives.html#sky">surfaceparm sky</a> keywords must be used to create the skybox "hull" of the map. The <a href="general-directives.html#skyParms">skyParms</a> farbox value must point to the base name of the skybox images (sans suffix). Optional surface emitted sun lighting can be added using <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> with <a href="q3map-global-directives.html#q3map_sun">q3map_sun</a> or <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a> (see Appendix I: <a href="light-emitting-shaders.html">Light Emitting Shaders</a>).</p>
 
 <pre>
 textures/skies/foghullsky
diff --git a/docs/shaderManual/fur.html b/docs/shaderManual/fur.html
index c021fdd6e..5caba8afe 100644
--- a/docs/shaderManual/fur.html
+++ b/docs/shaderManual/fur.html
@@ -77,7 +77,7 @@ <h2>q3map_cloneShader</h2>
 </pre>
 
 <h2>q3map_fur</h2>
-<p><a href="q3map-global-directives.html#q3map_fur">q3map_fur</a> generates additional surfaces above the base shader. The q3map_fur directive takes a few values: layers, offset and fade. Layers controls the number of surfaces generated (start with low values, high values will very quickly cause a reduction in performance). Offset controls the distance between layers. Fade controls how much each additional layer fades in addition to its previous layer. The fur shader shouldn't be applied to surface geometry as it is implicitly generated above the base shader.</p>
+<p><a href="q3map-global-directives.html#q3map_fur">q3map_fur</a> generates additional surfaces above the base shader. The <a href="q3map-global-directives.html#q3map_fur">q3map_fur</a> directive takes a few values: layers, offset and fade. Layers controls the number of surfaces generated (start with low values, high values will very quickly cause a reduction in performance). Offset controls the distance between layers. Fade controls how much each additional layer fades in addition to its previous layer. The fur shader shouldn't be applied to surface geometry as it is implicitly generated above the base shader.</p>
 
 <pre>
 // fur texture
diff --git a/docs/shaderManual/general-directives.html b/docs/shaderManual/general-directives.html
index 140203ded..18bf672e7 100644
--- a/docs/shaderManual/general-directives.html
+++ b/docs/shaderManual/general-directives.html
@@ -53,7 +53,7 @@
 </div>
 
 <h1>General Directives</h1>
-<p>General shader directives are global and affect all stages. They are read by the game engine only and are ignored by Q3Map2.</p>
+<p>General shader directives are global and affect all stages. They are all read by the game engine and also are partially used by Q3Map2.</p>
 
 <h2 id="skyParms">skyParms farbox cloudheight nearbox</h2>
 <p>Specifies how to use the surface as a sky, including an optional far box (stars, moon, etc), optional cloud layers with any shader attributes, and an optional near box (mountains in front of the clouds, etc).</p>
@@ -66,10 +66,10 @@ <h2 id="skyParms">skyParms farbox cloudheight nearbox</h2>
 	<h4>Design Notes:</h4>
 	<p>If you are making a map where the sky is seen by looking up most of the time, use a lower cloudheight value. Under those circumstances the tighter curve looks more dynamic. If you are making a map where the sky is seen by looking out windows most of the time or has a map area that is open to the sky on one or more sides, use a higher height to make the clouds seem more natural.</p>
 	<p>It is possible to create a sky with up to 8 cloudlayers (I don't think this is a physical limit, more of a practical one - see below), but that also means 8 processing passes and a potentially large processing hit.</p>
-	<p>Be aware that the skybox does not wrap around the entire world. The "floor" or bottom face of the skybox is not drawn by the game. If a player in the game can see that face, they will see the "hall of mirrors" effect.</p>
+	<p>Be aware that cloud layers are mapped onto hemisphere, hence they do not wrap around the entire world. If a player in the game can see the bottom, they will see the "hall of mirrors" effect (if skybox was not specified).</p>
 	<p>There's a bug in Quake 3 (but fixed in Enemy Territory) that causes a shader vertex overflow (SHADER_MAX_VERTEXES HIT IN FILLCLOUD SKY SIDE) if too many cloud layers are used in maps with a lot of visible sky. To compensate, either reduce the amount of visible sky or limit the shader to two cloud layers. Q3Map2 sky portals may be a good alternative if you feel a standard sky isn't interesting enough.</p>
 </blockquote>
-<p>Q3Map2 sky shaders work differently from the original and contain a number of improvements in terms of efficiency and visually. The example given below is an original Quake III Arena sky shader. While it is still operational, it is a little outdated and is being kept here for legacy purposes only. It is recommended that you take advantage of the new features of Q3Map2 skies by consulting Appendix: Light Emitting Shaders. Below is an example of a default (pre-Q3Map2) Quake 3 sky shader.</p>
+<p>Q3Map2 sky shaders work differently from the original and contain a number of improvements in terms of efficiency and visually. The example given below is an original Quake III Arena sky shader. While it is still operational, it is a little outdated and is being kept here for legacy purposes only. It is recommended that you take advantage of the new features of Q3Map2 skies by consulting Appendix: <a href="light-emitting-shaders.html">Light Emitting Shaders</a>. Below is an example of a default (pre-Q3Map2) Quake 3 sky shader.</p>
 <pre>
 textures/skies/xtoxicsky_dm9
 {
@@ -109,14 +109,14 @@ <h4>Design Notes:</h4>
 </blockquote>
 
 <h2 id="deformVertexes">deformVertexes type</h2>
-<p>This function performs a general deformation on the surface's vertexes, changing the actual shape of the surface before drawing the shader passes. You can stack multiple deformVertexes commands to modify positions in more complex ways, making an object move in two dimensions, for instance. There are 6 possible values for the type parameter, each of which will be described in more detail: wave, normal, bulge, move, autosprite, autosprite2. Depending on which of the 6 type parameters are used, different additional parameters will need to be used, including the generalized waveform functions (see Introduction: Key Concepts).</p>
+<p>This function performs a general deformation on the surface's vertexes, changing visual shape of the surface before drawing the shader passes. You can stack multiple deformVertexes commands to modify positions in more complex ways, making an object move in two dimensions, for instance. There are 6 possible values for the type parameter, each of which will be described in more detail: wave, normal, bulge, move, autosprite, autosprite2. Depending on which of the 6 type parameters are used, different additional parameters will need to be used, including the generalized <a href="shader-concepts.html#waveformfunctions">waveform functions</a>.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
 	<p>The div and amplitude parameters, when used in conjunction with liquid volumes like water should take into consideration how much the water will be moving. A large ocean area would have have massive swells (big div values) that rose and fell dramatically (big amplitude values). While a small, quiet pool may move very little.</p>
 </blockquote>
 
 <h3>deformVertexes wave div func base amplitude phase freq</h3>
-<p>Designed for water surfaces, modifying the values differently at each point. The div parameter is used to control the wave "spread" - a value equal to the q3map_tessSize of the surface is a good default value. It accepts the standard wave functions sin, triangle, square, sawtooth or inversesawtooth.</p>
+<p>Designed for water surfaces, modifying the values differently at each point. The div parameter is used to control the wave "spread" - a value equal to the <a href="q3map-global-directives.html#q3map_tessSize">q3map_tessSize</a> of the surface is a good default value. It accepts the <a href="shader-concepts.html#waveformfunctions">standard wave functions</a> sin, triangle, square, sawtooth or inversesawtooth.</p>
 
 <h3>deformVertexes normal amplitude freq</h3>
 <p>This deformation affects the normals of a vertex without actually moving it, which will effect later shader options like lighting and especially environment mapping. If the shader stages don't use normals in any of their calculations, there will be no visible effect. Good values for amplitude ranges from 0.1 to 0.5 while values of 1.0 to 4.0 are good for frequency.</p>
@@ -129,7 +129,7 @@ <h3>deformVertexes bulge div ampl freq</h3>
 <p>This forces a bulge to move along S texture direction. Designed for use on curved pipes. Div sets how frequently bulges are placed, the bigger value means more bulges. Amplitude parameter is the amount of bulge displacement measured in game units.</p>
 
 <h3>deformVertexes move x y z func base amplitude phase freq</h3>
-<p>The move parameter is used to make a brush, curve patch or model appear to move together as a unit. The x y z values are the distance and direction in game units the object appears to move relative to it's point of origin in the map. The func base amplitude phase freq values are the same as found in other waveform manipulations.</p>
+<p>The move parameter is used to make a brush, curve patch or model appear to move together as a unit. The x y z values are the distance and direction in game units the object appears to move relative to it's point of origin in the map. The func base amplitude phase freq values are the same as found in other <a href="shader-concepts.html#waveformfunctions">waveform manipulations</a>.</p>
 <p>The product of the function modifies the values x, y, and z. Therefore, if you have an amplitude of 5 and an x value of 2, the object will travel 10 units from its point of origin along the x axis. This results in a total of 20 units of motion along the x axis, since the amplitude is the variation both above and below the base.</p>
 <p>It must be noted that an object made with this shader does not actually change position, it only appears to.</p>
 <blockquote>
@@ -137,14 +137,14 @@ <h4>Design Notes:</h4>
 	<p>If an object is made up of surfaces with different shaders, all must have matching deformVertexes move values or the object will appear to tear itself apart.</p>
 </blockquote>
 
-<h3>deformVertexes autosprite</h3>
+<h3 id="deformVertexesAutosprite">deformVertexes autosprite</h3>
 <p>This function can be used to make any given triangle quad (pair of triangles that form a square rectangle) automatically behave like a sprite without having to make it a separate entity. This means that the "sprite" on which the texture is placed will rotate to always appear at right angles to the player's view as a sprite would. Any four-sided brush side, flat patch, or pair of triangles in a model can have the autosprite effect on it. The brush face containing a texture with this shader keyword must be square.</p>
 
-<h3>deformVertexes autosprite2</h3>
+<h3 id="deformVertexesAutosprite2">deformVertexes autosprite2</h3>
 <p>Is a slightly modified "sprite" that only rotates around the middle of its longest axis. This allows you to make a pillar of fire that you can walk around, or an energy beam stretched across the room.</p>
 
 <h2 id="fogParms">fogParms ( r g b ) opacity</h2>
-<p>Fogparms describes how to render the fog on the surfaces. You must also specify "surfaceparm fog" to cause Q3Map2 to identify the surfaces inside the volume.</p>
+<p>Fogparms describes how to render the fog on the surfaces. You must also specify "<a href="q3map-surface-parameter-directives.html#fog">surfaceparm fog</a>" to cause Q3Map2 to identify the surfaces inside the volume.</p>
 <dl>
 	<dt>r g b</dt><dd>These are normalized values. A good computer art program should give you the RGB values for a color. To obtain the values that define fog color for Quake III Arena, divide the desired color's red, green and blue values by 255 to obtain three normalized numbers within the 0.0 to 1.0 range.</dd>
 	<dt>opacity</dt><dd>This is the distance, in game units, until the fog becomes totally opaque, as measured from the point of view of the observer. By making the height of the fog brush shorter than the distance to opaque, the apparent density of the fog can be reduced (because it never reaches the depth at which full opacity occurs).</dd>
@@ -168,15 +168,15 @@ <h2 id="noMipMaps">noMipMaps</h2>
 <p>This implies noPicMip, but also prevents the generation of any lower resolution mipmaps for use by the 3D card. This will cause the texture to alias when it gets smaller, but there are some cases where you would rather have this than a blurry image. Sometimes thin slivers of triangles force things to very low mipmap levels, which leave a few constant pixels on otherwise scrolling special effects.</p>
 
 <h2 id="polygonOffset">polygonOffset</h2>
-<p>Surfaces rendered with the polygonOffset keyword are rendered slightly off the polygon's surface. This is typically used for wall markings and "decals." The distance between the offset and the polygon is fixed. It is not a variable in Quake III Arena.</p>
+<p>Surfaces rendered with the polygonOffset keyword are rendered slightly off the polygon's surface. This is typically used for wall markings and "decals". The distance between the offset and the polygon is fixed. It is not a variable in Quake III Arena.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
 	<p>Use this for wall or floor markings, particularly for direction arrows for team games. Texture the brush with the decal shader on one face and the other faces with a nodraw shader. Then place the brush flush with the surface of the wall or floor.</p>
-	<p>When using a _decal entity for texture projection, polygonOffset must be used to prevent Z-fighting. If you experience problems with depth sorting, try using sort 6.</p>
+	<p>When using a <a href="decal-tricks.html#_decal">_decal entity</a> for texture projection, polygonOffset must be used to prevent Z-fighting. If you experience problems with depth sorting, try using sort 6.</p>
 </blockquote>
 
 <h2 id="portal">portal</h2>
-<p>Specifies that this shader is the surface for a portal or mirror. In the game map, a portal entity (e.g. "misc_portal_surface") must be placed directly in front of the surface (within 64 game units). All this does is set "sort portal", so it isn't needed if you specify that explicitly.</p>
+<p>Specifies that this shader is the surface for a portal or mirror. In the game map, a portal entity (e.g. "misc_portal_surface") must be placed directly in front of the surface (within 64 game units). All this does is set "<a href="general-directives.html#sort">sort portal</a>", so it isn't needed if you specify that explicitly.</p>
 <p>Bare bones mirror shader example:</p>
 <pre>
 textures/ztest/mirror
@@ -197,15 +197,15 @@ <h2 id="sort">sort value</h2>
 <p>The default behavior is to put all blended shaders in sort 9 and all other shaders in sort "opaque", so you only need to specify this when you are trying to work around a sorting problem with multiple transparent surfaces in a scene.</p>
 <p>The value here can be either a numerical value or one of the keywords in the following list (listed in order of ascending priority):</p>
 <dl>
-	<dt>portal (1)</dt><dd>This surface is a portal, it draws over every other shader seen inside the portal, but before anything in the main view. Default for shaders marked as portal.</dd>
+	<dt>portal (1)</dt><dd>This surface is a portal, it draws over every other shader seen inside the portal, but before anything in the main view. Default for shaders marked as <a href="general-directives.html#portal">portal</a>.</dd>
 	<dt>Sky (2)</dt><dd>Typically, the sky is the farthest surface in the game world. Drawing this after other opaque surfaces can be an optimization on some cards. This currently has the wrong value for this purpose, so it doesn't do much of anything. Default for skies.</dd>
-	<dt>Opaque (3)</dt><dd>This surface is opaque (rarely needed since this is the default with no blendfunc).</dd>
-	<dt>Decal (4)</dt><dd>Scorch marks etc, default with polygonOffset.</dd>
-	<dt>SeeThrough (5)</dt><dd>Ladders, grates, grills that may have small blended edges in addition to alpha test.</dd>
+	<dt>Opaque (3)</dt><dd>This surface is opaque (rarely needed since this is the default with no <a href="stage-directives.html#blendFunc">blendFunc</a>).</dd>
+	<dt>Decal (4)</dt><dd>Scorch marks etc, default with <a href="general-directives.html#polygonOffset">polygonOffset</a>.</dd>
+	<dt>SeeThrough (5)</dt><dd>Ladders, grates, grills that may have small blended edges in addition to <a href="stage-directives.html#alphaFunc">alpha test</a>.</dd>
 	<dt>Banner (6)</dt><dd>Transparent, but very close to walls.</dd>
 	<dt>(7)</dt><dd>Default for fog.</dd>
 	<dt>Underwater (8)</dt><dd>Draw behind normal transparent surfaces.</dd>
-	<dt>(9)</dt><dd>Normal transparent surface (default for shaders with blendfunc's).</dd>
+	<dt>(9)</dt><dd>Normal transparent surface (default for shaders with <a href="stage-directives.html#blendFunc">blendFunc's</a>).</dd>
 	<dt>Additive (10)</dt><dd>Generally only used for additive type effects.</dd>
 	<dt>(14)</dt><dd>Used for stencil shadows.</dd>
 	<dt>Nearest (16)</dt><dd>This shader should always sort closest to the viewer, e.g. muzzle flashes and blend blobs.</dd>
diff --git a/docs/shaderManual/light-emitting-shaders.html b/docs/shaderManual/light-emitting-shaders.html
index 4beb27e2a..4aef5c296 100644
--- a/docs/shaderManual/light-emitting-shaders.html
+++ b/docs/shaderManual/light-emitting-shaders.html
@@ -60,7 +60,7 @@ <h2>Surface Lights</h2>
 <!-- add stuff about q3map_lightRGB red green blue -->
 
 <h2>Skies</h2>
-<p>Originally, sky shaders were just very large surface lights that casted parallel directional lighting. With Q3Map2, there are a few differences that sets sky shaders apart from surface lights. First of all, we'll take a look at how the pre-Q3Map2 shaders were set up:</p>
+<p>Originally, sky shaders were just very large <a href="q3map-global-directives.html#q3map_surfaceLight">surface lights</a> that casted parallel directional lighting. With Q3Map2, there are a few differences that sets sky shaders apart from surface lights. First of all, we'll take a look at how the pre-Q3Map2 shaders were set up:</p>
 
 <pre>
 textures/shadermanual/sky
@@ -140,11 +140,11 @@ <h2>Skies</h2>
 }
 </pre>
 
-<p>What we've done here is replace q3map_lightSubdivide and q3map_surfacelight with q3map_skylight which yields more uniform shadows at a fraction of the compile time. However, this also generates the "stadium light" effect - producing some unwanted shadows. We'll fix this later.</p>
+<p>What we've done here is replace <a href="q3map-global-directives.html#q3map_lightSubdivide">q3map_lightSubdivide</a> and <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> with <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> which yields more uniform shadows at a fraction of the compile time. However, this also generates the "stadium light" effect - producing some unwanted shadows. We'll fix this later.</p>
 
 <img src="sky02.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/sky02.jpg" width="416" height="316" alt="sky02" class="center" />
 
-<p>To solve the problem with jagged shadow edges, we can smooth out the shadows by blurring the lightmap. Depending on the type of lighting that you want to achieve for the sun (a cloudy day, for example), you can create a penumbra (half-shadow) effect using q3map_sunExt. This simulates the way sunlight bounces in certain conditions, creating a slight "jittering" effect. This is the same shader again with q3map_sunExt.</p>
+<p>To solve the problem with jagged shadow edges, we can smooth out the shadows by blurring the lightmap. Depending on the type of lighting that you want to achieve for the sun (a cloudy day, for example), you can create a penumbra (half-shadow) effect using <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a>. This simulates the way sunlight bounces in certain conditions, creating a slight "jittering" effect. This is the same shader again with <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a>.</p>
 
 <pre>
 textures/shadermanual/sky
@@ -185,7 +185,7 @@ <h2>Skies</h2>
 
 <img src="sky03.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/sky03.jpg" width="416" height="316" alt="sky03" class="center" />
 
-<p>As mentioned above, you may be faced with problems involving the "stadium lights" effect when using q3map_skyLight. We can eliminate this problem by using higher values for the q3map_sunExt samples and q3map_skyLight iterations parameter, but at the cost of a higher compile time. For example, q3map_sunExt 1 1 1 140 -35 25 3 32 and q3map_skylight 100 6.</p>
+<p>As mentioned above, you may be faced with problems involving the "stadium lights" effect when using <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a>. We can eliminate this problem by using higher values for the <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a> samples and <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> iterations parameter, but at the cost of a higher compile time. For example, q3map_sunExt 1 1 1 140 -35 25 3 32 and q3map_skylight 100 6.</p>
 
 <blockquote>
 	<h4>Note:</h4>
@@ -194,7 +194,7 @@ <h4>Note:</h4>
 
 <img src="sky04.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/sky04.jpg" width="416" height="316" alt="sky04" class="center" />
 
-<p>A faster approximate alternative of getting rid of the "stadium lights" effect is to use q3map_lightmapFilterRadius.</p>
+<p>A faster approximate alternative of getting rid of the "stadium lights" effect is to use <a href="q3map-global-directives.html#q3map_lightmapFilterRadius">q3map_lightmapFilterRadius</a>.</p>
 
 <pre>
 textures/shadermanual/sky
@@ -232,7 +232,7 @@ <h4>Note:</h4>
 }
 </pre>
 
-<p>The self and other parameters are the amount of filtering applied on the lightmap in world units. The self value is always set to "0" on sky shaders since skies don't have lightmaps. The q3map_lightmapFilterRadius directive should always be placed before any light-related directives that you want it to affect. In our case, we placed it after q3map_sunExt and before q3map_skyLight so that it filters the stadium lights, but won't blur the sun shadows which are already jittered. This produces very similar results without the long compile times.</p>
+<p>The self and other parameters are the amount of filtering applied on the lightmap in world units. The self value is always set to "0" on sky shaders since skies don't have lightmaps. The <a href="q3map-global-directives.html#q3map_lightmapFilterRadius">q3map_lightmapFilterRadius</a> directive should always be placed before any light-related directives that you want it to affect. In our case, we placed it after <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a> and before <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> so that it filters the stadium lights, but won't blur the sun shadows which are already jittered. This produces very similar results without the long compile times.</p>
 
 <img src="sky05.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/sky05.jpg" width="416" height="316" alt="sky05" class="center" />
 
diff --git a/docs/shaderManual/lightstyles.html b/docs/shaderManual/lightstyles.html
index db076e502..5631fc66d 100644
--- a/docs/shaderManual/lightstyles.html
+++ b/docs/shaderManual/lightstyles.html
@@ -57,7 +57,7 @@ <h1>Lightstyles</h1>
 <img src="lightstyles.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/lightstyles.jpg" width="416" height="316" alt="slstyle" class="center" />
 
 <h2>Worldspawn Keys</h2>
-<p>To create some flickering lights, we need some waveform functions. These are set on the worldspawn entity in Radiant's Entity Inspector using two new available key/value pairs: _style<em>N</em>rgbGen and _style<em>N</em>alphaGen keys, where "N" is the style index number, an integer between 1 and 31. Both keys will take <a href="shader-concepts.html#waveformfunctions" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#waveformfunctions">standard waveform functions</a> as values. As an example:</p>
+<p>To create some flickering lights, we need some <a href="shader-concepts.html#waveformfunctions">waveform functions</a>. These are set on the worldspawn entity in Radiant's Entity Inspector using two new available key/value pairs: _style<em>N</em>rgbGen and _style<em>N</em>alphaGen keys, where "N" is the style index number, an integer between 1 and 31. Both keys will take <a href="shader-concepts.html#waveformfunctions" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/shader-concepts.html#waveformfunctions">standard waveform functions</a> as values. As an example:</p>
 <pre>
 _style1alphaGen    wave sin .5 .3 .25 1.5
 _style1rgbGen      wave noise 0.5 1 0 5.37
@@ -73,7 +73,7 @@ <h3>Light Entities</h3>
 <p>With a light entity selected, open up the Entity Inspector and add a "style" key. Use a value between 1 and 31 matching the style index number previously set in the worldspawn.</p>
 
 <h3>Light Emitting Shaders</h3>
-<p>You can also use q3map_lightStyle N, where "N" is a value between 1 and 31 matching the style index number set in the worldspawn, on light-emitting shaders to have them emit styled light.</p>
+<p>You can also use <a href="q3map-global-directives.html#q3map_lightStyle">q3map_lightStyle</a> N, where "N" is a value between 1 and 31 matching the style index number set in the worldspawn, on light-emitting shaders to have them emit styled light.</p>
 <pre>
 textures/slstyle/light
 {
@@ -97,7 +97,7 @@ <h3>Light Emitting Shaders</h3>
 </pre>
 
 <h2>Lightmapped Surfaces</h2>
-<p>For any shaders that may be hit by a styled light, you'll need to add q3map_styleMarker after the lightmap stages and before the texture stages so Q3Map2 can properly create the fake lightmap stages. For masked textures where a depthFunc equal is required, add q3map_styleMarker2.</p>
+<p>For any shaders that may be hit by a styled light, you'll need to add <a href="q3map-global-directives.html#q3map_styleMarker">q3map_styleMarker</a> after the lightmap stages and before the texture stages so Q3Map2 can properly create the fake lightmap stages. For masked textures where a depthFunc equal is required, add <a href="q3map-global-directives.html#q3map_styleMarker2">q3map_styleMarker2</a>.</p>
 <p>Shaders with lightmaps after texture passes will look odd. This may change in the future. Try to rearrange your shaders, if possible, to have lightmaps first.</p>
 <pre>
 textures/slstyle/plywood2sided
diff --git a/docs/shaderManual/preface.html b/docs/shaderManual/preface.html
index 50d457d9f..4a8b38e4d 100644
--- a/docs/shaderManual/preface.html
+++ b/docs/shaderManual/preface.html
@@ -69,6 +69,7 @@ <h3>Q3Map2 Edition</h3>
 	<dt>Additional material</dt>
 		<dd>ydnar</dd>
 		<dd>TTimo</dd>
+		<dd>Garux</dd>
 </dl>
 
 <h3>QeRadiant Shader Manual, Revision #12</h3>
diff --git a/docs/shaderManual/q3map-global-directives.html b/docs/shaderManual/q3map-global-directives.html
index 2ef3dc413..f9970fc39 100644
--- a/docs/shaderManual/q3map-global-directives.html
+++ b/docs/shaderManual/q3map-global-directives.html
@@ -60,29 +60,29 @@ <h2 id="light">light value</h2>
 <p>Tells compiler to generate flare surface with default game flare shader. Value is not used, but must be present.</p>
 
 <h2 id="q3map_alphaGen">q3map_alphaGen func</h2>
-<p>Currently takes a single function, const. This directive is used to set a surfaces vertex alpha values. q3map_alphaGen operations are applied to an object's vertexes so the alphaGen vertex directive is required for each affected stage.</p>
+<p>Currently takes a single function, <em>const</em>. This directive is used to set a surfaces vertex alpha values. q3map_alphaGen operations are applied to an object's vertexes so the <a href="stage-directives.html#alphaGenVertex">alphaGen vertex</a> directive is required for each affected stage.</p>
 
-<h3>q3map_alphaGen const norm</h3>
-<p>Forces a fixed vertex alpha value to the entire shader surface, useful for controlling transparency or blending. Values are a normalized number.</p>
+<h3>q3map_alphaGen const N.N</h3>
+<p>Forces a fixed vertex alpha value to the entire shader surface, useful for controlling transparency or blending. Value is a <a href="shader-concepts.html#normalization">normalized number</a>.</p>
 
 <h2 id="q3map_alphaMod">q3map_alphaMod func</h2>
-<p>This is used for special vertex alpha blending effects on surfaces by altering the vertex alpha values depending on specific surface properties, such as the surfaces normal axis or the vertexes contained within its volume. q3map_alphaMod operations are applied to an object's vertexes so the alphaGen vertex directive is required for each affected stage.</p>
+<p>This is used for special vertex alpha blending effects on surfaces by altering the vertex alpha values depending on specific surface properties, such as the surfaces normal axis or the vertexes contained within its volume. q3map_alphaMod operations are applied to an object's vertexes so the <a href="stage-directives.html#alphaGenVertex">alphaGen vertex</a> directive is required for each affected stage.</p>
 
 <h3>q3map_alphaMod dotproduct ( X Y Z )</h3>
-<p>Used to blend textures using alphaFunc or blendFunc in the shader's second pass, with the transparency depending on the surface's normal axis vector. This is achieved by taking the user specified vector ( X Y Z ) and applying a dotproduct calculation with the generated vertex normal vector to yield a normalized vertex alpha value. The dot product operation multiplies each element of one vector against the corresponding elements of a second vector, then adds them:</p>
+<p>Used to blend textures using <a href="stage-directives.html#alphaFunc">alphaFunc</a> or <a href="stage-directives.html#blendFunc">blendFunc</a> in the shader's second pass, with the transparency depending on the surface's normal axis vector. This is achieved by taking the user specified vector ( X Y Z ) and applying a dotproduct calculation with the generated vertex normal vector to yield a normalized vertex alpha value. The dot product operation multiplies each element of one vector against the corresponding elements of a second vector, then adds them:</p>
 <pre>
 ( 0 0 1 ) dp ( 0 0 1 ) = 0 * 0 + 0 * 0 + 1 * 1 = 1
-( 0 0 1 ) dp ( 0 0 0.5 ) = 0 * 0 + 0 * 0 + 1 * 0.5 = 0.5
-( 0.5 0.5 1 ) dp ( 0 0.5 0.5 ) = 0.5 * 0 + 0.5 * 0.5 + 1 * 0.5 = 0.75
+( 0 0 1 ) dp ( 0 0.7 0.7 ) = 0 * 0 + 0 * 0.7 + 1 * 0.7 = 0.7
+( 0.5 -0.5 0.7 ) dp ( 0 0.7 0.7 ) = 0.5 * 0 - 0.5 * 0.7 + 0.7 * 0.7 = 0.14
 </pre>
-<p>In a practical sense, you can think of the dotproduct vector ( 0 0 0.9 ) as meaning that all vertex normal vectors pointing straight up along the z-axis ( 0 0 1 ) will have a vertex alpha value of 90% opacity.</p>
+<p>In a practical sense, you can think of the dotproduct vector ( 0 0 0.9 ) as meaning that all vertices with normal vector pointing straight up along the z-axis ( 0 0 1 ) will have a vertex alpha value of 90% opacity, entirely horizontal ( X Y 0 ) will get 0%, and everything in between will be mapped linearly.</p>
 
 <h3>q3map_alphaMod dotproduct2 ( X Y Z )</h3>
 <p>This works in a similar way to dotproduct except it exaggerates the differences in vertex normals by squaring the final dot product value. With the same values as the above example, dotproduct2 would give the following:</p>
 <pre>
 [ ( 0 0 1 ) dp ( 0 0 1 ) ]<sup>2</sup> = ( 0 * 0 + 0 * 0 + 1 * 1 )<sup>2</sup> = 1
-[ ( 0 0 1 ) dp ( 0 0 0.5 ) ]<sup>2</sup> = ( 0 * 0 + 0 * 0 + 1 * 0.5 )<sup>2</sup> = 0.25
-[ ( 0.5 0.5 1 ) dp ( 0 0.5 0.5 ) ]<sup>2</sup> = ( 0.5 * 0 + 0.5 * 0.5 + 1 * 0.5 )<sup>2</sup> = 0.5625
+[ ( 0 0 1 ) dp ( 0 0.7 0.7 ) ]<sup>2</sup> = ( 0 * 0 + 0 * 0.7 + 1 * 0.7 )<sup>2</sup> = 0.49
+[ ( 0.5 -0.5 0.7 ) dp ( 0 0.7 0.7 ) ]<sup>2</sup> = ( 0.5 * 0 - 0.5 * 0.7 + 0.7 * 0.7 )<sup>2</sup> = 0.0196
 </pre>
 <p>Example q3map_dotproduct2 shader for terrain:</p>
 <pre>
@@ -122,7 +122,7 @@ <h3>q3map_alphaMod dotproduct2 ( X Y Z )</h3>
 </pre>
 
 <h3>q3map_alphaMod dotproductScale ( X Y Z MIN MAX )</h3>
-<p>Works similar to q3map_alphaMod dotproduct, but in addition values MIN and MAX denote a range of cosine values, in which blending will occur. So less than MIN is mapped to alpha value 0, above MAX is mapped to alpha value 1, and everything in between is mapped linearily.</p>
+<p>Works similar to q3map_alphaMod dotproduct, but in addition values MIN and MAX denote a range of cosine values, in which blending will occur. So less than MIN is mapped to alpha value 0, above MAX is mapped to alpha value 1, and everything in between is mapped linearly.</p>
 <p>If you prefer working with angles, you can set MIN to the cosine of the most steep angle of the blending, and MAX to the cosine of the most flat angle of the blending. Example:</p>
 <pre>
 q3map_alphagen dotProductScale ( 0 0 1 0.500 0.966 )
@@ -140,13 +140,13 @@ <h4>Design Notes:</h4>
 	<p>Typical examples of use include snow covering the top faces of objects, or terrain with grass growing on horizontal planes blending into rocky cliffs on near vertical surfaces. It is an excellent way of automatically creating realistic alpha-blended terrain without the complicated steps of setting up an alpha map.</p>
 </blockquote>
 
-<h3>q3map_alphaMod scale norm</h3>
-<p>Used in conjunction with q3map_alphaMod volume. Scales the vertex alpha by the specified normalized number value.</p>
+<h3>q3map_alphaMod scale N.N</h3>
+<p>Used in conjunction with q3map_alphaMod volume. Scales the vertex alpha by the specified <a href="shader-concepts.html#normalization">normalized number</a> value.</p>
 
-<h3>q3map_alphaMod set norm</h3>
-<p>Used in conjunction with q3map_alphaMod volume. Sets the vertex alpha (regardless of any previous alpha values) to the specified normalized number value.</p>
+<h3>q3map_alphaMod set N.N</h3>
+<p>Used in conjunction with q3map_alphaMod volume. Sets the vertex alpha (regardless of any previous alpha values) to the specified <a href="shader-concepts.html#normalization">normalized number</a> value.</p>
 
-<h3>q3map_alphaMod volume</h3>
+<h3 id="q3map_alphaModVolume">q3map_alphaMod volume</h3>
 <p>This was created as a way to explicitly set or modify the vertex alpha values of vertex points contained within a controlling brush volume marked with this shader directive. Applies all other q3map_alphaMod directives to each vertex inside a brush textured with this shader, allowing large faded scrolling fire shaders, waterfalls, marquees, explicit dotProduct terrain blending control, etc.
 </p>
 <blockquote>
@@ -155,43 +155,43 @@ <h4>Design Notes:</h4>
 </blockquote>
 
 <h2 id="q3map_backShader">q3map_backShader shadername</h2>
-<p>This allows a brush to use a different shader when you are inside it looking out. By way of example, this would allow a water brush (or other) surfaces to have a different sort order or appearance when seen from the inside. q3map_backShader only works on brush faces. For this reason, it is often deprecated in favor of using q3map_cloneShader where the target shader contains q3map_invert. It can still be useful as a kind of shorthand.</p>
+<p>This allows a brush to use a different shader when you are inside it looking out. By way of example, this would allow a water brush (or other) surfaces to have a different <a href="general-directives.html#sort">sort</a> order or appearance when seen from the inside. This is essentially shorthand of <a href="q3map-global-directives.html#q3map_cloneShader">q3map_cloneShader</a> where the target shader contains <a href="q3map-global-directives.html#q3map_invert">q3map_invert</a>.</p>
 
 <h2 id="q3map_backSplash">q3map_backSplash percentage distance</h2>
 
-<p>A surface light is lit by itself, often causing areas of higher light intensity than other areas. q3map_backSplash moves the light source away from the surface of the shader, allowing it to create smoother lighting over the face. By default, all shaders are assigned backsplash values, 5 for percentage, 23 units for distance.</p>
+<p>By default <a href="q3map-global-directives.html#q3map_surfaceLight">surface light</a> generates extra 'backsplash' light to light itself and surrounding. That light source is moved away from the surface of the shader, allowing it to create smoother lighting over the face. By default, all shaders are assigned backsplash values, 5 for percentage, 23 units for distance.</p>
 
 <dl>
 	<dt>percentage</dt>
-		<dd>Specifies the intensity percentage of the light generated by q3map_surfacelight to be redirected back at the surface. Use a value of 0 or a negative value to disable back splash lights.</dd>
+		<dd>Specifies the intensity percentage of the light generated by <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> to be redirected back at the surface. Use a value of 0 or a negative value to disable back splash lights.</dd>
     <dt>distance</dt>
     	<dd>Distance of the back splash lights from the surface.</dd>
 </dl>
 
 <h2 id="q3map_baseShader">q3map_baseShader shadername</h2>
 <p>Allows shaders to be subclassed (Q3Map2 relevant portions only, such as surfaceparms, lighting, texture projection, etc). Subclassed shaders can reference the base shader by referring to the base shader's name. In order for q3map_baseShader to work correctly, the base shader must be specified before any shaders that subclass it. Some EasyGen terrain templates incorrectly specified the base shader after the terrain shaders that depended on it, resulting in some interesting errors.</p>
-<p>This is fundamentally the reverse of q3map_remapShader. Use q3map_baseShader when a single group of q3map_* directives is required for multiple base shaders. Use q3map_remapShader when similar shaders are used that require different groups of q3map_* directives.</p>
+<p>This is fundamentally the reverse of <a href="q3map-global-directives.html#q3map_remapShader">q3map_remapShader</a>. Use q3map_baseShader when a single group of q3map_* directives is required for multiple base shaders. Use <a href="q3map-global-directives.html#q3map_remapShader">q3map_remapShader</a> when similar shaders are used that require different groups of q3map_* directives.</p>
 
 <h2 id="q3map_bounce">q3map_bounce N.N</h2>
 <p>Deprecated! Use q3map_bounceScale instead.</p>
 
 <h2 id="q3map_bounceScale">q3map_bounceScale N.N</h2>
-<p>Takes positive decimal number values between 0 and 1.0 (or higher), to scale the amount of light reflected in radiosity passes. You can oversaturate it by using a number higher than 1.0, but this can lead to excessive compile times. Using 90 would probably make things positively glacial. 1.0 is a default, fudged number that looked OK with the maps that were tested. Tweaking it to 1.5 or 2.0 won't hurt anything per se, but it does give you finer control over how each shader re-emits light. The poorly worded q3map_bounce has been renamed to q3map_bounceScale. While its use has been deprecated, q3map_bounce still works.</p>
+<p>Takes positive decimal number values to scale the amount of light reflected in radiosity passes. You can oversaturate it by using a number higher than 1.0, but this can lead to excessive compile times. Using 0.9 would probably make things positively glacial. 1.0 is a default, fudged number that looked OK with the maps that were tested. Tweaking it to 1.5 or 2.0 won't hurt anything per se, but it does give you finer control over how each shader re-emits light. The poorly worded q3map_bounce has been renamed to q3map_bounceScale. While its use has been deprecated, q3map_bounce still works.</p>
 
 <h2 id="q3map_clipModel">q3map_clipModel</h2>
-<p>Automatically clips misc_model entities for player and weapon collision. This should only be used on large models such as terrain (not small decorative models - manually clip those). The shader's surfaceparms are inherited by the magic clip brush, so if you have surfaceparm nonsolid in your model's shader that uses q3map_clipModel, then the brush will also be non-solid. This can also be set on a per model basis with the entity key/value pair, spawnflags 2.</p>
+<p>Automatically clips misc_model entities for player and weapon collision. This should only be used on large models such as terrain (not small decorative models - manually clip those). The shader's surfaceparms are inherited by the magic clip brush, so if you have <a href="q3map-surface-parameter-directives.html#nonsolid">surfaceparm nonsolid</a> in your model's shader that uses q3map_clipModel, then the brush will also be non-solid. This can also be set on a per model basis with the entity key/value pair, spawnflags 2.</p>
 
 <h2 id="q3map_cloneShader">q3map_cloneShader shadername</h2>
 <p>Clones surface and applies target shader's properties and appearance to clone. Be careful, this can lead to an infinite loop if a cloning shader references another cloning shader or itself.</p>
 
 <h2 id="q3map_colorGen">q3map_colorGen func</h2>
-<p>Currently takes a single function, const. This directive is used to set a surfaces vertex color values. q3map_colorGen operations are applied to an object's vertexes so the rgbGen vertex directive is required for each affected stage. It's also needed to use q3map_noVertexLight or -novertex to avoid overwriting RGB vertex values by -light build stage. Same as q3map_rgbGen.</p>
+<p>Currently takes a single function, <em>const</em>. This directive is used to set a surfaces vertex color values. q3map_colorGen operations are applied to an object's vertexes so the <a href="stage-directives.html#rgbGenVertex">rgbGen vertex</a> directive is required for each affected stage. It's also needed to use <a href="q3map-global-directives.html#q3map_noVertexLight">q3map_noVertexLight</a> or -novertex to avoid overwriting RGB vertex values during -light build stage. Same as <a href="q3map-global-directives.html#q3map_rgbGen">q3map_rgbGen</a>.</p>
 
 <h3>q3map_colorGen const ( R G B )</h3>
 <p>Forces a fixed vertex color value to the entire shader surface.</p>
 
 <h2 id="q3map_colorMod">q3map_colorMod func</h2>
-<p>Used to alter the vertex color values of vertexes contained within its volume. q3map_colorMod operations are applied to an object's vertexes so the rgbGen vertex directive is required for each affected stage. It's also needed to use q3map_noVertexLight or -novertex to avoid overwriting RGB vertex values by -light build stage. Possible uses include creating a neutral hued texture for a CTF middleground and then creating shader instances of the texture for red and blue bases. Same as q3map_rgbMod.</p>
+<p>Used to alter the vertex color values of vertexes contained within its volume. q3map_colorMod operations are applied to an object's vertexes so the <a href="stage-directives.html#rgbGenVertex">rgbGen vertex</a> directive is required for each affected stage. It's also needed to use <a href="q3map-global-directives.html#q3map_noVertexLight">q3map_noVertexLight</a> or -novertex to avoid overwriting RGB vertex values during -light build stage. Possible uses include creating a neutral hued texture for a CTF middleground and then creating shader instances of the texture for red and blue bases. Same as <a href="q3map-global-directives.html#q3map_rgbMod">q3map_rgbMod</a>.</p>
 
 <h3>q3map_colorMod scale ( R G B )</h3>
 <p>Used in conjunction with q3map_colorMod volume. Scales the vertex color by the specified color values.</p>
@@ -210,12 +210,12 @@ <h3>q3map_colorMod dotproduct ( X Y Z )</h3>
 <h3>q3map_colorMod dotproduct2 ( X Y Z )</h3>
 <h3>q3map_colorMod dotproductScale ( X Y Z MIN MAX )</h3>
 <h3>q3map_colorMod dotproduct2scale ( X Y Z MIN MAX )</h3>
-<p>These ones work just like q3map_alphaMod dotproduct, but are modifying vertex color values.
+<p>These ones work just like <a href="q3map-global-directives.html#q3map_alphaMod">q3map_alphaMod dotproduct*</a>, but are modifying vertex color values.
 </p>
 
 
 <h2 id="q3map_deprecateShader">q3map_deprecateShader newShaderName</h2>
-<p>Rename current shader to newShaderName, so it will be shown in a map as newShaderName. Similar to q3map_remapShader, but, unlike it, performs renaming in early loading stage, so compile parameters of newShaderName are used.</p>
+<p>Rename current shader to newShaderName, so it will be shown in a map as newShaderName. Similar to <a href="q3map-global-directives.html#q3map_remapShader">q3map_remapShader</a>, but, unlike it, performs renaming in early loading stage, so compile parameters of newShaderName are used.</p>
 
 <h2 id="q3map_flare">q3map_flare shadername</h2>
 <p>Tells compiler to generate flare surface with specified shader.</p>
@@ -249,28 +249,28 @@ <h2 id="q3map_forceMeta">q3map_forceMeta</h2>
 <p>Forces model (MD3, ASE, etc.) surfaces to be broken down into their component triangles like brush faces and passed through the meta code on a per shader basis. This is required for lightmapped models. Setting spawnflags 4 on a misc_model will set q3map_forceMeta on all its surfaces.</p>
 
 <h2 id="q3map_forceSunlight">q3map_forceSunlight</h2>
-<p>Obsolete! By default, no sunlight is cast on vertex-lit .md3 models or vertex-lit terrain. Using this option, sunlight (overbright bits created by the q3map_sun option) will be cast on these surfaces. q3map_forceSunlight is now obsolete since suns are now first class light sources.</p>
+<p>Obsolete! By default, no sunlight is cast on vertex-lit .md3 models or vertex-lit terrain. Using this option, sunlight (overbright bits created by the <a href="q3map-global-directives.html#q3map_sun">q3map_sun</a> option) will be cast on these surfaces. q3map_forceSunlight is now obsolete since suns are now first class light sources.</p>
 
 <h2 id="q3map_fur">q3map_fur layers offset fade</h2>
-<p>This is used for generating fur over a surface. This is typically used in conjunction with q3map_cloneShader in the surface (parent) shader and references the fur shader as the clone. A possible application of this is to create grass on alphablended terrain. Keep in mind that the use of a fur shader may cause a large hit to performance but when used sparingly, it can produce some interesting effects. (See Appendix: Fur)</p>
+<p>This is used for generating fur over a surface. This is typically used in conjunction with <a href="q3map-global-directives.html#q3map_cloneShader">q3map_cloneShader</a> in the surface (parent) shader and references the fur shader as the clone. A possible application of this is to create grass on alphablended terrain. Keep in mind that the use of a fur shader may cause a large hit to performance but when used sparingly, it can produce some interesting effects. (See <a href="fur.html">Appendix: Fur</a>)</p>
 
 <dl>
 	<dt>layers</dt><dd>This specifies the number of desired replicated fur layers generated.</dd>
 	<dt>offset</dt><dd>The distance (in game units) between subsequent layers. It is additionally scaled by original vertex alpha color component.</dd>
-	<dt>fade</dt><dd>A normalized value indicating the fade falloff between subsequent layers.</dd>
+	<dt>fade</dt><dd>A <a href="shader-concepts.html#normalization">normalized value</a> indicating the fade falloff between subsequent layers.</dd>
 </dl>
 
 <h2 id="q3map_globalTexture">q3map_globalTexture</h2>
-<p>Use this shader in the global directive commands whenever the tcMod scale function is used in one of the later render stages. Many problems with getting shader effects to work across multiple adjacent brushes are a result of the way Q3Map2 optimizes texture precision. This option resolves that, but at the expense of some precision of the textures when they are far away from the origin of the map.</p>
+<p>Use this shader in the global directive commands whenever the <a href="stage-directives.html#tcModScale">tcMod scale</a> function is used in one of the later render stages. Many problems with getting shader effects to work across multiple adjacent brushes are a result of the way Q3Map2 optimizes texture precision. This option resolves that, but at the expense of some precision of the textures when they are far away from the origin of the map.</p>
 
 <h2 id="q3map_indexed">q3map_indexed</h2>
 <p>This is used for explicit terrain-style indexed mapping. It instructs Q3Map2 to look at the func_group terrain entity's _indexmap key for an image to pull index values from, and then to construct a shader name with the root based on the _shader key's value.</p>
 
 <h2 id="q3map_invert">q3map_invert</h2>
-<p>Inverts a surface normal. Works on brush faces, models and patches. Used in celshading to achieve the inverted backfacing hull. Can be used with a shader that is targeted by q3map_cloneshader for something similar to q3map_backShader.</p>
+<p>Inverts a surface normal. Works on brush faces, models and patches. Used in <a href="cel-shading.html">celshading</a> to achieve the inverted backfacing hull. Can be used with a shader that is targeted by <a href="q3map-global-directives.html#q3map_cloneShader">q3map_cloneShader</a> for something similar to <a href="q3map-global-directives.html#q3map_backShader">q3map_backShader</a>.</p>
 
 <h2 id="q3map_lightImage">q3map_lightImage texturename</h2>
-<p>By default, surface lights use the average color of the source image to generate the color of the light. q3map_lightImage specifies an alternate image to be used for light color emission, radiosity color emission, light filtering and alpha shadows. You can even use a light image with a different alpha channel for blurrier alpha shadows. The light color is averaged from the referenced texture. The texture must be the same size as the base image map. q3map_lightImage should appear before qer_editorImage.</p>
+<p>By default, surface lights use the average color of the source image to generate the color of the light. q3map_lightImage specifies an alternate image to be used for light color emission, radiosity color emission, light filtering and alpha shadows. You can even use a light image with a different alpha channel for blurrier alpha shadows. The light color is averaged from the referenced texture. The texture must be the same size as the base image map. q3map_lightImage should appear before <a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a>.</p>
 <p>The reason q3map_lightImage is specified for the light in the example below, is because the blend map is predominantly yellow, but the base image is not. The designer wanted the color of the light to be sampled from the blend map instead of the base image.
 <pre>
 textures/eerie/ironcrosslt2_10000
@@ -304,7 +304,7 @@ <h2 id="q3map_lightImage">q3map_lightImage texturename</h2>
 </pre>
 
 <h2 id="q3map_lightmapAxis">q3map_lightmapAxis axis</h2>
-<p>Takes a single argument: either x, y or z as the direction from which the lightmap is projected from. The directive q3map_terrain has an implicit (read default) q3map_lightmapAxis defined as z. This directive is not recommended for things like caves or arches which have undersides.</p>
+<p>Takes a single argument: either X, Y or Z as the direction from which the lightmap is projected from. The directive <a href="q3map-global-directives.html#q3map_terrain">q3map_terrain</a> has an implicit (read default) q3map_lightmapAxis defined as Z. This directive is not recommended for things like caves or arches which have undersides.</p>
 
 <h2 id="q3map_lightmapBrightness">q3map_lightmapBrightness N.N</h2>
 <p>Lightmap brightness scaling. A value of 2.0 will be twice as bright (linearly) and a value of 0.5 will be half as bright.</p>
@@ -313,43 +313,43 @@ <h2 id="q3map_lightmapFilterRadius">q3map_lightmapFilterRadius self other</h2>
 <p>This is usually used on light emitting shaders to approximate finer subdivided lighting. It adds a gaussian blur effect to the lightmaps of either the shader itself, or the surfaces affected by the shader, or both. The values for self and other are measured in world units of filtering (blurring) of lightmap data cast by any light sources.</p>
 <dl>
 	<dt>self</dt><dd>Amount of blur set for the shader itself to approximate for the surfacelight's finer subdivided lighting. It should be set to 0 for sky shaders since they don't have lightmaps.</dd>
-	<dt>other</dt><dd>Amount of blur set for other surfaces affected by this shader's emitted light. It should be set just high enough to eliminate the "stadium shadow" effect sometimes produced by q3map_skylight or to smooth out the lighting on surfacelights.</dd>
+	<dt>other</dt><dd>Amount of blur set for other surfaces affected by this shader's emitted light. It should be set just high enough to eliminate the "stadium shadow" effect sometimes produced by <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> or to smooth out the lighting on surfacelights.</dd>
 </dl>
-<p>If using a value higher than 4 for the iterations parameter on q3map_skylight, you don't need q3map_lightmapFilterRadius as much, but at the expense of higher compile times. q3map_lightmapFilterRadius should be placed before any light related shader directives that you want it to affect. (see Appendix: Light Emitting Shaders)</p>
+<p>If using a value higher than 4 for the iterations parameter on <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a>, you don't need q3map_lightmapFilterRadius as much, but at the expense of higher compile times. q3map_lightmapFilterRadius should be placed before any light related shader directives that you want it to affect. (see Appendix: <a href="light-emitting-shaders.html">Light Emitting Shaders</a>)</p>
 
 <h2 id="q3map_lightmapGamma">q3map_lightmapGamma N.N</h2>
-<p>Deprecated! Use q3map_lightmapBrightness instead.</p>
+<p>Deprecated! Use <a href="q3map-global-directives.html#q3map_lightmapBrightness">q3map_lightmapBrightness</a> instead.</p>
 
 <h2 id="q3map_lightmapMergable">q3map_lightmapMergable</h2>
-<p>Allows surfaces like terrain to be mapped onto a single lightmap page for seamless terrain shadows. It will specify that the shaders using it can merge nonplanars together onto a single lightmap, so you can have a single 512x512 lightmap across a terrain entity. Note that most id Tech 3 engine games are limited to lightmap pages of 128x128. You may need to experiment with q3map_lightmapSize and the Q3Map2 -export general switch.</p>
+<p>Allows surfaces like terrain to be mapped onto a single lightmap page for seamless terrain shadows. It will specify that the shaders using it can merge nonplanars together onto a single lightmap, so you can have a single 512x512 lightmap across a terrain entity. Note that most id Tech 3 engine games are limited to lightmap pages of 128x128. You may need to experiment with <a href="q3map-global-directives.html#q3map_lightmapSize">q3map_lightmapSize</a> and the Q3Map2 -export general switch.</p>
 
 <h2 id="q3map_lightmapSampleOffset">q3map_lightmapSampleOffset distance</h2>
-<p>Takes a single parameter, defaulting to 1.0, which specifies how many units off a surface should Q3Map2 sample lighting from. Use larger values (2.0-8.0) if you're getting ugly splotches on lightmapped terrain. Try to use filtering to solve splotches if possible, leaving q3MaplightmapSampleOffset as a last resort.</p>
+<p>Takes a single parameter, defaulting to 1.0, which specifies how many units off a surface should Q3Map2 sample lighting from. Use larger values (2.0-8.0) if you're getting ugly splotches on lightmapped terrain. Try to use filtering to solve splotches if possible, leaving q3map_lightmapSampleOffset as a last resort.</p>
 
 <h2 id="q3map_lightmapSampleSize">q3map_lightmapSampleSize N</h2>
-<p>Surfaces using a shader with this option will have the pixel size of the lightmaps set to N world grid units. This option can be used to produce high-resolution shadows on certain surfaces. In addition, it can be used to reduce the size of lightmap data, where high-resolution shadows are not required, gaining memory and performance benefits. The default Quake III lightmap sample size is 16, smaller numbers increases lightmap resolution. In general, you should stick with power of 2 values.</p>
+<p>Surfaces using a shader with this option will have the pixel size of the lightmaps set to N world grid units. This option can be used to produce high-resolution shadows on certain surfaces. In addition, it can be used to reduce the size of lightmap data, where high-resolution shadows are not required, gaining memory and performance benefits. The default Quake III lightmap sample size is 16, so square of 16x16 units will be 'lit' by single lightmap pixel. Smaller numbers increases lighting resolution. In general, you should stick with power of 2 values.</p>
 
 <h2 id="q3map_lightmapSize">q3map_lightmapSize width height</h2>
 <p>Specifies the size of the lightmap page that surface lightmaps get packed on to. Used mainly in Enemy Territory for terrain lightmaps (512x512) in concert with the Q3Map2 switch -lightmapsize. Most idTech 3 games will only support internal lightmap pages of 128x128. Larger pages will result in lightmaps exported externally from the .bsp file.</p>
 
 <h2 id="q3map_lightRGB">q3map_lightRGB red green blue</h2>
-<p>This forces a specified color of light to be emitted from a surface or sky light, rather than sampling colors from a lightimage, editor image or the texture map. Three normalized color values of light are required for the red green blue parameters. This does not affect bounced light in radiosity or lightfilter.</p>
+<p>This forces a specified color of light to be emitted from a surface or sky light, rather than sampling colors from a <a href="q3map-global-directives.html#q3map_lightImage">lightimage</a>, <a href="quake-editor-radiant-directives.html#qer_editorImage">editor image</a> or the <a href="stage-directives.html#map">texture map</a>. Three normalized color values of light are required for the red green blue parameters. This does not affect bounced light in radiosity or <a href="q3map-surface-parameter-directives.html#lightfilter">lightfilter</a>.</p>
 
 <h2 id="q3map_lightStyle">q3map_lightStyle N</h2>
-<p>Used to set light styles on surface lights for lightmap flickering/waveform effects. N takes the form of a number between 1 and 31, that references the corresponding style number set in the worldspawn entity. Equivalent to setting "style" "N" on a light entity (see Appendix: Lightstyles).</p>
+<p>Used to set light styles on surface lights for lightmap flickering/waveform effects. N takes the form of a number between 1 and 31, that references the corresponding style number set in the worldspawn entity. Equivalent to setting "style" "N" on a light entity (see Appendix: <a href="lightstyles.html">Lightstyles</a>).</p>
 
 <h2 id="q3map_lightSubdivide">q3map_lightSubdivide N</h2>
-<p>Used on surface lights (see q3map_surfacelight). Controls maximum size, above which surface light source is split for uniform lighting. It defaults to 999 game units, but can be made larger or smaller as needed (for light surfaces at the bottom of cracks, for example). This can be a dominant factor in processing time for Q3Map2 lighting. Can have an increasingly "darker" effect when used with -fast. Compensate by raising the surface light value. For sky shaders, use q3map_skylight instead (see Appendix: Light Emitting Shaders).</p>
+<p>Used on surface lights (see <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a>). Controls maximum size, above which surface light source is split for uniform lighting. It defaults to 999 game units, but can be made larger or smaller as needed (for light surfaces at the bottom of cracks, for example). This can be a dominant factor in processing time for Q3Map2 lighting. Can have an increasingly "darker" effect when used with -fast. Compensate by raising the surface light value. For sky shaders, use <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> instead (see Appendix: <a href="light-emitting-shaders.html">Light Emitting Shaders</a>).</p>
 <p>Surface lights are also used for -bounce lighting with default starting subdivision value of 256. q3map_lightSubdivide controls this value too.</p>
 
 <h2 id="q3map_noClip">q3map_noClip</h2>
-<p>You might have noticed that terrain has been made to not clip or t-junction anymore. It was causing too many issues, so a new parameter was added: q3map_noClip. Normally, Q3Map2 clips all faces to the BSP, and then takes the minimum polygon that encompasses all visible fragments. q3map_noClip forces Q3Map2 to uses the original brush faces (This is implicit for autosprite(2) surfaces). Therefore, if you map tidy, you could theoretically use q3map_noClip on all your shaders. q3map_noClip and q3map_noTJunc, when used in combination, will preserve mesh geometry exactly as you make it.</p>
+<p>You might have noticed that terrain has been made to not clip or t-junction anymore. It was causing too many issues, so a new parameter was added: q3map_noClip. Normally, Q3Map2 clips all faces to the BSP, and then takes the minimum polygon that encompasses all visible fragments. q3map_noClip forces Q3Map2 to uses the original brush faces (This is implicit for <a href="general-directives.html#deformVertexesAutosprite">autosprite(2)</a> surfaces). Therefore, if you map tidy, you could theoretically use q3map_noClip on all your shaders. q3map_noClip and <a href="q3map-global-directives.html#q3map_noTJunc">q3map_noTJunc</a>, when used in combination, will preserve mesh geometry exactly as you make it.</p>
 
 <h2 id="q3map_noDirty">q3map_noDirty</h2>
 <p>Don't apply -dirty on this surface.</p>
 
 <h2 id="q3map_noFast">q3map_noFast</h2>
-<p>When used on surfaces that emit light, this will disable -fast optimizations. This is useful for large areas of dim sky, where you want the dim light to reach all surfaces. This shader directive prevents fast from affecting dim sky surfaces. It is necessary, if you can't do a workaround with brighter skies or by using a larger q3map_lightSubdivide value.</p>
+<p>When used on surfaces that emit light, this will disable -fast optimizations. This is useful for large areas of dim sky, where you want the dim light to reach all surfaces. This shader directive prevents -fast from affecting dim sky surfaces. It is necessary, if you can't do a workaround with brighter skies or by using a larger <a href="q3map-global-directives.html#q3map_lightSubdivide">q3map_lightSubdivide</a> value.</p>
 
 <h2 id="q3map_noFog">q3map_noFog</h2>
 <p>Volumes marked with a shader containing this directive will not be affected by fog. For example, it can be used on sky shaders to prevent the fog from affecting it.</p>
@@ -361,62 +361,62 @@ <h2 id="q3map_normalImage">q3map_normalImage texturename</h2>
 <p>Allow the use of a normal (height) map to simulate textured bumpmapping. This isn't real bumpmapping per se, but generates a static lightmap image that reflects the normal map and light source.</p>
 
 <h2 id="q3map_noTJunc">q3map_noTJunc</h2>
-<p>Read as "no T-Junc". With this option, surfaces modified by a shader are not used for T-junction fixing. q3map_noClip and q3map_noTJunc, used in combination will preserve mesh geometry exactly as you make it.</p>
+<p>Read as "no T-Junc". With this option, surfaces modified by a shader are not used for T-junction fixing. <a href="q3map-global-directives.html#q3map_noClip">q3map_noClip</a> and q3map_noTJunc, used in combination will preserve mesh geometry exactly as you make it.</p>
 
 <h2 id="q3map_noVertexLight">q3map_noVertexLight</h2>
-<p>Suppresses Q3Map2 from overwriting the BSP-phase set vertex RGB values.</p>
+<p>Suppresses Q3Map2 from overwriting the BSP-phase set vertex RGB values by -light phase.</p>
 
 <h2 id="q3map_noVertexShadows">q3map_noVertexShadows</h2>
-<p>Obsolete! Vertex lighting code was rewritten a couple of times, rendering this directive irrelevant. Shaders that are used on misc_models or terrain were to use q3map_noVertexShadows to disable shadows being cast on the vertex lit surfaces. Casting shadows at small, misc_model objects often makes sense. However, having shadows on large, vertex lit terrain surfaces often looks bad. Shadows are not cast on forced_vertex_lit surfaces by default (shaders with pointlight).</p>
+<p>Obsolete! Vertex lighting code was rewritten a couple of times, rendering this directive irrelevant. Shaders that are used on misc_models or terrain were to use q3map_noVertexShadows to disable shadows being cast on the vertex lit surfaces. Casting shadows at small, misc_model objects often makes sense. However, having shadows on large, vertex lit terrain surfaces often looks bad. Shadows are not cast on forced_vertex_lit surfaces by default (shaders with <a href="q3map-surface-parameter-directives.html#pointlight">pointlight</a>).</p>
 
 <h2 id="q3map_offset">q3map_offset N.N</h2>
-<p>Offsets a surface along the vertex normals by N.N units. Used in celshading for those black edges.</p>
+<p>Offsets a surface along the vertex normals by N.N units. Used in <a href="cel-shading.html">celshading</a> for those black edges.</p>
 
 <h2 id="q3map_patchShadows">q3map_patchShadows</h2>
 <p>Obsolete! When this option is used in conjunction with the original lighting algorithm (-light), surfaces with textures modified with this option will show shadows that are cast by curve patches. Curve patches do not cast shadows by default. You would usually force patches to cast shadows by using the -patchshadows Q3Map2 switch.</p>
 
 <h2 id="q3map_remapShader">q3map_remapShader shadername</h2>
 <p>Allows shaders to be subclassed. Subclassed shaders can reference the remap shader by referencing the remap shader's name. In order for this to work, the remap shader must be specified before any shaders that references it. Subclassed shaders must contain Q3Map2 and editor relevant portions only (q3map_*, surfaceparm and qer_* directives).</p>
-<p>This is fundamentally the reverse of q3map_baseShader. Use q3map_baseShader when a single group of q3map_* directives is required for multiple base shaders. Use q3map_remapShader when similar shaders are used that require different groups of q3map_* directives.</p>
+<p>This is fundamentally the reverse of <a href="q3map-global-directives.html#q3map_baseShader">q3map_baseShader</a>. Use <a href="q3map-global-directives.html#q3map_baseShader">q3map_baseShader</a> when a single group of q3map_* directives is required for multiple base shaders. Use q3map_remapShader when similar shaders are used that require different groups of q3map_* directives.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
-	<p>Since the subclassed shaders that are applied to geometry does not contain any texture stages, qer_editorImage is usually required in conjunction with q3map_remapShader.</p>
+	<p>Since the subclassed shaders that are applied to geometry does not contain any texture stages, <a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a> is usually required in conjunction with q3map_remapShader.</p>
 </blockquote>
 
 <h2 id="q3map_rgbGen">q3map_rgbGen func</h2>
-<p>Same as q3map_colorGen</p>
+<p>Same as <a href="q3map-global-directives.html#q3map_colorGen">q3map_colorGen</a></p>
 
 <h2 id="q3map_rgbMod">q3map_rgbMod func</h2>
-<p>Same as q3map_colorMod</p>
+<p>Same as <a href="q3map-global-directives.html#q3map_colorMod">q3map_colorMod</a></p>
 
 <h2 id="q3map_shadeAngle">q3map_shadeAngle angle</h2>
-<p>Specifies the breaking angle for phong shading. This allows for smooth shadows between brush faces like patches. The angle parameter is the angle between adjacent faces at which smoothing will start to occur. Typical values are usually in the 120-179 range.</p>
+<p>Specifies the breaking angle for phong shading. This allows for smooth shadows between brush faces like on patches. The angle parameter is the angle between adjacent faces at which smoothing will start to occur. Typical values are usually in the 120-179 range.</p>
 
-<h2 id="q3map_skylight">q3map_skylight <em>amount iterations</em> optional[<em>horizon_min horizon_max sample_color</em>]</h2>
-<p>This replaces q3map_surfacelight and q3map_lightSubdivide on sky surfaces for much faster and more uniform sky illumination. May be used multiple times in a single shader. See Appendix: Light Emitting Shaders.</p>
+<h2 id="q3map_skylight">q3map_skylight <em>amount iterations</em> <small>optional</small>[<em>horizon_min horizon_max sample_color</em>]</h2>
+<p>This replaces <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> and <a href="q3map-global-directives.html#q3map_lightSubdivide">q3map_lightSubdivide</a> on sky surfaces for much faster and more uniform sky illumination. May be used multiple times in a single shader. See Appendix: <a href="light-emitting-shaders.html">Light Emitting Shaders</a>.</p>
 <dl>
-	<dt>amount</dt><dd>Brightness value, similar to what you would use in q3map_sun. Good values are between 50 and 200.</dd>
+	<dt>amount</dt><dd>Brightness value, similar to what you would use in <a href="q3map-global-directives.html#q3map_sun">q3map_sun</a>. Good values are between 50 and 200.</dd>
 	<dt>iterations</dt><dd>An exponential factor. 3 is the best value that balances speed and quality. Values of 4 and 5 are higher quality at the expense of higher compile time. Values below 3 are not too useful.</dd>
 	<dt>horizon_min horizon_max</dt><dd>Two spherical angles, defining portion of sphere to emit light from. Default is <em>0 90</em>, which is upper hemisphere. <em>-90 90</em> will be whole sphere.</dd>
-	<dt>sample_color</dt><dd>Default = 1: sample color of each individual light from skybox images, if they are present. 0: use shader color, set by q3map_lightRGB/q3map_lightImage/_up skybox image/qer_editorImage.</dd>
+	<dt>sample_color</dt><dd>Default = 1: sample color of each individual light from skybox images, if they are present. 0: use shader color, set by <a href="q3map-global-directives.html#q3map_lightRGB">q3map_lightRGB</a>/<a href="q3map-global-directives.html#q3map_lightImage">q3map_lightImage</a>/<a href="general-directives.html#skyParms">_up skybox image</a>/<a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a>.</dd>
 </dl>
 
 <h2 id="q3map_splotchFix">q3map_splotchFix</h2>
-<p>This is used on lightmapped model shaders if splotched lighting artifacts appear. Any shadows at the ambient/dark level will be flooded from neighbouring luxels. This gets rid of shadow acne, but a surface must be more or less uniformly lit or this looks ugly. Try using q3map_lightmapSampleOffset first before using this as a last resort.</p>
+<p>This is used on lightmapped model shaders if splotched lighting artifacts appear. Any shadows at the ambient/dark level will be flooded from neighbouring luxels. This gets rid of shadow acne, but a surface must be more or less uniformly lit or this looks ugly. Try using <a href="q3map-global-directives.html#q3map_lightmapSampleOffset">q3map_lightmapSampleOffset</a> first before using this as a last resort.</p>
 
 <h2 id="q3map_styleMarker">q3map_styleMarker</h2>
-<p>For use on shaders that accompany style lights. For any shaders that may be hit by a styled light, add q3map_styleMarker after the lightmap stage and before the texture stages so Q3Map2 can properly create the fake lightmap stages (see Appendix: Lightstyles).</p>
+<p>For use on shaders that accompany style lights. For any shaders that may be hit by a styled light, add q3map_styleMarker after the lightmap stage and before the texture stages so Q3Map2 can properly create the fake lightmap stages (see Appendix: <a href="lightstyles.html">Lightstyles</a>).</p>
 
 <h2 id="q3map_styleMarker2">q3map_styleMarker2</h2>
-<p>Similar to q3map_styleMarker except it is used on masked textures where a depthFunc equal is required.</p>
+<p>Similar to q3map_styleMarker except it is used on masked textures where a <a href="stage-directives.html#depthFunc">depthFunc equal</a> is required.</p>
 
 <h2 id="q3map_sun">q3map_sun red green blue intensity degrees elevation</h2>
-<p>This directive in a sky shader will create the illusion of light cast into a map by a single, infinitely distance parallel light source (sun, moon, hellish fire, etc.). This is only processed during the lighting phase of Q3Map2. While still perfectly usable, q3map_sun is now deprecated in favour of q3map_sunExt (see below).</p>
+<p>This directive in a sky shader will create the illusion of light cast into a map by a single, infinitely distance parallel light source (sun, moon, hellish fire, etc.). This is only processed during the lighting phase of Q3Map2. While still perfectly usable, q3map_sun is now deprecated in favour of <a href="q3map-global-directives.html#q3map_sunExt">q3map_sunExt</a> (see below).</p>
 
 <h2 id="q3map_sunExt">q3map_sunExt red green blue intensity degrees elevation deviance samples</h2>
-<p>Works like q3map_sun with the addition of two new parameters to create "light jittering" for penumbra (half-shadow) effects. This gives you much more realistic shadows from the sun, especially when trying to simulate a cloudy day or a wide sun. The penumbra effect can also be applied to entity lights (point, spot or sun) with the _deviance N (distance in world units for point/spot lights and degrees for suns) and _samples N (number of samples) key/value pairs.</p>
+<p>Works like <a href="q3map-global-directives.html#q3map_sun">q3map_sun</a> with the addition of two new parameters to create "light jittering" for penumbra (half-shadow) effects. This gives you much more realistic shadows from the sun, especially when trying to simulate a cloudy day or a wide sun. The penumbra effect can also be applied to entity lights (point, spot or sun) with the _deviance N (distance in world units for point/spot lights and degrees for suns) and _samples N (number of samples) key/value pairs.</p>
 <dl>
-	<dt>red green blue</dt><dd>Color is described by three normalized RGB values. Color will be normalized to a 0.0 to 1.0 range, so it doesn't matter what range you use.</dd>
+	<dt>red green blue</dt><dd>Color is described by three RGB values. Color will be normalized to a 0.0 to 1.0 range, so it doesn't matter what range you use.</dd>
 	<dt>intensity</dt><dd>The brightness of the generated light. A value of 100 is a fairly bright sun. The intensity of the light falls off with angle but not distance.</dd>
 	<dt>degrees</dt><dd>The angle relative to the directions of the map file. A setting of 0 degrees equals east. 90 is north, 180 is west and 270 is south. In the original version of Q3Map, non-axial values had a tendency to produce jagged shadows. With Q3Map2, this problem is avoided with new options like lightmap filtering, raytracing and penumbra effects.</dd>
 	<dt>elevation</dt><dd>The angle, measured in degrees from the horizon. An elevation of 0 is sunrise/sunset. An elevation of 90 is noon.</dd>
@@ -425,13 +425,13 @@ <h2 id="q3map_sunExt">q3map_sunExt red green blue intensity degrees elevation de
 </dl>
 <blockquote>
 	<h4>Design Notes:</h4>
-	<p>Sky shaders should probably still have a q3map_surfacelight or preferred q3map_skylight value. The "sun" gives a strong directional light, but doesn't necessarily give the fill light needed to soften and illuminate shadows. Skies with clouds should probably have a weaker q3map_sun value and a higher q3map_surfacelight or q3map_skylight value. Heavy clouds diffuse light and weaken shadows. The opposite is true of a cloudless or nearly cloudless sky. In such cases, the "sun" or "moon" will cast stronger shadows that have a greater degree of contrast. This is also why q3map_sunExt is preferred. It gives the designer greater control over shadow contrast with a penumbra effect.</p>
+	<p>Sky shaders should probably still have a <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> or preferred <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> value. The "sun" gives a strong directional light, but doesn't necessarily give the fill light needed to soften and illuminate shadows. Skies with clouds should probably have a weaker <a href="q3map-global-directives.html#q3map_sun">q3map_sun</a> value and a higher <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> or <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> value. Heavy clouds diffuse light and weaken shadows. The opposite is true of a cloudless or nearly cloudless sky. In such cases, the "sun" or "moon" will cast stronger shadows that have a greater degree of contrast. This is also why q3map_sunExt is preferred. It gives the designer greater control over shadow contrast with a penumbra effect.</p>
 	<h4>Design Notes:</h4>
 	<p>Not certain what color formula you want to use for the sun's light? Try this. Create a light entity. Use the Radiant editor's color selection tools to pick a color. The light's _color key's value will be the normalized RGB formula. Copy it from the value line in the editor (CTRL+c) and paste it into your shader.</p>
 </blockquote>
 
 <h2 id="q3map_surfaceLight">q3map_surfaceLight value</h2>
-<p>The texture gives off light equal to the value set for it. The relative surface area of the texture in the world affects the actual amount of light that appears to be radiated. To give off what appears to be the same amount of light, a smaller texture must be significantly brighter than a larger texture. Unless the q3map_lightImage or q3map_lightRGB directive is used to select a different source for the texture's light color information, the color of the light will be the averaged color of the texture. For sky shaders, use q3map_skylight instead for faster and more uniform sky illumination.</p>
+<p>The surface gives off light equal to the value set for it. The relative surface area in the world affects the actual amount of light that appears to be radiated. To give off what appears to be the same amount of light, a smaller surface must be significantly brighter than a larger one. Unless the <a href="q3map-global-directives.html#q3map_lightImage">q3map_lightImage</a> or <a href="q3map-global-directives.html#q3map_lightRGB">q3map_lightRGB</a> directive is used to select a different source for the shader's light color information, the color of the light will be the averaged color of the texture. For sky shaders, use <a href="q3map-global-directives.html#q3map_skylight">q3map_skylight</a> instead for faster and more uniform sky illumination.</p>
 
 <h2 id="q3map_surfaceModel">q3map_surfaceModel modelpath density odds minscale maxscale minangle maxangle oriented</h2>
 <p>A surface with q3map_surfaceModel in its shader will randomly place a specified model across it's face. This is designed to place grass or tree models over terrain.</p>
@@ -456,7 +456,7 @@ <h3>q3map_tcGen ivector 1.0/sVector 1.0/tVector</h3>
 <p>Projects a texture Ns units by Nt units along a chosen axis. q3map_tcGen ivector ( 256 0 0 ) ( 0 256 0 ) will project a texture every 256 units in x, and every 256 units in y, along the z-axis. Ivector means inverse vector, and this means you won't have to do the divide with a calculator. Inverse = 1.0/n, unless the value is 0, then the matrix value is set to 0. A bit of dodgy math, but it works.</p>
 
 <h2 id="q3map_tcMod">q3map_tcMod func</h2>
-<p>This works in a similar manner to the stage specific tcMod directive (see Stage Directives: tcMod), except in the compiler, so that modified texture coordinates are "baked" into the surface. This lets you set up less obvious texture tiling on natural and organic surfaces (especially terrain).</p>
+<p>This works in a similar manner to the stage specific tcMod directive (see Stage Directives: <a href="stage-directives.html#tcMod">tcMod</a>), except in the compiler, so that modified texture coordinates are "baked" into the surface. This lets you set up less obvious texture tiling on natural and organic surfaces (especially terrain).</p>
 
 <h3>q3map_tcMod rotate degrees</h3>
 <p>Rotates the texture (around origin, not center) a specified number of degrees.</p>
@@ -464,11 +464,11 @@ <h3>q3map_tcMod rotate degrees</h3>
 <h3>q3map_tcMod scale s-scale t-scale</h3>
 <p>Scales S (x) and T (y) texture co-ordinates. scale 2 2 would halve the size of the texture (doubling the texture co-ordinates).</p>
 
-<h3>q3map_tcMod translate or offset or shift s-offset t-offset</h3>
+<h3>q3map_tcMod translate <small>or</small> offset <small>or</small> shift s-offset t-offset</h3>
 <p>Shifts texture co-ordinates by S, T amount. translate 0.5 0 would shift it one-half in S, and none in T.</p>
 
 <h2 id="q3map_terrain">q3map_terrain</h2>
-<p>Alphamap terrain shaders (typically textures/common/terrain and terrain2) must have the q3map_terrain directive. Terrain is handled completely differently from previous versions. Q3Map2 no longer looks for the word terrain in the shader name to determine whether or not it is an indexed shader. It looks for q3map_indexed, or q3map_terrain, which then sets off a bunch of stuff shoehorned into it, like: the lightmap axis, texture projection, etc.</p>
+<p>Alphamap terrain shaders (typically textures/common/terrain and terrain2) must have the q3map_terrain directive. Terrain is handled completely differently from previous versions. Q3Map2 no longer looks for the word terrain in the shader name to determine whether or not it is an indexed shader. It looks for <a href="q3map-global-directives.html#q3map_indexed">q3map_indexed</a>, or q3map_terrain, which then sets off a bunch of stuff shoehorned into it, like: the lightmap axis, texture projection, etc.</p>
 <p>By default, q3map_terrain sets the following:</p>
 <pre>
 q3map_tcGen ivector ( 32 0 0 ) ( 0 32 0 )
@@ -479,20 +479,16 @@ <h2 id="q3map_terrain">q3map_terrain</h2>
 </pre>
 
 <h2 id="q3map_tessSize">q3map_tessSize amount</h2>
-<p>This controls the tessellation size (how finely a surface is chopped up in to triangles), in game units, of the surface. This is only applicable to solid brushes, not curves, and is generally only used on surfaces that are flagged with the deformVertexes directive. Abuse of this can create a huge number of triangles. This happens during Q3Map2 processing, so maps must be reprocessed for changes to take effect. The poorly named tessSize directive still works but has been deprecated in favour of q3map_tessSize for consistency.</p>
-<blockquote>
-	<h4>Design Notes:</h4>
-	<p>It can also be used on tessellating surfaces to make sure that tessellations are large and thus, less costly in terms of triangles created.</p>
-</blockquote>
+<p>This enables surface tessellation and controls its size (how finely a surface is chopped up in to triangles), in game units. This is only applicable to brushes, not curves, and is generally only used on surfaces that are flagged with the <a href="general-directives.html#deformVertexes">deformVertexes</a> directive. Abuse of this can create a huge number of triangles. The poorly named <em>tessSize</em> directive still works but has been deprecated in favour of q3map_tessSize for consistency.</p>
 
 <h2 id="q3map_textureSize">q3map_textureSize X Y</h2>
 <p>Deprecated. Useful when you don't specify an editor or light image for a shader. Recent builds of Q3Map2 will find some referenced image in a shader and use that as a fallback. Historically, this was used for surface splitting for RTCW for PS2, to accommodate the hardware's limited texture range precision.</p>
 
 <h2 id="q3map_vertexScale">q3map_vertexScale N.N</h2>
-<p>The light value, at the vertices of a surface using a shader with this option, is multiplied by the scale value. This is a way to lighten, or darken, a vertex_lit surface, in comparison to other lightmap_lit surfaces around it. Values must be normalized.</p>
+<p>The light value, at the vertices of a surface using a shader with this option, is multiplied by the scale value. This is a way to lighten, or darken, a vertex_lit surface, in comparison to other lightmap_lit surfaces around it.</p>
 
 <h2 id="q3map_vertexShadows">q3map_vertexShadows</h2>
-<p>Obsolete! (See q3map_noVertexShadows) By default, no shadows are cast on vertex_lit_surfaces (see surfaceparm pointlight). In addition, when running Quake III Arena in vertex light, no shadows are cast upon any surface at all, since shadows are part of the lightmap. When using this shader directive, shadows will be cast on surfaces that are vertex lit. However, sharp shadow edges won't be seen on the surfaces, since light values are only calculated at the vertices.</p>
+<p>Obsolete! (See <a href="q3map-global-directives.html#q3map_noVertexShadows">q3map_noVertexShadows</a>) By default, no shadows are cast on vertex_lit_surfaces (see surfaceparm pointlight). In addition, when running Quake III Arena in vertex light, no shadows are cast upon any surface at all, since shadows are part of the lightmap. When using this shader directive, shadows will be cast on surfaces that are vertex lit. However, sharp shadow edges won't be seen on the surfaces, since light values are only calculated at the vertices.</p>
 
 </body>
 </html>
diff --git a/docs/shaderManual/q3map-surface-parameter-directives.html b/docs/shaderManual/q3map-surface-parameter-directives.html
index d0e64164b..e349a3bf0 100644
--- a/docs/shaderManual/q3map-surface-parameter-directives.html
+++ b/docs/shaderManual/q3map-surface-parameter-directives.html
@@ -53,9 +53,9 @@
 </div>
 
 <h1>Q3Map Surface Parameter Directives</h1>
-<p>All surfaceparm keywords are preceded by the word surfaceparm as follows: surfaceparm fog or surfaceparm noimpact.</p>
+<p>All surfaceparm keywords are preceded by the word surfaceparm as follows: <a href="q3map-surface-parameter-directives.html#fog">surfaceparm fog</a> or <a href="q3map-surface-parameter-directives.html#noimpact">surfaceparm noimpact</a>.</p>
 <p>These keywords change the physical nature of the textures and the brushes that are marked with them. Changing any of these values will require the map to be re-compiled. These are global and affect the entire shader.</p>
-<p>It should be noted that some of these surface parameters will change both the surface as well as the content of an object (surfaceparm water, for example). Shaders containing content altering surface parameters should usually be used on all sides of the object.</p>
+<p>It should be noted that some of these surface parameters will change both the surface as well as the content of an object (<a href="q3map-surface-parameter-directives.html#water">surfaceparm water</a>, for example). Shaders containing content altering surface parameters should usually be used on all sides of the object.</p>
 <p>Many of these keywords are only used in "common" shaders (baseq3/scripts/common.shader), which are editor specific shaders used by the level designer. Such keywords are usually not used for the design of custom assets.</p>
 <p>Originally, surfaceparm's were part of the previous chapter since they are actually Q3Map2 specific keywords. I've moved them into their own chapter for the sake of being easier to reference, since both this and the previous chapter were getting too long.</p>
 
@@ -64,7 +64,7 @@ <h2 id="alphashadow">surfaceparm alphashadow</h2>
 <blockquote>
 	<h4><h4>Design Notes:</h4></h4>
 	<p>Alphashadow does not work well with fine line detail on a texture. Fine lines may not cast acceptable shadows. It appears to work best with well-defined silhouettes and wider lines within the texture. Most of our tattered banners use this to cast tattered shadows.</p>
-	<p>With Q3Map2, it is possible to increase the resolution of the lightmap receiving the shadows at the  cost to video memory. This can be achieved with the q3map_lightmapSampleSize keyword on the shadow receiving shader or by creating a func_group of the shadow receiving brushes and adding the _lightmapScale key with a floating-point value for the scale of the lightmap.</p>
+	<p>With Q3Map2, it is possible to increase the resolution of the lightmap receiving the shadows at the  cost to video memory. This can be achieved with the <a href="q3map-global-directives.html#q3map_lightmapSampleSize">q3map_lightmapSampleSize</a> keyword on the shadow receiving shader or by creating a func_group of the shadow receiving brushes and adding the _lightmapScale key with a floating-point value for the scale of the lightmap.</p>
 </blockquote>
 
 <h2 id="antiportal">surfaceparm antiportal</h2>
@@ -74,7 +74,7 @@ <h2 id="antiportal">surfaceparm antiportal</h2>
 <p>Players in part A of the map will not be able to see into part B and vice-versa. You can walk through the antiportal just fine. Note that this also blocks light. There are two caveats: They are opaque to light, and if aligned to another BSP cut (such as blocksize or the origin) they will not function correctly. Don't align it with anything else (like blocksize or another brush face) and it'll block vis. This keyword is found in "common/antiportal" so you shouldn't need to specify this. "common/antiportal" was added by ydnar, so if you're missing this shader, it is included with the latest version of Q3Map2.</p>
 
 <h2 id="areaportal">surfaceparm areaportal</h2>
-<p>A brush marked with this keyword functions as an areaportal, a break in the BSP tree. It is typically placed on a very thin brush placed inside a door entity (but is not a part of that entity). The intent is to block the game from processing surface triangles located behind it when the door is closed. It is also used by the BSPC (bot area file creation compiler) in the same manner as a clusterportal. The brush must touch all the structural brushes surrounding the areaportal. This keyword is found in "common/areaportal" so you shouldn't need to specify this.</p>
+<p>A brush marked with this keyword functions as an areaportal, a break in the BSP tree. It is typically placed on a very thin brush placed inside a door entity (but is not a part of that entity). The intent is to block the game from processing surface triangles located behind it when the door is closed. Blocked area ought to be wholly enclosed and only accessible via areaportals. It is also used by the BSPC (bot area file creation compiler) in the same manner as a <a href="q3map-surface-parameter-directives.html#clusterportal">clusterportal</a>. The brush must touch all the structural brushes surrounding the areaportal. This keyword is found in "common/areaportal" so you shouldn't need to specify this.</p>
 
 <h2 id="botclip">surfaceparm botclip</h2>
 <p>Blocks bot movement only. Other game world entities and human players can pass through a brush marked botclip. The intended use for this is to block the bot but not other players or projectiles. This keyword is found in "common/botclip" so you shouldn't need to specify this.</p>
@@ -84,13 +84,13 @@ <h4>Design Notes:</h4>
 </blockquote>
 
 <h2 id="clusterportal">surfaceparm clusterportal</h2>
-<p>A brush marked with this keyword function creates a subdivision of the area file (.aas) used by the bots for navigation. It is typically placed in locations that are natural breaks in a map, such as entrances to halls, doors, tunnels, etc. The intent is keep the bot from having to process the entire map at once. As with the the areaportal parameter, the affected brush must touch all the structural brushes surrounding the clusterportal. This keyword is found in "common/clusterportal" so you shouldn't need to specify this.</p>
+<p>A brush marked with this keyword function creates a subdivision of the area file (.aas) used by the bots for navigation. It is typically placed in locations that are natural breaks in a map, such as entrances to halls, doors, tunnels, etc. The intent is keep the bot from having to process the entire map at once. As with the the <a href="q3map-surface-parameter-directives.html#areaportal">areaportal</a> parameter, the affected brush must touch all the structural brushes surrounding the clusterportal. This keyword is found in "common/clusterportal" so you shouldn't need to specify this.</p>
 
 <h2 id="detail">surfaceparm detail</h2>
 <p>This surface attribute causes a brush to be ignored by the Q3Map2 process for generating possible break-points in the BSP tree. Generally speaking, detail brushes are usually set in the editor, so you shouldn't need to specify this.</p>
 
 <h2 id="donotenter">surfaceparm donotenter</h2>
-<p>Read as "do not enter". Like clusterportal, this is a bot-only property. A brush marked with donotenter will not affect non-bot players, but bots will not enter it. It should be used only when bots appear to have difficulty navigating around some map features. This does not physically stop the bot from entering a region (as with botclip). Bots will not enter the area on their own but may, for example, be blasted into the region with a rocket launcher. This keyword is found in "common/donotenter" so you shouldn't need to specify this.</p>
+<p>Read as "do not enter". Like <a href="q3map-surface-parameter-directives.html#clusterportal">clusterportal</a>, this is a bot-only property. A brush marked with donotenter will not affect non-bot players, but bots will not enter it. It should be used only when bots appear to have difficulty navigating around some map features. This does not physically stop the bot from entering a region (as with <a href="q3map-surface-parameter-directives.html#botclip">botclip</a>). Bots will not enter the area on their own but may, for example, be blasted into the region with a rocket launcher. This keyword is found in "common/donotenter" so you shouldn't need to specify this.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
 	<p>donotenter can be (sparingly) used in space maps around the void or around lava/slime in certain places where bots have an overwhelming tendency to commit suicide (lemming style).</p>
@@ -100,10 +100,10 @@ <h2 id="dust">surfaceparm dust</h2>
 <p>Team Arena specific: if a player lands on a surface that uses a shader with this parameter, a puff of dust will appear at the player's feet. Note that the worldspawn entity must contain the "enabledust" key with a set value of "1".</p>
 
 <h2 id="flesh">surfaceparm flesh</h2>
-<p>This will cue different sounds (in a similar manner to metalsteps) and cause blood to appear instead of bullet impact flashes. Actually, the code for this was never fully implemented by id Software. It remains half-finished so unfortunately it doesn't work.</p>
+<p>This will cue different sounds (in a similar manner to <a href="q3map-surface-parameter-directives.html#metalsteps">metalsteps</a>) and cause blood to appear instead of bullet impact flashes. Actually, the code for this was never fully implemented by id Software. It remains half-finished so unfortunately it doesn't work.</p>
 
 <h2 id="fog">surfaceparm fog</h2>
-<p>fog defines the brush as being a "fog" brush. This is a Q3Map2 function that chops and identifies all geometry inside the brush. The general shader keyword fogparms must also be specified to tell how to draw the fog.</p>
+<p>fog defines the brush as being a "fog" brush. This is a Q3Map2 function that chops and identifies all geometry inside the brush. The general shader keyword <a href="general-directives.html#fogParms">fogParms</a> must also be specified to tell how to draw the fog.</p>
 
 <h2 id="hint">surfaceparm hint</h2>
 <p>When Q3Map2 calculates the vis data, it tries to place portals in places in the map in an attempt to limit the potential viewable set (PVS). Brushes marked by a hint shader are used to manually place portals to force a break in the PVS. This keyword is found in "common/hint" so you shouldn't need to specify this.</p>
@@ -112,16 +112,16 @@ <h2 id="ladder">surfaceparm ladder</h2>
 <p>Supposedly used to allow the player to climb vertically. This is not functional in Quake III Arena.</p>
 
 <h2 id="lava">surfaceparm lava</h2>
-<p>Assigns to the texture the game properties set for lava. This affects both the surface and the content of a brush.</p>
+<p>Assigns lava content properties to a brush.</p>
 
 <h2 id="lightfilter">surfaceparm lightfilter</h2>
-<p>Causes the Q3Map2 light stage to use the texture's RGB and alpha channels to generate colored alpha shadows in the lightmap. For example, this can be used to create the colored light effect cast by stained glass windows. This can be used with surfaceparm alphashadow.</p>
+<p>Causes the Q3Map2 light stage to use the texture's RGB and alpha channels to generate colored alpha shadows in the lightmap. For example, this can be used to create the colored light effect cast by stained glass windows. This can be used with <a href="q3map-surface-parameter-directives.html#alphashadow">surfaceparm alphashadow</a>.</p>
 
 <h2 id="lightgrid">surfaceparm lightgrid</h2>
 <p>The min/max bounds of brushes with this shader in a map will define the bounds of the map's lightgrid (model lighting). Make it as small as possible around player space to minimize bsp size and compile time. This keyword is found in "common/lightgrid" so you shouldn't need to specify this. "common/lightgrid" was added by ydnar, so if you're missing this shader, it is included with the latest version of Q3Map2.</p>
 
 <h2 id="metalsteps">surfaceparm metalsteps</h2>
-<p>The player sounds as if he is walking on clanging metal steps or gratings. Other than specifying flesh (doesn't work), metalsteps, nosteps, or default (i.e. specify nothing) it is currently not possible for a designer to create or assign a specific sound routine to a texture. Note: If no sound is set for a texture, then the default footsteps sound routines are heard.</p>
+<p>The player sounds as if he is walking on clanging metal steps or gratings. Other than specifying <a href="q3map-surface-parameter-directives.html#flesh">flesh</a> (doesn't work), metalsteps, <a href="q3map-surface-parameter-directives.html#nosteps">nosteps</a>, or default (i.e. specify nothing) it is currently not possible for a designer to create or assign a specific sound routine to a texture. Note: If no sound is set for a texture, then the default footsteps sound routines are heard.</p>
 
 <h2 id="monsterclip">surfaceparm monsterclip</h2>
 <p>Blocks monster movement. Not functional in Quake III Arena.</p>
@@ -133,7 +133,7 @@ <h2 id="nodlight">surfaceparm nodlight</h2>
 <p>Read as "No Dee-Light". A texture containing this parameter will not be affected or lit by dynamic lights, such as weapon effects. An example in Quake III Arena would be solid lava.</p>
 
 <h2 id="nodraw">surfaceparm nodraw</h2>
-<p>A texture marked with nodraw will not visually appear in the game world. Most often used for triggers, clip brushes, origin brushes, shaders with cull none or cull disable and so on. This keyword is found in "common/nodraw" so you shouldn't need to specify this.</p>
+<p>A texture marked with nodraw will not visually appear in the game world. Most often used for triggers, clip brushes, origin brushes, on invisible sides of brushes with with <a href="general-directives.html#cull">cull none</a> shaders and so on. This keyword is found in "common/nodraw" so you shouldn't need to specify this.</p>
 
 <h2 id="nodrop">surfaceparm nodrop</h2>
 <p>When a player dies inside a volume (brush) marked nodrop, no weapon is dropped. The intend use is for "Pits of Death." Have a kill trigger inside a nodrop volume, and when the players die here, they won't drop their weapons. The intent is to prevent unnecessary polygon pileups on the floors of pits. This keyword is found in "common/nodrop" but you may want to specify this on certain shaders (fog volumes in pits, for example).</p>
@@ -149,13 +149,13 @@ <h4>Design Notes:</h4>
 </blockquote>
 
 <h2 id="nolightmap">surfaceparm nolightmap</h2>
-<p>This texture does not have a lightmap phase. It is not affected by the ambient lighting of the world around it. It does not require the addition of an rgbGen identity keyword in that stage.</p>
+<p>This texture does not have a lightmap phase.</p>
 
 <h2 id="nosteps">surfaceparm nosteps</h2>
 <p>The player makes no sound when walking on this texture.</p>
 
 <h2 id="nonsolid">surfaceparm nonsolid</h2>
-<p>This attribute indicates a brush, which does not block the movement of entities in the game world. It applied to triggers, hint brushes and similar brushes. This affects the content of a brush.</p>
+<p>This attribute indicates a brush or patch, which do not block the movement of entities in the game world. It applied to triggers, hints, etc.</p>
 
 <h2 id="origin">surfaceparm origin</h2>
 <p>Used on the "origin" texture. Rotating entities need to contain an origin brush in their construction. The brush must be rectangular (or square). The origin point is the exact center of the origin brush. This keyword is found in "common/origin" so you shouldn't need to specify this.</p>
@@ -169,10 +169,10 @@ <h4>Design Notes:</h4>
 </blockquote>
 
 <h2 id="pointlight">surfaceparm pointlight</h2>
-<p>Surfaces using a shader with this parameter will always be vertex lit. This option can be used to reduce the lightmap data. It is often used on surfaces that don't need shadows. Basically the same as surfaceparm nolightmap.</p>
+<p>Surfaces using a shader with this parameter will always be vertex lit. This option can be used to reduce the lightmap data. It is often used on surfaces that don't need shadows. Basically the same as <a href="q3map-surface-parameter-directives.html#nolightmap">surfaceparm nolightmap</a>.</p>
 
 <h2 id="skip">surfaceparm skip</h2>
-<p>Works just like Quake II skip texture. Use on sides of hint and antiportal brushes where you don't want BSP splits. This keyword is found in "common/skip" so you shouldn't need to specify this. "common/skip" was added by ydnar, so if you're missing this shader, it is included with the latest version of Q3Map2.</p>
+<p>Works just like Quake II skip texture. Use on sides of <a href="q3map-surface-parameter-directives.html#hint">hint</a>, <a href="q3map-surface-parameter-directives.html#antiportal">antiportal</a> and <a href="q3map-surface-parameter-directives.html#areaportal">areaportal</a> brushes where you don't want BSP splits. Usual use is 5 faces of skip + 1 functional face. This keyword is found in "common/skip" so you shouldn't need to specify this. "common/skip" was added by ydnar, so if you're missing this shader, it is included with the latest version of Q3Map2.</p>
 
 <h2 id="sky">surfaceparm sky</h2>
 <p>This flags the compiler, telling it that this surface should be rendered as sky.</p>
@@ -181,19 +181,19 @@ <h2 id="slick">surfaceparm slick</h2>
 <p>This surfaceparm included in a texture should give it zero friction and air type of acceleration, while standing on it. This keyword is found in "common/slick" but you may want to specify this on certain shaders (ice, for example).</p>
 
 <h2 id="slime">surfaceparm slime</h2>
-<p>Assigns to the texture the game properties for slime. This affects both the surface and the content of a brush.</p>
+<p>Assigns slime content properties to a brush.</p>
 
 <h2 id="structural">surfaceparm structural</h2>
 <p>This surface attribute causes a brush to be seen by the Q3Map2 process as a possible break-point in a BSP tree. It is used as a part of the shader for the "hint" texture. Generally speaking, any opaque texture not marked as "detail" is, by default, structural, so you shouldn't need to specify this.</p>
 
 <h2 id="trans">surfaceparm trans</h2>
-<p>Tells Q3Map2 that pre-computed visibility and light should not be blocked by this surface. Generally, any shaders that have blendfunc's should be marked as surfaceparm trans.</p>
+<p>Tells Q3Map2 that pre-computed visibility and light should not be blocked by this surface. Generally, any shaders that have <a href="stage-directives.html#blendFunc">blendFunc</a>'s should be marked as surfaceparm trans.</p>
 
 <h2 id="trigger">surfaceparm trigger</h2>
 <p>Implies transparent and nonsolid inside q3map2. Is not necessary for the game, as it assigns this flag basing on entity type.</p>
 
 <h2 id="water">surfaceparm water</h2>
-<p>Assigns to the texture the game properties for water. This affects both the surface and the content of a brush.</p>
+<p>Assigns water content properties to a brush.</p>
 
 
 
diff --git a/docs/shaderManual/quake-editor-radiant-directives.html b/docs/shaderManual/quake-editor-radiant-directives.html
index 0d2ce8b3a..9064c2242 100644
--- a/docs/shaderManual/quake-editor-radiant-directives.html
+++ b/docs/shaderManual/quake-editor-radiant-directives.html
@@ -56,8 +56,8 @@ <h1>Radiant Editor Directives</h1>
 <p>These directives only affect the texture when it is seen in the Radiant editor. They have no effect on the surface in-game. They should be grouped with the surface parameters but ahead of them in sequence.</p>
 
 <h2 id="qer_editorImage">qer_editorImage textureName</h2>
-<p>This directive creates a shader name in memory, but in the editor, it displays the TGA art image specified in qer_editorImage (in the shader below this is, textures/eerie/lavahell.tga).</p>
-<p>The editor maps a texture using the size attributes of the TGA file used for the editor image. When that editor image represents a shader, any texture used in any of the shader stages will be scaled up or down to the dimensions of the editor image. If a 128x128 pixel image is used to represent the shader in the editor, then a 256x256 image used in a later stage will be shrunk to fit. A 64x64 image would be stretched to fit. Be sure to check this on bouncy, acceleration, and power-up pads placed on surfaces other than 256 x 256. Use tcMod scale to change the size of the stretched texture. Remember that tcMod scale 0.5 0.5 will double your image, while tcMod scale 2 2 will halve it.</p>
+<p>This directive instructs editor, which image to use for shader display. It also defines shader dimensions for editor and compiler, and lastly shader color to be used in <a href="q3map-global-directives.html#q3map_surfaceLight">q3map_surfaceLight</a> and -bounce.</p>
+<p>The editor and Q3Map2 map a texture using the size attributes of the image file used for the editor image. When that editor image represents a shader, any texture used in any of the shader stages will be scaled up or down to the dimensions of the editor image. If a 128x128 pixel image is used to represent the shader in the editor, then a 256x256 image used in a later stage will be shrunk to fit. A 64x64 image would be stretched to fit. Be sure to check this on bouncy, acceleration, and power-up pads placed on surfaces other than 256 x 256. Use <a href="stage-directives.html#tcModScale">tcMod scale</a> to change the size of the stretched texture. Remember that tcMod scale 0.5 0.5 will double your image, while tcMod scale 2 2 will halve it.</p>
 <pre>
 textures/liquids/lavahell2       //path and name of new texture
 {
@@ -91,7 +91,7 @@ <h2 id="qer_trans">qer_trans N.N</h2>
 <p>This directive makes brush transparent when seen in the editor and filterable by 'translucent' filter (no effect on game rendering at all). It can have a positive value between 0 and 1. The higher the value, the less transparent the texture. Example: qer_trans 0.2 means the brush is 20% opaque and nearly invisible.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
-	<p>On GtkRadiant 1.4 and earlier, if the shader uses qer_trans and a qer_editorImage with an alpha channel, the transparent areas of the editorImage will be 100% transparent. To keep the solid areas of the editorImage opaque, use a near 1 value for qer_trans (eg. 0.9999). This is useful for grates, windows, fences, etc. If using GtkRadiant 1.5 or later, use qer_alphaFunc for editorImage masking instead. In NetRadiant-custom any value of qer_trans enables alpha channel transparency display, this may be used when alpha blending is wanted instead of alpha masking.</p>
+	<p>On GtkRadiant 1.4 and earlier, if the shader uses qer_trans and a <a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a> with an alpha channel, the transparent areas of the editorImage will be 100% transparent. To keep the solid areas of the editorImage opaque, use a near 1 value for qer_trans (eg. 0.9999). This is useful for grates, windows, fences, etc. If using GtkRadiant 1.5 or later, use <a href="quake-editor-radiant-directives.html#qer_alphaFunc">qer_alphaFunc</a> for editorImage masking instead. In NetRadiant-custom any value of qer_trans enables alpha channel transparency display, this may be used when alpha blending is wanted instead of alpha masking.</p>
 </blockquote>
 
 <h2 id="qer_alphaFunc">qer_alphaFunc func N.N</h2>
diff --git a/docs/shaderManual/shader-concepts.html b/docs/shaderManual/shader-concepts.html
index 48bd3719b..e86d3431d 100644
--- a/docs/shaderManual/shader-concepts.html
+++ b/docs/shaderManual/shader-concepts.html
@@ -124,12 +124,12 @@ <h3 id="waveformfunctions">Waveform Functions</h3>
 	<dt>Square</dt><dd>A square wave simply switches from -1 to 1 with no in-between.</dd>
 	<dt>Sawtooth</dt><dd>In the sawtooth wave, the ascent is like a triangle wave from 0 to 1, but the decay cuts off sharply back to 0.</dd>
 	<dt>Inversesawtooth</dt><dd>This is the reverse of the sawtooth... instant ascent to the peak value (1), then a triangle wave descent to the valley value (0). The phase on this goes from 1.0 to 0.0 instead of 0.0 to 1.0. This wave is particularly useful for additive cross-fades.</dd>
-	<dt>Noise</dt><dd>Available for some functions only (rgbGen wave, but not alphaGen wave), adds a randomly changing value. The frequency value is (probably) hard-coded so changing it (probably) doesn't affect the speed  of the flickering.</dd>
+	<dt>Noise</dt><dd>Available for <a href="stage-directives.html#rgbGenWave">rgbGen wave</a> function only, adds a randomly changing value. The frequency value affects the speed of the flickering.</dd>
 </dl>
 <p>Waveforms all have the following properties:</p>
 <dl>
 	<dt>base</dt><dd>Where the wave form begins. Amplitude is measured from this base value.</dd>
-	<dt>amplitude</dt><dd>This is the height of the wave created, measured from the base. You will probably need to test and tweak this value to get it correct for each new shader stage. The greater the amplitude, the higher the wave peaks and the deeper the valleys.</dd>
+	<dt>amplitude</dt><dd>This defines the height of the wave created. Functions handle this differently: sin, triangle, square, noise produce output values in the range [base - amplitude, base + amplitude], while sawtooth, inversesawtooth do [base, base + amplitude].</dd>
 	<dt>phase</dt><dd>This is a normalized value between 0.0 and 1.0. Changing phase to a non-zero value affects the point on the wave at which the wave form initially begins to be plotted. Example: In Sin or Triangle wave, a phase of 0.25 means it begins one fourth (25%) of the way along the curve, or more simply put, it begins at the peak of the wave. A phaseof 0.5 would begin at the point the wave re-crosses the base line. A phase of 0.75 would be at the lowest point of the valley. If only one wave form is being used in a shader, a phase shift will probably not be noticed and phase should have a value of zero (0). However, including two or more stages of the same process in a single shader, but with the phases shifted can be used to create interesting visual effects. Example: using rgbGen in two stages with different colors and a 0.5 difference in phase would cause the manipulated texture to modulate between two distinct colors. Phase changes can also be used when you have two uses of the same effect near each other, and you don't want them to be synchronized. You would write a separate shader for each, changing only the phase value.</dd>
 	<dt>freq</dt><dd>Frequency. This value is expressed as repetitions or cycles of the wave per second. A value of 1 would cycle once per second. A value of 10 would cycle 10 times per second. A value of 0.1 would cycle once every 10 seconds.</dd>
 </dl>
@@ -166,12 +166,23 @@ <h3>:q3map Suffix</h3>
 	surfaceparm metalsteps
 }
 </pre>
+<p>Another case is when we want to create a version of existing shader with specific compile-time parameters. Possible to reduce the noise too:</p>
+<pre>
+textures/tim/rmetaltechgeomtrn_slick:q3map
+{
+	// compile time parameter
+	surfaceparm slick
+	qer_editorimage textures/tim/rmetaltechgeomtrn.tga
+	// remap back to original shader
+	q3map_remapShader textures/tim/rmetaltechgeomtrn
+}
+</pre>
 
 <h2 id="directivetypes">Directive Types</h2>
 <p>Only the shader name is case sensitive (use all lowercase). Shader directives are not, but by convention, you should use mixedCase (ie. q3map_alphaMod). Some of the shader directives are order dependant, so it's good practice to keep all directive of a similar type grouped together in the following order, from top-down:</p>
 
 <h3>General Directives</h3>
-<p>A shader may contain general directives, which affects the shader's appearance globally (affects the entire shader), and changes the physical attributes of the surface that uses the shader. These attributes can affect the player. These parameters are executed at runtime, that is, in order to see the changes one does not need to re-compile the map.</p>
+<p>A shader may contain general directives, which affects the shader's appearance globally (affects the entire shader), and changes the visual attributes of the surface that uses the shader. These parameters are executed at runtime, that is, in order to see the changes one does not need to re-compile the map.</p>
 
 <h3>Q3Map Directives</h3>
 <p>The general directives may be followed by Q3Map directives. These directives are used by the compiler to change the physical nature of the shader's surface and are also global.</p>
diff --git a/docs/shaderManual/stage-directives.html b/docs/shaderManual/stage-directives.html
index e61a4c33d..623ef6910 100644
--- a/docs/shaderManual/stage-directives.html
+++ b/docs/shaderManual/stage-directives.html
@@ -61,18 +61,18 @@ <h2 id="map">Texture Map Specification</h2>
 <h3>map <em>texturename</em></h3>
 <p>Specifies the source texture map (a 24 or 32-bit TGA or JPG file) used for this stage. The texture may or may not contain alpha channel information. The special keywords $lightmap and $whiteimage may be substituted in lieu of an actual texture map name. In those cases, the texture named in the first line of the shader becomes the texture that supplies the light mapping data for the process. The texture name should always end with the ".tga" suffix regardless of whether the source texture map is actually a .tga file or .jpg.</p>
 
-<h3>map <em>$lightmap</em></h3>
-<p>This is the overall lightmap for the game world. It is calculated during the Q3Map2 process. It is the initial color data found in the framebuffer. Note: due to the use of overbright bits in light calculation, the keyword rgbGen identity must accompany all $lightmap instructions.</p>
+<h3 id="mapLightmap">map <em>$lightmap</em></h3>
+<p>This is the overall lightmap for the game world. It is calculated during the Q3Map2 process. It is the initial color data found in the framebuffer. Note: due to the use of overbright bits in light calculation, the keyword <a href="stage-directives.html#rgbGenIdentity">rgbGen identity</a> must accompany all $lightmap instructions.</p>
 
 <h3>map <em>$whiteimage</em></h3>
 <p>This is used for specular lighting on MD3 models. This is a white image generated internally by the game. This image can be used in lieu of $lightmap or an actual texture map if, for example, you wish for the vertex colors to come through unaltered.</p>
 
 <h3 id="clampMap">clampMap <em>texturename</em></h3>
 <!-- obsidian: clampMap may have been once named clampTexCoords. Changed all instances of clampTexCoords (2nd paragraph) to clampMap -->
-<p>Dictates that this stage should clamp texture coordinates instead of wrapping them. During a stretch function, the area, which the texture must cover during a wave cycle, enlarges and decreases. Instead of repeating a texture multiple times during enlargement (or seeing only a portion of the texture during shrinking) the texture dimensions increase or contract accordingly. This is only relevant when using something like deformTexCoordParms to stretch/compress texture coordinates for a specific special effect. Remember that the Quake III Arena engine normalizes all texture coordinates (regardless of actual texture size) into a scale of 0.0 to 1.0.</p>
-<p>When using clampMap make sure the texture is properly aligned on the brush. The clampMap function keeps the image from tiling. However, the editor doesn't represent this properly and shows a tiled image. Therefore, what appears to be the correct position may be offset. This is very apparent on anything with a tcMod rotate and clampMap function.</p>
+<p>Dictates that this stage should clamp texture coordinates instead of wrapping them. During a <a href="stage-directives.html#tcModStretch">stretch function</a>, the area, which the texture must cover during a wave cycle, enlarges and decreases. Instead of repeating a texture multiple times during enlargement (or seeing only a portion of the texture during shrinking) the texture dimensions increase or contract accordingly. This is only relevant when using something like deformTexCoordParms to stretch/compress texture coordinates for a specific special effect. Remember that the Quake III Arena engine normalizes all texture coordinates (regardless of actual texture size) into a scale of 0.0 to 1.0.</p>
+<p>When using clampMap make sure the texture is properly aligned on the brush. The clampMap function keeps the image from tiling. However, the editor doesn't represent this properly and shows a tiled image. Therefore, what appears to be the correct position may be offset. This is very apparent on anything with a <a href="stage-directives.html#tcModRotate">tcMod rotate</a> and clampMap function.</p>
 
-<p>Avoiding Distortion: When seen at a given distance (which can vary, depending on hardware and the size of the texture), the compression phase of a stretch function will cause a "cross"-like visual artifact to form on the modified texture due to the way that textures are reduced. This occurs because the texture undergoing modification lacks sufficient "empty space" around the displayed (non-black) part of the texture (see below, left)<!--(see figure 2a)-->. To compensate for this, make the non-zero portion of the texture substantially smaller (50% of maximum stretched size -- see below, right<!--figure 2b-->) than the dimensions of the texture. Then, write a scaling function (tcMod scale) into the appropriate shader phase, to enlarge the image to the desired proportion.</p>
+<p>Avoiding Distortion: When seen at a given distance (which can vary, depending on hardware and the size of the texture), the compression phase of a stretch function will cause a "cross"-like visual artifact to form on the modified texture due to the way that textures are reduced. This occurs because the texture undergoing modification lacks sufficient "empty space" around the displayed (non-black) part of the texture (see below, left)<!--(see figure 2a)-->. To compensate for this, make the non-zero portion of the texture substantially smaller (50% of maximum stretched size -- see below, right<!--figure 2b-->) than the dimensions of the texture. Then, write a scaling function (<a href="stage-directives.html#tcModScale">tcMod scale</a>) into the appropriate shader phase, to enlarge the image to the desired proportion.</p>
 
 <p><strong><img src="clampmap.jpg" tppabs="http://robotrenegade.com/q3map2/docs/shader_manual/_images/clampmap.jpg" alt="Figure 2a & 2b" class="center" /></strong></p>
 
@@ -110,7 +110,7 @@ <h3 id="clampMap">clampMap <em>texturename</em></h3>
 <h3 id="animMap">animMap <em>frequency texture1... texture8</em></h3>
 <p>The surfaces in the game can be animated by displaying a sequence of 1 to 8 frames (separate texture maps). These animations are affected by other keyword effects in the same and later shader stages.</p>
 <dl>
-	<dt>frequency</dt><dd>The number of frames to display per one second time period (fps).</dd>
+	<dt>frequency</dt><dd>The number of frames to display per one second time period (namely fps).</dd>
 	<dt>texture1... texture8</dt><dd>the texture path/texture name for each animation frame must be explicitly listed. Up to eight frames (eight separate .tga files) can be used to make an animated sequence. Each frame is displayed for 1/frequency seconds.</dd>
 </dl>
 <blockquote>
@@ -205,7 +205,7 @@ <h3>Explicit Blend Functions</h3>
 
 <p>Rather than think of the entire texture as a whole, it maybe easier to think of the number values that correspond to a single pixel, because that is essentially what the computer is processing... one pixel of the bitmap at a time.</p>
 
-<p>The process for calculating the final look of a texture in place in the game world begins with the precalculated lightmap for the area where the texture will be located. This data is in the frame buffer. That is to say, it is the initial data in the destination. In an unmanipulated texture (i.e. one without a special shader script), color information from the texture is combined with the lightmap. In a shader-modified texture, the $lightmap stage must be present for the lightmap to be included in the calculation of the final texture appearance.</p>
+<p>The process for calculating the final look of a texture in place in the game world begins with the precalculated lightmap for the area where the texture will be located. This data is in the frame buffer. That is to say, it is the initial data in the destination. In an unmanipulated texture (i.e. one without a special shader script), color information from the texture is combined with the lightmap. In a shader-modified texture, the <a href="stage-directives.html#mapLightmap">$lightmap</a> stage must be present for the lightmap to be included in the calculation of the final texture appearance.</p>
 
 <p>Each pass or "stage" of blending is combined (in a cumulative manner) with the color data passed onto it by the previous stage. How that data combines together depends on the values chosen for the source blends and destination blends at each stage. Remember it's numbers that are being mathematically combined together that are ultimately interpreted as colors.</p>
 
@@ -251,20 +251,20 @@ <h3>Technical Information/Limitations Regarding Blend Modes:</h3>
 <p>Cards running in 16 bit color cannot use any GL_DST_ALPHA blends.</p>
 
 <h2 id="rgbGen">rgbGen func</h2>
-<p>There are two color sources for any given shader, the texture file and the vertex colors. Output at any given time will be equal to TEXTURE multiplied by VERTEXCOLOR. Most of the time VERTEXCOLOR will default to white (which is a normalized value of 1.0), so output will be TEXTURE (this usually lands in the Source side of the shader equation). Sometimes you do the opposite and use TEXTURE = WHITE, but this is only commonly used when doing specular lighting on entities (i.e. shaders that level designers will probably never create.</p>
+<p>There are two color sources for any given shader, the texture file and the vertex colors. Output at any given time will be equal to TEXTURE multiplied by VERTEXCOLOR. Most of the time VERTEXCOLOR will default to white (which is a <a href="shader-concepts.html#normalization">normalized value</a> of 1.0), so output will be TEXTURE (this usually lands in the Source side of the shader equation). Sometimes you do the opposite and use TEXTURE = WHITE, but this is only commonly used when doing specular lighting on entities (i.e. shaders that level designers will probably never create.</p>
 
 <p>The most common reason to use rgbGen is to pulsate something. This means that the VERTEXCOLOR will oscillate between two values, and that value will be multiplied (darkening) the texture.</p>
 
 <p>If no rgbGen is specified, either "identityLighting" or "identity" will be selected, depending on which blend modes are used.</p>
 
-<h3>rgbGen identity</h3>
+<h3 id="rgbGenIdentity">rgbGen identity</h3>
 <p>Colors are assumed to be all white (1.0, 1.0, 1.0). All filters stages (lightmaps, etc) will get this by default.</p>
 
 <h3>rgbGen identityLighting</h3>
 <p>Colors will be (1.0, 1.0, 1.0) if running without overbright bits (NT, Linux, windowed modes), or (0.5, 0.5, 0.5) if running with overbright. Overbright allows a greater color range at the expense of a loss of precision. Additive and blended stages will get this by default.</p>
 
-<h3>rgbGen vertex</h3>
-<p>Colors are filled in directly by the data from the map or model files. Use rgbGen vertex + alphaGen const or rgbGen exactVertex to disable surfaces from being affected by alphaMod volumes.
+<h3 id="rgbGenVertex">rgbGen vertex</h3>
+<p>Colors are filled in directly by the color data baked to vertices of the map or model files.</p>
 <blockquote>
 	<h4>Design Notes:</h4>
 	<p>rgbGen vertex  should be used when you want the RGB values to be computed for a static model (i.e. mapobject) in the world using precomputed static lighting from Q3BSP. This would be used on things like the gargoyles, the portal frame, skulls, and other decorative models put into the Quake III Arena world.</p>
@@ -289,8 +289,8 @@ <h4>Design Notes:</h4>
 	<p>rgbGen lightingDiffuse is used when you want the RGB values to be computed for a dynamic model (i.e. non-map object) in the world using regular in-game lighting. For example, you would specify on shaders for items, characters, weapons, etc.</p>
 </blockquote>
 
-<h3>rgbGen wave <em>func base amplitude phase freq</em></h3>
-<p>Colors are generated using the specified waveform. An affected texture will become darker and lighter, but will not change hue. Hue stays constant. Note that the RGB values for color will not go below 0 (black) or above 1 (white). Valid waveforms are sin, triangle, square, sawtooth, inversesawtooth and noise (see Waveform Functions).</p>
+<h3 id="rgbGenWave">rgbGen wave <em>func base amplitude phase freq</em></h3>
+<p>Colors are generated using the specified waveform. An affected texture will become darker and lighter, but will not change hue. Hue stays constant. Note that the RGB values for color will not go below 0 (black) or above 1 (white). Valid waveforms are sin, triangle, square, sawtooth, inversesawtooth and noise (see <a href="shader-concepts.html#waveformfunctions">Waveform Functions</a>).</p>
 
 <h3>rgbGen const ( <em>R G B</em> )</h3>
 <p>A constant vertex colour is assigned to the affected surface. This modifies the hue of the texture.</p>
@@ -299,17 +299,23 @@ <h2 id="alphaGen">alphaGen func</h2>
 <p>The alpha channel can be specified like the RGB channels. If not specified, it defaults to 1.0.</p>
 
 <h3>alphaGen lightingSpecular</h3>
+
 <h3>alphaGen wave</h3>
+<p>All <a href="shader-concepts.html#waveformfunctions">waveform functions</a> except <em>noise</em>.</p>
+
 <h3>alphaGen entity</h3>
 <h3>alphaGen oneMinusEntity</h3>
-<h3>alphaGen vertex</h3>
+
+<h3 id="alphaGenVertex">alphaGen vertex</h3>
+<p>Baked alpha value is read from surface vertices.</p>
 <h3>alphaGen oneMinusVertex</h3>
+<p>Same as above, but (1.0 - value).</p>
 
 <h3>alphaGen const N.N</h3>
 <p>A constant vertex alpha is assigned to the affected surface. This modifies the transparency of the texture.</p>
 
 <h3>alphaGen portal <em>distance</em></h3>
-<p>This rendering stage keyword is normally used in conjunction with the surface parameter keyword portal. It is mandatory for portals to work (but not for mirrors). The function accomplishes the "fade" that causes the scene in the portal/mirror to fade from view. Specifically, it means "Generate alpha values based on the distance from the viewer to the portal". Viewer distance 0 maps to alpha 0, when distance is more than "distance" parameter value, alpha is 1. While latter is the case, portal/mirror content is not rendering at all, this optimization is original purpose of the keyword, though it may be utilized for other distance dependent effects.</p>
+<p>This rendering stage keyword is normally used in conjunction with the surface parameter keyword <a href="general-directives.html#portal">portal</a>. It is mandatory for portals to work (but not for mirrors). The function accomplishes the "fade" that causes the scene in the portal/mirror to fade from view. Specifically, it means "Generate alpha values based on the distance from the viewer to the portal". Viewer distance 0 maps to alpha 0, when distance is more than "distance" parameter value, alpha is 1. While latter is the case, portal/mirror content is not rendering at all, this optimization is original purpose of the keyword, though it may be utilized for other distance dependent effects.</p>
 <p>
 Basic fading portal/mirror shader example:
 </p>
@@ -338,7 +344,7 @@ <h2 id="tcGen">tcGen coordinateSource</h2>
 	<dt>vector</dt><dd>Projects a texture from a specified direction.</dd>
 </dl>
 
-<h3>tcGen vector ( <em>sx sy sz</em> ) ( <em>tx ty tz</em> )</h3>
+<h3 id="tcGenVector">tcGen vector ( <em>sx sy sz</em> ) ( <em>tx ty tz</em> )</h3>
 <p>New texture coordinate generation by world projection. This allows you to project a texture onto a surface in a fixed way, regardless of its orientation.</p>
 
 <p>S-coordinates correspond to the "x" coordinates on the texture itself. T-coordinates correspond to the "y" coordinates on the texture itself. The measurements are in game units.</p>
@@ -355,11 +361,11 @@ <h2 id="tcMod">tcMod <em>func</em></h2>
 tcMod scroll 1 1
 </pre>
 
-<h3>tcMod rotate <em>degrees/sec</em></h3>
+<h3 id="tcModRotate">tcMod rotate <em>degrees/sec</em></h3>
 <p>This keyword causes the texture coordinates to rotate. The value is expressed in degrees rotated each second. A positive value means clockwise rotation. A negative value means counterclockwise rotation. For example "tcMod rotate 5" would rotate texture coordinates 5 degrees each second in a clockwise direction. The texture rotates around the center point of the texture map, so you are rotating a texture with a single repetition, be careful to center it on the brush (unless off-center rotation is desired).</p>
 
-<h3>tcMod scale <em>sScale tScale</em></h3>
-<p>Resizes (enlarges or shrinks) the texture coordinates by multiplying them against the given factors of sScale and tScale. The values "s" and "t" conform to the "x" and "y" values (respectively) as they are found in the original texture. A positive value less than one will increase the size of the texture. A value greater than 1.0 will reduce the texture to a fraction of its size and cause it to repeat within the same area as the original texture (Note: see clampMap for ways to control this).</p>
+<h3 id="tcModScale">tcMod scale <em>sScale tScale</em></h3>
+<p>Resizes (enlarges or shrinks) the texture coordinates by multiplying them against the given factors of sScale and tScale. The values "s" and "t" conform to the "x" and "y" values (respectively) as they are found in the original texture. A positive value less than one will increase the size of the texture. A value greater than 1.0 will reduce the texture to a fraction of its size and cause it to repeat within the same area as the original texture (Note: see <a href="stage-directives.html#clampMap">clampMap</a> for ways to control this).</p>
 
 <img src="tcmodscale.png" class="center" />
 
@@ -370,8 +376,8 @@ <h3>tcMod scroll <em>sSpeed tSpeed</em></h3>
 
 <p>This should be the LAST tcMod in a stage. Otherwise there may be a popping or snapping visual effect in some shaders.</p>
 
-<h3>tcMod stretch <em>func base amplitude phase frequency</em></h3>
-<p>Stretches the texture coordinates with the given function. Stretching is defined as stretching the texture coordinate away from the texture center closest to the polygon center and then compressing it towards the center. (see Chapter 1: Key Concepts for waveform parameter definitions).</p>
+<h3 id="tcModStretch">tcMod stretch <em>func base amplitude phase frequency</em></h3>
+<p>Stretches the texture coordinates with the given function. Stretching is defined as stretching the texture coordinate away from the texture center closest to the polygon center and then compressing it towards the center (see <a href="shader-concepts.html#waveformfunctions">Waveform Functions</a>).</p>
 
 <h3>tcMod transform <em>m00 m01 m10 m11 t0 t1</em></h3>
 <p>Transforms each texture coordinate as follows:</p>
@@ -390,7 +396,7 @@ <h3>tcMod turb <em>base amplitude phase frequency</em></h3>
 <dl>
 	<dt>base</dt><dd>Undefined</dd>
 	<dt>amplitude</dt><dd>This is essentially the intensity of the disturbance or twisting and squiggling of the texture.</dd>
-	<dt>phase</dt><dd>See the explanation for phase under the deformVertexes keyword.</dd>
+	<dt>phase</dt><dd>See the explanation for phase in <a href="shader-concepts.html#waveformfunctions">Waveform Functions</a>.</dd>
 	<dt>frequency</dt><dd>Frequency. This value is expressed as repetitions or cycles of the wave per second. A value of one would cycle once per second. A value of 10 would cycle 10 times per second. A value of 0.1 would cycle once every 10 seconds.</dd>
 </dl>
 
@@ -401,7 +407,7 @@ <h2 id="depthWrite">depthWrite</h2>
 <p>By default, writes to the depth buffer when depthFunc passes will happen for opaque surfaces and not for translucent surfaces. Blended surfaces can have the depth writes forced with this function.</p>
 
 <h2 id="detail">detail</h2>
-<p>This feature was not used in Quake III Arena maps, but still functions. Designates this stage as a detail texture stage, which means that if the c_var, r_detailtextures, is set to 0 then this stage will be ignored (detail will not be displayed). This keyword, by itself, does not affect rendering at all. If you do put in a detail texture, it has to conform to very specific rules. Specifically, the blendFunc:</p>
+<p>This feature was not used in Quake III Arena maps, but still functions. Designates this stage as a detail texture stage, which means that if the c_var r_detailtextures is set to 0 then this stage will be ignored (detail will not be displayed). This keyword, by itself, does not affect rendering at all. If you do put in a detail texture, it has to conform to very specific rules. Specifically, the blendFunc:</p>
 
 <pre>
 blendFunc GL_DST_COLOR GL_SRC_COLOR
@@ -423,7 +429,7 @@ <h2 id="detail">detail</h2>
     <li>The detail texture MUST have a mean intensity around 127-129. If it does not then it will modify the displayed texture's perceived brightness in the world.</li>
     <li>The detail shader stage MUST have the "detail" keyword or it will not be disabled if the user uses the "r_detailtextures 0" setting.</li>
     <li>The detail stage MUST use "blendFunc GL_DST_COLOR GL_SRC_COLOR". Any other BlendFunc will cause mismatches in brightness between detail and non-detail views.</li>
-    <li>The detail stage should scale its textures by some amount (usually between 3 and 12) using "tcMod scale" to control density. This roughly corresponds to coarseness. A very large number, such as 12, will give very fine detail, however that detail will disappear VERY quickly as the viewer moves away from the wall since it will be MIP mapped away. A very small number, e.g. 3, gives diminishing returns since not enough is brought in when the user gets very close. I'm currently using values between 6 and 9.5. You should use non-integral numbers as much as possible to avoid seeing repeating patterns.</li>
+    <li>The detail stage should scale its textures by some amount (usually between 3 and 12) using "<a href="stage-directives.html#tcModScale">tcMod scale</a>" to control density. This roughly corresponds to coarseness. A very large number, such as 12, will give very fine detail, however that detail will disappear VERY quickly as the viewer moves away from the wall since it will be MIP mapped away. A very small number, e.g. 3, gives diminishing returns since not enough is brought in when the user gets very close. I'm currently using values between 6 and 9.5. You should use non-integral numbers as much as possible to avoid seeing repeating patterns.</li>
     <li>Detail textures add one pass of overdraw, so there is a definite performance hit.</li>
     <li>Detail textures can be shared, so designers may wish to define only a very small handful of detail textures for common surfaces such as rocks, etc.</li>
 </ul>
@@ -461,7 +467,7 @@ <h2 id="alphaFunc">alphaFunc <em>func</em></h2>
 
 <p>Determines the alpha test function used when rendering this map. Valid values are GT0, LT128, and GE128. These correspond to "GREATER THAN 0", "LESS THAN 128", and "GREATER THAN OR EQUAL TO 128". This function is used when determining if a pixel should be written to the framebuffer. For example, if GT0 is specified, the only the portions of the texture map with corresponding alpha values greater than zero will be written to the framebuffer. By default alpha testing is disabled.</p>
 
-<p>Both alpha testing and normal alpha blending can be used to get textures that have see-through parts. The difference is that alphaFunc is an all-or-nothing test, while blending smoothly blends between opaque and translucent at pixel edges. Alpha test can also be used with depthWrite, allowing other effects to be conditionally layered on top of just the opaque pixels by setting depthFunc to equal.</p>
+<p>Both alpha testing and normal alpha blending can be used to get textures that have see-through parts. The difference is that alphaFunc is an all-or-nothing test, while blending smoothly blends between opaque and translucent at pixel edges. Alpha test can also be used with depthWrite, allowing other effects to be conditionally layered on top of just the opaque pixels by setting <a href="stage-directives.html#depthFunc">depthFunc</a> to equal.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/shaderManual/terrain-and-alphamod-blends.html b/docs/shaderManual/terrain-and-alphamod-blends.html
index 6be19461a..1228f28d9 100644
--- a/docs/shaderManual/terrain-and-alphamod-blends.html
+++ b/docs/shaderManual/terrain-and-alphamod-blends.html
@@ -58,7 +58,7 @@ <h1>Terrain</h1>
 <h2>General Changes</h2>
 <p>Q3Map2 terrain has changed dramatically in terms of not only visually, but also in terms of how it is processed by the compiler. To ensure compatibility, there needs to be a few changes. Foremost, make sure that all terrain shader files are listed in the shaderlist.txt file.</p>
 
-<p>Before using Q3Map2 alphamapped terrain, it must be noted that terrain is now handled completely different than before. Q3Map2 no longer looks for the word terrain in the shader name to determine whether or not it is an indexed shader. Instead it looks for q3map_indexed or q3map_terrain. For this reason, the alphamap terrain shaders have been slightly modified. If using Q3Map2 alphamaps, make sure that your "textures/common/terrain" and "textures/common/terrain2" shaders have been updated to the following:</p>
+<p>Before using Q3Map2 alphamapped terrain, it must be noted that terrain is now handled completely different than before. Q3Map2 no longer looks for the word terrain in the shader name to determine whether or not it is an indexed shader. Instead it looks for <a href="q3map-global-directives.html#q3map_indexed">q3map_indexed</a> or <a href="q3map-global-directives.html#q3map_terrain">q3map_terrain</a>. For this reason, the alphamap terrain shaders have been slightly modified. If using Q3Map2 alphamaps, make sure that your "textures/common/terrain" and "textures/common/terrain2" shaders have been updated to the following:</p>
 
 <pre>
 textures/common/terrain
@@ -81,42 +81,42 @@ <h2>General Changes</h2>
 </pre>
 
 <h3>Base Shader</h3>
-<p>To simplify the terrain shader writing process, a base shader can be used as a template with subclassed shaders referencing it. This makes use of the q3map_baseShader directive. The base shader can consist of all q3map_* directives and must be processed before all other terrain shaders referencing it. The use of a base shader is recommend for all terrain shaders.</p>
+<p>To simplify the terrain shader writing process, a base shader can be used as a template with subclassed shaders referencing it. This makes use of the <a href="q3map-global-directives.html#q3map_baseShader">q3map_baseShader</a> directive. The base shader can consist of all q3map_* directives and must be processed before all other terrain shaders referencing it. The use of a base shader is recommend for all terrain shaders.</p>
 
 <h3>tcMod Functions</h3>
-<p>q3map_tcMod can be used on terrain shaders to minimize any obvious texture tiling, particularly q3map_tcMod rotate. In some situations q3map_tcMod scale or the stage driven tcMod scale may be used to scale the textures - though typically tcGen texture projection functions are usually the preferred method.</p>
+<p><a href="q3map-global-directives.html#q3map_tcMod">q3map_tcMod</a> can be used on terrain shaders to minimize any obvious texture tiling, particularly q3map_tcMod rotate. In some situations q3map_tcMod scale or the stage driven <a href="stage-directives.html#tcModScale">tcMod scale</a> may be used to scale the textures - though typically <a href="stage-directives.html#tcGenVector">tcGen texture projection</a> functions are usually the preferred method.</p>
 
 <h3>tcGen Functions</h3>
-<p>In most situations, terrain textures will need to be projected onto the terrain mesh. This is achieved by using either q3map_tcGen function or the stage specific tcGen. Any tcGen functions will overwrite any tcMod scale functions.</p>
+<p>In most situations, terrain textures will need to be projected onto the terrain mesh. This is achieved by using either <a href="q3map-global-directives.html#q3map_tcGen">q3map_tcGen</a> function or the stage specific <a href="stage-directives.html#tcGenVector">tcGen</a>. Any tcGen functions will overwrite any <a href="stage-directives.html#tcModScale">tcMod scale</a> functions.</p>
 
 <h2>Lightmapped Terrain</h2>
 <p>The foremost improvement to Q3Map2 terrain is the ability to use lightmaps as a lighting system rather than basic vertex lighting. This allows terrain to not only cast detailed shadows onto itself, but also allows other map geometry to cast shadows onto the terrain as well. The additional rendering pass of the lightmap creates a slight performance hit as a price for the improved visuals. Several new q3map_* directives are typically used to tweak the terrain lightmap:</p>
 
-<h3>q3map_nonPlanar</h3>
+<h3><a href="q3map-global-directives.html#q3map_nonPlanar">q3map_nonPlanar</a></h3>
 <p>Required on all terrain shaders, q3map_nonPlanar allows shadows to be cast across non-planar edges. This fixes a problem where lightmapped terrain would not light properly across uneven surfaces.</p>
 
-<h3>q3map_lightmapAxis</h3>
-<p>Optionally used, q3map_lightmapAxis can be used to specify the axis in which the lightmap is projected from. This is typically used on normal triangle-quad souped terrain and is set implicitly to "q3map_lightmapAxis z" with q3map_terrain. It is not recommended for terrain with caves or undersides.</p>
+<h3><a href="q3map-global-directives.html#q3map_lightmapAxis">q3map_lightmapAxis</a></h3>
+<p>Optionally used, q3map_lightmapAxis can be used to specify the axis in which the lightmap is projected from. This is typically used on normal triangle-quad souped terrain and is set implicitly to "q3map_lightmapAxis z" with <a href="q3map-global-directives.html#q3map_terrain">q3map_terrain</a>. It is not recommended for terrain with caves or undersides.</p>
 
-<h3>q3map_shadeAngle</h3>
+<h3><a href="q3map-global-directives.html#q3map_shadeAngle">q3map_shadeAngle</a></h3>
 <p>Most terrain artists will choose to enable triangle edge shadow smoothing to reduce the appearance of sharp shadow edges across the terrain mesh. q3map_shadeAngle specifies the triangle edge angle at which the light will be diffused. For best results, it is recommended that you start with low values and tweak the angle parameter in small increments until a satisfactory result is produced. Overly high values will wash out shadow details.</p>
 
-<h3>q3map_lightmapMergable</h3>
+<h3><a href="q3map-global-directives.html#q3map_lightmapMergable">q3map_lightmapMergable</a></h3>
 <p>Setting q3map_lightmapMergable merges all terrain into one seamless lightmap, reducing the appearance of artifacts spanning across separate lightmap images.</p>
 
-<h3>q3map_lightmapSampleSize</h3>
+<h3><a href="q3map-global-directives.html#q3map_lightmapSampleSize">q3map_lightmapSampleSize</a></h3>
 <p>Lightmapped terrain can be very memory intensive as Q3Map2 has to typically generate a large amount of lightmap data. q3map_lightmapSampleSize can be used to reduce the amount of lightmap memory used by limiting the resolution of the lightmap images. Similarly, it can also be used to increase the lightmap resolution at the cost of memory.</p>
 
-<h3>q3map_lightmapSampleOffset</h3>
+<h3><a href="q3map-global-directives.html#q3map_lightmapSampleOffset">q3map_lightmapSampleOffset</a></h3>
 <p>If experiencing lightmap splotches over the surface of terrain lightmaps, q3map_lightmapSampleOffset can be used to fix this. For best results, start with small numbers (default 1.0) and slowly increase this value until the splotches disappear. Overly high values will cause unsatisfactory results.</p>
 
 
 <h2>AlphaMod Dotproduct Terrain</h2>
-<p>AlphaMod dotproduct terrain is a revolutionary way in which Q3Map2 terrain is blended. It removes the need for an alphamap and metashader and automatically determines the blending of terrain depending on the vertex normals of the terrain mesh. Equally important, this new system removes the need of a triangle-quad grid, allowing the designer to create a terrain mesh using any triangle shape or size.</p>
+<p><a href="q3map-global-directives.html#q3map_alphaMod">AlphaMod dotproduct</a> terrain is a revolutionary way in which Q3Map2 terrain is blended. It removes the need for an alphamap and metashader and automatically determines the blending of terrain depending on the vertex normals of the terrain mesh. Equally important, this new system removes the need of a triangle-quad grid, allowing the designer to create a terrain mesh using any triangle shape or size.</p>
 
 
 <h2>AlphaMod Volume Terrain</h2>
-<p>Following the automatic generation of dotproduct blending, alphaMod volume terrain blending was developed to give direct control of the alpha blending back to the designer. Using this system the designer can modify the exact location and amount of blending to occur, directly from within the editor.</p>
+<p>Following the automatic generation of dotproduct blending, <a href="q3map-global-directives.html#q3map_alphaModVolume">alphaMod volume</a> terrain blending was developed to give direct control of the alpha blending back to the designer. Using this system the designer can modify the exact location and amount of blending to occur, directly from within the editor.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/shaderManual/texture-creation.html b/docs/shaderManual/texture-creation.html
index fc3447859..8ce56f09d 100644
--- a/docs/shaderManual/texture-creation.html
+++ b/docs/shaderManual/texture-creation.html
@@ -57,7 +57,7 @@ <h1>Texture Creation</h1>
 <p>If you are familiar with the required tools, creating new assets for use in Quake III Arena is not particularly difficult. As a general rule, you should create new directories for each map with names different from the names used by id. If you are making a map that will be called "H4x0r_D00M", every directory containing new assets for that map should be titled H4x0r_D00M. This is to try and avoid asset directories overwriting each other as the editor and the gameload in assets.</p>
 
 <h2>Tools Needed</h2>
-<p>Any combination of graphic programs and plug-ins that canout put a 24 bit MS windows compatible Targa (.tga) or JPEG (.jpg) graphic file.If you plan to make textures that will have an alpha channel component (a 4th 8-bit greyscale channel that is used by the shaders to further manipulate the art), you must have a program that can create 32-bit art with that fourth channel.</p>
+<p>Any combination of graphic programs and plug-ins that can output a 24 bit MS windows compatible Targa (.tga) or JPEG (.jpg) graphic file.If you plan to make textures that will have an alpha channel component (a 4th 8-bit greyscale channel that is used by the shaders to further manipulate the art), you must have a program that can create 32-bit art with that fourth channel.</p>
 <p>Adobe Photoshop has the ability to easily create alpha channels. PaintShop Pro from Corel (v5.0+) can also make an alpha channel by creating a mask and naming it "alpha". Free and open source GIMP also works quite well.</p>
 <p>Generally speaking, regardless of the program used, we found it best to do most of the art manipulation of the alpha channel in a separate layer or file and then paste it into the alpha channel before saving.</p>
 
@@ -70,7 +70,7 @@ <h2>Setting up Files</h2>
 <pre>
 quake3\baseq3\scripts\shaderlist.txt
 </pre>
-<p>Q3Radiant will use the contents of this script to grab your new textures for inclusion in the game. The contents of shaderlist.txt document will contain a listing of all the shader documents that were used by id Software to create Quake III Arena.</p>
+<p>This is whitelist for Q3Radiant and Q3Map2 to know which shader scripts to load (the rest will be skipped).</p>
 <p>Since you will obviously want to create your own shaders, you need to put them in separate folders and create a new shader script for them.</p>
 <p>If you plan to work on several maps at once and want to distinguish between textures used in each map, simply add additional map names here. For map and mod makers, we STRONGLY recommend that any new shader scripts created use the name of the map or mod in the shader file name. We know we can't avoid every incident of files overwriting each other, but we certainly can advise you how to try.</p>
 <p>Now, in the scripts directory that you just created, create another text file and call it:</p>
@@ -84,7 +84,9 @@ <h2>Rules and Guidelines</h2>
 	<li>Save your textures into your new [map name] directories.</li>
     <li>Don't use the same names that id used for textures. It will cause problems.</li>
     <li>For best quality, save textures without an alpha channel as 24 bit TARGA files. Using JPEG files can save memory space, but at the risk of losing detail and depth in the texture. JPEG files cannot be used for textures requiring an alpha channel.</li>
-    <li>Textures containing an alpha channel must be saved as32 bit TARGA files.</li>
+    <li>Textures containing an alpha channel must be saved as 32 bit TARGA files.</li>
+    <li>Indexed TARGA is not supported!</li>
+    <li>Progressive JPEG is not supported!</li>
     <li>If a new texture requires no further manipulation, it does not need a shader script.</li>
     <li>Size textures in powers of 2. Example: 8x8, 16x16,32x32, 64x64 pixels and so on.</li>
     <li>Textures don't need to be square. A 32x256 pixel texture is perfectly acceptable.</li>
@@ -92,9 +94,8 @@ <h2>Rules and Guidelines</h2>
 <p>The following are some things the id designers learned about textures.</p>
 <ul>
     <li>Create textures in "suites" built around one or two large textures with a number of much smaller supporting detail or accent textures.</li>
-    <li>Very large textures are possible, but some video cards compress textures larger than 256x256 pixels.</li>
     <li>Textures are grouped alphabetically by name in the texture display window, so you may want to give suites of textures similar names.</li>
-    <li>Use the shader function qe3_editorimage to conserve memory when making multiple versions of a single texture (as in the case of a glowing texture with several light values).</li>
+    <li>Use the shader function <a href="quake-editor-radiant-directives.html#qer_editorImage">qer_editorImage</a> to conserve memory when making multiple versions of a single texture (as in the case of a glowing texture with several light values).</li>
     <li>Unless you are creating special effects or textures designed to draw the player's eye to a specific spot, muted, middle value colors work best with the game engine.</li>
     <li>Extremely busy (a lot of fussy detail) textures can break up or form visually unpleasant patterns when seen at distances.</li>
 </ul>
diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index d10ab581b..59697afc1 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -1263,7 +1263,6 @@ static const std::vector<ShaderFormat> g_shaderStageFormats{
 			"square",
 			"sawtooth",
 			"inversesawtooth",
-			"noise",
 		}
 	},
 	{