Merge remote-tracking branch 'origin/dev' into dev

docs/api/examples/cameras/CombinedCamera.html

@@ -11,10 +11,10 @@
 
 		<h1>[name]</h1>
 
-		<div class="desc">A general perpose camera, for setting FOV, Lens Focal Length,
+		<div class="desc">A general purpose camera, for setting FOV, Lens Focal Length,
  		and switching between perspective and orthographic views easily.
  		Use this only if you do not wish to manage
- 		both a Orthographic and Perspective Camera</div>
+ 		both an Orthographic and Perspective Camera</div>
 
 
 		<h2>Constructor</h2>
@@ -69,14 +69,14 @@
 		Gets or sets the zoom factor of the camera.
 		</div> 
 
-		<h3>[property:number far]</h3>
+		<h3>[property:number near]</h3>
 		<div>
-		Gets camera frustum far plane.
+		Gets camera frustum near plane.
 		</div> 
 
-		<h3>[property:number near]</h3>
+		<h3>[property:number far]</h3>
 		<div>
-		Gets camera frustum near plane.
+		Gets camera frustum far plane.
 		</div> 
 
 		<h3>[property:OrthographicCamera cameraO]</h3>

docs/api/lights/SpotLight.html

@@ -42,8 +42,8 @@ scene.add( spotLight );</code>
 		<div>
 		[page:Integer hex] — Numeric value of the RGB component of the color. <br />
 		[page:Float intensity] — Numeric value of the light's strength/intensity. <br />
-		distance -- todo <br />
-		angle -- todo <br />
+		distance -- Maximum distance from origin where light will shine whose intensity is attenuated linearly based on distance from origin. <br />
+		angle -- Maximum angle of light dispersion from its direction whose upper bound is Math.PI/2.  <br />
 		exponent -- todo
 		</div>
 		<div>

docs/api/materials/LineDashedMaterial.html

@@ -34,37 +34,37 @@
 
 
 
-		<h3>[property:number scale]</h3>
-		<div>
-		The scale of the dashed part of a line.
-		</div> 
-
 		<h3>[property:Color color]</h3>
 		<div>
 		Sets the color of the line. Default is 0xffffff.
 		</div> 
 
-		<h3>[property:boolean vertexColors]</h3>
-		<div>Define how the vertices gets colored. Possible values are THREE.NoColors, THREE.FaceColors and THREE.VertexColors. Default is THREE.NoColors.</div>
-		<div>This setting might not have any effect when used with certain renderers.</div>
+		<h3>[property:number linewidth]</h3>
+		<div>Controls line thickness. Default is 1.</div>
+		<div>Due to limitations in the <a href="https://code.google.com/p/angleproject/" target="_blank">ANGLE layer</a>, on Windows platforms linewidth will always be 1 regardless of the set value.</div>
+
+		<h3>[property:number scale]</h3>
+		<div>
+		The scale of the dashed part of a line.
+		</div> 
 
 		<h3>[property:number dashSize]</h3>
 		<div>
 		The size of the dash. This is both the gap with the stroke. Default is 3.
 		</div> 
 
-		<h3>[property:boolean fog]</h3>
-		<div>Define whether the material color is affected by global fog settings.</div>
-		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.</div>
-
 		<h3>[property:number gapSize]</h3>
 		<div>
 		The size of the gap. Default is 1.
 		</div> 
 
-		<h3>[property:number linewidth]</h3>
-		<div>Controls line thickness. Default is 1.</div>
-		<div>Due to limitations in the <a href="https://code.google.com/p/angleproject/" target="_blank">ANGLE layer</a>, on Windows platforms linewidth will always be 1 regardless of the set value.</div>
+		<h3>[property:boolean vertexColors]</h3>
+		<div>Define how the vertices gets colored. Possible values are THREE.NoColors, THREE.FaceColors and THREE.VertexColors. Default is THREE.NoColors.</div>
+		<div>This setting might not have any effect when used with certain renderers.</div>
+
+		<h3>[property:boolean fog]</h3>
+		<div>Define whether the material color is affected by global fog settings.</div>
+		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.</div>
 
 		<h2>Methods</h2>
 

docs/api/math/Box2.html

@@ -29,14 +29,14 @@
 
 
 
-		<h3>[property:Vector2 max]</h3>
+		<h3>[property:Vector2 min]</h3>
 		<div>
-		Upper (x, y) boundary of this box.
+		Lower (x, y) boundary of this box.
 		</div> 
 
-		<h3>[property:Vector2 min]</h3>
+		<h3>[property:Vector2 max]</h3>
 		<div>
-		Lower (x, y) boundary of this box.
+		Upper (x, y) boundary of this box.
 		</div> 
 
 		<h2>Methods</h2>

docs/api/math/Box3.html

@@ -28,16 +28,16 @@
 
 
 
-		<h3>[property:Vector3 max]</h3>
-		<div>
-		Upper (x, y, z) boundary of this box.
-		</div> 
-
 		<h3>[property:Vector3 min]</h3>
 		<div>
 		Lower (x, y, z) boundary of this box.
 		</div>
 
+		<h3>[property:Vector3 max]</h3>
+		<div>
+		Upper (x, y, z) boundary of this box.
+		</div> 
+
 		<h2>Methods</h2>
 
 

docs/api/math/Triangle.html

@@ -35,12 +35,12 @@
 		The first [page:Vector3] of the triangle.
 		</div>
 		
-		<h3>[property:Vector3 c]</h3>
+		<h3>[property:Vector3 b]</h3>
 		<div>
 		The second [page:Vector3] of the triangle.
 		</div>
 
-		<h3>[property:Vector3 b]</h3>
+		<h3>[property:Vector3 c]</h3>
 		<div>
 		The third [page:Vector3] of the triangle.
 		</div>