Merge ec25b64568 into 90d544271e

opengl.html.markdown

@@ -342,7 +342,7 @@ void main() {
 We define a new input variable ```color``` which represents our color data, this data
 is passed on to ```fColor```, which is an output variable of our vertex shader and
 becomes an input variable for our fragment shader.
-It is imporatant that variables passed between shaders have the exact same name
+It is important that variables passed between shaders have the exact same name
 and type.
 
 ## Handling VBO's
@@ -574,7 +574,7 @@ in vec2 fTexCoords;
 out vec4 outColor;
 
 void main() {
-    // texture() loads the current texure data at the specified texture coords,
+    // texture() loads the current texture data at the specified texture coords,
     // then we can simply multiply them by our color.
     outColor = texture(tex, fTexCoords) * vec4(fColor, 1.0);
 }
@@ -685,7 +685,7 @@ Geometry shaders are inbetween the vertex and the fragment shader.
 
 layout(location = 0) in vec3 position;
 layout(location = 1) in vec3 color;
-// Create an output interface block passed to the next shadaer stage.
+// Create an output interface block passed to the next shader stage.
 // Interface blocks can be used to structure data passed between shaders.
 out VS_OUT {
     vec3 color;

python.html.markdown

@@ -226,7 +226,7 @@ li[::-1]  # Return list in reverse order => [3, 4, 2, 1]
 # Use any combination of these to make advanced slices
 # li[start:end:step]
 
-# Make a one layer deep copy using slices
+# Make a shallow copy using slices
 li2 = li[:]  # => li2 = [1, 2, 4, 3] but (li2 is li) will result in false.
 
 # Remove arbitrary elements from a list with "del"