Converted comments to javadoc, code cleanup

src/generated/org/lwjgl/opengl/ARBBufferObject.java

@@ -7,6 +7,9 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public class ARBBufferObject {
+	/**
+	 * Accepted by the <usage> parameter of BufferDataARB:
+	 */
 	public static final int GL_STREAM_DRAW_ARB = 0x88e0;
 	public static final int GL_STREAM_READ_ARB = 0x88e1;
 	public static final int GL_STREAM_COPY_ARB = 0x88e2;
@@ -16,9 +19,15 @@ public class ARBBufferObject {
 	public static final int GL_DYNAMIC_DRAW_ARB = 0x88e8;
 	public static final int GL_DYNAMIC_READ_ARB = 0x88e9;
 	public static final int GL_DYNAMIC_COPY_ARB = 0x88ea;
+	/**
+	 * Accepted by the <access> parameter of MapBufferARB:
+	 */
 	public static final int GL_READ_ONLY_ARB = 0x88b8;
 	public static final int GL_WRITE_ONLY_ARB = 0x88b9;
 	public static final int GL_READ_WRITE_ARB = 0x88ba;
+	/**
+	 * Accepted by the <pname> parameter of GetBufferParameterivARB:
+	 */
 	public static final int GL_BUFFER_SIZE_ARB = 0x8764;
 	public static final int GL_BUFFER_USAGE_ARB = 0x8765;
 	public static final int GL_BUFFER_ACCESS_ARB = 0x88bb;

src/generated/org/lwjgl/opengl/ARBColorBufferFloat.java

@@ -7,16 +7,30 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBColorBufferFloat {
+	/**
+	 * Accepted by the <pname> parameters of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
+	/**
+	 * Accepted by the <target> parameter of ClampColorARB and the <pname>
+	 * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev.
+	 */
 	public static final int GL_CLAMP_VERTEX_COLOR_ARB = 0x891a;
 	public static final int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891b;
 	public static final int GL_CLAMP_READ_COLOR_ARB = 0x891c;
+	/**
+	 * Accepted by the <clamp> parameter of ClampColorARB.
+	 */
 	public static final int GL_FIXED_ONLY_ARB = 0x891d;
 
 	private ARBColorBufferFloat() {
 	}
 
 
+	/**
+	 * Accepted as a bit set in the GLX_RENDER_TYPE variable
+	 */
 	public static void glClampColorARB(int target, int clamp) {
 		long function_pointer = GLContext.getCapabilities().ARB_color_buffer_float_glClampColorARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);

src/generated/org/lwjgl/opengl/ARBDepthTexture.java

@@ -7,10 +7,22 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBDepthTexture {
+	/**
+	 * Accepted by the <internalFormat> parameter of TexImage1D, TexImage2D,
+	 * CopyTexImage1D and CopyTexImage2D:
+	 */
 	public static final int GL_DEPTH_COMPONENT16_ARB = 0x81a5;
 	public static final int GL_DEPTH_COMPONENT24_ARB = 0x81a6;
 	public static final int GL_DEPTH_COMPONENT32_ARB = 0x81a7;
+	/**
+	 * Accepted by the <pname> parameter of GetTexLevelParameterfv and
+	 * GetTexLevelParameteriv:
+	 */
 	public static final int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884a;
+	/**
+	 * Accepted by the <pname> parameter of TexParameterf, TexParameteri,
+	 * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv:
+	 */
 	public static final int GL_DEPTH_TEXTURE_MODE_ARB = 0x884b;
 
 	private ARBDepthTexture() {

src/generated/org/lwjgl/opengl/ARBDrawBuffers.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBDrawBuffers {
+	/**
+	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;
 	public static final int GL_DRAW_BUFFER0_ARB = 0x8825;
 	public static final int GL_DRAW_BUFFER1_ARB = 0x8826;

src/generated/org/lwjgl/opengl/ARBFragmentProgram.java

@@ -7,7 +7,18 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBFragmentProgram extends ARBProgram {
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	 * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the <target> parameter of ProgramStringARB, BindProgramARB,
+	 * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB,
+	 * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB,
+	 * GetProgramivARB and GetProgramStringARB.
+	 */
 	public static final int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
+	/**
+	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 */
 	public static final int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
 	public static final int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
 	public static final int GL_PROGRAM_TEX_INDIRECTIONS_ARB = 0x8807;
@@ -20,6 +31,10 @@ public final class ARBFragmentProgram extends ARBProgram {
 	public static final int GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB = 0x880e;
 	public static final int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880f;
 	public static final int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
 	public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
 

src/generated/org/lwjgl/opengl/ARBFragmentShader.java

@@ -7,10 +7,22 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBFragmentShader {
+	/**
+	 * Accepted by the <shaderType> argument of CreateShaderObjectARB and
+	 * returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 */
 	public static final int GL_FRAGMENT_SHADER_ARB = 0x8b30;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8b49;
 	public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
 	public static final int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
+	/**
+	 * Accepted by the <target> parameter of Hint and the <pname> parameter of
+	 * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8b8b;
 
 	private ARBFragmentShader() {

src/generated/org/lwjgl/opengl/ARBHalfFloatPixel.java

@@ -7,6 +7,14 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBHalfFloatPixel {
+	/**
+	 * Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	 * TexImage1D, TexImage2D, TexImage3D, GetTexImage, TexSubImage1D,
+	 * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax,
+	 * ConvolutionFilter1D, ConvolutionFilter2D, GetConvolutionFilter,
+	 * SeparableFilter2D, GetSeparableFilter, ColorTable, ColorSubTable,
+	 * and GetColorTable:
+	 */
 	public static final int GL_HALF_FLOAT_ARB = 0x140b;
 
 	private ARBHalfFloatPixel() {

src/generated/org/lwjgl/opengl/ARBOcclusionQuery.java

@@ -7,9 +7,20 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBOcclusionQuery {
+	/**
+	 * Accepted by the <target> parameter of BeginQueryARB, EndQueryARB,
+	 * and GetQueryivARB:
+	 */
 	public static final int GL_SAMPLES_PASSED_ARB = 0x8914;
+	/**
+	 * Accepted by the <pname> parameter of GetQueryivARB:
+	 */
 	public static final int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
 	public static final int GL_CURRENT_QUERY_ARB = 0x8865;
+	/**
+	 * Accepted by the <pname> parameter of GetQueryObjectivARB and
+	 * GetQueryObjectuivARB:
+	 */
 	public static final int GL_QUERY_RESULT_ARB = 0x8866;
 	public static final int GL_QUERY_RESULT_AVAILABLE_ARB = 0x8867;
 

src/generated/org/lwjgl/opengl/ARBPixelBufferObject.java

@@ -7,8 +7,17 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBPixelBufferObject extends ARBBufferObject {
+	/**
+	 * Accepted by the <target> parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferParameteriv, and GetBufferPointerv:
+	 */
 	public static final int GL_PIXEL_PACK_BUFFER_ARB = 0x88eb;
 	public static final int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88ec;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ed;
 	public static final int GL_PIXEL_UNPACK_BUFFER_BINDING_ARB = 0x88ef;
 

src/generated/org/lwjgl/opengl/ARBPointSprite.java

@@ -7,7 +7,18 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBPointSprite {
+	/**
+	 * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	 * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv,
+	 * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv:
+	 */
 	public static final int GL_POINT_SPRITE_ARB = 0x8861;
+	/**
+	 * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
+	 * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of
+	 * <pname> may be:
+	 */
 	public static final int GL_COORD_REPLACE_ARB = 0x8862;
 
 	private ARBPointSprite() {

src/generated/org/lwjgl/opengl/ARBProgram.java

@@ -7,7 +7,13 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public class ARBProgram {
+	/**
+	 * Accepted by the <format> parameter of ProgramStringARB:
+	 */
 	public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
+	/**
+	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 */
 	public static final int GL_PROGRAM_LENGTH_ARB = 0x8627;
 	public static final int GL_PROGRAM_FORMAT_ARB = 0x8876;
 	public static final int GL_PROGRAM_BINDING_ARB = 0x8677;
@@ -30,14 +36,27 @@ public class ARBProgram {
 	public static final int GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB = 0x88b4;
 	public static final int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88b5;
 	public static final int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88b6;
+	/**
+	 * Accepted by the <pname> parameter of GetProgramStringARB:
+	 */
 	public static final int GL_PROGRAM_STRING_ARB = 0x8628;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_PROGRAM_ERROR_POSITION_ARB = 0x864b;
 	public static final int GL_CURRENT_MATRIX_ARB = 0x8641;
 	public static final int GL_TRANSPOSE_CURRENT_MATRIX_ARB = 0x88b7;
 	public static final int GL_CURRENT_MATRIX_STACK_DEPTH_ARB = 0x8640;
 	public static final int GL_MAX_PROGRAM_MATRICES_ARB = 0x862f;
 	public static final int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862e;
+	/**
+	 * Accepted by the <name> parameter of GetString:
+	 */
 	public static final int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
+	/**
+	 * Accepted by the <mode> parameter of MatrixMode:
+	 */
 	public static final int GL_MATRIX0_ARB = 0x88c0;
 	public static final int GL_MATRIX1_ARB = 0x88c1;
 	public static final int GL_MATRIX2_ARB = 0x88c2;

src/generated/org/lwjgl/opengl/ARBShaderObjects.java

@@ -7,7 +7,13 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBShaderObjects {
+	/**
+	 * Accepted by the <pname> argument of GetHandleARB:
+	 */
 	public static final int GL_PROGRAM_OBJECT_ARB = 0x8b40;
+	/**
+	 * Accepted by the <pname> parameter of GetObjectParameter{fi}vARB:
+	 */
 	public static final int GL_OBJECT_TYPE_ARB = 0x8b4e;
 	public static final int GL_OBJECT_SUBTYPE_ARB = 0x8b4f;
 	public static final int GL_OBJECT_DELETE_STATUS_ARB = 0x8b80;
@@ -19,7 +25,13 @@ public final class ARBShaderObjects {
 	public static final int GL_OBJECT_ACTIVE_UNIFORMS_ARB = 0x8b86;
 	public static final int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8b87;
 	public static final int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8b88;
+	/**
+	 * Returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 */
 	public static final int GL_SHADER_OBJECT_ARB = 0x8b48;
+	/**
+	 * Returned by the <type> parameter of GetActiveUniformARB:
+	 */
 	public static final int GL_FLOAT = 0x1406;
 	public static final int GL_FLOAT_VEC2_ARB = 0x8b50;
 	public static final int GL_FLOAT_VEC3_ARB = 0x8b51;
@@ -82,8 +94,6 @@ public final class ARBShaderObjects {
 	 * The ARB_shader_objects extension allows multiple, optionally null-terminated, source strings to define a shader program.
 	 * <p/>
 	 * This method uses just a single string, that should NOT be null-terminated.
-	 * @param shaderObj
-	 * @param string
 	 */
 	public static void glShaderSourceARB(int shader, ByteBuffer string) {
 		long function_pointer = GLContext.getCapabilities().ARB_shader_objects_glShaderSourceARB_pointer;
@@ -320,7 +330,6 @@ public final class ARBShaderObjects {
 	 * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a <b>null-terminated</b> string.
 	 * @param programObj
 	 * @param name
-	 * @return
 	 */
 	public static int glGetUniformLocationARB(int programObj, ByteBuffer name) {
 		long function_pointer = GLContext.getCapabilities().ARB_shader_objects_glGetUniformLocationARB_pointer;

src/generated/org/lwjgl/opengl/ARBShadingLanguage100.java

@@ -8,7 +8,7 @@ import java.nio.*;
 
 public final class ARBShadingLanguage100 {
 	/**
-	 * Accepted by the <name> parameter of GetString:
+	 * Accepted by the &lt;name&gt; parameter of GetString:
 	 */
 	public static final int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8b8c;
 

src/generated/org/lwjgl/opengl/ARBTextureFloat.java

@@ -7,6 +7,9 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBTextureFloat {
+	/**
+	 * Accepted by the <value> parameter of GetTexLevelParameter:
+	 */
 	public static final int GL_TEXTURE_RED_TYPE_ARB = 0x8c10;
 	public static final int GL_TEXTURE_GREEN_TYPE_ARB = 0x8c11;
 	public static final int GL_TEXTURE_BLUE_TYPE_ARB = 0x8c12;
@@ -14,7 +17,14 @@ public final class ARBTextureFloat {
 	public static final int GL_TEXTURE_LUMINANCE_TYPE_ARB = 0x8c14;
 	public static final int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8c15;
 	public static final int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8c16;
+	/**
+	 * Returned by the <params> parameter of GetTexLevelParameter:
+	 */
 	public static final int GL_UNSIGNED_NORMALIZED_ARB = 0x8c17;
+	/**
+	 * Accepted by the <internalFormat> parameter of TexImage1D,
+	 * TexImage2D, and TexImage3D:
+	 */
 	public static final int GL_RGBA32F_ARB = 0x8814;
 	public static final int GL_RGB32F_ARB = 0x8815;
 	public static final int GL_ALPHA32F_ARB = 0x8816;

src/generated/org/lwjgl/opengl/ARBTextureRectangle.java

@@ -7,12 +7,42 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBTextureRectangle {
+	/**
+	 *         Accepted by the <cap> parameter of Enable, Disable and IsEnabled;
+	 *         by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv
+	 *         and GetDoublev; and by the <target> parameter of BindTexture,
+	 *         GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri,
+	 *         TexParameterfv and TexParameteriv:
+	 *         Accepted by the <target> parameter of GetTexImage,
+	 *         GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D,
+	 *         CopyTexImage2D, TexSubImage2D and CopySubTexImage2D:
+	 */
 	public static final int GL_TEXTURE_RECTANGLE_ARB = 0x84f5;
+	/**
+	 *         Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv and GetDoublev:
+	 */
 	public static final int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84f6;
+	/**
+	 *         Accepted by the <target> parameter of GetTexLevelParameteriv,
+	 *         GetTexLevelParameterfv, GetTexParameteriv and TexImage2D:
+	 */
 	public static final int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84f7;
+	/**
+	 *         Accepted by the <pname> parameter of GetBooleanv, GetDoublev,
+	 *         GetIntegerv and GetFloatv:
+	 */
 	public static final int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84f8;
-	public static final int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
+	/**
-	public static final int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
+	 *         Returned by <type> parameter of GetActiveUniform when the location
+	 *         <index> for program object <program> is of type sampler2DRect:
+	 */
+	public static final int GL_SAMPLER_2D_RECT_ARB = 0x8b63;
+	/**
+	 *         Returned by <type> parameter of GetActiveUniform when the location
+	 *         <index> for program object <program> is of type sampler2DRectShadow:
+	 */
+	public static final int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8b64;
 
 	private ARBTextureRectangle() {
 	}

src/generated/org/lwjgl/opengl/ARBVertexBufferObject.java

@@ -7,8 +7,18 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBVertexBufferObject extends ARBBufferObject {
+	/**
+	 * Accepted by the <target> parameters of BindBufferARB, BufferDataARB,
+	 * BufferSubDataARB, MapBufferARB, UnmapBufferARB,
+	 * GetBufferSubDataARB, GetBufferParameterivARB, and
+	 * GetBufferPointervARB:
+	 */
 	public static final int GL_ARRAY_BUFFER_ARB = 0x8892;
 	public static final int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
 	public static final int GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB = 0x8895;
 	public static final int GL_VERTEX_ARRAY_BUFFER_BINDING_ARB = 0x8896;
@@ -20,6 +30,9 @@ public final class ARBVertexBufferObject extends ARBBufferObject {
 	public static final int GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB = 0x889c;
 	public static final int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889d;
 	public static final int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889e;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttribivARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889f;
 
 	private ARBVertexBufferObject() {

src/generated/org/lwjgl/opengl/ARBVertexProgram.java

@@ -7,21 +7,47 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBVertexProgram extends ARBProgram {
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	 * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the <target> parameter of ProgramStringARB, BindProgramARB,
+	 * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB,
+	 * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB,
+	 * GetProgramivARB, and GetProgramStringARB.
+	 */
 	public static final int GL_VERTEX_PROGRAM_ARB = 0x8620;
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and by
+	 * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
 	public static final int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
 	public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
 	public static final int GL_COLOR_SUM_ARB = 0x8458;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttrib[dfi]vARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886a;
 	public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
+	/**
+	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 */
 	public static final int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88b0;
 	public static final int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88b1;
 	public static final int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88b2;
 	public static final int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88b3;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
 
 	private ARBVertexProgram() {

src/generated/org/lwjgl/opengl/ARBVertexShader.java

@@ -7,7 +7,15 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ARBVertexShader {
+	/**
+	 * Accepted by the <shaderType> argument of CreateShaderObjectARB and
+	 * returned by the <params> parameter of GetObjectParameter{if}vARB:
+	 */
 	public static final int GL_VERTEX_SHADER_ARB = 0x8b31;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8b4a;
 	public static final int GL_MAX_VARYING_FLOATS_ARB = 0x8b4b;
 	public static final int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
@@ -15,17 +23,34 @@ public final class ARBVertexShader {
 	public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8b4c;
 	public static final int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8b4d;
 	public static final int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
+	 * by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
 	public static final int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
 	public static final int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
+	/**
+	 * Accepted by the <pname> parameter GetObjectParameter{if}vARB:
+	 */
 	public static final int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8b89;
 	public static final int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8b8a;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB = 0x8624;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB = 0x8625;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886a;
 	public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
+	/**
+	 * Returned by the <type> parameter of GetActiveAttribARB:
+	 */
 	public static final int GL_FLOAT = 0x1406;
 	public static final int GL_FLOAT_VEC2_ARB = 0x8b50;
 	public static final int GL_FLOAT_VEC3_ARB = 0x8b51;

src/generated/org/lwjgl/opengl/ATIDrawBuffers.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ATIDrawBuffers {
+	/**
+	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;
 	public static final int GL_DRAW_BUFFER0_ATI = 0x8825;
 	public static final int GL_DRAW_BUFFER1_ATI = 0x8826;

src/generated/org/lwjgl/opengl/ATIFragmentShader.java

@@ -101,9 +101,9 @@ public final class ATIFragmentShader {
 	public static final int GL_RED_BIT_ATI = 0x1;
 	public static final int GL_GREEN_BIT_ATI = 0x2;
 	public static final int GL_BLUE_BIT_ATI = 0x4;
-	public static final int GL_X2_BIT_ATI = 0x1;
+	public static final int GL_2X_BIT_ATI = 0x1;
-	public static final int GL_X4_BIT_ATI = 0x2;
+	public static final int GL_4X_BIT_ATI = 0x2;
-	public static final int GL_X8_BIT_ATI = 0x4;
+	public static final int GL_8X_BIT_ATI = 0x4;
 	public static final int GL_HALF_BIT_ATI = 0x8;
 	public static final int GL_QUARTER_BIT_ATI = 0x10;
 	public static final int GL_EIGHTH_BIT_ATI = 0x20;

src/generated/org/lwjgl/opengl/ATITextureFloat.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class ATITextureFloat {
+	/**
+	 * Accepted by the <internalFormat> parameter of TexImage1D,
+	 * TexImage2D, and TexImage3D:
+	 */
 	public static final int GL_RGBA_FLOAT32_ATI = 0x8814;
 	public static final int GL_RGB_FLOAT32_ATI = 0x8815;
 	public static final int GL_ALPHA_FLOAT32_ATI = 0x8816;

src/generated/org/lwjgl/opengl/EXTBlendEquationSeparate.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTBlendEquationSeparate {
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_BLEND_EQUATION_RGB_EXT = 0x8009;
 	public static final int GL_BLEND_EQUATION_ALPHA_EXT = 0x883d;
 

src/generated/org/lwjgl/opengl/EXTDepthBoundsTest.java

@@ -7,7 +7,16 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTDepthBoundsTest {
+	/**
+	 *         Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+	 *         and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
+	/**
+	 *         Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_DEPTH_BOUNDS_EXT = 0x8891;
 
 	private EXTDepthBoundsTest() {

src/generated/org/lwjgl/opengl/EXTPackedDepthStencil.java

@@ -7,9 +7,32 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTPackedDepthStencil {
+	/**
+	 *    Accepted by the <format> parameter of DrawPixels, ReadPixels,
+	 *    TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 *    TexSubImage3D, and GetTexImage, by the <type> parameter of
+	 *    CopyPixels, by the <internalformat> parameter of TexImage1D,
+	 *    TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 *    RenderbufferStorageEXT, and returned in the <data> parameter of
+	 *        GetTexLevelParameter and GetRenderbufferParameterivEXT.
+	 */
 	public static final int GL_DEPTH_STENCIL_EXT = 0x84f9;
+	/**
+	 *        Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	 *    TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 *    TexSubImage3D, and GetTexImage.
+	 */
 	public static final int GL_UNSIGNED_INT_24_8_EXT = 0x84fa;
+	/**
+	 *        Accepted by the <internalformat> parameter of TexImage1D,
+	 *    TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 *    RenderbufferStorageEXT, and returned in the <data> parameter of
+	 *    GetTexLevelParameter and GetRenderbufferParameterivEXT.
+	 */
 	public static final int GL_DEPTH24_STENCIL8_EXT = 0x88f0;
+	/**
+	 *        Accepted by the <value> parameter of GetTexLevelParameter.
+	 */
 	public static final int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88f1;
 
 	private EXTPackedDepthStencil() {

src/generated/org/lwjgl/opengl/EXTPalettedTexture.java

@@ -7,12 +7,20 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTPalettedTexture {
+	/**
+	 * Accepted by the internalformat parameter of TexImage1D, TexImage2D and
+	 * TexImage3DEXT:
+	 */
 	public static final int GL_COLOR_INDEX1_EXT = 0x80e2;
 	public static final int GL_COLOR_INDEX2_EXT = 0x80e3;
 	public static final int GL_COLOR_INDEX4_EXT = 0x80e4;
 	public static final int GL_COLOR_INDEX8_EXT = 0x80e5;
 	public static final int GL_COLOR_INDEX12_EXT = 0x80e6;
 	public static final int GL_COLOR_INDEX16_EXT = 0x80e7;
+	/**
+	 * Accepted by the pname parameter of GetColorTableParameterivEXT and
+	 * GetColorTableParameterfvEXT:
+	 */
 	public static final int GL_COLOR_TABLE_FORMAT_EXT = 0x80d8;
 	public static final int GL_COLOR_TABLE_WIDTH_EXT = 0x80d9;
 	public static final int GL_COLOR_TABLE_RED_SIZE_EXT = 0x80da;
@@ -21,6 +29,9 @@ public final class EXTPalettedTexture {
 	public static final int GL_COLOR_TABLE_ALPHA_SIZE_EXT = 0x80dd;
 	public static final int GL_COLOR_TABLE_LUMINANCE_SIZE_EXT = 0x80de;
 	public static final int GL_COLOR_TABLE_INTENSITY_SIZE_EXT = 0x80df;
+	/**
+	 * Accepted by the value parameter of GetTexLevelParameter{if}v:
+	 */
 	public static final int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ed;
 
 	private EXTPalettedTexture() {

src/generated/org/lwjgl/opengl/EXTPixelBufferObject.java

@@ -7,8 +7,17 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTPixelBufferObject extends ARBBufferObject {
+	/**
+	 * Accepted by the <target> parameters of BindBuffer, BufferData,
+	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
+	 * GetBufferParameteriv, and GetBufferPointerv:
+	 */
 	public static final int GL_PIXEL_PACK_BUFFER_EXT = 0x88eb;
 	public static final int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88ec;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ed;
 	public static final int PIXEL_UNPACK_BUFFER_BINDING_EXT = 0x88ef;
 

src/generated/org/lwjgl/opengl/EXTStencilClearTag.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTStencilClearTag {
+	/**
+	 *        Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *    GetFloatv, and GetDoublev.
+	 */
 	public static final int GL_STENCIL_TAG_BITS_EXT = 0x88f2;
 	public static final int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88f3;
 
@@ -14,6 +18,11 @@ public final class EXTStencilClearTag {
 	}
 
 
+	/**
+	 *        Controls the stencil clear tag state. stencilTagBits is a count of
+	 *    the number of most-significant stencil buffer bits involved in the
+	 *    stencil clear tag update.
+	 */
 	public static void glStencilClearTagEXT(int stencilTagBits, int stencilClearTag) {
 		long function_pointer = GLContext.getCapabilities().EXT_stencil_clear_tag_glStencilClearTagEXT_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);

src/generated/org/lwjgl/opengl/EXTTextureMirrorClamp.java

@@ -7,6 +7,12 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTTextureMirrorClamp {
+	/**
+	 * Accepted by the <param> parameter of TexParameteri and TexParameterf,
+	 * and by the <params> parameter of TexParameteriv and TexParameterfv,
+	 * when their <pname> parameter is TEXTURE_WRAP_S, TEXTURE_WRAP_T,
+	 * or TEXTURE_WRAP_R:
+	 */
 	public static final int GL_MIRROR_CLAMP_EXT = 0x8742;
 	public static final int GL_MIRROR_CLAMP_TO_EDGE_EXT = 0x8743;
 	public static final int GL_MIRROR_CLAMP_TO_BORDER_EXT = 0x8912;

src/generated/org/lwjgl/opengl/EXTTextureSRGB.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class EXTTextureSRGB {
+	/**
+	 *         Accepted by the <internalformat> parameter of TexImage1D, TexImage2D,
+	 *         TexImage3D, CopyTexImage1D, CopyTexImage2D.
+	 */
 	public static final int GL_SRGB_EXT = 0x8c40;
 	public static final int GL_SRGB8_EXT = 0x8c41;
 	public static final int GL_SRGB_ALPHA_EXT = 0x8c42;
@@ -19,6 +23,11 @@ public final class EXTTextureSRGB {
 	public static final int GL_COMPRESSED_SRGB_ALPHA_EXT = 0x8c49;
 	public static final int GL_COMPRESSED_SLUMINANCE_EXT = 0x8c4a;
 	public static final int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8c4b;
+	/**
+	 *         Accepted by the <internalformat> parameter of TexImage2D,
+	 *         CopyTexImage2D, and CompressedTexImage2DARB and the <format> parameter
+	 *         of CompressedTexSubImage2DARB.
+	 */
 	public static final int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8c4c;
 	public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8c4d;
 	public static final int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8c4e;

src/generated/org/lwjgl/opengl/GL15.java

@@ -38,9 +38,20 @@ public final class GL15 {
 	public static final int GL_BUFFER_ACCESS = 0x88bb;
 	public static final int GL_BUFFER_MAPPED = 0x88bc;
 	public static final int GL_BUFFER_MAP_POINTER = 0x88bd;
+	/**
+	 * Accepted by the <target> parameter of BeginQuery, EndQuery,
+	 * and GetQueryiv:
+	 */
 	public static final int GL_SAMPLES_PASSED = 0x8914;
+	/**
+	 *         Accepted by the <pname> parameter of GetQueryiv:
+	 */
 	public static final int GL_QUERY_COUNTER_BITS = 0x8864;
 	public static final int GL_CURRENT_QUERY = 0x8865;
+	/**
+	 *         Accepted by the <pname> parameter of GetQueryObjectiv and
+	 *         GetQueryObjectuiv:
+	 */
 	public static final int GL_QUERY_RESULT = 0x8866;
 	public static final int GL_QUERY_RESULT_AVAILABLE = 0x8867;
 

src/generated/org/lwjgl/opengl/GL20.java

@@ -7,8 +7,17 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class GL20 {
+	/**
+	 * Accepted by the <name> parameter of GetString:
+	 */
 	public static final int GL_SHADING_LANGUAGE_VERSION = 0x8b8c;
+	/**
+	 * Accepted by the <pname> argument of GetInteger:
+	 */
 	public static final int GL_CURRENT_PROGRAM = 0x8b8d;
+	/**
+	 * Accepted by the <pname> parameter of GetObjectParameter{fi}vARB:
+	 */
 	public static final int GL_SHADER_TYPE = 0x8b4f;
 	public static final int GL_DELETE_STATUS = 0x8b80;
 	public static final int GL_COMPILE_STATUS = 0x8b81;
@@ -21,7 +30,13 @@ public final class GL20 {
 	public static final int GL_ACTIVE_ATTRIBUTES = 0x8b89;
 	public static final int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8b8a;
 	public static final int GL_SHADER_SOURCE_LENGTH = 0x8b88;
+	/**
+	 * Returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 */
 	public static final int GL_SHADER_OBJECT = 0x8b48;
+	/**
+	 * Returned by the <type> parameter of GetActiveUniformARB:
+	 */
 	public static final int GL_FLOAT_VEC2 = 0x8b50;
 	public static final int GL_FLOAT_VEC3 = 0x8b51;
 	public static final int GL_FLOAT_VEC4 = 0x8b52;
@@ -41,7 +56,15 @@ public final class GL20 {
 	public static final int GL_SAMPLER_CUBE = 0x8b60;
 	public static final int GL_SAMPLER_1D_SHADOW = 0x8b61;
 	public static final int GL_SAMPLER_2D_SHADOW = 0x8b62;
+	/**
+	 * Accepted by the <shaderType> argument of CreateShader and
+	 * returned by the <params> parameter of GetShader{if}v:
+	 */
 	public static final int GL_VERTEX_SHADER = 0x8b31;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8b4a;
 	public static final int GL_MAX_VARYING_FLOATS = 0x8b4b;
 	public static final int GL_MAX_VERTEX_ATTRIBS = 0x8869;
@@ -49,18 +72,45 @@ public final class GL20 {
 	public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 0x8b4c;
 	public static final int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8b4d;
 	public static final int GL_MAX_TEXTURE_COORDS = 0x8871;
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
+	 * by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
 	public static final int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
 	public static final int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_STRIDE = 0x8624;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_TYPE = 0x8625;
 	public static final int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886a;
 	public static final int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
+	/**
+	 * Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
+	/**
+	 * Accepted by the <shaderType> argument of CreateShader and
+	 * returned by the <params> parameter of GetShader{fi}vARB:
+	 */
 	public static final int GL_FRAGMENT_SHADER = 0x8b30;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8b49;
+	/**
+	 * Accepted by the <target> parameter of Hint and the <pname> parameter of
+	 * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8b8b;
+	/**
+	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_MAX_DRAW_BUFFERS = 0x8824;
 	public static final int GL_DRAW_BUFFER0 = 0x8825;
 	public static final int GL_DRAW_BUFFER1 = 0x8826;
@@ -78,9 +128,27 @@ public final class GL20 {
 	public static final int GL_DRAW_BUFFER13 = 0x8832;
 	public static final int GL_DRAW_BUFFER14 = 0x8833;
 	public static final int GL_DRAW_BUFFER15 = 0x8834;
+	/**
+	 * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	 * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv,
+	 * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv:
+	 */
 	public static final int GL_POINT_SPRITE = 0x8861;
+	/**
+	 * When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
+	 * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE, then the value of
+	 * <pname> may be:
+	 */
 	public static final int GL_COORD_REPLACE = 0x8862;
+	/**
+	 * Accepted by the <pname> parameter of PointParameter{if}vARB, and the
+	 * <pname> of Get:
+	 */
 	public static final int GL_POINT_SPRITE_COORD_ORIGIN = 0x8ca0;
+	/**
+	 * Accepted by the <param> parameter of PointParameter{if}vARB:
+	 */
 	public static final int GL_LOWER_LEFT = 0x8ca1;
 	public static final int GL_UPPER_LEFT = 0x8ca2;
 	public static final int GL_STENCIL_BACK_FUNC = 0x8800;

src/generated/org/lwjgl/opengl/HPOcclusionTest.java

@@ -8,12 +8,12 @@ import java.nio.*;
 
 public final class HPOcclusionTest {
 	/**
-	 * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, by
-	 * the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev :
+	 * the &lt;pname&gt; of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev :
 	 */
 	public static final int GL_OCCLUSION_TEST_HP = 0x8165;
 	/**
-	 * Accepted by the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * Accepted by the &lt;pname&gt; of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev :
 	 */
 	public static final int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;

src/generated/org/lwjgl/opengl/IBMRasterposClip.java

@@ -8,7 +8,7 @@ import java.nio.*;
 
 public final class IBMRasterposClip {
 	/**
-	 * Accepted by the <target> parameter of Enable and Disable and the <value>
+	 * Accepted by the &lt;target&gt; parameter of Enable and Disable and the &lt;value&gt;
 	 * parameter of IsEnabled, GetBooleanv, GetIntegerv, GetFloatv, GetDoublev:
 	 */
 	public static final int GL_RASTER_POSITION_UNCLIPPED_IBM = 0x19262;

src/generated/org/lwjgl/opengl/NVFloatBuffer.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVFloatBuffer {
+	/**
+	 * Accepted by the <internalformat> parameter of TexImage2D and
+	 * CopyTexImage2D:
+	 */
 	public static final int GL_FLOAT_R_NV = 0x8880;
 	public static final int GL_FLOAT_RG_NV = 0x8881;
 	public static final int GL_FLOAT_RGB_NV = 0x8882;
@@ -19,7 +23,15 @@ public final class NVFloatBuffer {
 	public static final int GL_FLOAT_RGB32_NV = 0x8889;
 	public static final int GL_FLOAT_RGBA16_NV = 0x888a;
 	public static final int GL_FLOAT_RGBA32_NV = 0x888b;
+	/**
+	 * Accepted by the <pname> parameter of GetTexLevelParameterfv and
+	 * GetTexLevelParameteriv:
+	 */
 	public static final int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888c;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888d;
 	public static final int GL_FLOAT_RGBA_MODE_NV = 0x888e;
 

src/generated/org/lwjgl/opengl/NVFragmentProgram.java

@@ -7,7 +7,19 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVFragmentProgram extends NVProgram {
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	 * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the <target> parameter of BindProgramNV, LoadProgramNV,
+	 * ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB,
+	 * ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB,
+	 * GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB:
+	 */
 	public static final int GL_FRAGMENT_PROGRAM_NV = 0x8870;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev:
+	 */
 	public static final int GL_MAX_TEXTURE_COORDS_NV = 0x8871;
 	public static final int GL_MAX_TEXTURE_IMAGE_UNITS_NV = 0x8872;
 	public static final int GL_FRAGMENT_PROGRAM_BINDING_NV = 0x8873;

src/generated/org/lwjgl/opengl/NVFragmentProgram2.java

@@ -7,6 +7,9 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVFragmentProgram2 {
+	/**
+	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 */
 	public static final int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88f4;
 	public static final int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88f5;
 	public static final int GL_MAX_PROGRAM_IF_DEPTH_NV = 0x88f6;

src/generated/org/lwjgl/opengl/NVHalfFloat.java

@@ -7,6 +7,13 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVHalfFloat {
+	/**
+	 * Accepted by the <type> argument of VertexPointer, NormalPointer,
+	 * ColorPointer, TexCoordPointer, FogCoordPointerEXT,
+	 * SecondaryColorPointerEXT, VertexWeightPointerEXT, VertexAttribPointerNV,
+	 * DrawPixels, ReadPixels, TexImage1D, TexImage2D, TexImage3D, TexSubImage1D,
+	 * TexSubImage2D, TexSubImage3D, and GetTexImage:
+	 */
 	public static final int GL_HALF_FLOAT_NV = 0x140b;
 
 	private NVHalfFloat() {

src/generated/org/lwjgl/opengl/NVMultisampleFilterHint.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVMultisampleFilterHint {
+	/**
+	 * Accepted by the <target> parameter of Hint and by the <pname>
+	 * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;
 
 	private NVMultisampleFilterHint() {

src/generated/org/lwjgl/opengl/NVPixelDataRange.java

@@ -7,10 +7,22 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVPixelDataRange {
+	/**
+	 * Accepted by the <target> parameter of PixelDataRangeNV and
+	 * FlushPixelDataRangeNV, and by the <cap> parameter of
+	 * EnableClientState, DisableClientState, and IsEnabled:
+	 */
 	public static final int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
 	public static final int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887a;
 	public static final int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887b;
+	/**
+	 * Accepted by the <pname> parameter of GetPointerv:
+	 */
 	public static final int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887c;
 	public static final int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887d;
 

src/generated/org/lwjgl/opengl/NVPrimitiveRestart.java

@@ -7,7 +7,17 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVPrimitiveRestart {
+	/**
+	 * Accepted by the <array> parameter of EnableClientState and
+	 * DisableClientState, by the <cap> parameter of IsEnabled, and by
+	 * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev:
+	 */
 	public static final int GL_PRIMITIVE_RESTART_NV = 0x8558;
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;
 
 	private NVPrimitiveRestart() {

src/generated/org/lwjgl/opengl/NVProgram.java

@@ -7,11 +7,24 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public class NVProgram {
+	/**
+	 *         Accepted by the <pname> parameter of GetProgramivNV:
+	 */
 	public static final int GL_PROGRAM_TARGET_NV = 0x8646;
 	public static final int GL_PROGRAM_LENGTH_NV = 0x8627;
 	public static final int GL_PROGRAM_RESIDENT_NV = 0x8647;
+	/**
+	 *         Accepted by the <pname> parameter of GetProgramStringNV:
+	 */
 	public static final int GL_PROGRAM_STRING_NV = 0x8628;
+	/**
+	 *         Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_PROGRAM_ERROR_POSITION_NV = 0x864b;
+	/**
+	 *         Accepted by the <name> parameter of GetString:
+	 */
 	public static final int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
 
 

src/generated/org/lwjgl/opengl/NVTextureCompressionVTC.java

@@ -7,6 +7,11 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVTextureCompressionVTC {
+	/**
+	 * Accepted by the <internalformat> parameter of TexImage3D and
+	 * CompressedTexImage3DARB and the <format> parameter of
+	 * CompressedTexSubImage2DARB:
+	 */
 	public static final int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83f0;
 	public static final int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83f1;
 	public static final int GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83f2;

src/generated/org/lwjgl/opengl/NVTextureExpandNormal.java

@@ -7,6 +7,11 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVTextureExpandNormal {
+	/**
+	 * Accepted by the <pname> parameters of TexParameteri,
+	 * TexParameteriv, TexParameterf, TexParameterfv, GetTexParameteri,
+	 * and GetTexParameteriv:
+	 */
 	public static final int GL_TEXTURE_UNSIGNED_REMAP_MODE_NV = 0x888f;
 
 	private NVTextureExpandNormal() {

src/generated/org/lwjgl/opengl/NVVertexProgram.java

@@ -7,24 +7,64 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVVertexProgram extends NVProgram {
+	/**
+	 *         Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 *         and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 *         and GetDoublev, and by the <target> parameter of BindProgramNV,
+	 *         ExecuteProgramNV, GetProgramParameter[df]vNV, GetTrackMatrixivNV,
+	 *         LoadProgramNV, ProgramParameter[s]4[df][v]NV, and TrackMatrixNV:
+	 */
 	public static final int GL_VERTEX_PROGRAM_NV = 0x8620;
+	/**
+	 *         Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 *         and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 *         and GetDoublev:
+	 */
 	public static final int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
 	public static final int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
+	/**
+	 *         Accepted by the <target> parameter of ExecuteProgramNV and
+	 *         LoadProgramNV:
+	 */
 	public static final int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
+	/**
+	 *         Accepted by the <pname> parameter of GetVertexAttrib[dfi]vNV:
+	 */
 	public static final int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
 	public static final int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
 	public static final int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
 	public static final int GL_CURRENT_ATTRIB_NV = 0x8626;
+	/**
+	 *         Accepted by the <pname> parameter of GetProgramParameterfvNV
+	 *         and GetProgramParameterdvNV:
+	 */
 	public static final int GL_PROGRAM_PARAMETER_NV = 0x8644;
+	/**
+	 *         Accepted by the <pname> parameter of GetVertexAttribPointervNV:
+	 */
 	public static final int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
+	/**
+	 *         Accepted by the <pname> parameter of GetTrackMatrixivNV:
+	 */
 	public static final int GL_TRACK_MATRIX_NV = 0x8648;
 	public static final int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
+	/**
+	 *         Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862e;
 	public static final int GL_MAX_TRACK_MATRICES_NV = 0x862f;
 	public static final int GL_CURRENT_MATRIX_STACK_DEPTH_NV = 0x8640;
 	public static final int GL_CURRENT_MATRIX_NV = 0x8641;
 	public static final int GL_VERTEX_PROGRAM_BINDING_NV = 0x864a;
+	/**
+	 *         Accepted by the <matrix> parameter of TrackMatrixNV:
+	 */
 	public static final int GL_MODELVIEW_PROJECTION_NV = 0x8629;
+	/**
+	 *         Accepted by the <matrix> parameter of TrackMatrixNV and by the
+	 *         <mode> parameter of MatrixMode:
+	 */
 	public static final int GL_MATRIX0_NV = 0x8630;
 	public static final int GL_MATRIX1_NV = 0x8631;
 	public static final int GL_MATRIX2_NV = 0x8632;
@@ -33,10 +73,19 @@ public final class NVVertexProgram extends NVProgram {
 	public static final int GL_MATRIX5_NV = 0x8635;
 	public static final int GL_MATRIX6_NV = 0x8636;
 	public static final int GL_MATRIX7_NV = 0x8637;
+	/**
+	 *         Accepted by the <transform> parameter of TrackMatrixNV:
+	 */
 	public static final int GL_IDENTITY_NV = 0x862a;
 	public static final int GL_INVERSE_NV = 0x862b;
 	public static final int GL_TRANSPOSE_NV = 0x862c;
 	public static final int GL_INVERSE_TRANSPOSE_NV = 0x862d;
+	/**
+	 *         Accepted by the <array> parameter of EnableClientState and
+	 *         DisableClientState, by the <cap> parameter of IsEnabled, and by
+	 *         the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 *         GetDoublev:
+	 */
 	public static final int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
 	public static final int GL_VERTEX_ATTRIB_ARRAY1_NV = 0x8651;
 	public static final int GL_VERTEX_ATTRIB_ARRAY2_NV = 0x8652;
@@ -53,6 +102,12 @@ public final class NVVertexProgram extends NVProgram {
 	public static final int GL_VERTEX_ATTRIB_ARRAY13_NV = 0x865d;
 	public static final int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865e;
 	public static final int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865f;
+	/**
+	 *         Accepted by the <target> parameter of GetMapdv, GetMapfv, GetMapiv,
+	 *         Map1d and Map1f and by the <cap> parameter of Enable, Disable, and
+	 *         IsEnabled, and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
 	public static final int GL_MAP1_VERTEX_ATTRIB1_4_NV = 0x8661;
 	public static final int GL_MAP1_VERTEX_ATTRIB2_4_NV = 0x8662;
@@ -69,6 +124,12 @@ public final class NVVertexProgram extends NVProgram {
 	public static final int GL_MAP1_VERTEX_ATTRIB13_4_NV = 0x866d;
 	public static final int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866e;
 	public static final int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866f;
+	/**
+	 *         Accepted by the <target> parameter of GetMapdv, GetMapfv, GetMapiv,
+	 *         Map2d and Map2f and by the <cap> parameter of Enable, Disable, and
+	 *         IsEnabled, and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 *         GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
 	public static final int GL_MAP2_VERTEX_ATTRIB1_4_NV = 0x8671;
 	public static final int GL_MAP2_VERTEX_ATTRIB2_4_NV = 0x8672;

src/generated/org/lwjgl/opengl/NVVertexProgram2Option.java

@@ -7,6 +7,9 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVVertexProgram2Option {
+	/**
+	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 */
 	public static final int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88f4;
 	public static final int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88f5;
 

src/generated/org/lwjgl/opengl/NVVertexProgram3.java

@@ -7,6 +7,10 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class NVVertexProgram3 {
+	/**
+	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * GetFloatv, and GetDoublev:
+	 */
 	public static final int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8b4c;
 
 	private NVVertexProgram3() {

src/generated/org/lwjgl/opengl/SUNSliceAccum.java

@@ -7,6 +7,9 @@ import org.lwjgl.BufferChecks;
 import java.nio.*;
 
 public final class SUNSliceAccum {
+	/**
+	 * Accepted by the <op> parameter of Accum,
+	 */
 	public static final int GL_SLICE_ACCUM_SUN = 0x85cc;
 
 	private SUNSliceAccum() {

src/templates/org/lwjgl/opengl/ARB_buffer_object.java

@@ -35,10 +35,11 @@ import org.lwjgl.util.generator.*;
 
 import java.nio.*;
 
-@Extension(postfix="ARB", isFinal=false)
+@Extension(postfix = "ARB", isFinal = false)
 public interface ARB_buffer_object {
-	/*
+
-	 * Accepted by the <usage> parameter of BufferDataARB:
+	/**
+	 * Accepted by the &lt;usage&gt; parameter of BufferDataARB:
 	 */
 	int GL_STREAM_DRAW_ARB = 0x88E0;
 	int GL_STREAM_READ_ARB = 0x88E1;
@@ -50,15 +51,15 @@ public interface ARB_buffer_object {
 	int GL_DYNAMIC_READ_ARB = 0x88E9;
 	int GL_DYNAMIC_COPY_ARB = 0x88EA;
 
-	/*
+	/**
-	 * Accepted by the <access> parameter of MapBufferARB:
+	 * Accepted by the &lt;access&gt; parameter of MapBufferARB:
 	 */
 	int GL_READ_ONLY_ARB = 0x88B8;
 	int GL_WRITE_ONLY_ARB = 0x88B9;
 	int GL_READ_WRITE_ARB = 0x88BA;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBufferParameterivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetBufferParameterivARB:
 	 */
 	int GL_BUFFER_SIZE_ARB = 0x8764;
 	int GL_BUFFER_USAGE_ARB = 0x8765;
@@ -66,11 +67,14 @@ public interface ARB_buffer_object {
 	int GL_BUFFER_MAPPED_ARB = 0x88BC;
 	int GL_BUFFER_MAP_POINTER_ARB = 0x88BD;
 
-	@Code(	"		StateTracker.bindBuffer(target, buffer);")
+	@Code("		StateTracker.bindBuffer(target, buffer);")
 	void glBindBufferARB(@GLenum int target, @GLuint int buffer);
-	@Code(	"		StateTracker.deleteBuffers(buffers);")
+
+	@Code("		StateTracker.deleteBuffers(buffers);")
 	void glDeleteBuffersARB(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers);
+
 	void glGenBuffersARB(@AutoSize("buffers") int n, @GLuint IntBuffer buffers);
+
 	boolean glIsBufferARB(@GLuint int buffer);
 
 	@GenerateAutos
@@ -80,8 +84,7 @@ public interface ARB_buffer_object {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer data, @GLenum int usage);
-			Buffer data, @GLenum int usage);
 
 	void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size,
 	                        @Check
@@ -90,8 +93,7 @@ public interface ARB_buffer_object {
 	                        @GLshort
 	                        @GLint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer data);
-			Buffer data);
 
 	void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size,
 	                           @Check
@@ -99,8 +101,7 @@ public interface ARB_buffer_object {
 	                           @GLshort
 	                           @GLint
 	                           @GLfloat
-			@GLdouble
+	                           @GLdouble Buffer data);
-			Buffer data);
 
 	/**
 	 * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null,
@@ -116,7 +117,8 @@ public interface ARB_buffer_object {
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */
 	@CachedResult
-	@GLvoid ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
+	@GLvoid
+	ByteBuffer glMapBufferARB(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBufferARB(@GLenum int target);
 

src/templates/org/lwjgl/opengl/ARB_color_buffer_float.java

@@ -34,40 +34,40 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface ARB_color_buffer_float {
-	/*
+	/**
-     * Accepted by the <pname> parameters of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameters of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_RGBA_FLOAT_MODE_ARB = 0x8820;
 
-	/*
+	/**
-     * Accepted by the <target> parameter of ClampColorARB and the <pname>
+	 * Accepted by the &lt;target&gt; parameter of ClampColorARB and the &lt;pname&gt;
 	 * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev.
 	 */
 	int GL_CLAMP_VERTEX_COLOR_ARB = 0x891A;
 	int GL_CLAMP_FRAGMENT_COLOR_ARB = 0x891B;
 	int GL_CLAMP_READ_COLOR_ARB = 0x891C;
 
-	/*
+	/**
-	 * Accepted by the <clamp> parameter of ClampColorARB.
+	 * Accepted by the &lt;clamp&gt; parameter of ClampColorARB.
 	 */
 	int GL_FIXED_ONLY_ARB = 0x891D;
 
-	/*
+	/**
-	 * Accepted as a value in the <piAttribIList> and <pfAttribFList>
+	 * Accepted as a value in the &lt;piAttribIList&gt; and &lt;pfAttribFList&gt;
 	 * parameter arrays of wglChoosePixelFormatARB, and returned in the
-	 * <piValues> parameter array of wglGetPixelFormatAttribivARB, and the
+	 * &lt;piValues&gt; parameter array of wglGetPixelFormatAttribivARB, and the
-	 * <pfValues> parameter array of wglGetPixelFormatAttribfvARB:
+	 * &lt;pfValues&gt; parameter array of wglGetPixelFormatAttribfvARB:
 	 */
 	//int WGL_TYPE_RGBA_FLOAT_ARB = 0x21A0;
 
-	/*
+	/**
-	 * Accepted as values of the <render_type> arguments in the
+	 * Accepted as values of the &lt;render_type&gt; arguments in the
 	 * glXCreateNewContext and glXCreateContext functions
 	 */
 	//int GLX_RGBA_FLOAT_TYPE = 0x20B9;
 
-	/*
+	/**
 	 * Accepted as a bit set in the GLX_RENDER_TYPE variable
 	 */
 	//int GLX_RGBA_FLOAT_BIT = 0x00000004;

src/templates/org/lwjgl/opengl/ARB_depth_texture.java

@@ -32,22 +32,23 @@
 package org.lwjgl.opengl;
 
 public interface ARB_depth_texture {
-	/*
+
-	 * Accepted by the <internalFormat> parameter of TexImage1D, TexImage2D,
+	/**
+	 * Accepted by the &lt;internalFormat&gt; parameter of TexImage1D, TexImage2D,
 	 * CopyTexImage1D and CopyTexImage2D:
 	 */
 	int GL_DEPTH_COMPONENT16_ARB = 0x81A5;
 	int GL_DEPTH_COMPONENT24_ARB = 0x81A6;
 	int GL_DEPTH_COMPONENT32_ARB = 0x81A7;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetTexLevelParameterfv and
+	 * Accepted by the &lt;pname&gt; parameter of GetTexLevelParameterfv and
 	 * GetTexLevelParameteriv:
 	 */
 	int GL_TEXTURE_DEPTH_SIZE_ARB = 0x884A;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of TexParameterf, TexParameteri,
+	 * Accepted by the &lt;pname&gt; parameter of TexParameterf, TexParameteri,
 	 * TexParameterfv, TexParameteriv, GetTexParameterfv, and GetTexParameteriv:
 	 */
 	int GL_DEPTH_TEXTURE_MODE_ARB = 0x884B;

src/templates/org/lwjgl/opengl/ARB_draw_buffers.java

@@ -33,11 +33,12 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-import java.nio.IntBuffer;
+import java.nio.*;
 
 public interface ARB_draw_buffers {
-	/*
+
-	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_MAX_DRAW_BUFFERS_ARB = 0x8824;

src/templates/org/lwjgl/opengl/ARB_fragment_program.java

@@ -32,18 +32,19 @@
 package org.lwjgl.opengl;
 
 public interface ARB_fragment_program extends ARB_program {
-	/*
+
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	/**
-	 * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, by the
-	 * and by the <target> parameter of ProgramStringARB, BindProgramARB,
+	 * &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the &lt;target&gt; parameter of ProgramStringARB, BindProgramARB,
 	 * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB,
 	 * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB,
 	 * GetProgramivARB and GetProgramStringARB.
 	 */
 	int GL_FRAGMENT_PROGRAM_ARB = 0x8804;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetProgramivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramivARB:
 	 */
 	int GL_PROGRAM_ALU_INSTRUCTIONS_ARB = 0x8805;
 	int GL_PROGRAM_TEX_INSTRUCTIONS_ARB = 0x8806;
@@ -58,8 +59,8 @@ public interface ARB_fragment_program extends ARB_program {
 	int GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB = 0x880F;
 	int GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB = 0x8810;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;

src/templates/org/lwjgl/opengl/ARB_fragment_program_shadow.java

@@ -32,4 +32,5 @@
 package org.lwjgl.opengl;
 
 public interface ARB_fragment_program_shadow {
+
 }

src/templates/org/lwjgl/opengl/ARB_fragment_shader.java

@@ -32,22 +32,23 @@
 package org.lwjgl.opengl;
 
 public interface ARB_fragment_shader {
-	/*
+
-	 * Accepted by the <shaderType> argument of CreateShaderObjectARB and
+	/**
-	 * returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 * Accepted by the &lt;shaderType&gt; argument of CreateShaderObjectARB and
+	 * returned by the &lt;params&gt; parameter of GetObjectParameter{fi}vARB:
 	 */
 	int GL_FRAGMENT_SHADER_ARB = 0x8B30;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB = 0x8B49;
 	int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
 	int GL_MAX_TEXTURE_IMAGE_UNITS_ARB = 0x8872;
 
-	/*
+	/**
-	 * Accepted by the <target> parameter of Hint and the <pname> parameter of
+	 * Accepted by the &lt;target&gt; parameter of Hint and the &lt;pname&gt; parameter of
 	 * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
 	 */
 	int GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB = 0x8B8B;

src/templates/org/lwjgl/opengl/ARB_half_float_pixel.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface ARB_half_float_pixel {
-	/*
+
-	 * Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	/**
+	 * Accepted by the &lt;type&gt; parameter of DrawPixels, ReadPixels,
 	 * TexImage1D, TexImage2D, TexImage3D, GetTexImage, TexSubImage1D,
 	 * TexSubImage2D, TexSubImage3D, GetHistogram, GetMinmax,
 	 * ConvolutionFilter1D, ConvolutionFilter2D, GetConvolutionFilter,

src/templates/org/lwjgl/opengl/ARB_imaging.java

@@ -31,12 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 /**
  * $Id$
  * <p/>
@@ -46,8 +44,9 @@ import org.lwjgl.util.generator.*;
  * @version $Revision$
  */
 
-@Extension(postfix="")
+@Extension(postfix = "")
 public interface ARB_imaging {
+
 	int GL_CONSTANT_COLOR = 0x8001;
 	int GL_ONE_MINUS_CONSTANT_COLOR = 0x8002;
 	int GL_CONSTANT_ALPHA = 0x8003;
@@ -130,8 +129,7 @@ public interface ARB_imaging {
 	                  @Const
 	                  @GLbyte
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer data);
-			Buffer data);
 
 	void glColorSubTable(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type,
 	                     @BufferObject(BufferKind.UnpackPBO)
@@ -139,8 +137,7 @@ public interface ARB_imaging {
 	                     @Const
 	                     @GLbyte
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer data);
-			Buffer data);
 
 	@StripPostfix("params")
 	void glColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params);
@@ -156,11 +153,11 @@ public interface ARB_imaging {
 	                     @Check("256")
 	                     @GLbyte
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer data);
-			Buffer data);
 
 	@StripPostfix("params")
 	void glGetColorTableParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetColorTableParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params);
 
@@ -179,11 +176,11 @@ public interface ARB_imaging {
 	                    @GLshort
 	                    @GLint
 	                    @GLfloat
-			@GLdouble
+	                    @GLdouble Buffer values);
-			Buffer values);
 
 	@StripPostfix("params")
 	void glGetHistogramParameterfv(@GLenum int target, @GLenum int pname, @Check("256") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetHistogramParameteriv(@GLenum int target, @GLenum int pname, @Check("256") IntBuffer params);
 
@@ -198,11 +195,11 @@ public interface ARB_imaging {
 	                 @GLshort
 	                 @GLint
 	                 @GLfloat
-			@GLdouble
+	                 @GLdouble Buffer values);
-			Buffer values);
 
 	@StripPostfix("params")
 	void glGetMinmaxParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetMinmaxParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
@@ -214,8 +211,7 @@ public interface ARB_imaging {
 	                           @GLshort
 	                           @GLint
 	                           @GLfloat
-			@GLdouble
+	                           @GLdouble Buffer image);
-			Buffer image);
 
 	void glConvolutionFilter2D(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type,
 	                           @BufferObject(BufferKind.UnpackPBO)
@@ -223,8 +219,7 @@ public interface ARB_imaging {
 	                           @Const
 	                           @GLbyte
 	                           @GLshort
-			@GLint
+	                           @GLint Buffer image);
-			Buffer image);
 
 	void glConvolutionParameterf(@GLenum int target, @GLenum int pname, float params);
 
@@ -248,11 +243,11 @@ public interface ARB_imaging {
 	                            @GLshort
 	                            @GLint
 	                            @GLfloat
-			@GLdouble
+	                            @GLdouble Buffer image);
-			Buffer image);
 
 	@StripPostfix("params")
 	void glGetConvolutionParameterfv(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetConvolutionParameteriv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
@@ -265,8 +260,7 @@ public interface ARB_imaging {
 	                         @GLshort
 	                         @GLint
 	                         @GLfloat
-			@GLdouble
+	                         @GLdouble Buffer row,
-			Buffer row,
 	                         @BufferObject(BufferKind.UnpackPBO)
 	                         @Check
 	                         @Const
@@ -274,8 +268,7 @@ public interface ARB_imaging {
 	                         @GLshort
 	                         @GLint
 	                         @GLfloat
-			@GLdouble
+	                         @GLdouble Buffer column);
-			Buffer column);
 
 	// TODO: check buffer size valid
 	void glGetSeparableFilter(@GLenum int target, @GLenum int format, @GLenum int type,
@@ -285,21 +278,17 @@ public interface ARB_imaging {
 	                          @GLshort
 	                          @GLint
 	                          @GLfloat
-			@GLdouble
+	                          @GLdouble Buffer row,
-			Buffer row,
 	                          @BufferObject(BufferKind.PackPBO)
 	                          @Check
 	                          @GLbyte
 	                          @GLshort
 	                          @GLint
-			@GLdouble
+	                          @GLdouble Buffer column,
-			Buffer column,
 	                          @BufferObject(BufferKind.PackPBO)
 	                          @Check
 	                          @GLbyte
 	                          @GLshort
 	                          @GLint
-			@GLdouble
+	                          @GLdouble Buffer span);
-			Buffer span);
 }
-

src/templates/org/lwjgl/opengl/ARB_matrix_palette.java

@@ -31,14 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_matrix_palette {
+
 	int GL_MATRIX_PALETTE_ARB = 0x8840;
 	int GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB = 0x8841;
 	int GL_MAX_PALETTE_MATRICES_ARB = 0x8842;
@@ -59,13 +57,14 @@ public interface ARB_matrix_palette {
 	                             @Const
 	                             @GLubyte
 	                             @GLushort
-			@GLuint
+	                             @GLuint Buffer pPointer);
-			Buffer pPointer);
 
 	@StripPostfix("pIndices")
 	void glMatrixIndexubvARB(@AutoSize("pIndices") int size, @GLubyte ByteBuffer pIndices);
+
 	@StripPostfix("pIndices")
 	void glMatrixIndexusvARB(@AutoSize("pIndices") int size, @GLushort ShortBuffer pIndices);
+
 	@StripPostfix("pIndices")
 	void glMatrixIndexuivARB(@AutoSize("pIndices") int size, @GLuint IntBuffer pIndices);
 }

src/templates/org/lwjgl/opengl/ARB_multisample.java

@@ -34,6 +34,7 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface ARB_multisample {
+
 	int GL_MULTISAMPLE_ARB = 0x809D;
 	int GL_SAMPLE_ALPHA_TO_COVERAGE_ARB = 0x809E;
 	int GL_SAMPLE_ALPHA_TO_ONE_ARB = 0x809F;

src/templates/org/lwjgl/opengl/ARB_multitexture.java

@@ -34,6 +34,7 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface ARB_multitexture {
+
 	int GL_TEXTURE0_ARB = 0x84C0;
 	int GL_TEXTURE1_ARB = 0x84C1;
 	int GL_TEXTURE2_ARB = 0x84C2;

src/templates/org/lwjgl/opengl/ARB_occlusion_query.java

@@ -31,25 +31,26 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_occlusion_query {
-	/*
+
-	 * Accepted by the <target> parameter of BeginQueryARB, EndQueryARB,
+	/**
+	 * Accepted by the &lt;target&gt; parameter of BeginQueryARB, EndQueryARB,
 	 * and GetQueryivARB:
 	 */
 	int GL_SAMPLES_PASSED_ARB = 0x8914;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetQueryivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetQueryivARB:
 	 */
 	int GL_QUERY_COUNTER_BITS_ARB = 0x8864;
 	int GL_CURRENT_QUERY_ARB = 0x8865;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetQueryObjectivARB and
+	 * Accepted by the &lt;pname&gt; parameter of GetQueryObjectivARB and
 	 * GetQueryObjectuivARB:
 	 */
 	int GL_QUERY_RESULT_ARB = 0x8866;

src/templates/org/lwjgl/opengl/ARB_pixel_buffer_object.java

@@ -32,16 +32,17 @@
 package org.lwjgl.opengl;
 
 public interface ARB_pixel_buffer_object extends ARB_buffer_object {
-	/*
+
-	 * Accepted by the <target> parameters of BindBuffer, BufferData,
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
 	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
 	 * GetBufferParameteriv, and GetBufferPointerv:
 	 */
 	int GL_PIXEL_PACK_BUFFER_ARB = 0x88EB;
 	int GL_PIXEL_UNPACK_BUFFER_ARB = 0x88EC;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_PIXEL_PACK_BUFFER_BINDING_ARB = 0x88ED;

src/templates/org/lwjgl/opengl/ARB_point_parameters.java

@@ -31,11 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_point_parameters {
+
 	int GL_POINT_SIZE_MIN_ARB = 0x8126;
 	int GL_POINT_SIZE_MAX_ARB = 0x8127;
 	int GL_POINT_FADE_THRESHOLD_SIZE_ARB = 0x8128;
@@ -45,4 +46,5 @@ public interface ARB_point_parameters {
 
 	@StripPostfix("pfParams")
 	void glPointParameterfvARB(@GLenum int pname, @Check("4") @Const FloatBuffer pfParams);
+
 }

src/templates/org/lwjgl/opengl/ARB_point_sprite.java

@@ -32,18 +32,19 @@
 package org.lwjgl.opengl;
 
 public interface ARB_point_sprite {
-	/*
+
-	 * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	/**
-	 * the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, by
-	 * GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv,
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * GetDoublev, and by the &lt;target&gt; parameter of TexEnvi, TexEnviv,
 	 * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv:
 	 */
 	int GL_POINT_SPRITE_ARB = 0x8861;
 
-	/*
+	/**
-	* When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
+	 * When the &lt;target&gt; parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
 	 * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE_ARB, then the value of
-	* <pname> may be:
+	 * &lt;pname&gt; may be:
 	 */
 	int GL_COORD_REPLACE_ARB = 0x8862;
 }

src/templates/org/lwjgl/opengl/ARB_program.java

@@ -31,22 +31,20 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="ARB", isFinal=false)
+import java.nio.*;
+
+@Extension(postfix = "ARB", isFinal = false)
 public interface ARB_program {
-	/*
+
-	* Accepted by the <format> parameter of ProgramStringARB:
+	/**
+	 * Accepted by the &lt;format&gt; parameter of ProgramStringARB:
 	 */
 	int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetProgramivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramivARB:
 	 */
 	int GL_PROGRAM_LENGTH_ARB = 0x8627;
 	int GL_PROGRAM_FORMAT_ARB = 0x8876;
@@ -71,13 +69,13 @@ public interface ARB_program {
 	int GL_MAX_PROGRAM_ENV_PARAMETERS_ARB = 0x88B5;
 	int GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB = 0x88B6;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetProgramStringARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramStringARB:
 	 */
 	int GL_PROGRAM_STRING_ARB = 0x8628;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_PROGRAM_ERROR_POSITION_ARB = 0x864B;
@@ -87,13 +85,13 @@ public interface ARB_program {
 	int GL_MAX_PROGRAM_MATRICES_ARB = 0x862F;
 	int GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB = 0x862E;
 
-	/*
+	/**
-	* Accepted by the <name> parameter of GetString:
+	 * Accepted by the &lt;name&gt; parameter of GetString:
 	 */
 	int GL_PROGRAM_ERROR_STRING_ARB = 0x8874;
 
-	/*
+	/**
-	* Accepted by the <mode> parameter of MatrixMode:
+	 * Accepted by the &lt;mode&gt; parameter of MatrixMode:
 	 */
 	int GL_MATRIX0_ARB = 0x88C0;
 	int GL_MATRIX1_ARB = 0x88C1;
@@ -133,6 +131,7 @@ public interface ARB_program {
 	void glBindProgramARB(@GLenum int target, @GLuint int program);
 
 	void glDeleteProgramsARB(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs);
+
 	void glGenProgramsARB(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs);
 
 	void glProgramEnvParameter4fARB(int target, int index, float x, float y, float z, float w);

src/templates/org/lwjgl/opengl/ARB_shader_objects.java

@@ -31,20 +31,19 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_shader_objects {
-	/*
+
-	* Accepted by the <pname> argument of GetHandleARB:
+	/**
+	 * Accepted by the &lt;pname&gt; argument of GetHandleARB:
 	 */
 	int GL_PROGRAM_OBJECT_ARB = 0x8B40;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetObjectParameter{fi}vARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetObjectParameter{fi}vARB:
 	 */
 	int GL_OBJECT_TYPE_ARB = 0x8B4E;
 	int GL_OBJECT_SUBTYPE_ARB = 0x8B4F;
@@ -58,13 +57,13 @@ public interface ARB_shader_objects {
 	int GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB = 0x8B87;
 	int GL_OBJECT_SHADER_SOURCE_LENGTH_ARB = 0x8B88;
 
-	/*
+	/**
-	* Returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 * Returned by the &lt;params&gt; parameter of GetObjectParameter{fi}vARB:
 	 */
 	int GL_SHADER_OBJECT_ARB = 0x8B48;
 
-	/*
+	/**
-	* Returned by the <type> parameter of GetActiveUniformARB:
+	 * Returned by the &lt;type&gt; parameter of GetActiveUniformARB:
 	 */
 	int GL_FLOAT = 0x1406;
 	int GL_FLOAT_VEC2_ARB = 0x8B50;
@@ -92,35 +91,33 @@ public interface ARB_shader_objects {
 
 	void glDeleteObjectARB(@GLhandleARB int obj);
 
-	@GLhandleARB int glGetHandleARB(@GLenum int pname);
+	@GLhandleARB
+	int glGetHandleARB(@GLenum int pname);
 
 	void glDetachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int attachedObj);
 
-	@GLhandleARB int glCreateShaderObjectARB(@GLenum int shaderType);
+	@GLhandleARB
+	int glCreateShaderObjectARB(@GLenum int shaderType);
 
 	/**
 	 * The ARB_shader_objects extension allows multiple, optionally null-terminated, source strings to define a shader program.
 	 * <p/>
 	 * This method uses just a single string, that should NOT be null-terminated.
-	 *
-	 * @param shaderObj
-	 * @param string
 	 */
 	void glShaderSourceARB(@GLhandleARB int shader, @Constant("1") @GLsizei int count,
 	                       @Indirect
 	                       @Check
 	                       @Const
-			@GLcharARB
+	                       @GLcharARB ByteBuffer string,
-			ByteBuffer string,
 	                       @AutoSize("string")
 	                       @Indirect
 	                       @Const
-			@GLint
+	                       @GLint int length);
-			int length);
 
 	void glCompileShaderARB(@GLhandleARB int shaderObj);
 
-	@GLhandleARB int glCreateProgramObjectARB();
+	@GLhandleARB
+	int glCreateProgramObjectARB();
 
 	void glAttachObjectARB(@GLhandleARB int containerObj, @GLhandleARB int obj);
 
@@ -148,78 +145,77 @@ public interface ARB_shader_objects {
 
 	@StripPostfix("values")
 	void glUniform1fvARB(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values);
-	@StripPostfix("values")
-	void glUniform2fvARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values);
-	@StripPostfix("values")
-	void glUniform3fvARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values);
-	@StripPostfix("values")
-	void glUniform4fvARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values);
 
 	@StripPostfix("values")
-	void glUniform1ivARB(int location, @AutoSize(value="values") @GLsizei int count, IntBuffer values);
+	void glUniform2fvARB(int location, @AutoSize(value = "values", expression = " >> 1") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform2ivARB(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values);
+	void glUniform3fvARB(int location, @AutoSize(value = "values", expression = " / 3") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform3ivARB(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values);
+	void glUniform4fvARB(int location, @AutoSize(value = "values", expression = " >> 2") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform4ivARB(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values);
+	void glUniform1ivARB(int location, @AutoSize(value = "values") @GLsizei int count, IntBuffer values);
+
+	@StripPostfix("values")
+	void glUniform2ivARB(int location, @AutoSize(value = "values", expression = " >> 1") @GLsizei int count, IntBuffer values);
+
+	@StripPostfix("values")
+	void glUniform3ivARB(int location, @AutoSize(value = "values", expression = " / 3") @GLsizei int count, IntBuffer values);
+
+	@StripPostfix("values")
+	void glUniform4ivARB(int location, @AutoSize(value = "values", expression = " >> 2") @GLsizei int count, IntBuffer values);
 
 	@StripPostfix("matrices")
-	void glUniformMatrix2fvARB(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count, boolean transpose, FloatBuffer matrices);
+	void glUniformMatrix2fvARB(int location, @AutoSize(value = "matrices", expression = " >> 2") @GLsizei int count, boolean transpose, FloatBuffer matrices);
+
 	@StripPostfix("matrices")
-	void glUniformMatrix3fvARB(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count, boolean transpose, FloatBuffer matrices);
+	void glUniformMatrix3fvARB(int location, @AutoSize(value = "matrices", expression = " / (3 * 3)") @GLsizei int count, boolean transpose, FloatBuffer matrices);
+
 	@StripPostfix("matrices")
-	void glUniformMatrix4fvARB(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count, boolean transpose, FloatBuffer matrices);
+	void glUniformMatrix4fvARB(int location, @AutoSize(value = "matrices", expression = " >> 4") @GLsizei int count, boolean transpose, FloatBuffer matrices);
 
 	@StripPostfix("params")
 	void glGetObjectParameterfvARB(@GLhandleARB int obj, @GLenum int pname, @Check FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetObjectParameterivARB(@GLhandleARB int obj, @GLenum int pname, @Check IntBuffer params);
 
 	void glGetInfoLogARB(@GLhandleARB int obj, @AutoSize("infoLog") @GLsizei int maxLength,
-		@Check(value="1", canBeNull=true)
+	                     @Check(value = "1", canBeNull = true)
 	                     @GLsizei IntBuffer length,
-		@GLcharARB
+	                     @GLcharARB ByteBuffer infoLog);
-		ByteBuffer infoLog);
 
 	void glGetAttachedObjectsARB(@GLhandleARB int containerObj, @AutoSize("obj") @GLsizei int maxCount,
-			@Check(value="1", canBeNull=true)
+	                             @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                             @GLsizei IntBuffer count,
-			IntBuffer count,
+	                             @GLhandleARB IntBuffer obj);
-			@GLhandleARB
-			IntBuffer obj);
 
 	/**
 	 * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a <b>null-terminated</b> string.
 	 *
 	 * @param programObj
 	 * @param name
-	 *
-	 * @return
 	 */
 	int glGetUniformLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name);
 
 	void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @AutoSize("name") @GLsizei int maxLength,
-			@Check(value="1", canBeNull=true)
+	                           @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                           @GLsizei IntBuffer length,
-			IntBuffer length,
+	                           @Check("1") IntBuffer size,
 	                           @Check("1")
-			IntBuffer size,
+	                           @GLenum IntBuffer type,
-			@Check("1")
+	                           @GLcharARB ByteBuffer name);
-			@GLenum
-			IntBuffer type,
-			@GLcharARB
-			ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfvARB(@GLhandleARB int programObj, int location, @Check FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetUniformivARB(@GLhandleARB int programObj, int location, @Check IntBuffer params);
 
 	void glGetShaderSourceARB(@GLhandleARB int obj, @AutoSize("source") @GLsizei int maxLength,
-			@Check(value="1", canBeNull=true)
+	                          @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                          @GLsizei IntBuffer length,
-			IntBuffer length,
+	                          @GLcharARB ByteBuffer source);
-			@GLcharARB
-			ByteBuffer source);
 }

src/templates/org/lwjgl/opengl/ARB_shading_language_100.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface ARB_shading_language_100 {
+
 	/**
-     * Accepted by the <name> parameter of GetString:
+	 * Accepted by the &lt;name&gt; parameter of GetString:
 	 */
 	int GL_SHADING_LANGUAGE_VERSION_ARB = 0x8B8C;
 }

src/templates/org/lwjgl/opengl/ARB_texture_compression.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_texture_compression {
 	int GL_COMPRESSED_ALPHA_ARB = 0x84E9;
 	int GL_COMPRESSED_LUMINANCE_ARB = 0x84EA;
@@ -56,8 +56,7 @@ public interface ARB_texture_compression {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-		@GLdouble
+	                               @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize,
 	                               @BufferObject(BufferKind.UnpackPBO)
@@ -67,8 +66,7 @@ public interface ARB_texture_compression {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-		@GLdouble
+	                               @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize,
 	                               @BufferObject(BufferKind.UnpackPBO)
@@ -78,8 +76,7 @@ public interface ARB_texture_compression {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-		@GLdouble
+	                               @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize,
 	                                  @BufferObject(BufferKind.UnpackPBO)
@@ -89,8 +86,7 @@ public interface ARB_texture_compression {
 	                                  @GLshort
 	                                  @GLint
 	                                  @GLfloat
-		@GLdouble
+	                                  @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize,
 	                                  @BufferObject(BufferKind.UnpackPBO)
@@ -100,8 +96,7 @@ public interface ARB_texture_compression {
 	                                  @GLshort
 	                                  @GLint
 	                                  @GLfloat
-		@GLdouble
+	                                  @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize,
 	                                  @BufferObject(BufferKind.UnpackPBO)
@@ -111,8 +106,7 @@ public interface ARB_texture_compression {
 	                                  @GLshort
 	                                  @GLint
 	                                  @GLfloat
-		@GLdouble
+	                                  @GLdouble Buffer pData);
-		Buffer pData);
 
 	void glGetCompressedTexImageARB(@GLenum int target, int lod,
 	                                @BufferObject(BufferKind.PackPBO)
@@ -121,6 +115,5 @@ public interface ARB_texture_compression {
 	                                @GLshort
 	                                @GLint
 	                                @GLfloat
-		@GLdouble
+	                                @GLdouble Buffer pImg);
-		Buffer pImg);
 }

src/templates/org/lwjgl/opengl/ARB_texture_float.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface ARB_texture_float {
-	/*
+
-	 * Accepted by the <value> parameter of GetTexLevelParameter:
+	/**
+	 * Accepted by the &lt;value&gt; parameter of GetTexLevelParameter:
 	 */
 	int GL_TEXTURE_RED_TYPE_ARB = 0x8C10;
 	int GL_TEXTURE_GREEN_TYPE_ARB = 0x8C11;
@@ -43,13 +44,13 @@ public interface ARB_texture_float {
 	int GL_TEXTURE_INTENSITY_TYPE_ARB = 0x8C15;
 	int GL_TEXTURE_DEPTH_TYPE_ARB = 0x8C16;
 
-	/*
+	/**
-	 * Returned by the <params> parameter of GetTexLevelParameter:
+	 * Returned by the &lt;params&gt; parameter of GetTexLevelParameter:
 	 */
 	int GL_UNSIGNED_NORMALIZED_ARB = 0x8C17;
 
-	/*
+	/**
-	 * Accepted by the <internalFormat> parameter of TexImage1D,
+	 * Accepted by the &lt;internalFormat&gt; parameter of TexImage1D,
 	 * TexImage2D, and TexImage3D:
 	 */
 	int GL_RGBA32F_ARB = 0x8814;

src/templates/org/lwjgl/opengl/ARB_texture_rectangle.java

@@ -33,45 +33,45 @@ package org.lwjgl.opengl;
 
 public interface ARB_texture_rectangle {
 
-	/*
+	/**
-	Accepted by the <cap> parameter of Enable, Disable and IsEnabled;
+	 Accepted by the &lt;cap&gt; parameter of Enable, Disable and IsEnabled;
-	by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv
+	 by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv
-	and GetDoublev; and by the <target> parameter of BindTexture,
+	 and GetDoublev; and by the &lt;target&gt; parameter of BindTexture,
 	 GetTexParameterfv, GetTexParameteriv, TexParameterf, TexParameteri,
 	 TexParameterfv and TexParameteriv:
-	Accepted by the <target> parameter of GetTexImage,
+	 Accepted by the &lt;target&gt; parameter of GetTexImage,
 	 GetTexLevelParameteriv, GetTexLevelParameterfv, TexImage2D,
 	 CopyTexImage2D, TexSubImage2D and CopySubTexImage2D:
 	 */
 	int GL_TEXTURE_RECTANGLE_ARB = 0x84F5;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv and GetDoublev:
 	 */
 	int GL_TEXTURE_BINDING_RECTANGLE_ARB = 0x84F6;
 
-	/*
+	/**
-	Accepted by the <target> parameter of GetTexLevelParameteriv,
+	 Accepted by the &lt;target&gt; parameter of GetTexLevelParameteriv,
 	 GetTexLevelParameterfv, GetTexParameteriv and TexImage2D:
 	 */
 	int GL_PROXY_TEXTURE_RECTANGLE_ARB = 0x84F7;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetBooleanv, GetDoublev,
+	 Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetDoublev,
 	 GetIntegerv and GetFloatv:
 	 */
 	int GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB = 0x84F8;
 
-	/*
+	/**
-	Returned by <type> parameter of GetActiveUniform when the location
+	 Returned by &lt;type&gt; parameter of GetActiveUniform when the location
-	<index> for program object <program> is of type sampler2DRect:
+	 &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRect:
 	 */
 	int GL_SAMPLER_2D_RECT_ARB = 0x8B63;
 
-	/*
+	/**
-	Returned by <type> parameter of GetActiveUniform when the location
+	 Returned by &lt;type&gt; parameter of GetActiveUniform when the location
-	<index> for program object <program> is of type sampler2DRectShadow:
+	 &lt;index&gt; for program object &lt;program&gt; is of type sampler2DRectShadow:
 	 */
 	int GL_SAMPLER_2D_RECT_SHADOW_ARB = 0x8B64;
 

src/templates/org/lwjgl/opengl/ARB_transpose_matrix.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_transpose_matrix {
 	int GL_TRANSPOSE_MODELVIEW_MATRIX_ARB = 0x84E3;
 	int GL_TRANSPOSE_PROJECTION_MATRIX_ARB = 0x84E4;
@@ -43,6 +43,7 @@ public interface ARB_transpose_matrix {
 
 	@StripPostfix("pfMtx")
 	void glLoadTransposeMatrixfARB(@Check("16") @Const FloatBuffer pfMtx);
+
 	@StripPostfix("pfMtx")
 	void glMultTransposeMatrixfARB(@Check("16") @Const FloatBuffer pfMtx);
 }

src/templates/org/lwjgl/opengl/ARB_vertex_blend.java

@@ -31,16 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_vertex_blend {
+
 	int GL_MAX_VERTEX_UNITS_ARB = 0x86A4;
 	int GL_ACTIVE_VERTEX_UNITS_ARB = 0x86A5;
 	int GL_WEIGHT_SUM_UNITY_ARB = 0x86A6;
@@ -86,19 +82,25 @@ public interface ARB_vertex_blend {
 
 	@StripPostfix("pWeights")
 	void glWeightbvARB(@AutoSize("pWeights") int size, ByteBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightsvARB(@AutoSize("pWeights") int size, ShortBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightivARB(@AutoSize("pWeights") int size, IntBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightfvARB(@AutoSize("pWeights") int size, FloatBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightdvARB(@AutoSize("pWeights") int size, DoubleBuffer pWeights);
 
 	@StripPostfix("pWeights")
 	void glWeightubvARB(@AutoSize("pWeights") int size, @GLubyte ByteBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightusvARB(@AutoSize("pWeights") int size, @GLushort ShortBuffer pWeights);
+
 	@StripPostfix("pWeights")
 	void glWeightuivARB(@AutoSize("pWeights") int size, @GLuint IntBuffer pWeights);
 
@@ -114,8 +116,7 @@ public interface ARB_vertex_blend {
 	                        @GLint
 	                        @GLuint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer pPointer);
-			Buffer pPointer);
 
 	void glVertexBlendARB(int count);
 }

src/templates/org/lwjgl/opengl/ARB_vertex_buffer_object.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface ARB_vertex_buffer_object extends ARB_buffer_object {
-	/*
+
-	 * Accepted by the <target> parameters of BindBufferARB, BufferDataARB,
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBufferARB, BufferDataARB,
 	 * BufferSubDataARB, MapBufferARB, UnmapBufferARB,
 	 * GetBufferSubDataARB, GetBufferParameterivARB, and
 	 * GetBufferPointervARB:
@@ -41,8 +42,8 @@ public interface ARB_vertex_buffer_object extends ARB_buffer_object {
 	int GL_ARRAY_BUFFER_ARB = 0x8892;
 	int GL_ELEMENT_ARRAY_BUFFER_ARB = 0x8893;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_ARRAY_BUFFER_BINDING_ARB = 0x8894;
@@ -57,8 +58,8 @@ public interface ARB_vertex_buffer_object extends ARB_buffer_object {
 	int GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB = 0x889D;
 	int GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB = 0x889E;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetVertexAttribivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttribivARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB = 0x889F;
 }

src/templates/org/lwjgl/opengl/ARB_vertex_program.java

@@ -31,36 +31,33 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ARB_vertex_program extends ARB_program {
-	/*
+
-	* Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	/**
-	* <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, by the
-	* and by the <target> parameter of ProgramStringARB, BindProgramARB,
+	 * &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the &lt;target&gt; parameter of ProgramStringARB, BindProgramARB,
 	 * ProgramEnvParameter4[df][v]ARB, ProgramLocalParameter4[df][v]ARB,
 	 * GetProgramEnvParameter[df]vARB, GetProgramLocalParameter[df]vARB,
 	 * GetProgramivARB, and GetProgramStringARB.
 	 */
 	int GL_VERTEX_PROGRAM_ARB = 0x8620;
 
-	/*
+	/**
-	* Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and by
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, and by
-	* the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev:
 	 */
 	int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
 	int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
 	int GL_COLOR_SUM_ARB = 0x8458;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetVertexAttrib[dfi]vARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttrib[dfi]vARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
 	int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
@@ -69,21 +66,21 @@ public interface ARB_vertex_program extends ARB_program {
 	int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
 	int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttribPointervARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetProgramivARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramivARB:
 	 */
 	int GL_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B0;
 	int GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB = 0x88B1;
 	int GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B2;
 	int GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB = 0x88B3;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_VERTEX_ATTRIBS_ARB = 0x8869;
@@ -126,8 +123,7 @@ public interface ARB_vertex_program extends ARB_program {
 	                              @GLint
 	                              @GLuint
 	                              @GLfloat
-			@GLdouble
+	                              @GLdouble Buffer buffer);
-			Buffer buffer);
 
 	void glEnableVertexAttribArrayARB(@GLuint int index);
 
@@ -135,8 +131,10 @@ public interface ARB_vertex_program extends ARB_program {
 
 	@StripPostfix("params")
 	void glGetVertexAttribfvARB(@GLuint int index, @GLenum int pname, @Check FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetVertexAttribdvARB(@GLuint int index, @GLenum int pname, @Check DoubleBuffer params);
+
 	@StripPostfix("params")
 	void glGetVertexAttribivARB(@GLuint int index, @GLenum int pname, @Check IntBuffer params);
 

src/templates/org/lwjgl/opengl/ARB_vertex_shader.java

@@ -37,14 +37,14 @@ import java.nio.*;
 
 public interface ARB_vertex_shader {
 
-	/*
+	/**
-	 * Accepted by the <shaderType> argument of CreateShaderObjectARB and
+	 * Accepted by the &lt;shaderType&gt; argument of CreateShaderObjectARB and
-	 * returned by the <params> parameter of GetObjectParameter{if}vARB:
+	 * returned by the &lt;params&gt; parameter of GetObjectParameter{if}vARB:
 	 */
 	int GL_VERTEX_SHADER_ARB = 0x8B31;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB = 0x8B4A;
@@ -55,22 +55,22 @@ public interface ARB_vertex_shader {
 	int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB = 0x8B4D;
 	int GL_MAX_TEXTURE_COORDS_ARB = 0x8871;
 
-	/*
+	/**
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, and
-	 * by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev:
 	 */
 	int GL_VERTEX_PROGRAM_POINT_SIZE_ARB = 0x8642;
 	int GL_VERTEX_PROGRAM_TWO_SIDE_ARB = 0x8643;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter GetObjectParameter{if}vARB:
+	 * Accepted by the &lt;pname&gt; parameter GetObjectParameter{if}vARB:
 	 */
 	int GL_OBJECT_ACTIVE_ATTRIBUTES_ARB = 0x8B89;
 	int GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB = 0x8B8A;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttrib{dfi}vARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB = 0x8622;
 	int GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB = 0x8623;
@@ -79,13 +79,13 @@ public interface ARB_vertex_shader {
 	int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB = 0x886A;
 	int GL_CURRENT_VERTEX_ATTRIB_ARB = 0x8626;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttribPointervARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB = 0x8645;
 
-	/*
+	/**
-	 * Returned by the <type> parameter of GetActiveAttribARB:
+	 * Returned by the &lt;type&gt; parameter of GetActiveAttribARB:
 	 */
 	int GL_FLOAT = 0x1406;
 	int GL_FLOAT_VEC2_ARB = 0x8B50;

src/templates/org/lwjgl/opengl/ATI_draw_buffers.java

@@ -31,13 +31,14 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_draw_buffers {
-	/*
+
-	 * Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_MAX_DRAW_BUFFERS_ATI = 0x8824;

src/templates/org/lwjgl/opengl/ATI_element_array.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_element_array {
 	int GL_ELEMENT_ARRAY_ATI = 0x8768;
 	int GL_ELEMENT_ARRAY_TYPE_ATI = 0x8769;
@@ -47,8 +47,7 @@ public interface ATI_element_array {
 	                         @Const
 	                         @GLubyte
 	                         @GLushort
-			@GLuint
+	                         @GLuint Buffer pPointer);
-			Buffer pPointer);
 
 	void glDrawElementArrayATI(@GLenum int mode, @GLsizei int count);
 

src/templates/org/lwjgl/opengl/ATI_envmap_bumpmap.java

@@ -31,11 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_envmap_bumpmap {
 	int GL_BUMP_ROT_MATRIX_ATI = 0x8775;
 	int GL_BUMP_ROT_MATRIX_SIZE_ATI = 0x8776;
@@ -48,11 +47,13 @@ public interface ATI_envmap_bumpmap {
 
 	@StripPostfix("param")
 	void glTexBumpParameterfvATI(@GLenum int pname, @Check("4") @Const FloatBuffer param);
+
 	@StripPostfix("param")
 	void glTexBumpParameterivATI(@GLenum int pname, @Check("4") @Const IntBuffer param);
 
 	@StripPostfix("param")
 	void glGetTexBumpParameterfvATI(@GLenum int pname, @Check("4") FloatBuffer param);
+
 	@StripPostfix("param")
 	void glGetTexBumpParameterivATI(@GLenum int pname, @Check("4") IntBuffer param);
 }

src/templates/org/lwjgl/opengl/ATI_fragment_shader.java

@@ -29,18 +29,14 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/*
- * Note: 2X_BIT_ATI, 4X_BIT_ATI and 8X_BIT_ATI has been changed to X2_BIT_ATI, X4_BIT_ATI and X8_BIT_ATI
- * because variables cannot start with a number.
- *
- */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_fragment_shader {
+
 	int GL_FRAGMENT_SHADER_ATI = 0x8920;
 	int GL_REG_0_ATI = 0x8921;
 	int GL_REG_1_ATI = 0x8922;
@@ -135,9 +131,9 @@ public interface ATI_fragment_shader {
 	int GL_RED_BIT_ATI = 0x00000001;
 	int GL_GREEN_BIT_ATI = 0x00000002;
 	int GL_BLUE_BIT_ATI = 0x00000004;
-	int GL_X2_BIT_ATI = 0x00000001;
+	int GL_2X_BIT_ATI = 0x00000001;
-	int GL_X4_BIT_ATI = 0x00000002;
+	int GL_4X_BIT_ATI = 0x00000002;
-	int GL_X8_BIT_ATI = 0x00000004;
+	int GL_8X_BIT_ATI = 0x00000004;
 	int GL_HALF_BIT_ATI = 0x00000008;
 	int GL_QUARTER_BIT_ATI = 0x00000010;
 	int GL_EIGHTH_BIT_ATI = 0x00000020;
@@ -146,7 +142,8 @@ public interface ATI_fragment_shader {
 	int GL_NEGATE_BIT_ATI = 0x00000004;
 	int GL_BIAS_BIT_ATI = 0x00000008;
 
-	@GLuint int glGenFragmentShadersATI(@GLuint int range);
+	@GLuint
+	int glGenFragmentShadersATI(@GLuint int range);
 
 	void glBindFragmentShaderATI(@GLuint int id);
 

src/templates/org/lwjgl/opengl/ATI_map_object_buffer.java

@@ -31,11 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_map_object_buffer {
+
 	/**
 	 * glMapObjectBufferATI maps a gl object buffer to a ByteBuffer. The oldBuffer argument can be
 	 * null, in which case a new ByteBuffer will be created, pointing to the returned memory. If
@@ -50,7 +51,8 @@ public interface ATI_map_object_buffer {
 	 * @return A ByteBuffer representing the mapped object buffer memory.
 	 */
 	@CachedResult
-	@GLvoid ByteBuffer glMapObjectBufferATI(@GLuint int buffer);
+	@GLvoid
+	ByteBuffer glMapObjectBufferATI(@GLuint int buffer);
 
 	void glUnmapObjectBufferATI(@GLuint int buffer);
 

src/templates/org/lwjgl/opengl/ATI_texture_compression_3dc.java

@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="ATI", className="ATITextureCompression3DC")
+@Extension(postfix = "ATI", className = "ATITextureCompression3DC")
 public interface ATI_texture_compression_3dc {
 	int GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI = 0x8837;
 }

src/templates/org/lwjgl/opengl/ATI_texture_float.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface ATI_texture_float {
-	/*
+
-	 * Accepted by the <internalFormat> parameter of TexImage1D,
+	/**
+	 * Accepted by the &lt;internalFormat&gt; parameter of TexImage1D,
 	 * TexImage2D, and TexImage3D:
 	 */
 	int GL_RGBA_FLOAT32_ATI = 0x8814;

src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java

@@ -31,12 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_vertex_array_object {
 	int GL_STATIC_ATI = 0x8760;
 	int GL_DYNAMIC_ATI = 0x8761;
@@ -48,14 +46,14 @@ public interface ATI_vertex_array_object {
 	int GL_ARRAY_OBJECT_OFFSET_ATI = 0x8767;
 
 	@GenerateAutos
-	@GLuint int glNewObjectBufferATI(@AutoSize("pPointer") @GLsizei int size,
+	@GLuint
+	int glNewObjectBufferATI(@AutoSize("pPointer") @GLsizei int size,
 	                         @Const
 	                         @GLbyte
 	                         @GLshort
 	                         @GLint
 	                         @GLfloat
-			@GLdouble
+	                         @GLdouble Buffer pPointer, @GLenum int usage);
-			Buffer pPointer, @GLenum int usage);
 
 	boolean glIsObjectBufferATI(@GLuint int buffer);
 
@@ -65,11 +63,11 @@ public interface ATI_vertex_array_object {
 	                             @GLshort
 	                             @GLint
 	                             @GLfloat
-			@GLdouble
+	                             @GLdouble Buffer pPointer, @GLenum int preserve);
-			Buffer pPointer, @GLenum int preserve);
 
 	@StripPostfix("params")
 	void glGetObjectBufferfvATI(@GLuint int buffer, @GLenum int pname, @Check FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetObjectBufferivATI(@GLuint int buffer, @GLenum int pname, @Check IntBuffer params);
 
@@ -79,6 +77,7 @@ public interface ATI_vertex_array_object {
 
 	@StripPostfix("params")
 	void glGetArrayObjectfvATI(@GLenum int array, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetArrayObjectivATI(@GLenum int array, @GLenum int pname, @Check("4") IntBuffer params);
 
@@ -86,6 +85,7 @@ public interface ATI_vertex_array_object {
 
 	@StripPostfix("params")
 	void glGetVariantArrayObjectfvATI(@GLuint int id, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetVariantArrayObjectivATI(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params);
 }

src/templates/org/lwjgl/opengl/ATI_vertex_attrib_array_object.java

@@ -31,16 +31,16 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface ATI_vertex_attrib_array_object {
 	void glVertexAttribArrayObjectATI(@GLuint int index, int size, @GLenum int type, boolean normalized, @GLsizei int stride, @GLuint int buffer, @GLuint int offset);
 
 	@StripPostfix("params")
 	void glGetVertexAttribArrayObjectfvATI(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetVertexAttribArrayObjectivATI(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params);
 }

src/templates/org/lwjgl/opengl/EXT_bgra.java

@@ -31,11 +31,6 @@
  */
 package org.lwjgl.opengl;
 
-/**
- * EXT_bgra_constants
- *
- * @author cas
- */
 public interface EXT_bgra {
 	int GL_BGR_EXT = 0x80E0;
 	int GL_BGRA_EXT = 0x80E1;

src/templates/org/lwjgl/opengl/EXT_blend_equation_separate.java

@@ -34,8 +34,9 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface EXT_blend_equation_separate {
-	/*
+
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_BLEND_EQUATION_RGB_EXT = 0x8009;

src/templates/org/lwjgl/opengl/EXT_blend_subtract.java

@@ -31,11 +31,6 @@
  */
 package org.lwjgl.opengl;
 
-/**
- * EXT_blend_subtract constants
- *
- * @author cas
- */
 public interface EXT_blend_subtract {
 	int GL_FUNC_SUBTRACT_EXT = 0x800A;
 	int GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B;

src/templates/org/lwjgl/opengl/EXT_cg_shader.java

@@ -32,6 +32,7 @@
 package org.lwjgl.opengl;
 
 public interface EXT_cg_shader {
+
 	/**
 	 * You can pass GL_CG_VERTEX_SHADER_EXT to glCreateShaderARB instead of GL_VERTEX_SHADER_ARB to create a vertex shader object
 	 * that will parse and compile its shader source with the Cg compiler front-end rather than the GLSL front-end. Likewise, you

src/templates/org/lwjgl/opengl/EXT_depth_bounds_test.java

@@ -34,15 +34,16 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface EXT_depth_bounds_test {
-	/*
+
-	Accepted by the <cap> parameter of Enable, Disable, and IsEnabled,
+	/**
-	and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled,
+	 and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_DEPTH_BOUNDS_TEST_EXT = 0x8890;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_DEPTH_BOUNDS_EXT = 0x8891;

src/templates/org/lwjgl/opengl/EXT_draw_range_elements.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_draw_range_elements {
 	int GL_MAX_ELEMENTS_VERTICES_EXT = 0x80E8;
 	int GL_MAX_ELEMENTS_INDICES_EXT = 0x80E9;
@@ -44,6 +44,5 @@ public interface EXT_draw_range_elements {
 	                            @Const
 	                            @GLubyte
 	                            @GLushort
-			@GLuint
+	                            @GLuint Buffer pIndices);
-			Buffer pIndices);
 }

src/templates/org/lwjgl/opengl/EXT_fog_coord.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_fog_coord {
 	int GL_FOG_COORDINATE_SOURCE_EXT = 0x8450;
 	int GL_FOG_COORDINATE_EXT = 0x8451;
@@ -46,6 +46,7 @@ public interface EXT_fog_coord {
 	int GL_FOG_COORDINATE_ARRAY_EXT = 0x8457;
 
 	void glFogCoordfEXT(float coord);
+
 	void glFogCoorddEXT(double coord);
 
 	void glFogCoordPointerEXT(@AutoType("data") @GLenum int type, @GLsizei int stride,
@@ -54,6 +55,5 @@ public interface EXT_fog_coord {
 	                          @Check
 	                          @Const
 	                          @GLfloat
-			@GLdouble
+	                          @GLdouble Buffer data);
-			Buffer data);
 }

src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java

@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-import java.nio.IntBuffer;
+import java.nio.*;
 
 public interface EXT_framebuffer_object {
 
@@ -137,6 +137,7 @@ public interface EXT_framebuffer_object {
 	void glBindRenderbufferEXT(@GLenum int target, @GLuint int renderbuffer);
 
 	void glDeleteRenderbuffersEXT(@AutoSize("renderbuffers") int n, @Const @GLuint IntBuffer renderbuffers);
+
 	void glGenRenderbuffersEXT(@AutoSize("renderbuffers") int n, @GLuint IntBuffer renderbuffers);
 
 	void glRenderbufferStorageEXT(@GLenum int target, @GLenum int internalformat, @GLsizei int width, @GLsizei int height);
@@ -149,9 +150,11 @@ public interface EXT_framebuffer_object {
 	void glBindFramebufferEXT(@GLenum int target, @GLuint int framebuffer);
 
 	void glDeleteFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers);
+
 	void glGenFramebuffersEXT(@AutoSize("framebuffers") int n, @Const @GLuint IntBuffer framebuffers);
 
-	@GLenum int glCheckFramebufferStatusEXT(@GLenum int target);
+	@GLenum
+	int glCheckFramebufferStatusEXT(@GLenum int target);
 
 	void glFramebufferTexture1DEXT(@GLenum int target, @GLenum int attachment, @GLenum int textarget, @GLuint int texture, int level);
 

src/templates/org/lwjgl/opengl/EXT_multi_draw_arrays.java

@@ -31,12 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_multi_draw_arrays {
-	@Code(	"		if (piFirst.remaining() != piCount.remaining()) {\n" +
+	@Code("		if (piFirst.remaining() != piCount.remaining()) {\n" +
 	      "			throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" +
 	      "		}")
 	void glMultiDrawArraysEXT(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") int primcount);

src/templates/org/lwjgl/opengl/EXT_packed_depth_stencil.java

@@ -33,9 +33,35 @@ package org.lwjgl.opengl;
 
 public interface EXT_packed_depth_stencil {
 
+	/**
+	 Accepted by the <format> parameter of DrawPixels, ReadPixels,
+	 TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 TexSubImage3D, and GetTexImage, by the <type> parameter of
+	 CopyPixels, by the <internalformat> parameter of TexImage1D,
+	 TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 RenderbufferStorageEXT, and returned in the <data> parameter of
+	 GetTexLevelParameter and GetRenderbufferParameterivEXT.
+	 */
 	int GL_DEPTH_STENCIL_EXT = 0x84F9;
+
+	/**
+	 Accepted by the <type> parameter of DrawPixels, ReadPixels,
+	 TexImage1D, TexImage2D, TexImage3D, TexSubImage1D, TexSubImage2D,
+	 TexSubImage3D, and GetTexImage.
+	 */
 	int GL_UNSIGNED_INT_24_8_EXT = 0x84FA;
+
+	/**
+	 Accepted by the <internalformat> parameter of TexImage1D,
+	 TexImage2D, TexImage3D, CopyTexImage1D, CopyTexImage2D, and
+	 RenderbufferStorageEXT, and returned in the <data> parameter of
+	 GetTexLevelParameter and GetRenderbufferParameterivEXT.
+	 */
 	int GL_DEPTH24_STENCIL8_EXT = 0x88F0;
+
+	/**
+	 Accepted by the <value> parameter of GetTexLevelParameter.
+	 */
 	int GL_TEXTURE_STENCIL_SIZE_EXT = 0x88F1;
 
 }

src/templates/org/lwjgl/opengl/EXT_paletted_texture.java

@@ -36,7 +36,8 @@ import org.lwjgl.util.generator.*;
 import java.nio.*;
 
 public interface EXT_paletted_texture {
-	/*
+
+	/**
 	 * Accepted by the internalformat parameter of TexImage1D, TexImage2D and
 	 * TexImage3DEXT:
 	 */
@@ -47,7 +48,7 @@ public interface EXT_paletted_texture {
 	int GL_COLOR_INDEX12_EXT = 0x80E6;
 	int GL_COLOR_INDEX16_EXT = 0x80E7;
 
-	/*
+	/**
 	 * Accepted by the pname parameter of GetColorTableParameterivEXT and
 	 * GetColorTableParameterfvEXT:
 	 */
@@ -60,7 +61,7 @@ public interface EXT_paletted_texture {
 	int GL_COLOR_TABLE_LUMINANCE_SIZE_EXT = 0x80DE;
 	int GL_COLOR_TABLE_INTENSITY_SIZE_EXT = 0x80DF;
 
-	/*
+	/**
 	 * Accepted by the value parameter of GetTexLevelParameter{if}v:
 	 */
 	int GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED;
@@ -72,8 +73,7 @@ public interface EXT_paletted_texture {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer data);
-			Buffer data);
 
 	void glColorSubTableEXT(@GLenum int target, @GLsizei int start, @GLsizei int count, @GLenum int format, @GLenum int type,
 	                        @Check("GLChecks.calculateImageStorage(data, format, type, count, 1, 1)")
@@ -82,8 +82,7 @@ public interface EXT_paletted_texture {
 	                        @GLshort
 	                        @GLint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer data);
-			Buffer data);
 
 	void glGetColorTableEXT(@GLenum int target, @GLenum int format, @GLenum int type,
 	                        @Check
@@ -91,11 +90,11 @@ public interface EXT_paletted_texture {
 	                        @GLshort
 	                        @GLint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer data);
-			Buffer data);
 
 	@StripPostfix("params")
 	void glGetColorTableParameterivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetColorTableParameterfvEXT(@GLenum int target, @GLenum int pname, @Check("4") FloatBuffer params);
 }

src/templates/org/lwjgl/opengl/EXT_pixel_buffer_object.java

@@ -32,16 +32,17 @@
 package org.lwjgl.opengl;
 
 public interface EXT_pixel_buffer_object extends ARB_buffer_object {
-	/*
+
-	* Accepted by the <target> parameters of BindBuffer, BufferData,
+	/**
+	 * Accepted by the &lt;target&gt; parameters of BindBuffer, BufferData,
 	 * BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
 	 * GetBufferParameteriv, and GetBufferPointerv:
 	 */
 	int GL_PIXEL_PACK_BUFFER_EXT = 0x88EB;
 	int GL_PIXEL_UNPACK_BUFFER_EXT = 0x88EC;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int PIXEL_PACK_BUFFER_BINDING_EXT = 0x88ED;

src/templates/org/lwjgl/opengl/EXT_point_parameters.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_point_parameters {
 	int GL_POINT_SIZE_MIN_EXT = 0x8126;
 	int GL_POINT_SIZE_MAX_EXT = 0x8127;

src/templates/org/lwjgl/opengl/EXT_secondary_color.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_secondary_color {
 	int GL_COLOR_SUM_EXT = 0x8458;
 	int GL_CURRENT_SECONDARY_COLOR_EXT = 0x8459;
@@ -60,6 +60,5 @@ public interface EXT_secondary_color {
 	                                @GLbyte
 	                                @GLubyte
 	                                @GLfloat
-			@GLdouble
+	                                @GLdouble Buffer pPointer);
-			Buffer pPointer);
 }

src/templates/org/lwjgl/opengl/EXT_stencil_clear_tag.java

@@ -34,8 +34,19 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface EXT_stencil_clear_tag {
+
+	/**
+	 Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 GetFloatv, and GetDoublev.
+	 */
 	int GL_STENCIL_TAG_BITS_EXT = 0x88F2;
 	int GL_STENCIL_CLEAR_TAG_VALUE_EXT = 0x88F3;
 
+	/**
+	 Controls the stencil clear tag state. stencilTagBits is a count of
+	 the number of most-significant stencil buffer bits involved in the
+	 stencil clear tag update.
+	 */
 	void glStencilClearTagEXT(@GLsizei int stencilTagBits, @GLuint int stencilClearTag);
+
 }

src/templates/org/lwjgl/opengl/EXT_texture_compression_s3tc.java

@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="EXT", className="EXTTextureCompressionS3TC")
+@Extension(postfix = "EXT", className = "EXTTextureCompressionS3TC")
 public interface EXT_texture_compression_s3tc {
 	int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
 	int GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;

src/templates/org/lwjgl/opengl/EXT_texture_env_combine.java

@@ -31,7 +31,6 @@
  */
 package org.lwjgl.opengl;
 
-/** Insert the type's description here. Creation date: (22/02/00 01:26:05) */
 public interface EXT_texture_env_combine {
 	int GL_COMBINE_EXT = 0x8570;
 	int GL_COMBINE_RGB_EXT = 0x8571;

src/templates/org/lwjgl/opengl/EXT_texture_lod_bias.java

@@ -33,7 +33,7 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="EXT", className="EXTTextureLODBias")
+@Extension(postfix = "EXT", className = "EXTTextureLODBias")
 public interface EXT_texture_lod_bias {
 	int GL_TEXTURE_FILTER_CONTROL_EXT = 0x8500;
 	int GL_TEXTURE_LOD_BIAS_EXT = 0x8501;

src/templates/org/lwjgl/opengl/EXT_texture_mirror_clamp.java

@@ -32,10 +32,11 @@
 package org.lwjgl.opengl;
 
 public interface EXT_texture_mirror_clamp {
-	/*
+
-	 * Accepted by the <param> parameter of TexParameteri and TexParameterf,
+	/**
-	 * and by the <params> parameter of TexParameteriv and TexParameterfv,
+	 * Accepted by the &lt;param&gt; parameter of TexParameteri and TexParameterf,
-	 * when their <pname> parameter is TEXTURE_WRAP_S, TEXTURE_WRAP_T,
+	 * and by the &lt;params&gt; parameter of TexParameteriv and TexParameterfv,
+	 * when their &lt;pname&gt; parameter is TEXTURE_WRAP_S, TEXTURE_WRAP_T,
 	 * or TEXTURE_WRAP_R:
 	 */
 	int GL_MIRROR_CLAMP_EXT = 0x8742;

src/templates/org/lwjgl/opengl/EXT_texture_sRGB.java

@@ -31,9 +31,12 @@
  */
 package org.lwjgl.opengl;
 
-import org.lwjgl.util.generator.*;
-
 public interface EXT_texture_sRGB {
+
+	/**
+	 Accepted by the <internalformat> parameter of TexImage1D, TexImage2D,
+	 TexImage3D, CopyTexImage1D, CopyTexImage2D.
+	 */
 	int GL_SRGB_EXT = 0x8C40;
 	int GL_SRGB8_EXT = 0x8C41;
 	int GL_SRGB_ALPHA_EXT = 0x8C42;
@@ -47,6 +50,11 @@ public interface EXT_texture_sRGB {
 	int GL_COMPRESSED_SLUMINANCE_EXT = 0x8C4A;
 	int GL_COMPRESSED_SLUMINANCE_ALPHA_EXT = 0x8C4B;
 
+	/**
+	 Accepted by the <internalformat> parameter of TexImage2D,
+	 CopyTexImage2D, and CompressedTexImage2DARB and the <format> parameter
+	 of CompressedTexSubImage2DARB.
+	 */
 	int GL_COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C;
 	int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D;
 	int GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E;

src/templates/org/lwjgl/opengl/EXT_vertex_shader.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.*;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_vertex_shader {
 	int GL_VERTEX_SHADER_EXT = 0x8780;
 	int GL_VERTEX_SHADER_BINDING_EXT = 0x8781;
@@ -153,7 +153,8 @@ public interface EXT_vertex_shader {
 
 	void glBindVertexShaderEXT(@GLuint int id);
 
-	@GLuint int glGenVertexShadersEXT(@GLuint int range);
+	@GLuint
+	int glGenVertexShadersEXT(@GLuint int range);
 
 	void glDeleteVertexShaderEXT(@GLuint int id);
 
@@ -171,7 +172,8 @@ public interface EXT_vertex_shader {
 
 	void glExtractComponentEXT(@GLuint int res, @GLuint int src, @GLuint int num);
 
-	@GLuint int glGenSymbolsEXT(@GLenum int dataType, @GLenum int storageType, @GLenum int range, @GLuint int components);
+	@GLuint
+	int glGenSymbolsEXT(@GLenum int dataType, @GLenum int storageType, @GLenum int range, @GLuint int components);
 
 	void glSetInvariantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type,
 	                       @Check("4")
@@ -183,8 +185,7 @@ public interface EXT_vertex_shader {
 	                       @GLint
 	                       @GLuint
 	                       @GLfloat
-			@GLdouble
+	                       @GLdouble Buffer pAddr);
-			Buffer pAddr);
 
 	void glSetLocalConstantEXT(@GLuint int id, @AutoType("pAddr") @GLenum int type,
 	                           @Check("4")
@@ -196,24 +197,29 @@ public interface EXT_vertex_shader {
 	                           @GLint
 	                           @GLuint
 	                           @GLfloat
-			@GLdouble
+	                           @GLdouble Buffer pAddr);
-			Buffer pAddr);
 
 	@StripPostfix("pAddr")
 	void glVariantbvEXT(@GLuint int id, @Check("4") @Const ByteBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantsvEXT(@GLuint int id, @Check("4") @Const ShortBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantivEXT(@GLuint int id, @Check("4") @Const IntBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantfvEXT(@GLuint int id, @Check("4") @Const FloatBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantdvEXT(@GLuint int id, @Check("4") @Const DoubleBuffer pAddr);
 
 	@StripPostfix("pAddr")
 	void glVariantubvEXT(@GLuint int id, @Check("4") @Const @GLubyte ByteBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantusvEXT(@GLuint int id, @Check("4") @Const @GLushort ShortBuffer pAddr);
+
 	@StripPostfix("pAddr")
 	void glVariantuivEXT(@GLuint int id, @Check("4") @Const @GLuint IntBuffer pAddr);
 
@@ -229,45 +235,56 @@ public interface EXT_vertex_shader {
 	                         @GLushort
 	                         @GLuint
 	                         @GLfloat
-			@GLdouble
+	                         @GLdouble Buffer pAddr);
-			Buffer pAddr);
 
 	void glEnableVariantClientStateEXT(@GLuint int id);
 
 	void glDisableVariantClientStateEXT(@GLuint int id);
 
-	@GLuint int glBindLightParameterEXT(@GLenum int light, @GLenum int value);
+	@GLuint
+	int glBindLightParameterEXT(@GLenum int light, @GLenum int value);
 
-	@GLuint int glBindMaterialParameterEXT(@GLenum int face, @GLenum int value);
+	@GLuint
+	int glBindMaterialParameterEXT(@GLenum int face, @GLenum int value);
 
-	@GLuint int glBindTexGenParameterEXT(@GLenum int unit, @GLenum int coord, @GLenum int value);
+	@GLuint
+	int glBindTexGenParameterEXT(@GLenum int unit, @GLenum int coord, @GLenum int value);
 
-	@GLuint int glBindTextureUnitParameterEXT(@GLenum int unit, @GLenum int value);
+	@GLuint
+	int glBindTextureUnitParameterEXT(@GLenum int unit, @GLenum int value);
 
-	@GLuint int glBindParameterEXT(@GLenum int value);
+	@GLuint
+	int glBindParameterEXT(@GLenum int value);
 
 	boolean glIsVariantEnabledEXT(@GLuint int id, @GLenum int cap);
 
 	@StripPostfix("pbData")
 	void glGetVariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetVariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetVariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetVariantPointervEXT(@GLuint int id, @GLenum int value, @Result @GLvoid ByteBuffer pbData);
 
 	@StripPostfix("pbData")
 	void glGetInvariantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetInvariantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetInvariantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData);
 
 	@StripPostfix("pbData")
 	void glGetLocalConstantBooleanvEXT(@GLuint int id, @GLenum int value, @Check("4") ByteBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetLocalConstantIntegervEXT(@GLuint int id, @GLenum int value, @Check("4") IntBuffer pbData);
+
 	@StripPostfix("pbData")
 	void glGetLocalConstantFloatvEXT(@GLuint int id, @GLenum int value, @Check("4") FloatBuffer pbData);
 }

src/templates/org/lwjgl/opengl/EXT_vertex_weighting.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface EXT_vertex_weighting {
 	int GL_MODELVIEW0_STACK_DEPTH_EXT = 0x0BA3;
 	int GL_MODELVIEW1_STACK_DEPTH_EXT = 0x8502;
@@ -57,6 +57,5 @@ public interface EXT_vertex_weighting {
 	                              @BufferObject(BufferKind.ArrayVBO)
 	                              @Check
 	                              @Const
-			@GLfloat
+	                              @GLfloat Buffer pPointer);
-			Buffer pPointer);
 }

src/templates/org/lwjgl/opengl/GL11.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.*;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 /**
  * $Id$
  *
@@ -715,42 +715,55 @@ public interface GL11 {
 	int GL_TEXTURE_COMPONENTS = GL_TEXTURE_INTERNAL_FORMAT;
 
 	void glAccum(@GLenum int op, float value);
+
 	void glAlphaFunc(@GLenum int func, @GLclampf float ref);
+
 	void glClearColor(@GLclampf float red, @GLclampf float green, @GLclampf float blue, @GLclampf float alpha);
+
 	void glClearAccum(float red, float green, float blue, float alpha);
+
 	void glClear(@GLbitfield int mask);
 
 	void glCallLists(@AutoSize("lists") @GLsizei int n, @AutoType("lists") @GLenum int type,
 	                 @Const
 	                 @GLubyte
 	                 @GLushort
-			@GLuint
+	                 @GLuint Buffer lists);
-			Buffer lists);
 
 	void glCallList(@GLuint int list);
+
 	void glBlendFunc(@GLenum int sfactor, @GLenum int dfactor);
 
 	void glBitmap(@GLsizei int width, @GLsizei int height, float xorig, float yorig, float xmove, float ymove,
 	              @BufferObject(BufferKind.UnpackPBO)
 	              @Check("(((width + 7)/8)*height)")
 	              @Const
-			@GLubyte
+	              @GLubyte ByteBuffer bitmap);
-			ByteBuffer bitmap);
 
 	void glBindTexture(@GLenum int target, @GLuint int texture);
+
 	void glBegin(@GLenum int mode);
+
 	void glEnd();
+
 	void glArrayElement(int i);
+
 	void glClearDepth(@GLclampd double depth);
+
 	void glDeleteLists(@GLuint int list, @GLsizei int range);
 
 	void glDeleteTextures(@AutoSize("textures") @GLsizei int n, @Const @GLuint IntBuffer textures);
 
 	void glCullFace(@GLenum int mode);
+
 	void glCopyTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, int x, int y, @GLsizei int width, @GLsizei int height);
+
 	void glCopyTexSubImage1D(@GLenum int target, int level, int xoffset, int x, int y, @GLsizei int width);
+
 	void glCopyTexImage2D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, @GLsizei int height, int border);
+
 	void glCopyTexImage1D(@GLenum int target, int level, int internalFormat, int x, int y, @GLsizei int width, int border);
+
 	void glCopyPixels(int x, int y, int width, int height, int type);
 
 	void glColorPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride,
@@ -761,91 +774,121 @@ public interface GL11 {
 	                    @GLfloat
 	                    @GLdouble
 	                    @GLubyte
-			@GLbyte
+	                    @GLbyte Buffer pointer);
-			Buffer pointer);
 
 	void glColorMaterial(@GLenum int face, @GLenum int mode);
+
 	void glColorMask(boolean red, boolean green, boolean blue, boolean alpha);
+
 	void glColor3b(byte red, byte green, byte blue);
+
 	void glColor3f(float red, float green, float blue);
+
 	void glColor3d(double red, double green, double blue);
+
 	void glColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue);
+
 	void glColor4b(byte red, byte green, byte blue, byte alpha);
+
 	void glColor4f(float red, float green, float blue, float alpha);
+
 	void glColor4d(double red, double green, double blue, double alpha);
+
 	void glColor4ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue, @GLubyte byte alpha);
 
 	void glClipPlane(@GLenum int plane, @Check("4") @Const DoubleBuffer equation);
 
 	void glClearStencil(int s);
+
 	// This function is only used in indexed color mode
 //	void glClearIndex(float c);
 	void glEvalPoint1(int i);
+
 	void glEvalPoint2(int i, int j);
+
 	void glEvalMesh1(@GLenum int mode, int i1, int i2);
+
 	void glEvalMesh2(@GLenum int mode, int i1, int i2, int j1, int j2);
+
 	void glEvalCoord1f(float u);
+
 	void glEvalCoord1d(double u);
+
 	void glEvalCoord2f(float u, float v);
+
 	void glEvalCoord2d(double u, double v);
+
 	void glEnableClientState(@GLenum int cap);
+
 	void glDisableClientState(@GLenum int cap);
+
 	void glEnable(@GLenum int cap);
+
 	void glDisable(@GLenum int cap);
+
 	void glEdgeFlagPointer(int stride,
 	                       @CachedReference
 	                       @BufferObject(BufferKind.ArrayVBO)
 	                       @Check
 	                       @Const
-			@GLbyte
+	                       @GLbyte Buffer pointer);
-			Buffer pointer);
 
 	void glEdgeFlag(boolean flag);
+
 	void glDrawPixels(@GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type,
 	                  @Check("GLChecks.calculateImageStorage(pixels, format, type, width, height, 1)")
 	                  @BufferObject(BufferKind.UnpackPBO)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort
-			@GLint
+	                  @GLint Buffer pixels);
-			Buffer pixels);
 
 	void glDrawElements(@GLenum int mode, @AutoSize("indices") @GLsizei int count, @AutoType("indices") @GLenum int type,
 	                    @BufferObject(BufferKind.ElementVBO)
 	                    @Const
 	                    @GLubyte
 	                    @GLushort
-			@GLuint
+	                    @GLuint Buffer indices);
-			Buffer indices);
 
 	void glDrawBuffer(@GLenum int mode);
+
 	void glDrawArrays(@GLenum int mode, int first, @GLsizei int count);
+
 	void glDepthRange(@GLclampd double zNear, @GLclampd double zFar);
+
 	void glDepthMask(boolean flag);
+
 	void glDepthFunc(@GLenum int func);
 
 	void glFeedbackBuffer(@AutoSize("buffer") @GLsizei int size, @GLenum int type, FloatBuffer buffer);
 
 	@StripPostfix("values")
 	void glGetPixelMapfv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) FloatBuffer values);
+
 	@StripPostfix("values")
 	void glGetPixelMapuiv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLuint IntBuffer values);
+
 	@StripPostfix("values")
 	void glGetPixelMapusv(@GLenum int map, @Check("256") @BufferObject(BufferKind.PackPBO) @GLushort ShortBuffer values);
+
 	@StripPostfix("params")
 	void glGetMaterialfv(@GLenum int face, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@StripPostfix("v")
 	void glGetMapfv(@GLenum int target, @GLenum int query, @Check("256") FloatBuffer v);
+
 	@StripPostfix("v")
 	void glGetMapdv(@GLenum int target, @GLenum int query, @Check("256") DoubleBuffer v);
+
 	@StripPostfix("v")
 	void glGetMapiv(@GLenum int target, @GLenum int query, @Check("256") IntBuffer v);
 
 	@StripPostfix("params")
 	void glGetLightfv(@GLenum int light, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetLightiv(@GLenum int light, @GLenum int pname, @Check("4") IntBuffer params);
 
@@ -867,10 +910,15 @@ public interface GL11 {
 
 	void glGenTextures(@AutoSize("textures") @GLsizei int n, @GLuint IntBuffer textures);
 
-	@GLuint int glGenLists(@GLsizei int range);
+	@GLuint
+	int glGenLists(@GLsizei int range);
+
 	void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar);
+
 	void glFrontFace(@GLenum int mode);
+
 	void glFogf(@GLenum int pname, float param);
+
 	void glFogi(@GLenum int pname, int param);
 
 	@StripPostfix("params")
@@ -880,10 +928,12 @@ public interface GL11 {
 	void glFogiv(@GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	void glFlush();
+
 	void glFinish();
 
 	@StripPostfix("result")
 	void glGetPointerv(@GLenum int pname, @Result @GLvoid ByteBuffer result);
+
 	boolean glIsEnabled(@GLenum int cap);
 
 	void glInterleavedArrays(@GLenum int format, @GLsizei int stride,
@@ -894,10 +944,10 @@ public interface GL11 {
 	                         @GLshort
 	                         @GLint
 	                         @GLfloat
-			@GLdouble
+	                         @GLdouble Buffer pointer);
-			Buffer pointer);
 
 	void glInitNames();
+
 	void glHint(@GLenum int target, @GLenum int mode);
 
 	@StripPostfix("params")
@@ -919,8 +969,7 @@ public interface GL11 {
 	                   @GLshort
 	                   @GLint
 	                   @GLfloat
-			@GLdouble
+	                   @GLdouble Buffer pixels);
-			Buffer pixels);
 
 	@StripPostfix("params")
 	void glGetTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params);
@@ -933,6 +982,7 @@ public interface GL11 {
 
 	@StripPostfix("params")
 	void glGetTexEnviv(@GLenum int coord, @GLenum int pname, @Check("4") IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetTexEnvfv(@GLenum int coord, @GLenum int pname, @Check("4") FloatBuffer params);
 
@@ -942,7 +992,9 @@ public interface GL11 {
 	void glGetPolygonStipple(@BufferObject(BufferKind.PackPBO) @Check("1024") @GLubyte ByteBuffer mask);
 
 	boolean glIsList(@GLuint int list);
+
 	void glMaterialf(@GLenum int face, @GLenum int pname, float param);
+
 	void glMateriali(@GLenum int face, @GLenum int pname, int param);
 
 	@StripPostfix("params")
@@ -952,18 +1004,25 @@ public interface GL11 {
 	void glMaterialiv(@GLenum int face, @GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	void glMapGrid1f(int un, float u1, float u2);
+
 	void glMapGrid1d(int un, double u1, double u2);
+
 	void glMapGrid2f(int un, float u1, float u2, int vn, float v1, float v2);
+
 	void glMapGrid2d(int un, double u1, double u2, int vn, double v1, double v2);
 
 	// TODO: check buffer size valid
 	void glMap2f(@GLenum int target, float u1, float u2, int ustride, int uorder, float v1, float v2, int vstride, int vorder, @Check @Const FloatBuffer points);
+
 	void glMap2d(@GLenum int target, double u1, double u2, int ustride, int uorder, double v1, double v2, int vstride, int vorder, @Check @Const DoubleBuffer points);
+
 	// TODO: check buffer size valid
 	void glMap1f(@GLenum int target, float u1, float u2, int stride, int order, @Check @Const FloatBuffer points);
+
 	void glMap1d(@GLenum int target, double u1, double u2, int stride, int order, @Check @Const DoubleBuffer points);
 
 	void glLogicOp(@GLenum int opcode);
+
 	void glLoadName(@GLuint int name);
 
 	@StripPostfix("m")
@@ -973,10 +1032,15 @@ public interface GL11 {
 	void glLoadMatrixd(@Check("16") @Const DoubleBuffer m);
 
 	void glLoadIdentity();
+
 	void glListBase(@GLuint int base);
+
 	void glLineWidth(float width);
+
 	void glLineStipple(int factor, @GLushort short pattern);
+
 	void glLightModelf(@GLenum int pname, float param);
+
 	void glLightModeli(@GLenum int pname, int param);
 
 	@StripPostfix("params")
@@ -984,35 +1048,50 @@ public interface GL11 {
 
 	@StripPostfix("params")
 	void glLightModeliv(@GLenum int pname, @Check("4") @Const IntBuffer params);
+
 	void glLightf(@GLenum int light, @GLenum int pname, float param);
+
 	void glLighti(@GLenum int light, @GLenum int pname, int param);
 
 	@StripPostfix("params")
 	void glLightfv(@GLenum int light, @GLenum int pname, @Check("4") @Const FloatBuffer params);
+
 	@StripPostfix("params")
 	void glLightiv(@GLenum int light, @GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	boolean glIsTexture(@GLuint int texture);
+
 	void glMatrixMode(@GLenum int mode);
+
 	void glPolygonStipple(@BufferObject(BufferKind.UnpackPBO) @Check("1024") @Const @GLubyte ByteBuffer mask);
 
 	void glPolygonOffset(float factor, float units);
+
 	void glPolygonMode(@GLenum int face, @GLenum int mode);
+
 	void glPointSize(float size);
+
 	void glPixelZoom(float xfactor, float yfactor);
+
 	void glPixelTransferf(@GLenum int pname, float param);
+
 	void glPixelTransferi(@GLenum int pname, int param);
+
 	void glPixelStoref(@GLenum int pname, float param);
+
 	void glPixelStorei(@GLenum int pname, int param);
 
 	@StripPostfix("values")
 	void glPixelMapfv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const FloatBuffer values);
+
 	@StripPostfix("values")
 	void glPixelMapuiv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLuint IntBuffer values);
+
 	@StripPostfix("values")
 	void glPixelMapusv(@GLenum int map, @AutoSize("values") @GLsizei int mapsize, @BufferObject(BufferKind.UnpackPBO) @Const @GLushort ShortBuffer values);
 
 	void glPassThrough(float token);
+
 	void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar);
 
 	void glNormalPointer(@AutoType("pointer") @GLenum int type, @GLsizei int stride,
@@ -1023,14 +1102,18 @@ public interface GL11 {
 	                     @GLint
 	                     @GLbyte
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer pointer);
-			Buffer pointer);
 
 	void glNormal3b(byte nx, byte ny, byte nz);
+
 	void glNormal3f(float nx, float ny, float nz);
+
 	void glNormal3d(double nx, double ny, double nz);
+
 	void glNormal3i(int nx, int ny, int nz);
+
 	void glNewList(@GLuint int list, @GLenum int mode);
+
 	void glEndList();
 
 	@StripPostfix("m")
@@ -1044,12 +1127,19 @@ public interface GL11 {
 	void glSelectBuffer(@AutoSize("buffer") @GLsizei int size, @CachedReference @GLuint IntBuffer buffer);
 
 	void glScissor(int x, int y, @GLsizei int width, @GLsizei int height);
+
 	void glScalef(float x, float y, float z);
+
 	void glScaled(double x, double y, double z);
+
 	void glRotatef(float angle, float x, float y, float z);
+
 	int glRenderMode(@GLenum int mode);
+
 	void glRectf(float x1, float y1, float x2, float y2);
+
 	void glRectd(double x1, double y1, double x2, double y2);
+
 	void glRecti(int x1, int y1, int x2, int y2);
 
 	void glReadPixels(int x, int y, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type,
@@ -1059,32 +1149,46 @@ public interface GL11 {
 	                  @GLshort
 	                  @GLint
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer pixels);
-			Buffer pixels);
 
 	void glReadBuffer(@GLenum int mode);
+
 	void glRasterPos2f(float x, float y);
+
 	void glRasterPos2d(double x, double y);
+
 	void glRasterPos2i(int x, int y);
+
 	void glRasterPos3f(float x, float y, float z);
+
 	void glRasterPos3d(double x, double y, double z);
+
 	void glRasterPos3i(int x, int y, int z);
+
 	void glRasterPos4f(float x, float y, float z, float w);
+
 	void glRasterPos4d(double x, double y, double z, double w);
+
 	void glRasterPos4i(int x, int y, int z, int w);
+
 	void glPushName(@GLuint int name);
+
 	void glPopName();
+
 	void glPushMatrix();
+
 	void glPopMatrix();
 
-	@Code(	"		StateTracker.pushAttrib(mask);")
+	@Code("		StateTracker.pushAttrib(mask);")
 	void glPushClientAttrib(@GLbitfield int mask);
 
-	@Code(	"		StateTracker.popAttrib();")
+	@Code("		StateTracker.popAttrib();")
 	void glPopClientAttrib();
 
 	void glPushAttrib(@GLbitfield int mask);
+
 	void glPopAttrib();
+
 	void glStencilFunc(@GLenum int func, int ref, @GLuint int mask);
 
 	void glVertexPointer(int size, @AutoType("pointer") @GLenum int type, @GLsizei int stride,
@@ -1094,42 +1198,50 @@ public interface GL11 {
 	                     @Const
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer pointer);
-			Buffer pointer);
 
 	void glVertex2f(float x, float y);
+
 	void glVertex2d(double x, double y);
+
 	void glVertex2i(int x, int y);
+
 	void glVertex3f(float x, float y, float z);
+
 	void glVertex3d(double x, double y, double z);
+
 	void glVertex3i(int x, int y, int z);
+
 	void glVertex4f(float x, float y, float z, float w);
+
 	void glVertex4d(double x, double y, double z, double w);
+
 	void glVertex4i(int x, int y, int z, int w);
+
 	void glTranslatef(float x, float y, float z);
+
 	void glTranslated(double x, double y, double z);
 
 	void glTexImage1D(@GLenum int target, int level, int internalformat, @GLsizei int width, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-			@Check(value="GLChecks.calculateTexImage1DStorage(pixels, format, type, width, border)", canBeNull=true)
+	                  @Check(value = "GLChecks.calculateTexImage1DStorage(pixels, format, type, width, border)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort
 	                  @GLint
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer pixels);
-			Buffer pixels);
 
 	void glTexImage2D(@GLenum int target, int level, int internalformat, int width, int height, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-			@Check(value="GLChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)", canBeNull=true)
+	                  @Check(value = "GLChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort
 	                  @GLint
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer pixels);
-			Buffer pixels);
+
 	void glTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLenum int type,
 	                     @BufferObject(BufferKind.UnpackPBO)
 	                     @Check("GLChecks.calculateImageStorage(pixels, format, type, width, 1, 1)")
@@ -1138,8 +1250,8 @@ public interface GL11 {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer pixels);
-			Buffer pixels);
+
 	void glTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLenum int type,
 	                     @BufferObject(BufferKind.UnpackPBO)
 	                     @Check("GLChecks.calculateImageStorage(pixels, format, type, width, height, 1)")
@@ -1148,18 +1260,20 @@ public interface GL11 {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer pixels);
-			Buffer pixels);
 
 	void glTexParameterf(@GLenum int target, @GLenum int pname, float param);
+
 	void glTexParameteri(@GLenum int target, @GLenum int pname, int param);
 
 	@StripPostfix("param")
 	void glTexParameterfv(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer param);
+
 	@StripPostfix("param")
 	void glTexParameteriv(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer param);
 
 	void glTexGenf(@GLenum int coord, @GLenum int pname, float param);
+
 	void glTexGend(@GLenum int coord, @GLenum int pname, double param);
 
 	@StripPostfix("params")
@@ -1174,6 +1288,7 @@ public interface GL11 {
 	void glTexGeniv(@GLenum int coord, @GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	void glTexEnvf(@GLenum int target, @GLenum int pname, float param);
+
 	void glTexEnvi(@GLenum int target, @GLenum int pname, int param);
 
 	@StripPostfix("params")
@@ -1188,18 +1303,27 @@ public interface GL11 {
 	                       @Check
 	                       @Const
 	                       @GLfloat
-			@GLdouble
+	                       @GLdouble Buffer pointer);
-			Buffer pointer);
 
 	void glTexCoord1f(float s);
+
 	void glTexCoord1d(double s);
+
 	void glTexCoord2f(float s, float t);
+
 	void glTexCoord2d(double s, double t);
+
 	void glTexCoord3f(float s, float t, float r);
+
 	void glTexCoord3d(double s, double t, double r);
+
 	void glTexCoord4f(float s, float t, float r, float q);
+
 	void glTexCoord4d(double s, double t, double r, double q);
+
 	void glStencilOp(@GLenum int fail, @GLenum int zfail, @GLenum int zpass);
+
 	void glStencilMask(@GLuint int mask);
+
 	void glViewport(int x, int y, @GLsizei int width, @GLsizei int height);
 }

src/templates/org/lwjgl/opengl/GL12.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 /**
  * $Id$
  * <p/>
@@ -88,25 +88,22 @@ public interface GL12 {
 
 	void glDrawRangeElements(@GLenum int mode, @GLuint int start, @GLuint int end, @AutoSize("indices") @GLsizei int count,
 	                         @AutoType("indices")
-			@GLenum
+	                         @GLenum int type,
-			int type,
 	                         @BufferObject(BufferKind.ElementVBO)
 	                         @Const
 	                         @GLubyte
 	                         @GLushort
-			@GLuint
+	                         @GLuint Buffer indices);
-			Buffer indices);
 
 	void glTexImage3D(@GLenum int target, int level, int internalFormat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLenum int format, @GLenum int type,
 	                  @BufferObject(BufferKind.UnpackPBO)
-			@Check(value="GLChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)", canBeNull=true)
+	                  @Check(value = "GLChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)", canBeNull = true)
 	                  @Const
 	                  @GLbyte
 	                  @GLshort
 	                  @GLint
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer pixels);
-			Buffer pixels);
 
 	void glTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLenum int type,
 	                     @BufferObject(BufferKind.UnpackPBO)
@@ -116,8 +113,8 @@ public interface GL12 {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer pixels);
-			Buffer pixels);
+
 	void glCopyTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, @GLsizei int width, @GLsizei int height);
 }
 

src/templates/org/lwjgl/opengl/GL13.java

@@ -31,12 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 /**
  * $Id$
  * <p/>
@@ -151,6 +149,7 @@ public interface GL13 {
 	void glActiveTexture(@GLenum int texture);
 
 	void glClientActiveTexture(@GLenum int texture);
+
 	void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize,
 	                            @BufferObject(BufferKind.UnpackPBO)
 	                            @Check
@@ -159,8 +158,7 @@ public interface GL13 {
 	                            @GLshort
 	                            @GLint
 	                            @GLfloat
-			@GLdouble
+	                            @GLdouble Buffer data);
-			Buffer data);
 
 	void glCompressedTexImage2D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize,
 	                            @BufferObject(BufferKind.UnpackPBO)
@@ -170,8 +168,7 @@ public interface GL13 {
 	                            @GLshort
 	                            @GLint
 	                            @GLfloat
-			@GLdouble
+	                            @GLdouble Buffer data);
-			Buffer data);
 
 	void glCompressedTexImage3D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize,
 	                            @BufferObject(BufferKind.UnpackPBO)
@@ -181,8 +178,7 @@ public interface GL13 {
 	                            @GLshort
 	                            @GLint
 	                            @GLfloat
-			@GLdouble
+	                            @GLdouble Buffer data);
-			Buffer data);
 
 	void glCompressedTexSubImage1D(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize,
 	                               @BufferObject(BufferKind.UnpackPBO)
@@ -192,8 +188,7 @@ public interface GL13 {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-			@GLdouble
+	                               @GLdouble Buffer data);
-			Buffer data);
 
 	void glCompressedTexSubImage2D(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize,
 	                               @BufferObject(BufferKind.UnpackPBO)
@@ -203,8 +198,7 @@ public interface GL13 {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-			@GLdouble
+	                               @GLdouble Buffer data);
-			Buffer data);
 
 	void glCompressedTexSubImage3D(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize,
 	                               @BufferObject(BufferKind.UnpackPBO)
@@ -214,8 +208,7 @@ public interface GL13 {
 	                               @GLshort
 	                               @GLint
 	                               @GLfloat
-			@GLdouble
+	                               @GLdouble Buffer data);
-			Buffer data);
 
 	// TODO: check buffer size valid
 	void glGetCompressedTexImage(@GLenum int target, int lod,
@@ -223,8 +216,7 @@ public interface GL13 {
 	                             @Check
 	                             @GLbyte
 	                             @GLshort
-			@GLint
+	                             @GLint Buffer img);
-			Buffer img);
 
 	void glMultiTexCoord1f(@GLenum int target, float s);
 

src/templates/org/lwjgl/opengl/GL14.java

@@ -31,12 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 /**
  * $Id$
  * <p/>
@@ -100,10 +98,9 @@ public interface GL14 {
 	                       @Check
 	                       @Const
 	                       @GLfloat
-			@GLdouble
+	                       @GLdouble Buffer data);
-			Buffer data);
 
-	@Code(	"		if (piFirst.remaining() != piCount.remaining()) {\n" +
+	@Code("		if (piFirst.remaining() != piCount.remaining()) {\n" +
 	      "			throw new IllegalArgumentException(\"piFirst.remaining() != piCount.remaining()\");\n" +
 	      "		}")
 	void glMultiDrawArrays(@GLenum int mode, IntBuffer piFirst, @Check @GLsizei IntBuffer piCount, @AutoSize("piFirst") @GLsizei int primcount);
@@ -111,15 +108,21 @@ public interface GL14 {
 	//void glMultiDrawElements(int mode, int piCount, int type, int pIndices, int primcount);
 
 	void glPointParameteri(@GLenum int pname, int param);
+
 	void glPointParameterf(@GLenum int pname, float param);
+
 	@StripPostfix("params")
 	void glPointParameteriv(@GLenum int pname, @Check("4") @Const IntBuffer params);
+
 	@StripPostfix("params")
 	void glPointParameterfv(@GLenum int pname, @Check("4") @Const FloatBuffer params);
 
 	void glSecondaryColor3b(byte red, byte green, byte blue);
+
 	void glSecondaryColor3f(float red, float green, float blue);
+
 	void glSecondaryColor3d(double red, double green, double blue);
+
 	void glSecondaryColor3ub(@GLubyte byte red, @GLubyte byte green, @GLubyte byte blue);
 
 	void glSecondaryColorPointer(int size, @AutoType("data") @GLenum int type, @GLsizei int stride,
@@ -129,15 +132,20 @@ public interface GL14 {
 	                             @GLbyte
 	                             @GLubyte
 	                             @GLfloat
-			@GLdouble
+	                             @GLdouble Buffer data);
-			Buffer data);
 
 	void glBlendFuncSeparate(@GLenum int sfactorRGB, @GLenum int dfactorRGB, @GLenum int sfactorAlpha, @GLenum int dfactorAlpha);
+
 	void glWindowPos2f(float x, float y);
+
 	void glWindowPos2d(double x, double y);
+
 	void glWindowPos2i(int x, int y);
+
 	void glWindowPos3f(float x, float y, float z);
+
 	void glWindowPos3d(double x, double y, double z);
+
 	void glWindowPos3i(int x, int y, int z);
 }
 

src/templates/org/lwjgl/opengl/GL15.java

@@ -72,12 +72,14 @@ public interface GL15 {
 	int GL_BUFFER_MAPPED = 0x88BC;
 	int GL_BUFFER_MAP_POINTER = 0x88BD;
 
-	@Code(	"		StateTracker.bindBuffer(target, buffer);")
+	@Code("		StateTracker.bindBuffer(target, buffer);")
 	void glBindBuffer(@GLenum int target, @GLuint int buffer);
-	@Code(	"		StateTracker.deleteBuffers(buffers);")
+
+	@Code("		StateTracker.deleteBuffers(buffers);")
 	void glDeleteBuffers(@AutoSize("buffers") @GLsizei int n, @Const @GLuint IntBuffer buffers);
 
 	void glGenBuffers(@AutoSize("buffers") @GLsizei int n, @GLuint IntBuffer buffers);
+
 	boolean glIsBuffer(@GLuint int buffer);
 
 	@GenerateAutos
@@ -87,8 +89,8 @@ public interface GL15 {
 	                  @GLshort
 	                  @GLint
 	                  @GLfloat
-			@GLdouble
+	                  @GLdouble Buffer data, @GLenum int usage);
-			Buffer data, @GLenum int usage);
+
 	void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size,
 	                     @Check
 	                     @Const
@@ -96,8 +98,7 @@ public interface GL15 {
 	                     @GLshort
 	                     @GLint
 	                     @GLfloat
-			@GLdouble
+	                     @GLdouble Buffer data);
-			Buffer data);
 
 	void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size,
 	                        @Check
@@ -105,8 +106,7 @@ public interface GL15 {
 	                        @GLshort
 	                        @GLint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer data);
-			Buffer data);
 
 	/**
 	 * glMapBuffer maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new
@@ -124,7 +124,8 @@ public interface GL15 {
 	 * @return A ByteBuffer representing the mapped buffer memory.
 	 */
 	@CachedResult
-	@GLvoid ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
+	@GLvoid
+	ByteBuffer glMapBuffer(@GLenum int target, @GLenum int access);
 
 	boolean glUnmapBuffer(@GLenum int target);
 
@@ -138,30 +139,33 @@ public interface GL15 {
 	// ---------------------- ARB_occlusion_query ----------------------
 	// -----------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <target> parameter of BeginQuery, EndQuery,
+	 * Accepted by the &lt;target&gt; parameter of BeginQuery, EndQuery,
 	 * and GetQueryiv:
 	 */
 	int GL_SAMPLES_PASSED = 0x8914;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetQueryiv:
+	 Accepted by the &lt;pname&gt; parameter of GetQueryiv:
 	 */
 	int GL_QUERY_COUNTER_BITS = 0x8864;
 	int GL_CURRENT_QUERY = 0x8865;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetQueryObjectiv and
+	 Accepted by the &lt;pname&gt; parameter of GetQueryObjectiv and
 	 GetQueryObjectuiv:
 	 */
 	int GL_QUERY_RESULT = 0x8866;
 	int GL_QUERY_RESULT_AVAILABLE = 0x8867;
 
 	void glGenQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids);
+
 	void glDeleteQueries(@AutoSize("ids") @GLsizei int n, @GLuint IntBuffer ids);
+
 	boolean glIsQuery(@GLuint int id);
 
 	void glBeginQuery(@GLenum int target, @GLuint int id);
+
 	void glEndQuery(@GLenum int target);
 
 	@StripPostfix("params")

src/templates/org/lwjgl/opengl/GL20.java

@@ -40,8 +40,8 @@ public interface GL20 {
 	// ----------------------[ ARB_shading_language_100 ]----------------------
 	// ------------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <name> parameter of GetString:
+	 * Accepted by the &lt;name&gt; parameter of GetString:
 	 */
 	int GL_SHADING_LANGUAGE_VERSION = 0x8B8C;
 
@@ -49,13 +49,13 @@ public interface GL20 {
 	// ----------------------[ ARB_shader_objects ]----------------------
 	// ------------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <pname> argument of GetInteger:
+	 * Accepted by the &lt;pname&gt; argument of GetInteger:
 	 */
 	int GL_CURRENT_PROGRAM = 0x8B8D;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetObjectParameter{fi}vARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetObjectParameter{fi}vARB:
 	 */
 	int GL_SHADER_TYPE = 0x8B4F;
 	int GL_DELETE_STATUS = 0x8B80;
@@ -70,13 +70,13 @@ public interface GL20 {
 	int GL_ACTIVE_ATTRIBUTE_MAX_LENGTH = 0x8B8A;
 	int GL_SHADER_SOURCE_LENGTH = 0x8B88;
 
-	/*
+	/**
-	* Returned by the <params> parameter of GetObjectParameter{fi}vARB:
+	 * Returned by the &lt;params&gt; parameter of GetObjectParameter{fi}vARB:
 	 */
 	int GL_SHADER_OBJECT = 0x8B48;
 
-	/*
+	/**
-	* Returned by the <type> parameter of GetActiveUniformARB:
+	 * Returned by the &lt;type&gt; parameter of GetActiveUniformARB:
 	 */
 	int GL_FLOAT_VEC2 = 0x8B50;
 	int GL_FLOAT_VEC3 = 0x8B51;
@@ -110,13 +110,11 @@ public interface GL20 {
 	                    @Indirect
 	                    @Check
 	                    @Const
-			@GLchar
+	                    @GLchar ByteBuffer string,
-			ByteBuffer string,
 	                    @AutoSize("string")
 	                    @Indirect
 	                    @Const
-			@GLint
+	                    @GLint int length);
-			int length);
 
 	int glCreateShader(@GLuint int type);
 
@@ -160,30 +158,38 @@ public interface GL20 {
 
 	@StripPostfix("values")
 	void glUniform1fv(int location, @AutoSize("values") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform2fv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, FloatBuffer values);
+	void glUniform2fv(int location, @AutoSize(value = "values", expression = " >> 1") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform3fv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, FloatBuffer values);
+	void glUniform3fv(int location, @AutoSize(value = "values", expression = " / 3") @GLsizei int count, FloatBuffer values);
+
 	@StripPostfix("values")
-	void glUniform4fv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, FloatBuffer values);
+	void glUniform4fv(int location, @AutoSize(value = "values", expression = " >> 2") @GLsizei int count, FloatBuffer values);
 
 	@StripPostfix("values")
 	void glUniform1iv(int location, @AutoSize("values") @GLsizei int count, IntBuffer values);
+
 	@StripPostfix("values")
-	void glUniform2iv(int location, @AutoSize(value="values", expression=" >> 1") @GLsizei int count, IntBuffer values);
+	void glUniform2iv(int location, @AutoSize(value = "values", expression = " >> 1") @GLsizei int count, IntBuffer values);
+
 	@StripPostfix("values")
-	void glUniform3iv(int location, @AutoSize(value="values", expression=" / 3") @GLsizei int count, IntBuffer values);
+	void glUniform3iv(int location, @AutoSize(value = "values", expression = " / 3") @GLsizei int count, IntBuffer values);
+
 	@StripPostfix("values")
-	void glUniform4iv(int location, @AutoSize(value="values", expression=" >> 2") @GLsizei int count, IntBuffer values);
+	void glUniform4iv(int location, @AutoSize(value = "values", expression = " >> 2") @GLsizei int count, IntBuffer values);
 
 	@StripPostfix("matrices")
-	void glUniformMatrix2fv(int location, @AutoSize(value="matrices", expression=" >> 2") @GLsizei int count,
+	void glUniformMatrix2fv(int location, @AutoSize(value = "matrices", expression = " >> 2") @GLsizei int count,
 	                        boolean transpose, FloatBuffer matrices);
+
 	@StripPostfix("matrices")
-	void glUniformMatrix3fv(int location, @AutoSize(value="matrices", expression=" / (3 * 3)") @GLsizei int count,
+	void glUniformMatrix3fv(int location, @AutoSize(value = "matrices", expression = " / (3 * 3)") @GLsizei int count,
 	                        boolean transpose, FloatBuffer matrices);
+
 	@StripPostfix("matrices")
-	void glUniformMatrix4fv(int location, @AutoSize(value="matrices", expression=" >> 4") @GLsizei int count,
+	void glUniformMatrix4fv(int location, @AutoSize(value = "matrices", expression = " >> 4") @GLsizei int count,
 	                        boolean transpose, FloatBuffer matrices);
 
 	@StripPostfix("params")
@@ -194,24 +200,18 @@ public interface GL20 {
 
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength,
 	                        @GLsizei
-			@Check(value="1", canBeNull=true)
+	                        @Check(value = "1", canBeNull = true) IntBuffer length,
-			IntBuffer length,
+	                        @GLchar ByteBuffer infoLog);
-			@GLchar
-			ByteBuffer infoLog);
 
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int maxLength,
 	                         @GLsizei
-			@Check(value="1", canBeNull=true)
+	                         @Check(value = "1", canBeNull = true) IntBuffer length,
-			IntBuffer length,
+	                         @GLchar ByteBuffer infoLog);
-			@GLchar
-			ByteBuffer infoLog);
 
 	void glGetAttachedShaders(@GLuint int program, @AutoSize("shaders") @GLsizei int maxCount,
 	                          @GLsizei
-			@Check(value="1", canBeNull=true)
+	                          @Check(value = "1", canBeNull = true) IntBuffer count,
-			IntBuffer count,
+	                          @GLuint IntBuffer shaders);
-			@GLuint
-			IntBuffer shaders);
 
 	/**
 	 * Returns the location of the uniform with the specified name. The ByteBuffer should contain the uniform name as a
@@ -225,29 +225,24 @@ public interface GL20 {
 	int glGetUniformLocation(@GLuint int program, @NullTerminated @Check("1") @Const @GLchar ByteBuffer name);
 
 	void glGetActiveUniform(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength,
-			@Check(value="1", canBeNull=true)
+	                        @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                        @GLsizei IntBuffer length,
-			IntBuffer length,
 	                        @Check
-			@GLsizei
+	                        @GLsizei IntBuffer size,
-			IntBuffer size,
 	                        @Check
-			@GLenum
+	                        @GLenum IntBuffer type,
-			IntBuffer type,
+	                        @GLchar ByteBuffer name);
-			@GLchar
-			ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfv(@GLuint int program, int location, @Check FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetUniformiv(@GLuint int program, int location, @Check IntBuffer params);
 
 	void glGetShaderSource(@GLuint int shader, @AutoSize("source") @GLsizei int maxLength,
-			@Check(value="1", canBeNull=true)
+	                       @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                       @GLsizei IntBuffer length,
-			IntBuffer length,
+	                       @GLchar ByteBuffer source);
-			@GLchar
-			ByteBuffer source);
 
 	// ------------------------------------------------------------------
 	// ----------------------[ ARB_vertex_program ]----------------------
@@ -291,16 +286,18 @@ public interface GL20 {
 	                           @GLint
 	                           @GLuint
 	                           @GLfloat
-			@GLdouble
+	                           @GLdouble Buffer buffer);
-			Buffer buffer);
 
 	void glEnableVertexAttribArray(@GLuint int index);
+
 	void glDisableVertexAttribArray(@GLuint int index);
 
 	@StripPostfix("params")
 	void glGetVertexAttribfv(@GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetVertexAttribdv(@GLuint int index, @GLenum int pname, @Check("4") DoubleBuffer params);
+
 	@StripPostfix("params")
 	void glGetVertexAttribiv(@GLuint int index, @GLenum int pname, @Check("4") IntBuffer params);
 
@@ -311,14 +308,14 @@ public interface GL20 {
 	// ----------------------[ ARB_vertex_shader ]----------------------
 	// -----------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <shaderType> argument of CreateShader and
+	 * Accepted by the &lt;shaderType&gt; argument of CreateShader and
-	* returned by the <params> parameter of GetShader{if}v:
+	 * returned by the &lt;params&gt; parameter of GetShader{if}v:
 	 */
 	int GL_VERTEX_SHADER = 0x8B31;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_VERTEX_UNIFORM_COMPONENTS = 0x8B4A;
@@ -329,16 +326,16 @@ public interface GL20 {
 	int GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
 	int GL_MAX_TEXTURE_COORDS = 0x8871;
 
-	/*
+	/**
-	* Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, and
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, and
-	* by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev:
 	 */
 	int GL_VERTEX_PROGRAM_POINT_SIZE = 0x8642;
 	int GL_VERTEX_PROGRAM_TWO_SIDE = 0x8643;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetVertexAttrib{dfi}vARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttrib{dfi}vARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_ENABLED = 0x8622;
 	int GL_VERTEX_ATTRIB_ARRAY_SIZE = 0x8623;
@@ -347,25 +344,21 @@ public interface GL20 {
 	int GL_VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A;
 	int GL_CURRENT_VERTEX_ATTRIB = 0x8626;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetVertexAttribPointervARB:
+	 * Accepted by the &lt;pname&gt; parameter of GetVertexAttribPointervARB:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
 
 	void glBindAttribLocation(@GLuint int program, @GLuint int index, @NullTerminated @Const @GLchar ByteBuffer name);
 
 	void glGetActiveAttrib(@GLuint int program, @GLuint int index, @AutoSize("name") @GLsizei int maxLength,
-			@Check(value="1", canBeNull=true)
+	                       @Check(value = "1", canBeNull = true)
-			@GLsizei
+	                       @GLsizei IntBuffer length,
-			IntBuffer length,
+	                       @Check("1") IntBuffer size,
 	                       @Check("1")
-			IntBuffer size,
+	                       @GLenum IntBuffer type,
-			@Check("1")
-			@GLenum
-			IntBuffer type,
 	                       @Const
-			@GLchar
+	                       @GLchar ByteBuffer name);
-			ByteBuffer name);
 
 	int glGetAttribLocation(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
 
@@ -373,20 +366,20 @@ public interface GL20 {
 	// ----------------------[ ARB_fragment_shader ]----------------------
 	// -------------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <shaderType> argument of CreateShader and
+	 * Accepted by the &lt;shaderType&gt; argument of CreateShader and
-	* returned by the <params> parameter of GetShader{fi}vARB:
+	 * returned by the &lt;params&gt; parameter of GetShader{fi}vARB:
 	 */
 	int GL_FRAGMENT_SHADER = 0x8B30;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_FRAGMENT_UNIFORM_COMPONENTS = 0x8B49;
 
-	/*
+	/**
-	* Accepted by the <target> parameter of Hint and the <pname> parameter of
+	 * Accepted by the &lt;target&gt; parameter of Hint and the &lt;pname&gt; parameter of
 	 * GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
 	 */
 	int GL_FRAGMENT_SHADER_DERIVATIVE_HINT = 0x8B8B;
@@ -395,8 +388,8 @@ public interface GL20 {
 	// ----------------------[ ARB_draw_buffers ]----------------------
 	// ----------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <pname> parameters of GetIntegerv, GetFloatv,
+	 * Accepted by the &lt;pname&gt; parameters of GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_MAX_DRAW_BUFFERS = 0x8824;
@@ -423,29 +416,29 @@ public interface GL20 {
 	// ----------------------[ ARB_point_sprite ]----------------------
 	// ----------------------------------------------------------------
 
-	/*
+	/**
-	* Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, by
-	* the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
-	* GetDoublev, and by the <target> parameter of TexEnvi, TexEnviv,
+	 * GetDoublev, and by the &lt;target&gt; parameter of TexEnvi, TexEnviv,
 	 * TexEnvf, TexEnvfv, GetTexEnviv, and GetTexEnvfv:
 	 */
 	int GL_POINT_SPRITE = 0x8861;
 
-	/*
+	/**
-	* When the <target> parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
+	 * When the &lt;target&gt; parameter of TexEnvf, TexEnvfv, TexEnvi, TexEnviv,
 	 * GetTexEnvfv, or GetTexEnviv is POINT_SPRITE, then the value of
-	* <pname> may be:
+	 * &lt;pname&gt; may be:
 	 */
 	int GL_COORD_REPLACE = 0x8862;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of PointParameter{if}vARB, and the
+	 * Accepted by the &lt;pname&gt; parameter of PointParameter{if}vARB, and the
-	 * <pname> of Get:
+	 * &lt;pname&gt; of Get:
 	 */
 	int GL_POINT_SPRITE_COORD_ORIGIN = 0x8CA0;
 
-	/*
+	/**
-	* Accepted by the <param> parameter of PointParameter{if}vARB:
+	 * Accepted by the &lt;param&gt; parameter of PointParameter{if}vARB:
 	 */
 	int GL_LOWER_LEFT = 0x8CA1;
 	int GL_UPPER_LEFT = 0x8CA2;

src/templates/org/lwjgl/opengl/HP_occlusion_test.java

@@ -34,13 +34,13 @@ package org.lwjgl.opengl;
 public interface HP_occlusion_test {
 
 	/**
-    * Accepted by the <cap> parameter of Enable, Disable, and IsEnabled, by
+	 * Accepted by the &lt;cap&gt; parameter of Enable, Disable, and IsEnabled, by
-    * the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev :
+	 * the &lt;pname&gt; of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev :
 	 */
 	int GL_OCCLUSION_TEST_HP = 0x8165;
 
 	/**
-	* Accepted by the <pname> of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * Accepted by the &lt;pname&gt; of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev :
 	 */
 	int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;

src/templates/org/lwjgl/opengl/IBM_rasterpos_clip.java

@@ -34,7 +34,7 @@ package org.lwjgl.opengl;
 public interface IBM_rasterpos_clip {
 
 	/**
-    * Accepted by the <target> parameter of Enable and Disable and the <value>
+	 * Accepted by the &lt;target&gt; parameter of Enable and Disable and the &lt;value&gt;
 	 * parameter of IsEnabled, GetBooleanv, GetIntegerv, GetFloatv, GetDoublev:
 	 */
 	int GL_RASTER_POSITION_UNCLIPPED_IBM = 103010;

src/templates/org/lwjgl/opengl/NV_evaluators.java

@@ -31,12 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_evaluators {
 	int GL_EVAL_2D_NV = 0x86C0;
 	int GL_EVAL_TRIANGULAR_2D_NV = 0x86C1;
@@ -66,23 +64,25 @@ public interface NV_evaluators {
 	void glGetMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, boolean packed,
 	                             @Check
 	                             @Const
-			@GLfloat
+	                             @GLfloat Buffer pPoints);
-			Buffer pPoints);
 
 	void glMapControlPointsNV(@GLenum int target, @GLuint int index, @GLenum int type, @GLsizei int ustride, @GLsizei int vstride, int uorder, int vorder, boolean packed, @Check @Const @GLfloat Buffer pPoints);
 
 	@StripPostfix("params")
 	void glMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params);
+
 	@StripPostfix("params")
 	void glMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	@StripPostfix("params")
 	void glGetMapParameterfvNV(@GLenum int target, @GLenum int pname, @Check("4") @Const FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetMapParameterivNV(@GLenum int target, @GLenum int pname, @Check("4") @Const IntBuffer params);
 
 	@StripPostfix("params")
 	void glGetMapAttribParameterfvNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetMapAttribParameterivNV(@GLenum int target, @GLuint int index, @GLenum int pname, @Check("4") IntBuffer params);
 

src/templates/org/lwjgl/opengl/NV_fence.java

@@ -31,16 +31,17 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_fence {
 	int GL_ALL_COMPLETED_NV = 0x84F2;
 	int GL_FENCE_STATUS_NV = 0x84F3;
 	int GL_FENCE_CONDITION_NV = 0x84F4;
 
 	void glGenFencesNV(@AutoSize("piFences") @GLsizei int n, @GLuint IntBuffer piFences);
+
 	void glDeleteFencesNV(@AutoSize("piFences") @GLsizei int n, @Const @GLuint IntBuffer piFences);
 
 	void glSetFenceNV(@GLuint int fence, @GLenum int condition);

src/templates/org/lwjgl/opengl/NV_float_buffer.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_float_buffer {
-	/*
+
-	 * Accepted by the <internalformat> parameter of TexImage2D and
+	/**
+	 * Accepted by the &lt;internalformat&gt; parameter of TexImage2D and
 	 * CopyTexImage2D:
 	 */
 	int GL_FLOAT_R_NV = 0x8880;
@@ -49,23 +50,23 @@ public interface NV_float_buffer {
 	int GL_FLOAT_RGBA16_NV = 0x888A;
 	int GL_FLOAT_RGBA32_NV = 0x888B;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetTexLevelParameterfv and
+	 * Accepted by the &lt;pname&gt; parameter of GetTexLevelParameterfv and
 	 * GetTexLevelParameteriv:
 	 */
 	int GL_TEXTURE_FLOAT_COMPONENTS_NV = 0x888C;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_FLOAT_CLEAR_COLOR_VALUE_NV = 0x888D;
 	int GL_FLOAT_RGBA_MODE_NV = 0x888E;
 
-	/*
+	/**
-	* Accepted in the <piAttributes> array of wglGetPixelFormatAttribivARB and
+	 * Accepted in the &lt;piAttributes&gt; array of wglGetPixelFormatAttribivARB and
-	* wglGetPixelFormatAttribfvARB and in the <piAttribIList> and
+	 * wglGetPixelFormatAttribfvARB and in the &lt;piAttribIList&gt; and
-	* <pfAttribFList> arrays of wglChoosePixelFormatARB:
+	 * &lt;pfAttribFList&gt; arrays of wglChoosePixelFormatARB:
 	 */
 	/*
 	 int WGL_FLOAT_COMPONENTS_NV = 0x20B0;
@@ -75,9 +76,9 @@ public interface NV_float_buffer {
 	 int WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV = 0x20B4;
 	 */
 
-	/*
+	/**
-	* Accepted in the <piAttribIList> array of wglCreatePbufferARB and returned
+	 * Accepted in the &lt;piAttribIList&gt; array of wglCreatePbufferARB and returned
-	* in the <value> parameter of wglQueryPbufferARB when <iAttribute> is
+	 * in the &lt;value&gt; parameter of wglQueryPbufferARB when &lt;iAttribute&gt; is
 	 * WGL_TEXTURE_FORMAT_ARB:
 	 */
 	/*

src/templates/org/lwjgl/opengl/NV_fragment_program.java

@@ -31,25 +31,24 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.nio.DoubleBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_fragment_program extends NV_program {
-	/*
+
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled, by the
+	/**
-	 * <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled, by the
-	 * and by the <target> parameter of BindProgramNV, LoadProgramNV,
+	 * &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev,
+	 * and by the &lt;target&gt; parameter of BindProgramNV, LoadProgramNV,
 	 * ProgramLocalParameter4dARB, ProgramLocalParameter4dvARB,
 	 * ProgramLocalParameter4fARB, ProgramLocalParameter4fvARB,
 	 * GetProgramLocalParameterdvARB, and GetProgramLocalParameterfvARB:
 	 */
 	int GL_FRAGMENT_PROGRAM_NV = 0x8870;
 
-	/*
+	/**
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
 	 * and GetDoublev:
 	 */
 	int GL_MAX_TEXTURE_COORDS_NV = 0x8871;

src/templates/org/lwjgl/opengl/NV_fragment_program2.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_fragment_program2 {
-	/*
+
-	 * Accepted by the <pname> parameter of GetProgramivARB:
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramivARB:
 	 */
 	int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
 	int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;

src/templates/org/lwjgl/opengl/NV_half_float.java

@@ -31,13 +31,14 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.ShortBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_half_float {
-	/*
+
-	 * Accepted by the <type> argument of VertexPointer, NormalPointer,
+	/**
+	 * Accepted by the &lt;type&gt; argument of VertexPointer, NormalPointer,
 	 * ColorPointer, TexCoordPointer, FogCoordPointerEXT,
 	 * SecondaryColorPointerEXT, VertexWeightPointerEXT, VertexAttribPointerNV,
 	 * DrawPixels, ReadPixels, TexImage1D, TexImage2D, TexImage3D, TexSubImage1D,
@@ -87,10 +88,13 @@ public interface NV_half_float {
 
 	@StripPostfix("attribs")
 	void glVertexAttribs1hvNV(@GLuint int index, @AutoSize("attribs") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+
 	@StripPostfix("attribs")
-	void glVertexAttribs2hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 1") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+	void glVertexAttribs2hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " >> 1") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+
 	@StripPostfix("attribs")
-	void glVertexAttribs3hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" / 3") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+	void glVertexAttribs3hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " / 3") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+
 	@StripPostfix("attribs")
-	void glVertexAttribs4hvNV(@GLuint int index, @AutoSize(value="attribs", expression=" >> 2") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
+	void glVertexAttribs4hvNV(@GLuint int index, @AutoSize(value = "attribs", expression = " >> 2") @GLsizei int n, @Const @GLhalf ShortBuffer attribs);
 }

src/templates/org/lwjgl/opengl/NV_multisample_filter_hint.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_multisample_filter_hint {
-	/*
+
-	 * Accepted by the <target> parameter of Hint and by the <pname>
+	/**
+	 * Accepted by the &lt;target&gt; parameter of Hint and by the &lt;pname&gt;
 	 * parameter of GetBooleanv, GetIntegerv, GetFloatv, and GetDoublev:
 	 */
 	int GL_MULTISAMPLE_FILTER_HINT_NV = 0x8534;

src/templates/org/lwjgl/opengl/NV_occlusion_query.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_occlusion_query {
 	int GL_OCCLUSION_TEST_HP = 0x8165;
 	int GL_OCCLUSION_TEST_RESULT_HP = 0x8166;
@@ -45,6 +45,7 @@ public interface NV_occlusion_query {
 	int GL_PIXEL_COUNT_AVAILABLE_NV = 0x8867;
 
 	void glGenOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @GLuint IntBuffer piIDs);
+
 	void glDeleteOcclusionQueriesNV(@AutoSize("piIDs") @GLsizei int n, @Const @GLuint IntBuffer piIDs);
 
 	boolean glIsOcclusionQueryNV(@GLuint int id);
@@ -55,6 +56,7 @@ public interface NV_occlusion_query {
 
 	@StripPostfix("params")
 	void glGetOcclusionQueryuivNV(@GLuint int id, @GLenum int pname, @Check("4") @GLuint IntBuffer params);
+
 	@StripPostfix("params")
 	void glGetOcclusionQueryivNV(@GLuint int id, @GLenum int pname, @Check("4") IntBuffer params);
 }

src/templates/org/lwjgl/opengl/NV_pixel_data_range.java

@@ -31,28 +31,29 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_pixel_data_range {
-	/*
+
-	* Accepted by the <target> parameter of PixelDataRangeNV and
+	/**
-	* FlushPixelDataRangeNV, and by the <cap> parameter of
+	 * Accepted by the &lt;target&gt; parameter of PixelDataRangeNV and
+	 * FlushPixelDataRangeNV, and by the &lt;cap&gt; parameter of
 	 * EnableClientState, DisableClientState, and IsEnabled:
 	 */
 	int GL_WRITE_PIXEL_DATA_RANGE_NV = 0x8878;
 	int GL_READ_PIXEL_DATA_RANGE_NV = 0x8879;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV = 0x887A;
 	int GL_READ_PIXEL_DATA_RANGE_LENGTH_NV = 0x887B;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetPointerv:
+	 * Accepted by the &lt;pname&gt; parameter of GetPointerv:
 	 */
 	int GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV = 0x887C;
 	int GL_READ_PIXEL_DATA_RANGE_POINTER_NV = 0x887D;
@@ -62,8 +63,7 @@ public interface NV_pixel_data_range {
 	                        @GLshort
 	                        @GLint
 	                        @GLfloat
-			@GLdouble
+	                        @GLdouble Buffer data);
-			Buffer data);
 
 	void glFlushPixelDataRangeNV(@GLenum int target);
 }

src/templates/org/lwjgl/opengl/NV_point_sprite.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_point_sprite {
 	int GL_POINT_SPRITE_NV = 0x8861;
 	int GL_COORD_REPLACE_NV = 0x8862;

src/templates/org/lwjgl/opengl/NV_primitive_restart.java

@@ -34,16 +34,17 @@ package org.lwjgl.opengl;
 import org.lwjgl.util.generator.*;
 
 public interface NV_primitive_restart {
-	/*
+
-	* Accepted by the <array> parameter of EnableClientState and
+	/**
-	* DisableClientState, by the <cap> parameter of IsEnabled, and by
+	 * Accepted by the &lt;array&gt; parameter of EnableClientState and
-	* the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 * DisableClientState, by the &lt;cap&gt; parameter of IsEnabled, and by
+	 * the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
 	 * GetDoublev:
 	 */
 	int GL_PRIMITIVE_RESTART_NV = 0x8558;
 
-	/*
+	/**
-	* Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_PRIMITIVE_RESTART_INDEX_NV = 0x8559;

src/templates/org/lwjgl/opengl/NV_program.java

@@ -31,34 +31,33 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="NV", isFinal=false)
+import java.nio.*;
+
+@Extension(postfix = "NV", isFinal = false)
 public interface NV_program {
-	/*
+
-	   Accepted by the <pname> parameter of GetProgramivNV:
+	/**
+	 Accepted by the &lt;pname&gt; parameter of GetProgramivNV:
 	 */
 	int GL_PROGRAM_TARGET_NV = 0x8646;
 	int GL_PROGRAM_LENGTH_NV = 0x8627;
 	int GL_PROGRAM_RESIDENT_NV = 0x8647;
 
-	/*
+	/**
-	   Accepted by the <pname> parameter of GetProgramStringNV:
+	 Accepted by the &lt;pname&gt; parameter of GetProgramStringNV:
 	 */
 	int GL_PROGRAM_STRING_NV = 0x8628;
 
-	/*
+	/**
-	   Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_PROGRAM_ERROR_POSITION_NV = 0x864B;
 
-	/*
+	/**
-	   Accepted by the <name> parameter of GetString:
+	 Accepted by the &lt;name&gt; parameter of GetString:
 	 */
 	int GL_PROGRAM_ERROR_STRING_NV = 0x8874;
 
@@ -67,6 +66,7 @@ public interface NV_program {
 	void glBindProgramNV(@GLenum int target, @GLuint int programID);
 
 	void glDeleteProgramsNV(@AutoSize("programs") @GLsizei int n, @Const @GLuint IntBuffer programs);
+
 	void glGenProgramsNV(@AutoSize("programs") @GLsizei int n, @GLuint IntBuffer programs);
 
 	@StripPostfix("params")
@@ -76,15 +76,13 @@ public interface NV_program {
 
 	boolean glIsProgramNV(@GLuint int programID);
 
-	@Code(	"		if (programIDs.remaining() != programResidences.remaining())\n" +
+	@Code("		if (programIDs.remaining() != programResidences.remaining())\n" +
 	      "			throw new IllegalArgumentException(\"programIDs.remaining() != programResidences.remaining()\");")
 	boolean glAreProgramsResidentNV(@AutoSize("programIDs") @GLsizei int n,
 	                                @Const
-			@GLuint
+	                                @GLuint IntBuffer programIDs,
-			IntBuffer programIDs,
 	                                @Check
-			@GLboolean
+	                                @GLboolean ByteBuffer programResidences);
-			ByteBuffer programResidences);
 
 	void glRequestResidentProgramsNV(@AutoSize("programIDs") @GLsizei int n, @GLuint IntBuffer programIDs);
 }

src/templates/org/lwjgl/opengl/NV_register_combiners.java

@@ -31,11 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_register_combiners {
 	int GL_REGISTER_COMBINERS_NV = 0x8522;
 	int GL_COMBINER0_NV = 0x8550;
@@ -107,16 +106,19 @@ public interface NV_register_combiners {
 
 	@StripPostfix("params")
 	void glGetCombinerInputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetCombinerInputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@StripPostfix("params")
 	void glGetCombinerOutputParameterfvNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetCombinerOutputParameterivNV(@GLenum int stage, @GLenum int portion, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@StripPostfix("params")
 	void glGetFinalCombinerInputParameterfvNV(@GLenum int variable, @GLenum int pname, @Check("4") FloatBuffer params);
+
 	@StripPostfix("params")
 	void glGetFinalCombinerInputParameterivNV(@GLenum int variable, @GLenum int pname, @Check("4") IntBuffer params);
 }

src/templates/org/lwjgl/opengl/NV_register_combiners2.java

@@ -31,10 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.FloatBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_register_combiners2 {
 	int GL_PER_STAGE_CONSTANTS_NV = 0x8535;
 

src/templates/org/lwjgl/opengl/NV_texture_compression_vtc.java

@@ -33,11 +33,12 @@ package org.lwjgl.opengl;
 
 import org.lwjgl.util.generator.*;
 
-@Extension(postfix="NV", className="NVTextureCompressionVTC")
+@Extension(postfix = "NV", className = "NVTextureCompressionVTC")
 public interface NV_texture_compression_vtc {
-	/*
+
-	 * Accepted by the <internalformat> parameter of TexImage3D and
+	/**
-	 * CompressedTexImage3DARB and the <format> parameter of
+	 * Accepted by the &lt;internalformat&gt; parameter of TexImage3D and
+	 * CompressedTexImage3DARB and the &lt;format&gt; parameter of
 	 * CompressedTexSubImage2DARB:
 	 */
 	int GL_COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;

src/templates/org/lwjgl/opengl/NV_texture_expand_normal.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_texture_expand_normal {
-	/*
+
-	 * Accepted by the <pname> parameters of TexParameteri,
+	/**
+	 * Accepted by the &lt;pname&gt; parameters of TexParameteri,
 	 * TexParameteriv, TexParameterf, TexParameterfv, GetTexParameteri,
 	 * and GetTexParameteriv:
 	 */

src/templates/org/lwjgl/opengl/NV_vertex_array_range.java

@@ -31,11 +31,10 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_vertex_array_range {
 	int GL_VERTEX_ARRAY_RANGE_NV = 0x851D;
 	int GL_VERTEX_ARRAY_RANGE_LENGTH_NV = 0x851E;
@@ -49,13 +48,13 @@ public interface NV_vertex_array_range {
 	                          @GLshort
 	                          @GLint
 	                          @GLfloat
-			@GLdouble
+	                          @GLdouble Buffer pPointer);
-			Buffer pPointer);
 
 	void glFlushVertexArrayRangeNV();
 
 	@PlatformDependent({Platform.WGL, Platform.GLX})
-	@GLvoid ByteBuffer glAllocateMemoryNV(@AutoResultSize int size, float readFrequency, float writeFrequency, float priority);
+	@GLvoid
+	ByteBuffer glAllocateMemoryNV(@AutoResultSize int size, float readFrequency, float writeFrequency, float priority);
 
 	@PlatformDependent({Platform.WGL, Platform.GLX})
 	void glFreeMemoryNV(@Check @GLbyte Buffer pointer);

src/templates/org/lwjgl/opengl/NV_vertex_program.java

@@ -31,61 +31,62 @@
  */
 package org.lwjgl.opengl;
 
-import java.nio.*;
-
 import org.lwjgl.util.generator.*;
 
+import java.nio.*;
+
 public interface NV_vertex_program extends NV_program {
-	/*
+
-	Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	/**
-	and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled,
-	and GetDoublev, and by the <target> parameter of BindProgramNV,
+	 and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 and GetDoublev, and by the &lt;target&gt; parameter of BindProgramNV,
 	 ExecuteProgramNV, GetProgramParameter[df]vNV, GetTrackMatrixivNV,
 	 LoadProgramNV, ProgramParameter[s]4[df][v]NV, and TrackMatrixNV:
 	 */
 	int GL_VERTEX_PROGRAM_NV = 0x8620;
 
-	/*
+	/**
-	Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 Accepted by the &lt;cap&gt; parameter of Disable, Enable, and IsEnabled,
-	and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv,
 	 and GetDoublev:
 	 */
 	int GL_VERTEX_PROGRAM_POINT_SIZE_NV = 0x8642;
 	int GL_VERTEX_PROGRAM_TWO_SIDE_NV = 0x8643;
 
-	/*
+	/**
-	Accepted by the <target> parameter of ExecuteProgramNV and
+	 Accepted by the &lt;target&gt; parameter of ExecuteProgramNV and
 	 LoadProgramNV:
 	 */
 	int GL_VERTEX_STATE_PROGRAM_NV = 0x8621;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetVertexAttrib[dfi]vNV:
+	 Accepted by the &lt;pname&gt; parameter of GetVertexAttrib[dfi]vNV:
 	 */
 	int GL_ATTRIB_ARRAY_SIZE_NV = 0x8623;
 	int GL_ATTRIB_ARRAY_STRIDE_NV = 0x8624;
 	int GL_ATTRIB_ARRAY_TYPE_NV = 0x8625;
 	int GL_CURRENT_ATTRIB_NV = 0x8626;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetProgramParameterfvNV
+	 Accepted by the &lt;pname&gt; parameter of GetProgramParameterfvNV
 	 and GetProgramParameterdvNV:
 	 */
 	int GL_PROGRAM_PARAMETER_NV = 0x8644;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetVertexAttribPointervNV:
+	 Accepted by the &lt;pname&gt; parameter of GetVertexAttribPointervNV:
 	 */
 	int GL_ATTRIB_ARRAY_POINTER_NV = 0x8645;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetTrackMatrixivNV:
+	 Accepted by the &lt;pname&gt; parameter of GetTrackMatrixivNV:
 	 */
 	int GL_TRACK_MATRIX_NV = 0x8648;
 	int GL_TRACK_MATRIX_TRANSFORM_NV = 0x8649;
 
-	/*
+	/**
-	Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV = 0x862E;
@@ -94,14 +95,14 @@ public interface NV_vertex_program extends NV_program {
 	int GL_CURRENT_MATRIX_NV = 0x8641;
 	int GL_VERTEX_PROGRAM_BINDING_NV = 0x864A;
 
-	/*
+	/**
-	Accepted by the <matrix> parameter of TrackMatrixNV:
+	 Accepted by the &lt;matrix&gt; parameter of TrackMatrixNV:
 	 */
 	int GL_MODELVIEW_PROJECTION_NV = 0x8629;
 
-	/*
+	/**
-	Accepted by the <matrix> parameter of TrackMatrixNV and by the
+	 Accepted by the &lt;matrix&gt; parameter of TrackMatrixNV and by the
-	<mode> parameter of MatrixMode:
+	 &lt;mode&gt; parameter of MatrixMode:
 	 */
 	int GL_MATRIX0_NV = 0x8630;
 	int GL_MATRIX1_NV = 0x8631;
@@ -112,18 +113,18 @@ public interface NV_vertex_program extends NV_program {
 	int GL_MATRIX6_NV = 0x8636;
 	int GL_MATRIX7_NV = 0x8637;
 
-	/*
+	/**
-	Accepted by the <transform> parameter of TrackMatrixNV:
+	 Accepted by the &lt;transform&gt; parameter of TrackMatrixNV:
 	 */
 	int GL_IDENTITY_NV = 0x862A;
 	int GL_INVERSE_NV = 0x862B;
 	int GL_TRANSPOSE_NV = 0x862C;
 	int GL_INVERSE_TRANSPOSE_NV = 0x862D;
 
-	/*
+	/**
-	Accepted by the <array> parameter of EnableClientState and
+	 Accepted by the &lt;array&gt; parameter of EnableClientState and
-	DisableClientState, by the <cap> parameter of IsEnabled, and by
+	 DisableClientState, by the &lt;cap&gt; parameter of IsEnabled, and by
-	the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv, and
+	 the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv, GetFloatv, and
 	 GetDoublev:
 	 */
 	int GL_VERTEX_ATTRIB_ARRAY0_NV = 0x8650;
@@ -143,10 +144,10 @@ public interface NV_vertex_program extends NV_program {
 	int GL_VERTEX_ATTRIB_ARRAY14_NV = 0x865E;
 	int GL_VERTEX_ATTRIB_ARRAY15_NV = 0x865F;
 
-	/*
+	/**
-	Accepted by the <target> parameter of GetMapdv, GetMapfv, GetMapiv,
+	 Accepted by the &lt;target&gt; parameter of GetMapdv, GetMapfv, GetMapiv,
-	Map1d and Map1f and by the <cap> parameter of Enable, Disable, and
+	 Map1d and Map1f and by the &lt;cap&gt; parameter of Enable, Disable, and
-	IsEnabled, and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 IsEnabled, and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_MAP1_VERTEX_ATTRIB0_4_NV = 0x8660;
@@ -166,10 +167,10 @@ public interface NV_vertex_program extends NV_program {
 	int GL_MAP1_VERTEX_ATTRIB14_4_NV = 0x866E;
 	int GL_MAP1_VERTEX_ATTRIB15_4_NV = 0x866F;
 
-	/*
+	/**
-	Accepted by the <target> parameter of GetMapdv, GetMapfv, GetMapiv,
+	 Accepted by the &lt;target&gt; parameter of GetMapdv, GetMapfv, GetMapiv,
-	Map2d and Map2f and by the <cap> parameter of Enable, Disable, and
+	 Map2d and Map2f and by the &lt;cap&gt; parameter of Enable, Disable, and
-	IsEnabled, and by the <pname> parameter of GetBooleanv, GetIntegerv,
+	 IsEnabled, and by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 GetFloatv, and GetDoublev:
 	 */
 	int GL_MAP2_VERTEX_ATTRIB0_4_NV = 0x8670;
@@ -217,14 +218,12 @@ public interface NV_vertex_program extends NV_program {
 	void glProgramParameter4dNV(@GLenum int target, @GLuint int index, double x, double y, double z, double w);
 
 	@StripPostfix("params")
-	void glProgramParameters4fvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count,
+	void glProgramParameters4fvNV(@GLenum int target, @GLuint int index, @AutoSize(value = "params", expression = " >> 2") @GLuint int count,
-			@Const
+	                              @Const FloatBuffer params);
-			FloatBuffer params);
 
 	@StripPostfix("params")
-	void glProgramParameters4dvNV(@GLenum int target, @GLuint int index, @AutoSize(value="params", expression=" >> 2") @GLuint int count,
+	void glProgramParameters4dvNV(@GLenum int target, @GLuint int index, @AutoSize(value = "params", expression = " >> 2") @GLuint int count,
-			@Const
+	                              @Const DoubleBuffer params);
-			DoubleBuffer params);
 
 	void glTrackMatrixNV(@GLenum int target, @GLuint int address, @GLenum int matrix, @GLenum int transform);
 
@@ -240,8 +239,7 @@ public interface NV_vertex_program extends NV_program {
 	                             @GLint
 	                             @GLuint
 	                             @GLfloat
-			@GLdouble
+	                             @GLdouble Buffer buffer);
-			Buffer buffer);
 
 	void glVertexAttrib1sNV(@GLuint int index, short x);
 
@@ -271,29 +269,37 @@ public interface NV_vertex_program extends NV_program {
 
 	@StripPostfix("v")
 	void glVertexAttribs1svNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const ShortBuffer v);
+
 	@StripPostfix("v")
 	void glVertexAttribs1fvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const FloatBuffer v);
+
 	@StripPostfix("v")
 	void glVertexAttribs1dvNV(@GLuint int index, @AutoSize("v") @GLsizei int n, @Const DoubleBuffer v);
 
 	@StripPostfix("v")
-	void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const ShortBuffer v);
+	void glVertexAttribs2svNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const ShortBuffer v);
-	@StripPostfix("v")
-	void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const FloatBuffer v);
-	@StripPostfix("v")
-	void glVertexAttribs2dvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 1") @GLsizei int n, @Const DoubleBuffer v);
 
 	@StripPostfix("v")
-	void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const ShortBuffer v);
+	void glVertexAttribs2fvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const FloatBuffer v);
-	@StripPostfix("v")
-	void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const FloatBuffer v);
-	@StripPostfix("v")
-	void glVertexAttribs3dvNV(@GLuint int index, @AutoSize(value="v", expression=" / 3") @GLsizei int n, @Const DoubleBuffer v);
 
 	@StripPostfix("v")
-	void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const ShortBuffer v);
+	void glVertexAttribs2dvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 1") @GLsizei int n, @Const DoubleBuffer v);
+
 	@StripPostfix("v")
-	void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const FloatBuffer v);
+	void glVertexAttribs3svNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const ShortBuffer v);
+
 	@StripPostfix("v")
-	void glVertexAttribs4dvNV(@GLuint int index, @AutoSize(value="v", expression=" >> 2") @GLsizei int n, @Const DoubleBuffer v);
+	void glVertexAttribs3fvNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const FloatBuffer v);
+
+	@StripPostfix("v")
+	void glVertexAttribs3dvNV(@GLuint int index, @AutoSize(value = "v", expression = " / 3") @GLsizei int n, @Const DoubleBuffer v);
+
+	@StripPostfix("v")
+	void glVertexAttribs4svNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const ShortBuffer v);
+
+	@StripPostfix("v")
+	void glVertexAttribs4fvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const FloatBuffer v);
+
+	@StripPostfix("v")
+	void glVertexAttribs4dvNV(@GLuint int index, @AutoSize(value = "v", expression = " >> 2") @GLsizei int n, @Const DoubleBuffer v);
 }

src/templates/org/lwjgl/opengl/NV_vertex_program2_option.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_vertex_program2_option {
-	/*
+
-	 * Accepted by the <pname> parameter of GetProgramivARB:
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetProgramivARB:
 	 */
 	int GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV = 0x88F4;
 	int GL_MAX_PROGRAM_CALL_DEPTH_NV = 0x88F5;

src/templates/org/lwjgl/opengl/NV_vertex_program3.java

@@ -32,8 +32,9 @@
 package org.lwjgl.opengl;
 
 public interface NV_vertex_program3 {
-	/*
+
-	 * Accepted by the <pname> parameter of GetBooleanv, GetIntegerv,
+	/**
+	 * Accepted by the &lt;pname&gt; parameter of GetBooleanv, GetIntegerv,
 	 * GetFloatv, and GetDoublev:
 	 */
 	int GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB = 0x8B4C;

src/templates/org/lwjgl/opengl/SUN_slice_accum.java

@@ -33,8 +33,8 @@ package org.lwjgl.opengl;
 
 public interface SUN_slice_accum {
 
-    /*
+	/**
-     * Accepted by the <op> parameter of Accum,
+	 * Accepted by the &lt;op&gt; parameter of Accum,
 	 */
 	int GL_SLICE_ACCUM_SUN = 0x85CC;