Merge remote-tracking branch 'PaulJacobs/patch-12' into dev

docs/api/materials/ShaderMaterial.html

@@ -57,7 +57,7 @@
 
 		<h3>.[page:string vertexShader]</h3>
 		<div>
-		Vertex shader GLSL code.  This is the actual code for the shader.  In the example above the code is retrieved from DOM elements emnbedded directly in the page although other methods can be used including specifying a string directly.  
+		Vertex shader GLSL code.  This is the actual code for the shader.  In the example above the code is retrieved from DOM elements embedded directly in the page although other methods can be used including specifying a string directly.  
 		</div> 
 
 		<h3>.[page:boolean morphTargets]</h3>