瀏覽代碼

Merge pull request #11778 from nevermakeport/patch-1

Docs: Fix link and typos
Mr.doob 8 年之前
父節點
當前提交
062709698d
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      docs/api/materials/ShaderMaterial.html

+ 3 - 3
docs/api/materials/ShaderMaterial.html

@@ -14,7 +14,7 @@
 
 		<div class="desc">
 			A material rendered with custom shaders. A shader is a small program written in
-			[link:https://www.khronos.org/files/opengles_shading_language.pdf_ES GLSL] that runs on the GPU.
+			[link:https://www.khronos.org/files/opengles_shading_language.pdf GLSL] that runs on the GPU.
 			You may want to use a custom shader if you need to:
 		<ul>
 			<li>implement an effect not included with any of the built-in [page:Material materials]</li>
@@ -40,7 +40,7 @@
 				must be used instead.
 			</li>
 			<li>
-				Built in attributes an uniforms are passed to the shaders along with your code.
+				Built in attributes and uniforms are passed to the shaders along with your code.
 				If you don't want the [page:WebGLProgram] to add anything to your shader code, you can use
 				[page:RawShaderMaterial] instead of this class.
 			</li>
@@ -296,7 +296,7 @@ this.defaultAttributeValues = {
 
 		<h3>[property:Object extensions]</h3>
 		<div>
-		An object with the folowing properties:
+		An object with the following properties:
 		<code>
 this.extensions = {
 	derivatives: false, // set to use derivatives