From: Andy Wingo Date: Tue, 5 Feb 2013 21:00:34 +0000 (+0100) Subject: rename upstream-man-pages to upstream-doc X-Git-Url: http://git.hcoop.net/clinton/guile-figl.git/commitdiff_plain/a6a00658f26c164551287799b194cc2f07eb78be rename upstream-man-pages to upstream-doc * upstream-doc/: Rename from upstream-man-pages. * figl/parse.scm: * figl/config.scm.in: Adapt. --- diff --git a/figl/config.scm.in b/figl/config.scm.in index 35edb2c..9084ce8 100644 --- a/figl/config.scm.in +++ b/figl/config.scm.in @@ -23,10 +23,10 @@ (define-module (figl config) #:export (abs-top-srcdir - upstream-man-pages)) + upstream-doc)) (define (abs-top-srcdir) "@abs_top_srcdir@") -(define (upstream-man-pages) - "@abs_top_srcdir@/upstream-man-pages") +(define (upstream-doc) + "@abs_top_srcdir@/upstream-doc") diff --git a/figl/parse.scm b/figl/parse.scm index 88663ba..558619a 100644 --- a/figl/parse.scm +++ b/figl/parse.scm @@ -135,7 +135,7 @@ (define (parse-man-xml version filename) (define subdir (format #f "man~A" version)) - (call-with-input-file (in-vicinity (upstream-man-pages) + (call-with-input-file (in-vicinity (upstream-doc) (in-vicinity subdir filename)) (lambda (port) (zap-whitespace @@ -145,7 +145,7 @@ (define (xml-files version) (define subdir (format #f "man~A" version)) - (scandir (in-vicinity (upstream-man-pages) subdir) + (scandir (in-vicinity (upstream-doc) subdir) (lambda (x) (string-suffix? ".xml" x)))) (define (take-first proc) diff --git a/upstream-man-pages/man2/Makefile b/upstream-doc/man2/Makefile similarity index 100% rename from upstream-man-pages/man2/Makefile rename to upstream-doc/man2/Makefile diff --git a/upstream-man-pages/man2/README.txt b/upstream-doc/man2/README.txt similarity index 100% rename from upstream-man-pages/man2/README.txt rename to upstream-doc/man2/README.txt diff --git a/upstream-man-pages/man2/bottom.php b/upstream-doc/man2/bottom.php similarity index 100% rename from upstream-man-pages/man2/bottom.php rename to upstream-doc/man2/bottom.php diff --git a/upstream-man-pages/man2/docs/Viewing_XHTML_and_MathML.html b/upstream-doc/man2/docs/Viewing_XHTML_and_MathML.html similarity index 100% rename from upstream-man-pages/man2/docs/Viewing_XHTML_and_MathML.html rename to upstream-doc/man2/docs/Viewing_XHTML_and_MathML.html diff --git a/upstream-man-pages/man2/docs/XML_Toolchain_and_Man_Pages.html b/upstream-doc/man2/docs/XML_Toolchain_and_Man_Pages.html similarity index 100% rename from upstream-man-pages/man2/docs/XML_Toolchain_and_Man_Pages.html rename to upstream-doc/man2/docs/XML_Toolchain_and_Man_Pages.html diff --git a/upstream-man-pages/man2/fo/Makefile b/upstream-doc/man2/fo/Makefile similarity index 100% rename from upstream-man-pages/man2/fo/Makefile rename to upstream-doc/man2/fo/Makefile diff --git a/upstream-man-pages/man2/fo/glTexGen.fo b/upstream-doc/man2/fo/glTexGen.fo similarity index 100% rename from upstream-man-pages/man2/fo/glTexGen.fo rename to upstream-doc/man2/fo/glTexGen.fo diff --git a/upstream-man-pages/man2/fo/glTexGen.pdf b/upstream-doc/man2/fo/glTexGen.pdf similarity index 100% rename from upstream-man-pages/man2/fo/glTexGen.pdf rename to upstream-doc/man2/fo/glTexGen.pdf diff --git a/upstream-man-pages/man2/foo b/upstream-doc/man2/foo similarity index 100% rename from upstream-man-pages/man2/foo rename to upstream-doc/man2/foo diff --git a/upstream-man-pages/man2/glAccum.xml b/upstream-doc/man2/glAccum.xml similarity index 100% rename from upstream-man-pages/man2/glAccum.xml rename to upstream-doc/man2/glAccum.xml diff --git a/upstream-man-pages/man2/glActiveTexture.xml b/upstream-doc/man2/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man2/glActiveTexture.xml rename to upstream-doc/man2/glActiveTexture.xml diff --git a/upstream-man-pages/man2/glAlphaFunc.xml b/upstream-doc/man2/glAlphaFunc.xml similarity index 100% rename from upstream-man-pages/man2/glAlphaFunc.xml rename to upstream-doc/man2/glAlphaFunc.xml diff --git a/upstream-man-pages/man2/glAreTexturesResident.xml b/upstream-doc/man2/glAreTexturesResident.xml similarity index 100% rename from upstream-man-pages/man2/glAreTexturesResident.xml rename to upstream-doc/man2/glAreTexturesResident.xml diff --git a/upstream-man-pages/man2/glArrayElement.xml b/upstream-doc/man2/glArrayElement.xml similarity index 100% rename from upstream-man-pages/man2/glArrayElement.xml rename to upstream-doc/man2/glArrayElement.xml diff --git a/upstream-man-pages/man2/glAttachShader.xml b/upstream-doc/man2/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man2/glAttachShader.xml rename to upstream-doc/man2/glAttachShader.xml diff --git a/upstream-man-pages/man2/glBegin.xml b/upstream-doc/man2/glBegin.xml similarity index 100% rename from upstream-man-pages/man2/glBegin.xml rename to upstream-doc/man2/glBegin.xml diff --git a/upstream-man-pages/man2/glBeginQuery.xml b/upstream-doc/man2/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man2/glBeginQuery.xml rename to upstream-doc/man2/glBeginQuery.xml diff --git a/upstream-man-pages/man2/glBindAttribLocation.xml b/upstream-doc/man2/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man2/glBindAttribLocation.xml rename to upstream-doc/man2/glBindAttribLocation.xml diff --git a/upstream-man-pages/man2/glBindBuffer.xml b/upstream-doc/man2/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glBindBuffer.xml rename to upstream-doc/man2/glBindBuffer.xml diff --git a/upstream-man-pages/man2/glBindTexture.xml b/upstream-doc/man2/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man2/glBindTexture.xml rename to upstream-doc/man2/glBindTexture.xml diff --git a/upstream-man-pages/man2/glBitmap.xml b/upstream-doc/man2/glBitmap.xml similarity index 100% rename from upstream-man-pages/man2/glBitmap.xml rename to upstream-doc/man2/glBitmap.xml diff --git a/upstream-man-pages/man2/glBlendColor.xml b/upstream-doc/man2/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man2/glBlendColor.xml rename to upstream-doc/man2/glBlendColor.xml diff --git a/upstream-man-pages/man2/glBlendEquation.xml b/upstream-doc/man2/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man2/glBlendEquation.xml rename to upstream-doc/man2/glBlendEquation.xml diff --git a/upstream-man-pages/man2/glBlendEquationSeparate.xml b/upstream-doc/man2/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man2/glBlendEquationSeparate.xml rename to upstream-doc/man2/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man2/glBlendFunc.xml b/upstream-doc/man2/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man2/glBlendFunc.xml rename to upstream-doc/man2/glBlendFunc.xml diff --git a/upstream-man-pages/man2/glBlendFuncSeparate.xml b/upstream-doc/man2/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man2/glBlendFuncSeparate.xml rename to upstream-doc/man2/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man2/glBufferData.xml b/upstream-doc/man2/glBufferData.xml similarity index 100% rename from upstream-man-pages/man2/glBufferData.xml rename to upstream-doc/man2/glBufferData.xml diff --git a/upstream-man-pages/man2/glBufferSubData.xml b/upstream-doc/man2/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man2/glBufferSubData.xml rename to upstream-doc/man2/glBufferSubData.xml diff --git a/upstream-man-pages/man2/glCallList.xml b/upstream-doc/man2/glCallList.xml similarity index 100% rename from upstream-man-pages/man2/glCallList.xml rename to upstream-doc/man2/glCallList.xml diff --git a/upstream-man-pages/man2/glCallLists.xml b/upstream-doc/man2/glCallLists.xml similarity index 100% rename from upstream-man-pages/man2/glCallLists.xml rename to upstream-doc/man2/glCallLists.xml diff --git a/upstream-man-pages/man2/glClear.xml b/upstream-doc/man2/glClear.xml similarity index 100% rename from upstream-man-pages/man2/glClear.xml rename to upstream-doc/man2/glClear.xml diff --git a/upstream-man-pages/man2/glClearAccum.xml b/upstream-doc/man2/glClearAccum.xml similarity index 100% rename from upstream-man-pages/man2/glClearAccum.xml rename to upstream-doc/man2/glClearAccum.xml diff --git a/upstream-man-pages/man2/glClearColor.xml b/upstream-doc/man2/glClearColor.xml similarity index 100% rename from upstream-man-pages/man2/glClearColor.xml rename to upstream-doc/man2/glClearColor.xml diff --git a/upstream-man-pages/man2/glClearDepth.xml b/upstream-doc/man2/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man2/glClearDepth.xml rename to upstream-doc/man2/glClearDepth.xml diff --git a/upstream-man-pages/man2/glClearIndex.xml b/upstream-doc/man2/glClearIndex.xml similarity index 100% rename from upstream-man-pages/man2/glClearIndex.xml rename to upstream-doc/man2/glClearIndex.xml diff --git a/upstream-man-pages/man2/glClearStencil.xml b/upstream-doc/man2/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man2/glClearStencil.xml rename to upstream-doc/man2/glClearStencil.xml diff --git a/upstream-man-pages/man2/glClientActiveTexture.xml b/upstream-doc/man2/glClientActiveTexture.xml similarity index 100% rename from upstream-man-pages/man2/glClientActiveTexture.xml rename to upstream-doc/man2/glClientActiveTexture.xml diff --git a/upstream-man-pages/man2/glClipPlane.xml b/upstream-doc/man2/glClipPlane.xml similarity index 100% rename from upstream-man-pages/man2/glClipPlane.xml rename to upstream-doc/man2/glClipPlane.xml diff --git a/upstream-man-pages/man2/glColor.xml b/upstream-doc/man2/glColor.xml similarity index 100% rename from upstream-man-pages/man2/glColor.xml rename to upstream-doc/man2/glColor.xml diff --git a/upstream-man-pages/man2/glColorMask.xml b/upstream-doc/man2/glColorMask.xml similarity index 100% rename from upstream-man-pages/man2/glColorMask.xml rename to upstream-doc/man2/glColorMask.xml diff --git a/upstream-man-pages/man2/glColorMaterial.xml b/upstream-doc/man2/glColorMaterial.xml similarity index 100% rename from upstream-man-pages/man2/glColorMaterial.xml rename to upstream-doc/man2/glColorMaterial.xml diff --git a/upstream-man-pages/man2/glColorPointer.xml b/upstream-doc/man2/glColorPointer.xml similarity index 100% rename from upstream-man-pages/man2/glColorPointer.xml rename to upstream-doc/man2/glColorPointer.xml diff --git a/upstream-man-pages/man2/glColorSubTable.xml b/upstream-doc/man2/glColorSubTable.xml similarity index 100% rename from upstream-man-pages/man2/glColorSubTable.xml rename to upstream-doc/man2/glColorSubTable.xml diff --git a/upstream-man-pages/man2/glColorTable.xml b/upstream-doc/man2/glColorTable.xml similarity index 100% rename from upstream-man-pages/man2/glColorTable.xml rename to upstream-doc/man2/glColorTable.xml diff --git a/upstream-man-pages/man2/glColorTableParameter.xml b/upstream-doc/man2/glColorTableParameter.xml similarity index 100% rename from upstream-man-pages/man2/glColorTableParameter.xml rename to upstream-doc/man2/glColorTableParameter.xml diff --git a/upstream-man-pages/man2/glCompileShader.xml b/upstream-doc/man2/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man2/glCompileShader.xml rename to upstream-doc/man2/glCompileShader.xml diff --git a/upstream-man-pages/man2/glCompressedTexImage1D.xml b/upstream-doc/man2/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexImage1D.xml rename to upstream-doc/man2/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man2/glCompressedTexImage2D.xml b/upstream-doc/man2/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexImage2D.xml rename to upstream-doc/man2/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man2/glCompressedTexImage3D.xml b/upstream-doc/man2/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexImage3D.xml rename to upstream-doc/man2/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man2/glCompressedTexSubImage1D.xml b/upstream-doc/man2/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexSubImage1D.xml rename to upstream-doc/man2/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man2/glCompressedTexSubImage2D.xml b/upstream-doc/man2/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexSubImage2D.xml rename to upstream-doc/man2/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man2/glCompressedTexSubImage3D.xml b/upstream-doc/man2/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/glCompressedTexSubImage3D.xml rename to upstream-doc/man2/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man2/glConvolutionFilter1D.xml b/upstream-doc/man2/glConvolutionFilter1D.xml similarity index 100% rename from upstream-man-pages/man2/glConvolutionFilter1D.xml rename to upstream-doc/man2/glConvolutionFilter1D.xml diff --git a/upstream-man-pages/man2/glConvolutionFilter2D.xml b/upstream-doc/man2/glConvolutionFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/glConvolutionFilter2D.xml rename to upstream-doc/man2/glConvolutionFilter2D.xml diff --git a/upstream-man-pages/man2/glConvolutionParameter.xml b/upstream-doc/man2/glConvolutionParameter.xml similarity index 100% rename from upstream-man-pages/man2/glConvolutionParameter.xml rename to upstream-doc/man2/glConvolutionParameter.xml diff --git a/upstream-man-pages/man2/glCopyColorSubTable.xml b/upstream-doc/man2/glCopyColorSubTable.xml similarity index 100% rename from upstream-man-pages/man2/glCopyColorSubTable.xml rename to upstream-doc/man2/glCopyColorSubTable.xml diff --git a/upstream-man-pages/man2/glCopyColorTable.xml b/upstream-doc/man2/glCopyColorTable.xml similarity index 100% rename from upstream-man-pages/man2/glCopyColorTable.xml rename to upstream-doc/man2/glCopyColorTable.xml diff --git a/upstream-man-pages/man2/glCopyConvolutionFilter1D.xml b/upstream-doc/man2/glCopyConvolutionFilter1D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyConvolutionFilter1D.xml rename to upstream-doc/man2/glCopyConvolutionFilter1D.xml diff --git a/upstream-man-pages/man2/glCopyConvolutionFilter2D.xml b/upstream-doc/man2/glCopyConvolutionFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyConvolutionFilter2D.xml rename to upstream-doc/man2/glCopyConvolutionFilter2D.xml diff --git a/upstream-man-pages/man2/glCopyPixels.xml b/upstream-doc/man2/glCopyPixels.xml similarity index 100% rename from upstream-man-pages/man2/glCopyPixels.xml rename to upstream-doc/man2/glCopyPixels.xml diff --git a/upstream-man-pages/man2/glCopyTexImage1D.xml b/upstream-doc/man2/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyTexImage1D.xml rename to upstream-doc/man2/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man2/glCopyTexImage2D.xml b/upstream-doc/man2/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyTexImage2D.xml rename to upstream-doc/man2/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man2/glCopyTexSubImage1D.xml b/upstream-doc/man2/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyTexSubImage1D.xml rename to upstream-doc/man2/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man2/glCopyTexSubImage2D.xml b/upstream-doc/man2/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyTexSubImage2D.xml rename to upstream-doc/man2/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man2/glCopyTexSubImage3D.xml b/upstream-doc/man2/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/glCopyTexSubImage3D.xml rename to upstream-doc/man2/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man2/glCreateProgram.xml b/upstream-doc/man2/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man2/glCreateProgram.xml rename to upstream-doc/man2/glCreateProgram.xml diff --git a/upstream-man-pages/man2/glCreateShader.xml b/upstream-doc/man2/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man2/glCreateShader.xml rename to upstream-doc/man2/glCreateShader.xml diff --git a/upstream-man-pages/man2/glCullFace.xml b/upstream-doc/man2/glCullFace.xml similarity index 100% rename from upstream-man-pages/man2/glCullFace.xml rename to upstream-doc/man2/glCullFace.xml diff --git a/upstream-man-pages/man2/glDeleteBuffers.xml b/upstream-doc/man2/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteBuffers.xml rename to upstream-doc/man2/glDeleteBuffers.xml diff --git a/upstream-man-pages/man2/glDeleteLists.xml b/upstream-doc/man2/glDeleteLists.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteLists.xml rename to upstream-doc/man2/glDeleteLists.xml diff --git a/upstream-man-pages/man2/glDeleteProgram.xml b/upstream-doc/man2/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteProgram.xml rename to upstream-doc/man2/glDeleteProgram.xml diff --git a/upstream-man-pages/man2/glDeleteQueries.xml b/upstream-doc/man2/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteQueries.xml rename to upstream-doc/man2/glDeleteQueries.xml diff --git a/upstream-man-pages/man2/glDeleteShader.xml b/upstream-doc/man2/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteShader.xml rename to upstream-doc/man2/glDeleteShader.xml diff --git a/upstream-man-pages/man2/glDeleteTextures.xml b/upstream-doc/man2/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man2/glDeleteTextures.xml rename to upstream-doc/man2/glDeleteTextures.xml diff --git a/upstream-man-pages/man2/glDepthFunc.xml b/upstream-doc/man2/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man2/glDepthFunc.xml rename to upstream-doc/man2/glDepthFunc.xml diff --git a/upstream-man-pages/man2/glDepthMask.xml b/upstream-doc/man2/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man2/glDepthMask.xml rename to upstream-doc/man2/glDepthMask.xml diff --git a/upstream-man-pages/man2/glDepthRange.xml b/upstream-doc/man2/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man2/glDepthRange.xml rename to upstream-doc/man2/glDepthRange.xml diff --git a/upstream-man-pages/man2/glDetachShader.xml b/upstream-doc/man2/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man2/glDetachShader.xml rename to upstream-doc/man2/glDetachShader.xml diff --git a/upstream-man-pages/man2/glDrawArrays.xml b/upstream-doc/man2/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man2/glDrawArrays.xml rename to upstream-doc/man2/glDrawArrays.xml diff --git a/upstream-man-pages/man2/glDrawBuffer.xml b/upstream-doc/man2/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glDrawBuffer.xml rename to upstream-doc/man2/glDrawBuffer.xml diff --git a/upstream-man-pages/man2/glDrawBuffers.xml b/upstream-doc/man2/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man2/glDrawBuffers.xml rename to upstream-doc/man2/glDrawBuffers.xml diff --git a/upstream-man-pages/man2/glDrawElements.xml b/upstream-doc/man2/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man2/glDrawElements.xml rename to upstream-doc/man2/glDrawElements.xml diff --git a/upstream-man-pages/man2/glDrawPixels.xml b/upstream-doc/man2/glDrawPixels.xml similarity index 100% rename from upstream-man-pages/man2/glDrawPixels.xml rename to upstream-doc/man2/glDrawPixels.xml diff --git a/upstream-man-pages/man2/glDrawRangeElements.xml b/upstream-doc/man2/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man2/glDrawRangeElements.xml rename to upstream-doc/man2/glDrawRangeElements.xml diff --git a/upstream-man-pages/man2/glEdgeFlag.xml b/upstream-doc/man2/glEdgeFlag.xml similarity index 100% rename from upstream-man-pages/man2/glEdgeFlag.xml rename to upstream-doc/man2/glEdgeFlag.xml diff --git a/upstream-man-pages/man2/glEdgeFlagPointer.xml b/upstream-doc/man2/glEdgeFlagPointer.xml similarity index 100% rename from upstream-man-pages/man2/glEdgeFlagPointer.xml rename to upstream-doc/man2/glEdgeFlagPointer.xml diff --git a/upstream-man-pages/man2/glEnable.xml b/upstream-doc/man2/glEnable.xml similarity index 100% rename from upstream-man-pages/man2/glEnable.xml rename to upstream-doc/man2/glEnable.xml diff --git a/upstream-man-pages/man2/glEnableClientState.xml b/upstream-doc/man2/glEnableClientState.xml similarity index 100% rename from upstream-man-pages/man2/glEnableClientState.xml rename to upstream-doc/man2/glEnableClientState.xml diff --git a/upstream-man-pages/man2/glEnableVertexAttribArray.xml b/upstream-doc/man2/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man2/glEnableVertexAttribArray.xml rename to upstream-doc/man2/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man2/glEvalCoord.xml b/upstream-doc/man2/glEvalCoord.xml similarity index 100% rename from upstream-man-pages/man2/glEvalCoord.xml rename to upstream-doc/man2/glEvalCoord.xml diff --git a/upstream-man-pages/man2/glEvalMesh.xml b/upstream-doc/man2/glEvalMesh.xml similarity index 100% rename from upstream-man-pages/man2/glEvalMesh.xml rename to upstream-doc/man2/glEvalMesh.xml diff --git a/upstream-man-pages/man2/glEvalPoint.xml b/upstream-doc/man2/glEvalPoint.xml similarity index 100% rename from upstream-man-pages/man2/glEvalPoint.xml rename to upstream-doc/man2/glEvalPoint.xml diff --git a/upstream-man-pages/man2/glFeedbackBuffer.xml b/upstream-doc/man2/glFeedbackBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glFeedbackBuffer.xml rename to upstream-doc/man2/glFeedbackBuffer.xml diff --git a/upstream-man-pages/man2/glFinish.xml b/upstream-doc/man2/glFinish.xml similarity index 100% rename from upstream-man-pages/man2/glFinish.xml rename to upstream-doc/man2/glFinish.xml diff --git a/upstream-man-pages/man2/glFlush.xml b/upstream-doc/man2/glFlush.xml similarity index 100% rename from upstream-man-pages/man2/glFlush.xml rename to upstream-doc/man2/glFlush.xml diff --git a/upstream-man-pages/man2/glFog.xml b/upstream-doc/man2/glFog.xml similarity index 100% rename from upstream-man-pages/man2/glFog.xml rename to upstream-doc/man2/glFog.xml diff --git a/upstream-man-pages/man2/glFogCoord.xml b/upstream-doc/man2/glFogCoord.xml similarity index 100% rename from upstream-man-pages/man2/glFogCoord.xml rename to upstream-doc/man2/glFogCoord.xml diff --git a/upstream-man-pages/man2/glFogCoordPointer.xml b/upstream-doc/man2/glFogCoordPointer.xml similarity index 100% rename from upstream-man-pages/man2/glFogCoordPointer.xml rename to upstream-doc/man2/glFogCoordPointer.xml diff --git a/upstream-man-pages/man2/glFrontFace.xml b/upstream-doc/man2/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man2/glFrontFace.xml rename to upstream-doc/man2/glFrontFace.xml diff --git a/upstream-man-pages/man2/glFrustum.xml b/upstream-doc/man2/glFrustum.xml similarity index 100% rename from upstream-man-pages/man2/glFrustum.xml rename to upstream-doc/man2/glFrustum.xml diff --git a/upstream-man-pages/man2/glGenBuffers.xml b/upstream-doc/man2/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man2/glGenBuffers.xml rename to upstream-doc/man2/glGenBuffers.xml diff --git a/upstream-man-pages/man2/glGenLists.xml b/upstream-doc/man2/glGenLists.xml similarity index 100% rename from upstream-man-pages/man2/glGenLists.xml rename to upstream-doc/man2/glGenLists.xml diff --git a/upstream-man-pages/man2/glGenQueries.xml b/upstream-doc/man2/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man2/glGenQueries.xml rename to upstream-doc/man2/glGenQueries.xml diff --git a/upstream-man-pages/man2/glGenTextures.xml b/upstream-doc/man2/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man2/glGenTextures.xml rename to upstream-doc/man2/glGenTextures.xml diff --git a/upstream-man-pages/man2/glGet.xml b/upstream-doc/man2/glGet.xml similarity index 100% rename from upstream-man-pages/man2/glGet.xml rename to upstream-doc/man2/glGet.xml diff --git a/upstream-man-pages/man2/glGetActiveAttrib.xml b/upstream-doc/man2/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glGetActiveAttrib.xml rename to upstream-doc/man2/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man2/glGetActiveUniform.xml b/upstream-doc/man2/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man2/glGetActiveUniform.xml rename to upstream-doc/man2/glGetActiveUniform.xml diff --git a/upstream-man-pages/man2/glGetAttachedShaders.xml b/upstream-doc/man2/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man2/glGetAttachedShaders.xml rename to upstream-doc/man2/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man2/glGetAttribLocation.xml b/upstream-doc/man2/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man2/glGetAttribLocation.xml rename to upstream-doc/man2/glGetAttribLocation.xml diff --git a/upstream-man-pages/man2/glGetBufferParameteriv.xml b/upstream-doc/man2/glGetBufferParameteriv.xml similarity index 100% rename from upstream-man-pages/man2/glGetBufferParameteriv.xml rename to upstream-doc/man2/glGetBufferParameteriv.xml diff --git a/upstream-man-pages/man2/glGetBufferPointerv.xml b/upstream-doc/man2/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man2/glGetBufferPointerv.xml rename to upstream-doc/man2/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man2/glGetBufferSubData.xml b/upstream-doc/man2/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man2/glGetBufferSubData.xml rename to upstream-doc/man2/glGetBufferSubData.xml diff --git a/upstream-man-pages/man2/glGetClipPlane.xml b/upstream-doc/man2/glGetClipPlane.xml similarity index 100% rename from upstream-man-pages/man2/glGetClipPlane.xml rename to upstream-doc/man2/glGetClipPlane.xml diff --git a/upstream-man-pages/man2/glGetColorTable.xml b/upstream-doc/man2/glGetColorTable.xml similarity index 100% rename from upstream-man-pages/man2/glGetColorTable.xml rename to upstream-doc/man2/glGetColorTable.xml diff --git a/upstream-man-pages/man2/glGetColorTableParameter.xml b/upstream-doc/man2/glGetColorTableParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetColorTableParameter.xml rename to upstream-doc/man2/glGetColorTableParameter.xml diff --git a/upstream-man-pages/man2/glGetCompressedTexImage.xml b/upstream-doc/man2/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man2/glGetCompressedTexImage.xml rename to upstream-doc/man2/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man2/glGetConvolutionFilter.xml b/upstream-doc/man2/glGetConvolutionFilter.xml similarity index 100% rename from upstream-man-pages/man2/glGetConvolutionFilter.xml rename to upstream-doc/man2/glGetConvolutionFilter.xml diff --git a/upstream-man-pages/man2/glGetConvolutionParameter.xml b/upstream-doc/man2/glGetConvolutionParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetConvolutionParameter.xml rename to upstream-doc/man2/glGetConvolutionParameter.xml diff --git a/upstream-man-pages/man2/glGetError.xml b/upstream-doc/man2/glGetError.xml similarity index 100% rename from upstream-man-pages/man2/glGetError.xml rename to upstream-doc/man2/glGetError.xml diff --git a/upstream-man-pages/man2/glGetHistogram.xml b/upstream-doc/man2/glGetHistogram.xml similarity index 100% rename from upstream-man-pages/man2/glGetHistogram.xml rename to upstream-doc/man2/glGetHistogram.xml diff --git a/upstream-man-pages/man2/glGetHistogramParameter.xml b/upstream-doc/man2/glGetHistogramParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetHistogramParameter.xml rename to upstream-doc/man2/glGetHistogramParameter.xml diff --git a/upstream-man-pages/man2/glGetLight.xml b/upstream-doc/man2/glGetLight.xml similarity index 100% rename from upstream-man-pages/man2/glGetLight.xml rename to upstream-doc/man2/glGetLight.xml diff --git a/upstream-man-pages/man2/glGetMap.xml b/upstream-doc/man2/glGetMap.xml similarity index 100% rename from upstream-man-pages/man2/glGetMap.xml rename to upstream-doc/man2/glGetMap.xml diff --git a/upstream-man-pages/man2/glGetMaterial.xml b/upstream-doc/man2/glGetMaterial.xml similarity index 100% rename from upstream-man-pages/man2/glGetMaterial.xml rename to upstream-doc/man2/glGetMaterial.xml diff --git a/upstream-man-pages/man2/glGetMinmax.xml b/upstream-doc/man2/glGetMinmax.xml similarity index 100% rename from upstream-man-pages/man2/glGetMinmax.xml rename to upstream-doc/man2/glGetMinmax.xml diff --git a/upstream-man-pages/man2/glGetMinmaxParameter.xml b/upstream-doc/man2/glGetMinmaxParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetMinmaxParameter.xml rename to upstream-doc/man2/glGetMinmaxParameter.xml diff --git a/upstream-man-pages/man2/glGetPixelMap.xml b/upstream-doc/man2/glGetPixelMap.xml similarity index 100% rename from upstream-man-pages/man2/glGetPixelMap.xml rename to upstream-doc/man2/glGetPixelMap.xml diff --git a/upstream-man-pages/man2/glGetPointerv.xml b/upstream-doc/man2/glGetPointerv.xml similarity index 100% rename from upstream-man-pages/man2/glGetPointerv.xml rename to upstream-doc/man2/glGetPointerv.xml diff --git a/upstream-man-pages/man2/glGetPolygonStipple.xml b/upstream-doc/man2/glGetPolygonStipple.xml similarity index 100% rename from upstream-man-pages/man2/glGetPolygonStipple.xml rename to upstream-doc/man2/glGetPolygonStipple.xml diff --git a/upstream-man-pages/man2/glGetProgram.xml b/upstream-doc/man2/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man2/glGetProgram.xml rename to upstream-doc/man2/glGetProgram.xml diff --git a/upstream-man-pages/man2/glGetProgramInfoLog.xml b/upstream-doc/man2/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man2/glGetProgramInfoLog.xml rename to upstream-doc/man2/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man2/glGetQueryObject.xml b/upstream-doc/man2/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man2/glGetQueryObject.xml rename to upstream-doc/man2/glGetQueryObject.xml diff --git a/upstream-man-pages/man2/glGetQueryiv.xml b/upstream-doc/man2/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man2/glGetQueryiv.xml rename to upstream-doc/man2/glGetQueryiv.xml diff --git a/upstream-man-pages/man2/glGetSeparableFilter.xml b/upstream-doc/man2/glGetSeparableFilter.xml similarity index 100% rename from upstream-man-pages/man2/glGetSeparableFilter.xml rename to upstream-doc/man2/glGetSeparableFilter.xml diff --git a/upstream-man-pages/man2/glGetShader.xml b/upstream-doc/man2/glGetShader.xml similarity index 100% rename from upstream-man-pages/man2/glGetShader.xml rename to upstream-doc/man2/glGetShader.xml diff --git a/upstream-man-pages/man2/glGetShaderInfoLog.xml b/upstream-doc/man2/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man2/glGetShaderInfoLog.xml rename to upstream-doc/man2/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man2/glGetShaderSource.xml b/upstream-doc/man2/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man2/glGetShaderSource.xml rename to upstream-doc/man2/glGetShaderSource.xml diff --git a/upstream-man-pages/man2/glGetString.xml b/upstream-doc/man2/glGetString.xml similarity index 100% rename from upstream-man-pages/man2/glGetString.xml rename to upstream-doc/man2/glGetString.xml diff --git a/upstream-man-pages/man2/glGetTexEnv.xml b/upstream-doc/man2/glGetTexEnv.xml similarity index 100% rename from upstream-man-pages/man2/glGetTexEnv.xml rename to upstream-doc/man2/glGetTexEnv.xml diff --git a/upstream-man-pages/man2/glGetTexGen.xml b/upstream-doc/man2/glGetTexGen.xml similarity index 100% rename from upstream-man-pages/man2/glGetTexGen.xml rename to upstream-doc/man2/glGetTexGen.xml diff --git a/upstream-man-pages/man2/glGetTexImage.xml b/upstream-doc/man2/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man2/glGetTexImage.xml rename to upstream-doc/man2/glGetTexImage.xml diff --git a/upstream-man-pages/man2/glGetTexLevelParameter.xml b/upstream-doc/man2/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetTexLevelParameter.xml rename to upstream-doc/man2/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man2/glGetTexParameter.xml b/upstream-doc/man2/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man2/glGetTexParameter.xml rename to upstream-doc/man2/glGetTexParameter.xml diff --git a/upstream-man-pages/man2/glGetUniform.xml b/upstream-doc/man2/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man2/glGetUniform.xml rename to upstream-doc/man2/glGetUniform.xml diff --git a/upstream-man-pages/man2/glGetUniformLocation.xml b/upstream-doc/man2/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man2/glGetUniformLocation.xml rename to upstream-doc/man2/glGetUniformLocation.xml diff --git a/upstream-man-pages/man2/glGetVertexAttrib.xml b/upstream-doc/man2/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glGetVertexAttrib.xml rename to upstream-doc/man2/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man2/glGetVertexAttribPointerv.xml b/upstream-doc/man2/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man2/glGetVertexAttribPointerv.xml rename to upstream-doc/man2/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man2/glHint.xml b/upstream-doc/man2/glHint.xml similarity index 100% rename from upstream-man-pages/man2/glHint.xml rename to upstream-doc/man2/glHint.xml diff --git a/upstream-man-pages/man2/glHistogram.xml b/upstream-doc/man2/glHistogram.xml similarity index 100% rename from upstream-man-pages/man2/glHistogram.xml rename to upstream-doc/man2/glHistogram.xml diff --git a/upstream-man-pages/man2/glIndex.xml b/upstream-doc/man2/glIndex.xml similarity index 100% rename from upstream-man-pages/man2/glIndex.xml rename to upstream-doc/man2/glIndex.xml diff --git a/upstream-man-pages/man2/glIndexMask.xml b/upstream-doc/man2/glIndexMask.xml similarity index 100% rename from upstream-man-pages/man2/glIndexMask.xml rename to upstream-doc/man2/glIndexMask.xml diff --git a/upstream-man-pages/man2/glIndexPointer.xml b/upstream-doc/man2/glIndexPointer.xml similarity index 100% rename from upstream-man-pages/man2/glIndexPointer.xml rename to upstream-doc/man2/glIndexPointer.xml diff --git a/upstream-man-pages/man2/glInitNames.xml b/upstream-doc/man2/glInitNames.xml similarity index 100% rename from upstream-man-pages/man2/glInitNames.xml rename to upstream-doc/man2/glInitNames.xml diff --git a/upstream-man-pages/man2/glInterleavedArrays.xml b/upstream-doc/man2/glInterleavedArrays.xml similarity index 100% rename from upstream-man-pages/man2/glInterleavedArrays.xml rename to upstream-doc/man2/glInterleavedArrays.xml diff --git a/upstream-man-pages/man2/glIsBuffer.xml b/upstream-doc/man2/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glIsBuffer.xml rename to upstream-doc/man2/glIsBuffer.xml diff --git a/upstream-man-pages/man2/glIsEnabled.xml b/upstream-doc/man2/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man2/glIsEnabled.xml rename to upstream-doc/man2/glIsEnabled.xml diff --git a/upstream-man-pages/man2/glIsList.xml b/upstream-doc/man2/glIsList.xml similarity index 100% rename from upstream-man-pages/man2/glIsList.xml rename to upstream-doc/man2/glIsList.xml diff --git a/upstream-man-pages/man2/glIsProgram.xml b/upstream-doc/man2/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man2/glIsProgram.xml rename to upstream-doc/man2/glIsProgram.xml diff --git a/upstream-man-pages/man2/glIsQuery.xml b/upstream-doc/man2/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man2/glIsQuery.xml rename to upstream-doc/man2/glIsQuery.xml diff --git a/upstream-man-pages/man2/glIsShader.xml b/upstream-doc/man2/glIsShader.xml similarity index 100% rename from upstream-man-pages/man2/glIsShader.xml rename to upstream-doc/man2/glIsShader.xml diff --git a/upstream-man-pages/man2/glIsTexture.xml b/upstream-doc/man2/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man2/glIsTexture.xml rename to upstream-doc/man2/glIsTexture.xml diff --git a/upstream-man-pages/man2/glLight.xml b/upstream-doc/man2/glLight.xml similarity index 100% rename from upstream-man-pages/man2/glLight.xml rename to upstream-doc/man2/glLight.xml diff --git a/upstream-man-pages/man2/glLightModel.xml b/upstream-doc/man2/glLightModel.xml similarity index 100% rename from upstream-man-pages/man2/glLightModel.xml rename to upstream-doc/man2/glLightModel.xml diff --git a/upstream-man-pages/man2/glLineStipple.xml b/upstream-doc/man2/glLineStipple.xml similarity index 100% rename from upstream-man-pages/man2/glLineStipple.xml rename to upstream-doc/man2/glLineStipple.xml diff --git a/upstream-man-pages/man2/glLineWidth.xml b/upstream-doc/man2/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man2/glLineWidth.xml rename to upstream-doc/man2/glLineWidth.xml diff --git a/upstream-man-pages/man2/glLinkProgram.xml b/upstream-doc/man2/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man2/glLinkProgram.xml rename to upstream-doc/man2/glLinkProgram.xml diff --git a/upstream-man-pages/man2/glListBase.xml b/upstream-doc/man2/glListBase.xml similarity index 100% rename from upstream-man-pages/man2/glListBase.xml rename to upstream-doc/man2/glListBase.xml diff --git a/upstream-man-pages/man2/glLoadIdentity.xml b/upstream-doc/man2/glLoadIdentity.xml similarity index 100% rename from upstream-man-pages/man2/glLoadIdentity.xml rename to upstream-doc/man2/glLoadIdentity.xml diff --git a/upstream-man-pages/man2/glLoadMatrix.xml b/upstream-doc/man2/glLoadMatrix.xml similarity index 100% rename from upstream-man-pages/man2/glLoadMatrix.xml rename to upstream-doc/man2/glLoadMatrix.xml diff --git a/upstream-man-pages/man2/glLoadName.xml b/upstream-doc/man2/glLoadName.xml similarity index 100% rename from upstream-man-pages/man2/glLoadName.xml rename to upstream-doc/man2/glLoadName.xml diff --git a/upstream-man-pages/man2/glLoadTransposeMatrix.xml b/upstream-doc/man2/glLoadTransposeMatrix.xml similarity index 100% rename from upstream-man-pages/man2/glLoadTransposeMatrix.xml rename to upstream-doc/man2/glLoadTransposeMatrix.xml diff --git a/upstream-man-pages/man2/glLogicOp.xml b/upstream-doc/man2/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man2/glLogicOp.xml rename to upstream-doc/man2/glLogicOp.xml diff --git a/upstream-man-pages/man2/glMap1.xml b/upstream-doc/man2/glMap1.xml similarity index 100% rename from upstream-man-pages/man2/glMap1.xml rename to upstream-doc/man2/glMap1.xml diff --git a/upstream-man-pages/man2/glMap2.xml b/upstream-doc/man2/glMap2.xml similarity index 100% rename from upstream-man-pages/man2/glMap2.xml rename to upstream-doc/man2/glMap2.xml diff --git a/upstream-man-pages/man2/glMapBuffer.xml b/upstream-doc/man2/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glMapBuffer.xml rename to upstream-doc/man2/glMapBuffer.xml diff --git a/upstream-man-pages/man2/glMapGrid.xml b/upstream-doc/man2/glMapGrid.xml similarity index 100% rename from upstream-man-pages/man2/glMapGrid.xml rename to upstream-doc/man2/glMapGrid.xml diff --git a/upstream-man-pages/man2/glMaterial.xml b/upstream-doc/man2/glMaterial.xml similarity index 100% rename from upstream-man-pages/man2/glMaterial.xml rename to upstream-doc/man2/glMaterial.xml diff --git a/upstream-man-pages/man2/glMatrixMode.xml b/upstream-doc/man2/glMatrixMode.xml similarity index 100% rename from upstream-man-pages/man2/glMatrixMode.xml rename to upstream-doc/man2/glMatrixMode.xml diff --git a/upstream-man-pages/man2/glMinmax.xml b/upstream-doc/man2/glMinmax.xml similarity index 100% rename from upstream-man-pages/man2/glMinmax.xml rename to upstream-doc/man2/glMinmax.xml diff --git a/upstream-man-pages/man2/glMultMatrix.xml b/upstream-doc/man2/glMultMatrix.xml similarity index 100% rename from upstream-man-pages/man2/glMultMatrix.xml rename to upstream-doc/man2/glMultMatrix.xml diff --git a/upstream-man-pages/man2/glMultTransposeMatrix.xml b/upstream-doc/man2/glMultTransposeMatrix.xml similarity index 100% rename from upstream-man-pages/man2/glMultTransposeMatrix.xml rename to upstream-doc/man2/glMultTransposeMatrix.xml diff --git a/upstream-man-pages/man2/glMultiDrawArrays.xml b/upstream-doc/man2/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man2/glMultiDrawArrays.xml rename to upstream-doc/man2/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man2/glMultiDrawElements.xml b/upstream-doc/man2/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man2/glMultiDrawElements.xml rename to upstream-doc/man2/glMultiDrawElements.xml diff --git a/upstream-man-pages/man2/glMultiTexCoord.xml b/upstream-doc/man2/glMultiTexCoord.xml similarity index 100% rename from upstream-man-pages/man2/glMultiTexCoord.xml rename to upstream-doc/man2/glMultiTexCoord.xml diff --git a/upstream-man-pages/man2/glNewList.xml b/upstream-doc/man2/glNewList.xml similarity index 100% rename from upstream-man-pages/man2/glNewList.xml rename to upstream-doc/man2/glNewList.xml diff --git a/upstream-man-pages/man2/glNormal.xml b/upstream-doc/man2/glNormal.xml similarity index 100% rename from upstream-man-pages/man2/glNormal.xml rename to upstream-doc/man2/glNormal.xml diff --git a/upstream-man-pages/man2/glNormalPointer.xml b/upstream-doc/man2/glNormalPointer.xml similarity index 100% rename from upstream-man-pages/man2/glNormalPointer.xml rename to upstream-doc/man2/glNormalPointer.xml diff --git a/upstream-man-pages/man2/glOrtho.xml b/upstream-doc/man2/glOrtho.xml similarity index 100% rename from upstream-man-pages/man2/glOrtho.xml rename to upstream-doc/man2/glOrtho.xml diff --git a/upstream-man-pages/man2/glPassThrough.xml b/upstream-doc/man2/glPassThrough.xml similarity index 100% rename from upstream-man-pages/man2/glPassThrough.xml rename to upstream-doc/man2/glPassThrough.xml diff --git a/upstream-man-pages/man2/glPixelMap.xml b/upstream-doc/man2/glPixelMap.xml similarity index 100% rename from upstream-man-pages/man2/glPixelMap.xml rename to upstream-doc/man2/glPixelMap.xml diff --git a/upstream-man-pages/man2/glPixelStore.xml b/upstream-doc/man2/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man2/glPixelStore.xml rename to upstream-doc/man2/glPixelStore.xml diff --git a/upstream-man-pages/man2/glPixelTransfer.xml b/upstream-doc/man2/glPixelTransfer.xml similarity index 100% rename from upstream-man-pages/man2/glPixelTransfer.xml rename to upstream-doc/man2/glPixelTransfer.xml diff --git a/upstream-man-pages/man2/glPixelZoom.xml b/upstream-doc/man2/glPixelZoom.xml similarity index 100% rename from upstream-man-pages/man2/glPixelZoom.xml rename to upstream-doc/man2/glPixelZoom.xml diff --git a/upstream-man-pages/man2/glPointParameter.xml b/upstream-doc/man2/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man2/glPointParameter.xml rename to upstream-doc/man2/glPointParameter.xml diff --git a/upstream-man-pages/man2/glPointSize.xml b/upstream-doc/man2/glPointSize.xml similarity index 100% rename from upstream-man-pages/man2/glPointSize.xml rename to upstream-doc/man2/glPointSize.xml diff --git a/upstream-man-pages/man2/glPolygonMode.xml b/upstream-doc/man2/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man2/glPolygonMode.xml rename to upstream-doc/man2/glPolygonMode.xml diff --git a/upstream-man-pages/man2/glPolygonOffset.xml b/upstream-doc/man2/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man2/glPolygonOffset.xml rename to upstream-doc/man2/glPolygonOffset.xml diff --git a/upstream-man-pages/man2/glPolygonStipple.xml b/upstream-doc/man2/glPolygonStipple.xml similarity index 100% rename from upstream-man-pages/man2/glPolygonStipple.xml rename to upstream-doc/man2/glPolygonStipple.xml diff --git a/upstream-man-pages/man2/glPrioritizeTextures.xml b/upstream-doc/man2/glPrioritizeTextures.xml similarity index 100% rename from upstream-man-pages/man2/glPrioritizeTextures.xml rename to upstream-doc/man2/glPrioritizeTextures.xml diff --git a/upstream-man-pages/man2/glPushAttrib.xml b/upstream-doc/man2/glPushAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glPushAttrib.xml rename to upstream-doc/man2/glPushAttrib.xml diff --git a/upstream-man-pages/man2/glPushClientAttrib.xml b/upstream-doc/man2/glPushClientAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glPushClientAttrib.xml rename to upstream-doc/man2/glPushClientAttrib.xml diff --git a/upstream-man-pages/man2/glPushMatrix.xml b/upstream-doc/man2/glPushMatrix.xml similarity index 100% rename from upstream-man-pages/man2/glPushMatrix.xml rename to upstream-doc/man2/glPushMatrix.xml diff --git a/upstream-man-pages/man2/glPushName.xml b/upstream-doc/man2/glPushName.xml similarity index 100% rename from upstream-man-pages/man2/glPushName.xml rename to upstream-doc/man2/glPushName.xml diff --git a/upstream-man-pages/man2/glRasterPos.xml b/upstream-doc/man2/glRasterPos.xml similarity index 100% rename from upstream-man-pages/man2/glRasterPos.xml rename to upstream-doc/man2/glRasterPos.xml diff --git a/upstream-man-pages/man2/glReadBuffer.xml b/upstream-doc/man2/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glReadBuffer.xml rename to upstream-doc/man2/glReadBuffer.xml diff --git a/upstream-man-pages/man2/glReadPixels.xml b/upstream-doc/man2/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man2/glReadPixels.xml rename to upstream-doc/man2/glReadPixels.xml diff --git a/upstream-man-pages/man2/glRect.xml b/upstream-doc/man2/glRect.xml similarity index 100% rename from upstream-man-pages/man2/glRect.xml rename to upstream-doc/man2/glRect.xml diff --git a/upstream-man-pages/man2/glRenderMode.xml b/upstream-doc/man2/glRenderMode.xml similarity index 100% rename from upstream-man-pages/man2/glRenderMode.xml rename to upstream-doc/man2/glRenderMode.xml diff --git a/upstream-man-pages/man2/glResetHistogram.xml b/upstream-doc/man2/glResetHistogram.xml similarity index 100% rename from upstream-man-pages/man2/glResetHistogram.xml rename to upstream-doc/man2/glResetHistogram.xml diff --git a/upstream-man-pages/man2/glResetMinmax.xml b/upstream-doc/man2/glResetMinmax.xml similarity index 100% rename from upstream-man-pages/man2/glResetMinmax.xml rename to upstream-doc/man2/glResetMinmax.xml diff --git a/upstream-man-pages/man2/glRotate.xml b/upstream-doc/man2/glRotate.xml similarity index 100% rename from upstream-man-pages/man2/glRotate.xml rename to upstream-doc/man2/glRotate.xml diff --git a/upstream-man-pages/man2/glSampleCoverage.xml b/upstream-doc/man2/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man2/glSampleCoverage.xml rename to upstream-doc/man2/glSampleCoverage.xml diff --git a/upstream-man-pages/man2/glScale.xml b/upstream-doc/man2/glScale.xml similarity index 100% rename from upstream-man-pages/man2/glScale.xml rename to upstream-doc/man2/glScale.xml diff --git a/upstream-man-pages/man2/glScissor.xml b/upstream-doc/man2/glScissor.xml similarity index 100% rename from upstream-man-pages/man2/glScissor.xml rename to upstream-doc/man2/glScissor.xml diff --git a/upstream-man-pages/man2/glSecondaryColor.xml b/upstream-doc/man2/glSecondaryColor.xml similarity index 100% rename from upstream-man-pages/man2/glSecondaryColor.xml rename to upstream-doc/man2/glSecondaryColor.xml diff --git a/upstream-man-pages/man2/glSecondaryColorPointer.xml b/upstream-doc/man2/glSecondaryColorPointer.xml similarity index 100% rename from upstream-man-pages/man2/glSecondaryColorPointer.xml rename to upstream-doc/man2/glSecondaryColorPointer.xml diff --git a/upstream-man-pages/man2/glSelectBuffer.xml b/upstream-doc/man2/glSelectBuffer.xml similarity index 100% rename from upstream-man-pages/man2/glSelectBuffer.xml rename to upstream-doc/man2/glSelectBuffer.xml diff --git a/upstream-man-pages/man2/glSeparableFilter2D.xml b/upstream-doc/man2/glSeparableFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/glSeparableFilter2D.xml rename to upstream-doc/man2/glSeparableFilter2D.xml diff --git a/upstream-man-pages/man2/glShadeModel.xml b/upstream-doc/man2/glShadeModel.xml similarity index 100% rename from upstream-man-pages/man2/glShadeModel.xml rename to upstream-doc/man2/glShadeModel.xml diff --git a/upstream-man-pages/man2/glShaderSource.xml b/upstream-doc/man2/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man2/glShaderSource.xml rename to upstream-doc/man2/glShaderSource.xml diff --git a/upstream-man-pages/man2/glStencilFunc.xml b/upstream-doc/man2/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man2/glStencilFunc.xml rename to upstream-doc/man2/glStencilFunc.xml diff --git a/upstream-man-pages/man2/glStencilFuncSeparate.xml b/upstream-doc/man2/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man2/glStencilFuncSeparate.xml rename to upstream-doc/man2/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man2/glStencilMask.xml b/upstream-doc/man2/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man2/glStencilMask.xml rename to upstream-doc/man2/glStencilMask.xml diff --git a/upstream-man-pages/man2/glStencilMaskSeparate.xml b/upstream-doc/man2/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man2/glStencilMaskSeparate.xml rename to upstream-doc/man2/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man2/glStencilOp.xml b/upstream-doc/man2/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man2/glStencilOp.xml rename to upstream-doc/man2/glStencilOp.xml diff --git a/upstream-man-pages/man2/glStencilOpSeparate.xml b/upstream-doc/man2/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man2/glStencilOpSeparate.xml rename to upstream-doc/man2/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man2/glTexCoord.xml b/upstream-doc/man2/glTexCoord.xml similarity index 100% rename from upstream-man-pages/man2/glTexCoord.xml rename to upstream-doc/man2/glTexCoord.xml diff --git a/upstream-man-pages/man2/glTexCoordPointer.xml b/upstream-doc/man2/glTexCoordPointer.xml similarity index 100% rename from upstream-man-pages/man2/glTexCoordPointer.xml rename to upstream-doc/man2/glTexCoordPointer.xml diff --git a/upstream-man-pages/man2/glTexEnv.xml b/upstream-doc/man2/glTexEnv.xml similarity index 100% rename from upstream-man-pages/man2/glTexEnv.xml rename to upstream-doc/man2/glTexEnv.xml diff --git a/upstream-man-pages/man2/glTexGen.xml b/upstream-doc/man2/glTexGen.xml similarity index 100% rename from upstream-man-pages/man2/glTexGen.xml rename to upstream-doc/man2/glTexGen.xml diff --git a/upstream-man-pages/man2/glTexImage1D.xml b/upstream-doc/man2/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glTexImage1D.xml rename to upstream-doc/man2/glTexImage1D.xml diff --git a/upstream-man-pages/man2/glTexImage2D.xml b/upstream-doc/man2/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glTexImage2D.xml rename to upstream-doc/man2/glTexImage2D.xml diff --git a/upstream-man-pages/man2/glTexImage3D.xml b/upstream-doc/man2/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man2/glTexImage3D.xml rename to upstream-doc/man2/glTexImage3D.xml diff --git a/upstream-man-pages/man2/glTexParameter.xml b/upstream-doc/man2/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man2/glTexParameter.xml rename to upstream-doc/man2/glTexParameter.xml diff --git a/upstream-man-pages/man2/glTexSubImage1D.xml b/upstream-doc/man2/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/glTexSubImage1D.xml rename to upstream-doc/man2/glTexSubImage1D.xml diff --git a/upstream-man-pages/man2/glTexSubImage2D.xml b/upstream-doc/man2/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/glTexSubImage2D.xml rename to upstream-doc/man2/glTexSubImage2D.xml diff --git a/upstream-man-pages/man2/glTexSubImage3D.xml b/upstream-doc/man2/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/glTexSubImage3D.xml rename to upstream-doc/man2/glTexSubImage3D.xml diff --git a/upstream-man-pages/man2/glTranslate.xml b/upstream-doc/man2/glTranslate.xml similarity index 100% rename from upstream-man-pages/man2/glTranslate.xml rename to upstream-doc/man2/glTranslate.xml diff --git a/upstream-man-pages/man2/glUniform.xml b/upstream-doc/man2/glUniform.xml similarity index 100% rename from upstream-man-pages/man2/glUniform.xml rename to upstream-doc/man2/glUniform.xml diff --git a/upstream-man-pages/man2/glUseProgram.xml b/upstream-doc/man2/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man2/glUseProgram.xml rename to upstream-doc/man2/glUseProgram.xml diff --git a/upstream-man-pages/man2/glValidateProgram.xml b/upstream-doc/man2/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man2/glValidateProgram.xml rename to upstream-doc/man2/glValidateProgram.xml diff --git a/upstream-man-pages/man2/glVertex.xml b/upstream-doc/man2/glVertex.xml similarity index 100% rename from upstream-man-pages/man2/glVertex.xml rename to upstream-doc/man2/glVertex.xml diff --git a/upstream-man-pages/man2/glVertexAttrib.xml b/upstream-doc/man2/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glVertexAttrib.xml rename to upstream-doc/man2/glVertexAttrib.xml diff --git a/upstream-man-pages/man2/glVertexAttribPointer.xml b/upstream-doc/man2/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man2/glVertexAttribPointer.xml rename to upstream-doc/man2/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man2/glVertexPointer.xml b/upstream-doc/man2/glVertexPointer.xml similarity index 100% rename from upstream-man-pages/man2/glVertexPointer.xml rename to upstream-doc/man2/glVertexPointer.xml diff --git a/upstream-man-pages/man2/glViewport.xml b/upstream-doc/man2/glViewport.xml similarity index 100% rename from upstream-man-pages/man2/glViewport.xml rename to upstream-doc/man2/glViewport.xml diff --git a/upstream-man-pages/man2/glWindowPos.xml b/upstream-doc/man2/glWindowPos.xml similarity index 100% rename from upstream-man-pages/man2/glWindowPos.xml rename to upstream-doc/man2/glWindowPos.xml diff --git a/upstream-man-pages/man2/glXChooseFBConfig.xml b/upstream-doc/man2/glXChooseFBConfig.xml similarity index 100% rename from upstream-man-pages/man2/glXChooseFBConfig.xml rename to upstream-doc/man2/glXChooseFBConfig.xml diff --git a/upstream-man-pages/man2/glXChooseVisual.xml b/upstream-doc/man2/glXChooseVisual.xml similarity index 100% rename from upstream-man-pages/man2/glXChooseVisual.xml rename to upstream-doc/man2/glXChooseVisual.xml diff --git a/upstream-man-pages/man2/glXCopyContext.xml b/upstream-doc/man2/glXCopyContext.xml similarity index 100% rename from upstream-man-pages/man2/glXCopyContext.xml rename to upstream-doc/man2/glXCopyContext.xml diff --git a/upstream-man-pages/man2/glXCreateContext.xml b/upstream-doc/man2/glXCreateContext.xml similarity index 100% rename from upstream-man-pages/man2/glXCreateContext.xml rename to upstream-doc/man2/glXCreateContext.xml diff --git a/upstream-man-pages/man2/glXCreateGLXPixmap.xml b/upstream-doc/man2/glXCreateGLXPixmap.xml similarity index 100% rename from upstream-man-pages/man2/glXCreateGLXPixmap.xml rename to upstream-doc/man2/glXCreateGLXPixmap.xml diff --git a/upstream-man-pages/man2/glXCreateNewContext.xml b/upstream-doc/man2/glXCreateNewContext.xml similarity index 100% rename from upstream-man-pages/man2/glXCreateNewContext.xml rename to upstream-doc/man2/glXCreateNewContext.xml diff --git a/upstream-man-pages/man2/glXCreatePbuffer.xml b/upstream-doc/man2/glXCreatePbuffer.xml similarity index 100% rename from upstream-man-pages/man2/glXCreatePbuffer.xml rename to upstream-doc/man2/glXCreatePbuffer.xml diff --git a/upstream-man-pages/man2/glXCreatePixmap.xml b/upstream-doc/man2/glXCreatePixmap.xml similarity index 100% rename from upstream-man-pages/man2/glXCreatePixmap.xml rename to upstream-doc/man2/glXCreatePixmap.xml diff --git a/upstream-man-pages/man2/glXCreateWindow.xml b/upstream-doc/man2/glXCreateWindow.xml similarity index 100% rename from upstream-man-pages/man2/glXCreateWindow.xml rename to upstream-doc/man2/glXCreateWindow.xml diff --git a/upstream-man-pages/man2/glXDestroyContext.xml b/upstream-doc/man2/glXDestroyContext.xml similarity index 100% rename from upstream-man-pages/man2/glXDestroyContext.xml rename to upstream-doc/man2/glXDestroyContext.xml diff --git a/upstream-man-pages/man2/glXDestroyGLXPixmap.xml b/upstream-doc/man2/glXDestroyGLXPixmap.xml similarity index 100% rename from upstream-man-pages/man2/glXDestroyGLXPixmap.xml rename to upstream-doc/man2/glXDestroyGLXPixmap.xml diff --git a/upstream-man-pages/man2/glXDestroyPbuffer.xml b/upstream-doc/man2/glXDestroyPbuffer.xml similarity index 100% rename from upstream-man-pages/man2/glXDestroyPbuffer.xml rename to upstream-doc/man2/glXDestroyPbuffer.xml diff --git a/upstream-man-pages/man2/glXDestroyPixmap.xml b/upstream-doc/man2/glXDestroyPixmap.xml similarity index 100% rename from upstream-man-pages/man2/glXDestroyPixmap.xml rename to upstream-doc/man2/glXDestroyPixmap.xml diff --git a/upstream-man-pages/man2/glXDestroyWindow.xml b/upstream-doc/man2/glXDestroyWindow.xml similarity index 100% rename from upstream-man-pages/man2/glXDestroyWindow.xml rename to upstream-doc/man2/glXDestroyWindow.xml diff --git a/upstream-man-pages/man2/glXFreeContextEXT.xml b/upstream-doc/man2/glXFreeContextEXT.xml similarity index 100% rename from upstream-man-pages/man2/glXFreeContextEXT.xml rename to upstream-doc/man2/glXFreeContextEXT.xml diff --git a/upstream-man-pages/man2/glXGetClientString.xml b/upstream-doc/man2/glXGetClientString.xml similarity index 100% rename from upstream-man-pages/man2/glXGetClientString.xml rename to upstream-doc/man2/glXGetClientString.xml diff --git a/upstream-man-pages/man2/glXGetConfig.xml b/upstream-doc/man2/glXGetConfig.xml similarity index 100% rename from upstream-man-pages/man2/glXGetConfig.xml rename to upstream-doc/man2/glXGetConfig.xml diff --git a/upstream-man-pages/man2/glXGetContextIDEXT.xml b/upstream-doc/man2/glXGetContextIDEXT.xml similarity index 100% rename from upstream-man-pages/man2/glXGetContextIDEXT.xml rename to upstream-doc/man2/glXGetContextIDEXT.xml diff --git a/upstream-man-pages/man2/glXGetCurrentContext.xml b/upstream-doc/man2/glXGetCurrentContext.xml similarity index 100% rename from upstream-man-pages/man2/glXGetCurrentContext.xml rename to upstream-doc/man2/glXGetCurrentContext.xml diff --git a/upstream-man-pages/man2/glXGetCurrentDisplay.xml b/upstream-doc/man2/glXGetCurrentDisplay.xml similarity index 100% rename from upstream-man-pages/man2/glXGetCurrentDisplay.xml rename to upstream-doc/man2/glXGetCurrentDisplay.xml diff --git a/upstream-man-pages/man2/glXGetCurrentDrawable.xml b/upstream-doc/man2/glXGetCurrentDrawable.xml similarity index 100% rename from upstream-man-pages/man2/glXGetCurrentDrawable.xml rename to upstream-doc/man2/glXGetCurrentDrawable.xml diff --git a/upstream-man-pages/man2/glXGetCurrentReadDrawable.xml b/upstream-doc/man2/glXGetCurrentReadDrawable.xml similarity index 100% rename from upstream-man-pages/man2/glXGetCurrentReadDrawable.xml rename to upstream-doc/man2/glXGetCurrentReadDrawable.xml diff --git a/upstream-man-pages/man2/glXGetFBConfigAttrib.xml b/upstream-doc/man2/glXGetFBConfigAttrib.xml similarity index 100% rename from upstream-man-pages/man2/glXGetFBConfigAttrib.xml rename to upstream-doc/man2/glXGetFBConfigAttrib.xml diff --git a/upstream-man-pages/man2/glXGetFBConfigs.xml b/upstream-doc/man2/glXGetFBConfigs.xml similarity index 100% rename from upstream-man-pages/man2/glXGetFBConfigs.xml rename to upstream-doc/man2/glXGetFBConfigs.xml diff --git a/upstream-man-pages/man2/glXGetProcAddress.xml b/upstream-doc/man2/glXGetProcAddress.xml similarity index 100% rename from upstream-man-pages/man2/glXGetProcAddress.xml rename to upstream-doc/man2/glXGetProcAddress.xml diff --git a/upstream-man-pages/man2/glXGetSelectedEvent.xml b/upstream-doc/man2/glXGetSelectedEvent.xml similarity index 100% rename from upstream-man-pages/man2/glXGetSelectedEvent.xml rename to upstream-doc/man2/glXGetSelectedEvent.xml diff --git a/upstream-man-pages/man2/glXGetVisualFromFBConfig.xml b/upstream-doc/man2/glXGetVisualFromFBConfig.xml similarity index 100% rename from upstream-man-pages/man2/glXGetVisualFromFBConfig.xml rename to upstream-doc/man2/glXGetVisualFromFBConfig.xml diff --git a/upstream-man-pages/man2/glXImportContextEXT.xml b/upstream-doc/man2/glXImportContextEXT.xml similarity index 100% rename from upstream-man-pages/man2/glXImportContextEXT.xml rename to upstream-doc/man2/glXImportContextEXT.xml diff --git a/upstream-man-pages/man2/glXIntro.xml b/upstream-doc/man2/glXIntro.xml similarity index 100% rename from upstream-man-pages/man2/glXIntro.xml rename to upstream-doc/man2/glXIntro.xml diff --git a/upstream-man-pages/man2/glXIsDirect.xml b/upstream-doc/man2/glXIsDirect.xml similarity index 100% rename from upstream-man-pages/man2/glXIsDirect.xml rename to upstream-doc/man2/glXIsDirect.xml diff --git a/upstream-man-pages/man2/glXMakeContextCurrent.xml b/upstream-doc/man2/glXMakeContextCurrent.xml similarity index 100% rename from upstream-man-pages/man2/glXMakeContextCurrent.xml rename to upstream-doc/man2/glXMakeContextCurrent.xml diff --git a/upstream-man-pages/man2/glXMakeCurrent.xml b/upstream-doc/man2/glXMakeCurrent.xml similarity index 100% rename from upstream-man-pages/man2/glXMakeCurrent.xml rename to upstream-doc/man2/glXMakeCurrent.xml diff --git a/upstream-man-pages/man2/glXQueryContext.xml b/upstream-doc/man2/glXQueryContext.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryContext.xml rename to upstream-doc/man2/glXQueryContext.xml diff --git a/upstream-man-pages/man2/glXQueryContextInfoEXT.xml b/upstream-doc/man2/glXQueryContextInfoEXT.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryContextInfoEXT.xml rename to upstream-doc/man2/glXQueryContextInfoEXT.xml diff --git a/upstream-man-pages/man2/glXQueryDrawable.xml b/upstream-doc/man2/glXQueryDrawable.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryDrawable.xml rename to upstream-doc/man2/glXQueryDrawable.xml diff --git a/upstream-man-pages/man2/glXQueryExtension.xml b/upstream-doc/man2/glXQueryExtension.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryExtension.xml rename to upstream-doc/man2/glXQueryExtension.xml diff --git a/upstream-man-pages/man2/glXQueryExtensionsString.xml b/upstream-doc/man2/glXQueryExtensionsString.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryExtensionsString.xml rename to upstream-doc/man2/glXQueryExtensionsString.xml diff --git a/upstream-man-pages/man2/glXQueryServerString.xml b/upstream-doc/man2/glXQueryServerString.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryServerString.xml rename to upstream-doc/man2/glXQueryServerString.xml diff --git a/upstream-man-pages/man2/glXQueryVersion.xml b/upstream-doc/man2/glXQueryVersion.xml similarity index 100% rename from upstream-man-pages/man2/glXQueryVersion.xml rename to upstream-doc/man2/glXQueryVersion.xml diff --git a/upstream-man-pages/man2/glXSelectEvent.xml b/upstream-doc/man2/glXSelectEvent.xml similarity index 100% rename from upstream-man-pages/man2/glXSelectEvent.xml rename to upstream-doc/man2/glXSelectEvent.xml diff --git a/upstream-man-pages/man2/glXSwapBuffers.xml b/upstream-doc/man2/glXSwapBuffers.xml similarity index 100% rename from upstream-man-pages/man2/glXSwapBuffers.xml rename to upstream-doc/man2/glXSwapBuffers.xml diff --git a/upstream-man-pages/man2/glXUseXFont.xml b/upstream-doc/man2/glXUseXFont.xml similarity index 100% rename from upstream-man-pages/man2/glXUseXFont.xml rename to upstream-doc/man2/glXUseXFont.xml diff --git a/upstream-man-pages/man2/glXWaitGL.xml b/upstream-doc/man2/glXWaitGL.xml similarity index 100% rename from upstream-man-pages/man2/glXWaitGL.xml rename to upstream-doc/man2/glXWaitGL.xml diff --git a/upstream-man-pages/man2/glXWaitX.xml b/upstream-doc/man2/glXWaitX.xml similarity index 100% rename from upstream-man-pages/man2/glXWaitX.xml rename to upstream-doc/man2/glXWaitX.xml diff --git a/upstream-man-pages/man2/gluBeginCurve.xml b/upstream-doc/man2/gluBeginCurve.xml similarity index 100% rename from upstream-man-pages/man2/gluBeginCurve.xml rename to upstream-doc/man2/gluBeginCurve.xml diff --git a/upstream-man-pages/man2/gluBeginPolygon.xml b/upstream-doc/man2/gluBeginPolygon.xml similarity index 100% rename from upstream-man-pages/man2/gluBeginPolygon.xml rename to upstream-doc/man2/gluBeginPolygon.xml diff --git a/upstream-man-pages/man2/gluBeginSurface.xml b/upstream-doc/man2/gluBeginSurface.xml similarity index 100% rename from upstream-man-pages/man2/gluBeginSurface.xml rename to upstream-doc/man2/gluBeginSurface.xml diff --git a/upstream-man-pages/man2/gluBeginTrim.xml b/upstream-doc/man2/gluBeginTrim.xml similarity index 100% rename from upstream-man-pages/man2/gluBeginTrim.xml rename to upstream-doc/man2/gluBeginTrim.xml diff --git a/upstream-man-pages/man2/gluBuild1DMipmapLevels.xml b/upstream-doc/man2/gluBuild1DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild1DMipmapLevels.xml rename to upstream-doc/man2/gluBuild1DMipmapLevels.xml diff --git a/upstream-man-pages/man2/gluBuild1DMipmaps.xml b/upstream-doc/man2/gluBuild1DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild1DMipmaps.xml rename to upstream-doc/man2/gluBuild1DMipmaps.xml diff --git a/upstream-man-pages/man2/gluBuild2DMipmapLevels.xml b/upstream-doc/man2/gluBuild2DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild2DMipmapLevels.xml rename to upstream-doc/man2/gluBuild2DMipmapLevels.xml diff --git a/upstream-man-pages/man2/gluBuild2DMipmaps.xml b/upstream-doc/man2/gluBuild2DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild2DMipmaps.xml rename to upstream-doc/man2/gluBuild2DMipmaps.xml diff --git a/upstream-man-pages/man2/gluBuild3DMipmapLevels.xml b/upstream-doc/man2/gluBuild3DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild3DMipmapLevels.xml rename to upstream-doc/man2/gluBuild3DMipmapLevels.xml diff --git a/upstream-man-pages/man2/gluBuild3DMipmaps.xml b/upstream-doc/man2/gluBuild3DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/gluBuild3DMipmaps.xml rename to upstream-doc/man2/gluBuild3DMipmaps.xml diff --git a/upstream-man-pages/man2/gluCheckExtension.xml b/upstream-doc/man2/gluCheckExtension.xml similarity index 100% rename from upstream-man-pages/man2/gluCheckExtension.xml rename to upstream-doc/man2/gluCheckExtension.xml diff --git a/upstream-man-pages/man2/gluCylinder.xml b/upstream-doc/man2/gluCylinder.xml similarity index 100% rename from upstream-man-pages/man2/gluCylinder.xml rename to upstream-doc/man2/gluCylinder.xml diff --git a/upstream-man-pages/man2/gluDeleteNurbsRenderer.xml b/upstream-doc/man2/gluDeleteNurbsRenderer.xml similarity index 100% rename from upstream-man-pages/man2/gluDeleteNurbsRenderer.xml rename to upstream-doc/man2/gluDeleteNurbsRenderer.xml diff --git a/upstream-man-pages/man2/gluDeleteQuadric.xml b/upstream-doc/man2/gluDeleteQuadric.xml similarity index 100% rename from upstream-man-pages/man2/gluDeleteQuadric.xml rename to upstream-doc/man2/gluDeleteQuadric.xml diff --git a/upstream-man-pages/man2/gluDeleteTess.xml b/upstream-doc/man2/gluDeleteTess.xml similarity index 100% rename from upstream-man-pages/man2/gluDeleteTess.xml rename to upstream-doc/man2/gluDeleteTess.xml diff --git a/upstream-man-pages/man2/gluDisk.xml b/upstream-doc/man2/gluDisk.xml similarity index 100% rename from upstream-man-pages/man2/gluDisk.xml rename to upstream-doc/man2/gluDisk.xml diff --git a/upstream-man-pages/man2/gluErrorString.xml b/upstream-doc/man2/gluErrorString.xml similarity index 100% rename from upstream-man-pages/man2/gluErrorString.xml rename to upstream-doc/man2/gluErrorString.xml diff --git a/upstream-man-pages/man2/gluGetNurbsProperty.xml b/upstream-doc/man2/gluGetNurbsProperty.xml similarity index 100% rename from upstream-man-pages/man2/gluGetNurbsProperty.xml rename to upstream-doc/man2/gluGetNurbsProperty.xml diff --git a/upstream-man-pages/man2/gluGetString.xml b/upstream-doc/man2/gluGetString.xml similarity index 100% rename from upstream-man-pages/man2/gluGetString.xml rename to upstream-doc/man2/gluGetString.xml diff --git a/upstream-man-pages/man2/gluGetTessProperty.xml b/upstream-doc/man2/gluGetTessProperty.xml similarity index 100% rename from upstream-man-pages/man2/gluGetTessProperty.xml rename to upstream-doc/man2/gluGetTessProperty.xml diff --git a/upstream-man-pages/man2/gluLoadSamplingMatrices.xml b/upstream-doc/man2/gluLoadSamplingMatrices.xml similarity index 100% rename from upstream-man-pages/man2/gluLoadSamplingMatrices.xml rename to upstream-doc/man2/gluLoadSamplingMatrices.xml diff --git a/upstream-man-pages/man2/gluLookAt.xml b/upstream-doc/man2/gluLookAt.xml similarity index 100% rename from upstream-man-pages/man2/gluLookAt.xml rename to upstream-doc/man2/gluLookAt.xml diff --git a/upstream-man-pages/man2/gluNewNurbsRenderer.xml b/upstream-doc/man2/gluNewNurbsRenderer.xml similarity index 100% rename from upstream-man-pages/man2/gluNewNurbsRenderer.xml rename to upstream-doc/man2/gluNewNurbsRenderer.xml diff --git a/upstream-man-pages/man2/gluNewQuadric.xml b/upstream-doc/man2/gluNewQuadric.xml similarity index 100% rename from upstream-man-pages/man2/gluNewQuadric.xml rename to upstream-doc/man2/gluNewQuadric.xml diff --git a/upstream-man-pages/man2/gluNewTess.xml b/upstream-doc/man2/gluNewTess.xml similarity index 100% rename from upstream-man-pages/man2/gluNewTess.xml rename to upstream-doc/man2/gluNewTess.xml diff --git a/upstream-man-pages/man2/gluNextContour.xml b/upstream-doc/man2/gluNextContour.xml similarity index 100% rename from upstream-man-pages/man2/gluNextContour.xml rename to upstream-doc/man2/gluNextContour.xml diff --git a/upstream-man-pages/man2/gluNurbsCallback.xml b/upstream-doc/man2/gluNurbsCallback.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsCallback.xml rename to upstream-doc/man2/gluNurbsCallback.xml diff --git a/upstream-man-pages/man2/gluNurbsCallbackData.xml b/upstream-doc/man2/gluNurbsCallbackData.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsCallbackData.xml rename to upstream-doc/man2/gluNurbsCallbackData.xml diff --git a/upstream-man-pages/man2/gluNurbsCallbackDataEXT.xml b/upstream-doc/man2/gluNurbsCallbackDataEXT.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsCallbackDataEXT.xml rename to upstream-doc/man2/gluNurbsCallbackDataEXT.xml diff --git a/upstream-man-pages/man2/gluNurbsCurve.xml b/upstream-doc/man2/gluNurbsCurve.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsCurve.xml rename to upstream-doc/man2/gluNurbsCurve.xml diff --git a/upstream-man-pages/man2/gluNurbsProperty.xml b/upstream-doc/man2/gluNurbsProperty.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsProperty.xml rename to upstream-doc/man2/gluNurbsProperty.xml diff --git a/upstream-man-pages/man2/gluNurbsSurface.xml b/upstream-doc/man2/gluNurbsSurface.xml similarity index 100% rename from upstream-man-pages/man2/gluNurbsSurface.xml rename to upstream-doc/man2/gluNurbsSurface.xml diff --git a/upstream-man-pages/man2/gluOrtho2D.xml b/upstream-doc/man2/gluOrtho2D.xml similarity index 100% rename from upstream-man-pages/man2/gluOrtho2D.xml rename to upstream-doc/man2/gluOrtho2D.xml diff --git a/upstream-man-pages/man2/gluPartialDisk.xml b/upstream-doc/man2/gluPartialDisk.xml similarity index 100% rename from upstream-man-pages/man2/gluPartialDisk.xml rename to upstream-doc/man2/gluPartialDisk.xml diff --git a/upstream-man-pages/man2/gluPerspective.xml b/upstream-doc/man2/gluPerspective.xml similarity index 100% rename from upstream-man-pages/man2/gluPerspective.xml rename to upstream-doc/man2/gluPerspective.xml diff --git a/upstream-man-pages/man2/gluPickMatrix.xml b/upstream-doc/man2/gluPickMatrix.xml similarity index 100% rename from upstream-man-pages/man2/gluPickMatrix.xml rename to upstream-doc/man2/gluPickMatrix.xml diff --git a/upstream-man-pages/man2/gluProject.xml b/upstream-doc/man2/gluProject.xml similarity index 100% rename from upstream-man-pages/man2/gluProject.xml rename to upstream-doc/man2/gluProject.xml diff --git a/upstream-man-pages/man2/gluPwlCurve.xml b/upstream-doc/man2/gluPwlCurve.xml similarity index 100% rename from upstream-man-pages/man2/gluPwlCurve.xml rename to upstream-doc/man2/gluPwlCurve.xml diff --git a/upstream-man-pages/man2/gluQuadricCallback.xml b/upstream-doc/man2/gluQuadricCallback.xml similarity index 100% rename from upstream-man-pages/man2/gluQuadricCallback.xml rename to upstream-doc/man2/gluQuadricCallback.xml diff --git a/upstream-man-pages/man2/gluQuadricDrawStyle.xml b/upstream-doc/man2/gluQuadricDrawStyle.xml similarity index 100% rename from upstream-man-pages/man2/gluQuadricDrawStyle.xml rename to upstream-doc/man2/gluQuadricDrawStyle.xml diff --git a/upstream-man-pages/man2/gluQuadricNormals.xml b/upstream-doc/man2/gluQuadricNormals.xml similarity index 100% rename from upstream-man-pages/man2/gluQuadricNormals.xml rename to upstream-doc/man2/gluQuadricNormals.xml diff --git a/upstream-man-pages/man2/gluQuadricOrientation.xml b/upstream-doc/man2/gluQuadricOrientation.xml similarity index 100% rename from upstream-man-pages/man2/gluQuadricOrientation.xml rename to upstream-doc/man2/gluQuadricOrientation.xml diff --git a/upstream-man-pages/man2/gluQuadricTexture.xml b/upstream-doc/man2/gluQuadricTexture.xml similarity index 100% rename from upstream-man-pages/man2/gluQuadricTexture.xml rename to upstream-doc/man2/gluQuadricTexture.xml diff --git a/upstream-man-pages/man2/gluScaleImage.xml b/upstream-doc/man2/gluScaleImage.xml similarity index 100% rename from upstream-man-pages/man2/gluScaleImage.xml rename to upstream-doc/man2/gluScaleImage.xml diff --git a/upstream-man-pages/man2/gluSphere.xml b/upstream-doc/man2/gluSphere.xml similarity index 100% rename from upstream-man-pages/man2/gluSphere.xml rename to upstream-doc/man2/gluSphere.xml diff --git a/upstream-man-pages/man2/gluTessBeginContour.xml b/upstream-doc/man2/gluTessBeginContour.xml similarity index 100% rename from upstream-man-pages/man2/gluTessBeginContour.xml rename to upstream-doc/man2/gluTessBeginContour.xml diff --git a/upstream-man-pages/man2/gluTessBeginPolygon.xml b/upstream-doc/man2/gluTessBeginPolygon.xml similarity index 100% rename from upstream-man-pages/man2/gluTessBeginPolygon.xml rename to upstream-doc/man2/gluTessBeginPolygon.xml diff --git a/upstream-man-pages/man2/gluTessCallback.xml b/upstream-doc/man2/gluTessCallback.xml similarity index 100% rename from upstream-man-pages/man2/gluTessCallback.xml rename to upstream-doc/man2/gluTessCallback.xml diff --git a/upstream-man-pages/man2/gluTessEndPolygon.xml b/upstream-doc/man2/gluTessEndPolygon.xml similarity index 100% rename from upstream-man-pages/man2/gluTessEndPolygon.xml rename to upstream-doc/man2/gluTessEndPolygon.xml diff --git a/upstream-man-pages/man2/gluTessNormal.xml b/upstream-doc/man2/gluTessNormal.xml similarity index 100% rename from upstream-man-pages/man2/gluTessNormal.xml rename to upstream-doc/man2/gluTessNormal.xml diff --git a/upstream-man-pages/man2/gluTessProperty.xml b/upstream-doc/man2/gluTessProperty.xml similarity index 100% rename from upstream-man-pages/man2/gluTessProperty.xml rename to upstream-doc/man2/gluTessProperty.xml diff --git a/upstream-man-pages/man2/gluTessVertex.xml b/upstream-doc/man2/gluTessVertex.xml similarity index 100% rename from upstream-man-pages/man2/gluTessVertex.xml rename to upstream-doc/man2/gluTessVertex.xml diff --git a/upstream-man-pages/man2/gluUnProject.xml b/upstream-doc/man2/gluUnProject.xml similarity index 100% rename from upstream-man-pages/man2/gluUnProject.xml rename to upstream-doc/man2/gluUnProject.xml diff --git a/upstream-man-pages/man2/gluUnProject4.xml b/upstream-doc/man2/gluUnProject4.xml similarity index 100% rename from upstream-man-pages/man2/gluUnProject4.xml rename to upstream-doc/man2/gluUnProject4.xml diff --git a/upstream-man-pages/man2/index.php b/upstream-doc/man2/index.php similarity index 100% rename from upstream-man-pages/man2/index.php rename to upstream-doc/man2/index.php diff --git a/upstream-man-pages/man2/pdf/DejaVuSans.ttf b/upstream-doc/man2/pdf/DejaVuSans.ttf similarity index 100% rename from upstream-man-pages/man2/pdf/DejaVuSans.ttf rename to upstream-doc/man2/pdf/DejaVuSans.ttf diff --git a/upstream-man-pages/man2/pdf/Makefile b/upstream-doc/man2/pdf/Makefile similarity index 100% rename from upstream-man-pages/man2/pdf/Makefile rename to upstream-doc/man2/pdf/Makefile diff --git a/upstream-man-pages/man2/pdf/footer b/upstream-doc/man2/pdf/footer similarity index 100% rename from upstream-man-pages/man2/pdf/footer rename to upstream-doc/man2/pdf/footer diff --git a/upstream-man-pages/man2/pdf/header b/upstream-doc/man2/pdf/header similarity index 100% rename from upstream-man-pages/man2/pdf/header rename to upstream-doc/man2/pdf/header diff --git a/upstream-man-pages/man2/pdf/ogl_prep_xml.xsl b/upstream-doc/man2/pdf/ogl_prep_xml.xsl similarity index 100% rename from upstream-man-pages/man2/pdf/ogl_prep_xml.xsl rename to upstream-doc/man2/pdf/ogl_prep_xml.xsl diff --git a/upstream-man-pages/man2/pdf/opengl-pdf.xsl b/upstream-doc/man2/pdf/opengl-pdf.xsl similarity index 100% rename from upstream-man-pages/man2/pdf/opengl-pdf.xsl rename to upstream-doc/man2/pdf/opengl-pdf.xsl diff --git a/upstream-man-pages/man2/top.php b/upstream-doc/man2/top.php similarity index 100% rename from upstream-man-pages/man2/top.php rename to upstream-doc/man2/top.php diff --git a/upstream-man-pages/man2/usr/include/make/commondefs b/upstream-doc/man2/usr/include/make/commondefs similarity index 100% rename from upstream-man-pages/man2/usr/include/make/commondefs rename to upstream-doc/man2/usr/include/make/commondefs diff --git a/upstream-man-pages/man2/usr/include/make/commonrules b/upstream-doc/man2/usr/include/make/commonrules similarity index 100% rename from upstream-man-pages/man2/usr/include/make/commonrules rename to upstream-doc/man2/usr/include/make/commonrules diff --git a/upstream-man-pages/man2/usr/include/make/commonrules.win32 b/upstream-doc/man2/usr/include/make/commonrules.win32 similarity index 100% rename from upstream-man-pages/man2/usr/include/make/commonrules.win32 rename to upstream-doc/man2/usr/include/make/commonrules.win32 diff --git a/upstream-man-pages/man2/usr/include/make/linuxdefs b/upstream-doc/man2/usr/include/make/linuxdefs similarity index 100% rename from upstream-man-pages/man2/usr/include/make/linuxdefs rename to upstream-doc/man2/usr/include/make/linuxdefs diff --git a/upstream-man-pages/man2/xhtml/Makefile b/upstream-doc/man2/xhtml/Makefile similarity index 100% rename from upstream-man-pages/man2/xhtml/Makefile rename to upstream-doc/man2/xhtml/Makefile diff --git a/upstream-man-pages/man2/xhtml/ctop.xsl b/upstream-doc/man2/xhtml/ctop.xsl similarity index 100% rename from upstream-man-pages/man2/xhtml/ctop.xsl rename to upstream-doc/man2/xhtml/ctop.xsl diff --git a/upstream-man-pages/man2/xhtml/glAccum.xml b/upstream-doc/man2/xhtml/glAccum.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glAccum.xml rename to upstream-doc/man2/xhtml/glAccum.xml diff --git a/upstream-man-pages/man2/xhtml/glActiveTexture.xml b/upstream-doc/man2/xhtml/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glActiveTexture.xml rename to upstream-doc/man2/xhtml/glActiveTexture.xml diff --git a/upstream-man-pages/man2/xhtml/glAlphaFunc.xml b/upstream-doc/man2/xhtml/glAlphaFunc.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glAlphaFunc.xml rename to upstream-doc/man2/xhtml/glAlphaFunc.xml diff --git a/upstream-man-pages/man2/xhtml/glAreTexturesResident.xml b/upstream-doc/man2/xhtml/glAreTexturesResident.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glAreTexturesResident.xml rename to upstream-doc/man2/xhtml/glAreTexturesResident.xml diff --git a/upstream-man-pages/man2/xhtml/glArrayElement.xml b/upstream-doc/man2/xhtml/glArrayElement.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glArrayElement.xml rename to upstream-doc/man2/xhtml/glArrayElement.xml diff --git a/upstream-man-pages/man2/xhtml/glAttachShader.xml b/upstream-doc/man2/xhtml/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glAttachShader.xml rename to upstream-doc/man2/xhtml/glAttachShader.xml diff --git a/upstream-man-pages/man2/xhtml/glBegin.xml b/upstream-doc/man2/xhtml/glBegin.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBegin.xml rename to upstream-doc/man2/xhtml/glBegin.xml diff --git a/upstream-man-pages/man2/xhtml/glBeginQuery.xml b/upstream-doc/man2/xhtml/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBeginQuery.xml rename to upstream-doc/man2/xhtml/glBeginQuery.xml diff --git a/upstream-man-pages/man2/xhtml/glBindAttribLocation.xml b/upstream-doc/man2/xhtml/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBindAttribLocation.xml rename to upstream-doc/man2/xhtml/glBindAttribLocation.xml diff --git a/upstream-man-pages/man2/xhtml/glBindBuffer.xml b/upstream-doc/man2/xhtml/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBindBuffer.xml rename to upstream-doc/man2/xhtml/glBindBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glBindTexture.xml b/upstream-doc/man2/xhtml/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBindTexture.xml rename to upstream-doc/man2/xhtml/glBindTexture.xml diff --git a/upstream-man-pages/man2/xhtml/glBitmap.xml b/upstream-doc/man2/xhtml/glBitmap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBitmap.xml rename to upstream-doc/man2/xhtml/glBitmap.xml diff --git a/upstream-man-pages/man2/xhtml/glBlendColor.xml b/upstream-doc/man2/xhtml/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBlendColor.xml rename to upstream-doc/man2/xhtml/glBlendColor.xml diff --git a/upstream-man-pages/man2/xhtml/glBlendEquation.xml b/upstream-doc/man2/xhtml/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBlendEquation.xml rename to upstream-doc/man2/xhtml/glBlendEquation.xml diff --git a/upstream-man-pages/man2/xhtml/glBlendEquationSeparate.xml b/upstream-doc/man2/xhtml/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBlendEquationSeparate.xml rename to upstream-doc/man2/xhtml/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man2/xhtml/glBlendFunc.xml b/upstream-doc/man2/xhtml/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBlendFunc.xml rename to upstream-doc/man2/xhtml/glBlendFunc.xml diff --git a/upstream-man-pages/man2/xhtml/glBlendFuncSeparate.xml b/upstream-doc/man2/xhtml/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBlendFuncSeparate.xml rename to upstream-doc/man2/xhtml/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man2/xhtml/glBufferData.xml b/upstream-doc/man2/xhtml/glBufferData.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBufferData.xml rename to upstream-doc/man2/xhtml/glBufferData.xml diff --git a/upstream-man-pages/man2/xhtml/glBufferSubData.xml b/upstream-doc/man2/xhtml/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glBufferSubData.xml rename to upstream-doc/man2/xhtml/glBufferSubData.xml diff --git a/upstream-man-pages/man2/xhtml/glCallList.xml b/upstream-doc/man2/xhtml/glCallList.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCallList.xml rename to upstream-doc/man2/xhtml/glCallList.xml diff --git a/upstream-man-pages/man2/xhtml/glCallLists.xml b/upstream-doc/man2/xhtml/glCallLists.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCallLists.xml rename to upstream-doc/man2/xhtml/glCallLists.xml diff --git a/upstream-man-pages/man2/xhtml/glClear.xml b/upstream-doc/man2/xhtml/glClear.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClear.xml rename to upstream-doc/man2/xhtml/glClear.xml diff --git a/upstream-man-pages/man2/xhtml/glClearAccum.xml b/upstream-doc/man2/xhtml/glClearAccum.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClearAccum.xml rename to upstream-doc/man2/xhtml/glClearAccum.xml diff --git a/upstream-man-pages/man2/xhtml/glClearColor.xml b/upstream-doc/man2/xhtml/glClearColor.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClearColor.xml rename to upstream-doc/man2/xhtml/glClearColor.xml diff --git a/upstream-man-pages/man2/xhtml/glClearDepth.xml b/upstream-doc/man2/xhtml/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClearDepth.xml rename to upstream-doc/man2/xhtml/glClearDepth.xml diff --git a/upstream-man-pages/man2/xhtml/glClearIndex.xml b/upstream-doc/man2/xhtml/glClearIndex.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClearIndex.xml rename to upstream-doc/man2/xhtml/glClearIndex.xml diff --git a/upstream-man-pages/man2/xhtml/glClearStencil.xml b/upstream-doc/man2/xhtml/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClearStencil.xml rename to upstream-doc/man2/xhtml/glClearStencil.xml diff --git a/upstream-man-pages/man2/xhtml/glClientActiveTexture.xml b/upstream-doc/man2/xhtml/glClientActiveTexture.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClientActiveTexture.xml rename to upstream-doc/man2/xhtml/glClientActiveTexture.xml diff --git a/upstream-man-pages/man2/xhtml/glClipPlane.xml b/upstream-doc/man2/xhtml/glClipPlane.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glClipPlane.xml rename to upstream-doc/man2/xhtml/glClipPlane.xml diff --git a/upstream-man-pages/man2/xhtml/glColor.xml b/upstream-doc/man2/xhtml/glColor.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColor.xml rename to upstream-doc/man2/xhtml/glColor.xml diff --git a/upstream-man-pages/man2/xhtml/glColor4.xml b/upstream-doc/man2/xhtml/glColor4.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColor4.xml rename to upstream-doc/man2/xhtml/glColor4.xml diff --git a/upstream-man-pages/man2/xhtml/glColorMask.xml b/upstream-doc/man2/xhtml/glColorMask.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorMask.xml rename to upstream-doc/man2/xhtml/glColorMask.xml diff --git a/upstream-man-pages/man2/xhtml/glColorMaterial.xml b/upstream-doc/man2/xhtml/glColorMaterial.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorMaterial.xml rename to upstream-doc/man2/xhtml/glColorMaterial.xml diff --git a/upstream-man-pages/man2/xhtml/glColorPointer.xml b/upstream-doc/man2/xhtml/glColorPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorPointer.xml rename to upstream-doc/man2/xhtml/glColorPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glColorSubTable.xml b/upstream-doc/man2/xhtml/glColorSubTable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorSubTable.xml rename to upstream-doc/man2/xhtml/glColorSubTable.xml diff --git a/upstream-man-pages/man2/xhtml/glColorTable.xml b/upstream-doc/man2/xhtml/glColorTable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorTable.xml rename to upstream-doc/man2/xhtml/glColorTable.xml diff --git a/upstream-man-pages/man2/xhtml/glColorTableParameter.xml b/upstream-doc/man2/xhtml/glColorTableParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glColorTableParameter.xml rename to upstream-doc/man2/xhtml/glColorTableParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glCompileShader.xml b/upstream-doc/man2/xhtml/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompileShader.xml rename to upstream-doc/man2/xhtml/glCompileShader.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexImage1D.xml b/upstream-doc/man2/xhtml/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexImage1D.xml rename to upstream-doc/man2/xhtml/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexImage2D.xml b/upstream-doc/man2/xhtml/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexImage2D.xml rename to upstream-doc/man2/xhtml/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexImage3D.xml b/upstream-doc/man2/xhtml/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexImage3D.xml rename to upstream-doc/man2/xhtml/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexSubImage1D.xml b/upstream-doc/man2/xhtml/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexSubImage1D.xml rename to upstream-doc/man2/xhtml/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexSubImage2D.xml b/upstream-doc/man2/xhtml/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexSubImage2D.xml rename to upstream-doc/man2/xhtml/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glCompressedTexSubImage3D.xml b/upstream-doc/man2/xhtml/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCompressedTexSubImage3D.xml rename to upstream-doc/man2/xhtml/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man2/xhtml/glConvolutionFilter1D.xml b/upstream-doc/man2/xhtml/glConvolutionFilter1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glConvolutionFilter1D.xml rename to upstream-doc/man2/xhtml/glConvolutionFilter1D.xml diff --git a/upstream-man-pages/man2/xhtml/glConvolutionFilter2D.xml b/upstream-doc/man2/xhtml/glConvolutionFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glConvolutionFilter2D.xml rename to upstream-doc/man2/xhtml/glConvolutionFilter2D.xml diff --git a/upstream-man-pages/man2/xhtml/glConvolutionParameter.xml b/upstream-doc/man2/xhtml/glConvolutionParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glConvolutionParameter.xml rename to upstream-doc/man2/xhtml/glConvolutionParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyColorSubTable.xml b/upstream-doc/man2/xhtml/glCopyColorSubTable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyColorSubTable.xml rename to upstream-doc/man2/xhtml/glCopyColorSubTable.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyColorTable.xml b/upstream-doc/man2/xhtml/glCopyColorTable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyColorTable.xml rename to upstream-doc/man2/xhtml/glCopyColorTable.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyConvolutionFilter1D.xml b/upstream-doc/man2/xhtml/glCopyConvolutionFilter1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyConvolutionFilter1D.xml rename to upstream-doc/man2/xhtml/glCopyConvolutionFilter1D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyConvolutionFilter2D.xml b/upstream-doc/man2/xhtml/glCopyConvolutionFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyConvolutionFilter2D.xml rename to upstream-doc/man2/xhtml/glCopyConvolutionFilter2D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyPixels.xml b/upstream-doc/man2/xhtml/glCopyPixels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyPixels.xml rename to upstream-doc/man2/xhtml/glCopyPixels.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyTexImage1D.xml b/upstream-doc/man2/xhtml/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyTexImage1D.xml rename to upstream-doc/man2/xhtml/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyTexImage2D.xml b/upstream-doc/man2/xhtml/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyTexImage2D.xml rename to upstream-doc/man2/xhtml/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyTexSubImage1D.xml b/upstream-doc/man2/xhtml/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyTexSubImage1D.xml rename to upstream-doc/man2/xhtml/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyTexSubImage2D.xml b/upstream-doc/man2/xhtml/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyTexSubImage2D.xml rename to upstream-doc/man2/xhtml/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glCopyTexSubImage3D.xml b/upstream-doc/man2/xhtml/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCopyTexSubImage3D.xml rename to upstream-doc/man2/xhtml/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man2/xhtml/glCreateProgram.xml b/upstream-doc/man2/xhtml/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCreateProgram.xml rename to upstream-doc/man2/xhtml/glCreateProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glCreateShader.xml b/upstream-doc/man2/xhtml/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCreateShader.xml rename to upstream-doc/man2/xhtml/glCreateShader.xml diff --git a/upstream-man-pages/man2/xhtml/glCullFace.xml b/upstream-doc/man2/xhtml/glCullFace.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glCullFace.xml rename to upstream-doc/man2/xhtml/glCullFace.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteBuffers.xml b/upstream-doc/man2/xhtml/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteBuffers.xml rename to upstream-doc/man2/xhtml/glDeleteBuffers.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteLists.xml b/upstream-doc/man2/xhtml/glDeleteLists.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteLists.xml rename to upstream-doc/man2/xhtml/glDeleteLists.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteProgram.xml b/upstream-doc/man2/xhtml/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteProgram.xml rename to upstream-doc/man2/xhtml/glDeleteProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteQueries.xml b/upstream-doc/man2/xhtml/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteQueries.xml rename to upstream-doc/man2/xhtml/glDeleteQueries.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteShader.xml b/upstream-doc/man2/xhtml/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteShader.xml rename to upstream-doc/man2/xhtml/glDeleteShader.xml diff --git a/upstream-man-pages/man2/xhtml/glDeleteTextures.xml b/upstream-doc/man2/xhtml/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDeleteTextures.xml rename to upstream-doc/man2/xhtml/glDeleteTextures.xml diff --git a/upstream-man-pages/man2/xhtml/glDepthFunc.xml b/upstream-doc/man2/xhtml/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDepthFunc.xml rename to upstream-doc/man2/xhtml/glDepthFunc.xml diff --git a/upstream-man-pages/man2/xhtml/glDepthMask.xml b/upstream-doc/man2/xhtml/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDepthMask.xml rename to upstream-doc/man2/xhtml/glDepthMask.xml diff --git a/upstream-man-pages/man2/xhtml/glDepthRange.xml b/upstream-doc/man2/xhtml/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDepthRange.xml rename to upstream-doc/man2/xhtml/glDepthRange.xml diff --git a/upstream-man-pages/man2/xhtml/glDetachShader.xml b/upstream-doc/man2/xhtml/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDetachShader.xml rename to upstream-doc/man2/xhtml/glDetachShader.xml diff --git a/upstream-man-pages/man2/xhtml/glDisable.xml b/upstream-doc/man2/xhtml/glDisable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDisable.xml rename to upstream-doc/man2/xhtml/glDisable.xml diff --git a/upstream-man-pages/man2/xhtml/glDisableClientState.xml b/upstream-doc/man2/xhtml/glDisableClientState.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDisableClientState.xml rename to upstream-doc/man2/xhtml/glDisableClientState.xml diff --git a/upstream-man-pages/man2/xhtml/glDisableVertexAttribArray.xml b/upstream-doc/man2/xhtml/glDisableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDisableVertexAttribArray.xml rename to upstream-doc/man2/xhtml/glDisableVertexAttribArray.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawArrays.xml b/upstream-doc/man2/xhtml/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawArrays.xml rename to upstream-doc/man2/xhtml/glDrawArrays.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawBuffer.xml b/upstream-doc/man2/xhtml/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawBuffer.xml rename to upstream-doc/man2/xhtml/glDrawBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawBuffers.xml b/upstream-doc/man2/xhtml/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawBuffers.xml rename to upstream-doc/man2/xhtml/glDrawBuffers.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawElements.xml b/upstream-doc/man2/xhtml/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawElements.xml rename to upstream-doc/man2/xhtml/glDrawElements.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawPixels.xml b/upstream-doc/man2/xhtml/glDrawPixels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawPixels.xml rename to upstream-doc/man2/xhtml/glDrawPixels.xml diff --git a/upstream-man-pages/man2/xhtml/glDrawRangeElements.xml b/upstream-doc/man2/xhtml/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glDrawRangeElements.xml rename to upstream-doc/man2/xhtml/glDrawRangeElements.xml diff --git a/upstream-man-pages/man2/xhtml/glEdgeFlag.xml b/upstream-doc/man2/xhtml/glEdgeFlag.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEdgeFlag.xml rename to upstream-doc/man2/xhtml/glEdgeFlag.xml diff --git a/upstream-man-pages/man2/xhtml/glEdgeFlagPointer.xml b/upstream-doc/man2/xhtml/glEdgeFlagPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEdgeFlagPointer.xml rename to upstream-doc/man2/xhtml/glEdgeFlagPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glEnable.xml b/upstream-doc/man2/xhtml/glEnable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEnable.xml rename to upstream-doc/man2/xhtml/glEnable.xml diff --git a/upstream-man-pages/man2/xhtml/glEnableClientState.xml b/upstream-doc/man2/xhtml/glEnableClientState.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEnableClientState.xml rename to upstream-doc/man2/xhtml/glEnableClientState.xml diff --git a/upstream-man-pages/man2/xhtml/glEnableVertexAttribArray.xml b/upstream-doc/man2/xhtml/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEnableVertexAttribArray.xml rename to upstream-doc/man2/xhtml/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man2/xhtml/glEnd.xml b/upstream-doc/man2/xhtml/glEnd.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEnd.xml rename to upstream-doc/man2/xhtml/glEnd.xml diff --git a/upstream-man-pages/man2/xhtml/glEndList.xml b/upstream-doc/man2/xhtml/glEndList.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEndList.xml rename to upstream-doc/man2/xhtml/glEndList.xml diff --git a/upstream-man-pages/man2/xhtml/glEndQuery.xml b/upstream-doc/man2/xhtml/glEndQuery.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEndQuery.xml rename to upstream-doc/man2/xhtml/glEndQuery.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalCoord.xml b/upstream-doc/man2/xhtml/glEvalCoord.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalCoord.xml rename to upstream-doc/man2/xhtml/glEvalCoord.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalCoord1.xml b/upstream-doc/man2/xhtml/glEvalCoord1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalCoord1.xml rename to upstream-doc/man2/xhtml/glEvalCoord1.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalCoord2.xml b/upstream-doc/man2/xhtml/glEvalCoord2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalCoord2.xml rename to upstream-doc/man2/xhtml/glEvalCoord2.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalMesh.xml b/upstream-doc/man2/xhtml/glEvalMesh.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalMesh.xml rename to upstream-doc/man2/xhtml/glEvalMesh.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalMesh1.xml b/upstream-doc/man2/xhtml/glEvalMesh1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalMesh1.xml rename to upstream-doc/man2/xhtml/glEvalMesh1.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalMesh2.xml b/upstream-doc/man2/xhtml/glEvalMesh2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalMesh2.xml rename to upstream-doc/man2/xhtml/glEvalMesh2.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalPoint.xml b/upstream-doc/man2/xhtml/glEvalPoint.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalPoint.xml rename to upstream-doc/man2/xhtml/glEvalPoint.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalPoint1.xml b/upstream-doc/man2/xhtml/glEvalPoint1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalPoint1.xml rename to upstream-doc/man2/xhtml/glEvalPoint1.xml diff --git a/upstream-man-pages/man2/xhtml/glEvalPoint2.xml b/upstream-doc/man2/xhtml/glEvalPoint2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glEvalPoint2.xml rename to upstream-doc/man2/xhtml/glEvalPoint2.xml diff --git a/upstream-man-pages/man2/xhtml/glFeedbackBuffer.xml b/upstream-doc/man2/xhtml/glFeedbackBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFeedbackBuffer.xml rename to upstream-doc/man2/xhtml/glFeedbackBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glFinish.xml b/upstream-doc/man2/xhtml/glFinish.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFinish.xml rename to upstream-doc/man2/xhtml/glFinish.xml diff --git a/upstream-man-pages/man2/xhtml/glFlush.xml b/upstream-doc/man2/xhtml/glFlush.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFlush.xml rename to upstream-doc/man2/xhtml/glFlush.xml diff --git a/upstream-man-pages/man2/xhtml/glFog.xml b/upstream-doc/man2/xhtml/glFog.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFog.xml rename to upstream-doc/man2/xhtml/glFog.xml diff --git a/upstream-man-pages/man2/xhtml/glFogCoord.xml b/upstream-doc/man2/xhtml/glFogCoord.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFogCoord.xml rename to upstream-doc/man2/xhtml/glFogCoord.xml diff --git a/upstream-man-pages/man2/xhtml/glFogCoordPointer.xml b/upstream-doc/man2/xhtml/glFogCoordPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFogCoordPointer.xml rename to upstream-doc/man2/xhtml/glFogCoordPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glFrontFace.xml b/upstream-doc/man2/xhtml/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFrontFace.xml rename to upstream-doc/man2/xhtml/glFrontFace.xml diff --git a/upstream-man-pages/man2/xhtml/glFrustum.xml b/upstream-doc/man2/xhtml/glFrustum.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glFrustum.xml rename to upstream-doc/man2/xhtml/glFrustum.xml diff --git a/upstream-man-pages/man2/xhtml/glGenBuffers.xml b/upstream-doc/man2/xhtml/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGenBuffers.xml rename to upstream-doc/man2/xhtml/glGenBuffers.xml diff --git a/upstream-man-pages/man2/xhtml/glGenLists.xml b/upstream-doc/man2/xhtml/glGenLists.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGenLists.xml rename to upstream-doc/man2/xhtml/glGenLists.xml diff --git a/upstream-man-pages/man2/xhtml/glGenQueries.xml b/upstream-doc/man2/xhtml/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGenQueries.xml rename to upstream-doc/man2/xhtml/glGenQueries.xml diff --git a/upstream-man-pages/man2/xhtml/glGenTextures.xml b/upstream-doc/man2/xhtml/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGenTextures.xml rename to upstream-doc/man2/xhtml/glGenTextures.xml diff --git a/upstream-man-pages/man2/xhtml/glGet.xml b/upstream-doc/man2/xhtml/glGet.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGet.xml rename to upstream-doc/man2/xhtml/glGet.xml diff --git a/upstream-man-pages/man2/xhtml/glGetActiveAttrib.xml b/upstream-doc/man2/xhtml/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetActiveAttrib.xml rename to upstream-doc/man2/xhtml/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glGetActiveUniform.xml b/upstream-doc/man2/xhtml/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetActiveUniform.xml rename to upstream-doc/man2/xhtml/glGetActiveUniform.xml diff --git a/upstream-man-pages/man2/xhtml/glGetAttachedShaders.xml b/upstream-doc/man2/xhtml/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetAttachedShaders.xml rename to upstream-doc/man2/xhtml/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man2/xhtml/glGetAttribLocation.xml b/upstream-doc/man2/xhtml/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetAttribLocation.xml rename to upstream-doc/man2/xhtml/glGetAttribLocation.xml diff --git a/upstream-man-pages/man2/xhtml/glGetBufferParameteriv.xml b/upstream-doc/man2/xhtml/glGetBufferParameteriv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetBufferParameteriv.xml rename to upstream-doc/man2/xhtml/glGetBufferParameteriv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetBufferPointerv.xml b/upstream-doc/man2/xhtml/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetBufferPointerv.xml rename to upstream-doc/man2/xhtml/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetBufferSubData.xml b/upstream-doc/man2/xhtml/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetBufferSubData.xml rename to upstream-doc/man2/xhtml/glGetBufferSubData.xml diff --git a/upstream-man-pages/man2/xhtml/glGetClipPlane.xml b/upstream-doc/man2/xhtml/glGetClipPlane.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetClipPlane.xml rename to upstream-doc/man2/xhtml/glGetClipPlane.xml diff --git a/upstream-man-pages/man2/xhtml/glGetColorTable.xml b/upstream-doc/man2/xhtml/glGetColorTable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetColorTable.xml rename to upstream-doc/man2/xhtml/glGetColorTable.xml diff --git a/upstream-man-pages/man2/xhtml/glGetColorTableParameter.xml b/upstream-doc/man2/xhtml/glGetColorTableParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetColorTableParameter.xml rename to upstream-doc/man2/xhtml/glGetColorTableParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetCompressedTexImage.xml b/upstream-doc/man2/xhtml/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetCompressedTexImage.xml rename to upstream-doc/man2/xhtml/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man2/xhtml/glGetConvolutionFilter.xml b/upstream-doc/man2/xhtml/glGetConvolutionFilter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetConvolutionFilter.xml rename to upstream-doc/man2/xhtml/glGetConvolutionFilter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetConvolutionParameter.xml b/upstream-doc/man2/xhtml/glGetConvolutionParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetConvolutionParameter.xml rename to upstream-doc/man2/xhtml/glGetConvolutionParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetDoublev.xml b/upstream-doc/man2/xhtml/glGetDoublev.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetDoublev.xml rename to upstream-doc/man2/xhtml/glGetDoublev.xml diff --git a/upstream-man-pages/man2/xhtml/glGetError.xml b/upstream-doc/man2/xhtml/glGetError.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetError.xml rename to upstream-doc/man2/xhtml/glGetError.xml diff --git a/upstream-man-pages/man2/xhtml/glGetFloatv.xml b/upstream-doc/man2/xhtml/glGetFloatv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetFloatv.xml rename to upstream-doc/man2/xhtml/glGetFloatv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetHistogram.xml b/upstream-doc/man2/xhtml/glGetHistogram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetHistogram.xml rename to upstream-doc/man2/xhtml/glGetHistogram.xml diff --git a/upstream-man-pages/man2/xhtml/glGetHistogramParameter.xml b/upstream-doc/man2/xhtml/glGetHistogramParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetHistogramParameter.xml rename to upstream-doc/man2/xhtml/glGetHistogramParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetIntegerv.xml b/upstream-doc/man2/xhtml/glGetIntegerv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetIntegerv.xml rename to upstream-doc/man2/xhtml/glGetIntegerv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetLight.xml b/upstream-doc/man2/xhtml/glGetLight.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetLight.xml rename to upstream-doc/man2/xhtml/glGetLight.xml diff --git a/upstream-man-pages/man2/xhtml/glGetMap.xml b/upstream-doc/man2/xhtml/glGetMap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetMap.xml rename to upstream-doc/man2/xhtml/glGetMap.xml diff --git a/upstream-man-pages/man2/xhtml/glGetMaterial.xml b/upstream-doc/man2/xhtml/glGetMaterial.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetMaterial.xml rename to upstream-doc/man2/xhtml/glGetMaterial.xml diff --git a/upstream-man-pages/man2/xhtml/glGetMinmax.xml b/upstream-doc/man2/xhtml/glGetMinmax.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetMinmax.xml rename to upstream-doc/man2/xhtml/glGetMinmax.xml diff --git a/upstream-man-pages/man2/xhtml/glGetMinmaxParameter.xml b/upstream-doc/man2/xhtml/glGetMinmaxParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetMinmaxParameter.xml rename to upstream-doc/man2/xhtml/glGetMinmaxParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetPixelMap.xml b/upstream-doc/man2/xhtml/glGetPixelMap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetPixelMap.xml rename to upstream-doc/man2/xhtml/glGetPixelMap.xml diff --git a/upstream-man-pages/man2/xhtml/glGetPointerv.xml b/upstream-doc/man2/xhtml/glGetPointerv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetPointerv.xml rename to upstream-doc/man2/xhtml/glGetPointerv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetPolygonStipple.xml b/upstream-doc/man2/xhtml/glGetPolygonStipple.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetPolygonStipple.xml rename to upstream-doc/man2/xhtml/glGetPolygonStipple.xml diff --git a/upstream-man-pages/man2/xhtml/glGetProgram.xml b/upstream-doc/man2/xhtml/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetProgram.xml rename to upstream-doc/man2/xhtml/glGetProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glGetProgramInfoLog.xml b/upstream-doc/man2/xhtml/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetProgramInfoLog.xml rename to upstream-doc/man2/xhtml/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man2/xhtml/glGetQueryObject.xml b/upstream-doc/man2/xhtml/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetQueryObject.xml rename to upstream-doc/man2/xhtml/glGetQueryObject.xml diff --git a/upstream-man-pages/man2/xhtml/glGetQueryiv.xml b/upstream-doc/man2/xhtml/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetQueryiv.xml rename to upstream-doc/man2/xhtml/glGetQueryiv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetSeparableFilter.xml b/upstream-doc/man2/xhtml/glGetSeparableFilter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetSeparableFilter.xml rename to upstream-doc/man2/xhtml/glGetSeparableFilter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetShader.xml b/upstream-doc/man2/xhtml/glGetShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetShader.xml rename to upstream-doc/man2/xhtml/glGetShader.xml diff --git a/upstream-man-pages/man2/xhtml/glGetShaderInfoLog.xml b/upstream-doc/man2/xhtml/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetShaderInfoLog.xml rename to upstream-doc/man2/xhtml/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man2/xhtml/glGetShaderSource.xml b/upstream-doc/man2/xhtml/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetShaderSource.xml rename to upstream-doc/man2/xhtml/glGetShaderSource.xml diff --git a/upstream-man-pages/man2/xhtml/glGetString.xml b/upstream-doc/man2/xhtml/glGetString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetString.xml rename to upstream-doc/man2/xhtml/glGetString.xml diff --git a/upstream-man-pages/man2/xhtml/glGetTexEnv.xml b/upstream-doc/man2/xhtml/glGetTexEnv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetTexEnv.xml rename to upstream-doc/man2/xhtml/glGetTexEnv.xml diff --git a/upstream-man-pages/man2/xhtml/glGetTexGen.xml b/upstream-doc/man2/xhtml/glGetTexGen.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetTexGen.xml rename to upstream-doc/man2/xhtml/glGetTexGen.xml diff --git a/upstream-man-pages/man2/xhtml/glGetTexImage.xml b/upstream-doc/man2/xhtml/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetTexImage.xml rename to upstream-doc/man2/xhtml/glGetTexImage.xml diff --git a/upstream-man-pages/man2/xhtml/glGetTexLevelParameter.xml b/upstream-doc/man2/xhtml/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetTexLevelParameter.xml rename to upstream-doc/man2/xhtml/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetTexParameter.xml b/upstream-doc/man2/xhtml/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetTexParameter.xml rename to upstream-doc/man2/xhtml/glGetTexParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glGetUniform.xml b/upstream-doc/man2/xhtml/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetUniform.xml rename to upstream-doc/man2/xhtml/glGetUniform.xml diff --git a/upstream-man-pages/man2/xhtml/glGetUniformLocation.xml b/upstream-doc/man2/xhtml/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetUniformLocation.xml rename to upstream-doc/man2/xhtml/glGetUniformLocation.xml diff --git a/upstream-man-pages/man2/xhtml/glGetVertexAttrib.xml b/upstream-doc/man2/xhtml/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetVertexAttrib.xml rename to upstream-doc/man2/xhtml/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glGetVertexAttribPointerv.xml b/upstream-doc/man2/xhtml/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glGetVertexAttribPointerv.xml rename to upstream-doc/man2/xhtml/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man2/xhtml/glHint.xml b/upstream-doc/man2/xhtml/glHint.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glHint.xml rename to upstream-doc/man2/xhtml/glHint.xml diff --git a/upstream-man-pages/man2/xhtml/glHistogram.xml b/upstream-doc/man2/xhtml/glHistogram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glHistogram.xml rename to upstream-doc/man2/xhtml/glHistogram.xml diff --git a/upstream-man-pages/man2/xhtml/glIndex.xml b/upstream-doc/man2/xhtml/glIndex.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIndex.xml rename to upstream-doc/man2/xhtml/glIndex.xml diff --git a/upstream-man-pages/man2/xhtml/glIndexMask.xml b/upstream-doc/man2/xhtml/glIndexMask.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIndexMask.xml rename to upstream-doc/man2/xhtml/glIndexMask.xml diff --git a/upstream-man-pages/man2/xhtml/glIndexPointer.xml b/upstream-doc/man2/xhtml/glIndexPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIndexPointer.xml rename to upstream-doc/man2/xhtml/glIndexPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glInitNames.xml b/upstream-doc/man2/xhtml/glInitNames.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glInitNames.xml rename to upstream-doc/man2/xhtml/glInitNames.xml diff --git a/upstream-man-pages/man2/xhtml/glInterleavedArrays.xml b/upstream-doc/man2/xhtml/glInterleavedArrays.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glInterleavedArrays.xml rename to upstream-doc/man2/xhtml/glInterleavedArrays.xml diff --git a/upstream-man-pages/man2/xhtml/glIsBuffer.xml b/upstream-doc/man2/xhtml/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsBuffer.xml rename to upstream-doc/man2/xhtml/glIsBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glIsEnabled.xml b/upstream-doc/man2/xhtml/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsEnabled.xml rename to upstream-doc/man2/xhtml/glIsEnabled.xml diff --git a/upstream-man-pages/man2/xhtml/glIsList.xml b/upstream-doc/man2/xhtml/glIsList.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsList.xml rename to upstream-doc/man2/xhtml/glIsList.xml diff --git a/upstream-man-pages/man2/xhtml/glIsProgram.xml b/upstream-doc/man2/xhtml/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsProgram.xml rename to upstream-doc/man2/xhtml/glIsProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glIsQuery.xml b/upstream-doc/man2/xhtml/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsQuery.xml rename to upstream-doc/man2/xhtml/glIsQuery.xml diff --git a/upstream-man-pages/man2/xhtml/glIsShader.xml b/upstream-doc/man2/xhtml/glIsShader.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsShader.xml rename to upstream-doc/man2/xhtml/glIsShader.xml diff --git a/upstream-man-pages/man2/xhtml/glIsTexture.xml b/upstream-doc/man2/xhtml/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glIsTexture.xml rename to upstream-doc/man2/xhtml/glIsTexture.xml diff --git a/upstream-man-pages/man2/xhtml/glLight.xml b/upstream-doc/man2/xhtml/glLight.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLight.xml rename to upstream-doc/man2/xhtml/glLight.xml diff --git a/upstream-man-pages/man2/xhtml/glLightModel.xml b/upstream-doc/man2/xhtml/glLightModel.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLightModel.xml rename to upstream-doc/man2/xhtml/glLightModel.xml diff --git a/upstream-man-pages/man2/xhtml/glLineStipple.xml b/upstream-doc/man2/xhtml/glLineStipple.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLineStipple.xml rename to upstream-doc/man2/xhtml/glLineStipple.xml diff --git a/upstream-man-pages/man2/xhtml/glLineWidth.xml b/upstream-doc/man2/xhtml/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLineWidth.xml rename to upstream-doc/man2/xhtml/glLineWidth.xml diff --git a/upstream-man-pages/man2/xhtml/glLinkProgram.xml b/upstream-doc/man2/xhtml/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLinkProgram.xml rename to upstream-doc/man2/xhtml/glLinkProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glListBase.xml b/upstream-doc/man2/xhtml/glListBase.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glListBase.xml rename to upstream-doc/man2/xhtml/glListBase.xml diff --git a/upstream-man-pages/man2/xhtml/glLoadIdentity.xml b/upstream-doc/man2/xhtml/glLoadIdentity.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLoadIdentity.xml rename to upstream-doc/man2/xhtml/glLoadIdentity.xml diff --git a/upstream-man-pages/man2/xhtml/glLoadMatrix.xml b/upstream-doc/man2/xhtml/glLoadMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLoadMatrix.xml rename to upstream-doc/man2/xhtml/glLoadMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glLoadName.xml b/upstream-doc/man2/xhtml/glLoadName.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLoadName.xml rename to upstream-doc/man2/xhtml/glLoadName.xml diff --git a/upstream-man-pages/man2/xhtml/glLoadTransposeMatrix.xml b/upstream-doc/man2/xhtml/glLoadTransposeMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLoadTransposeMatrix.xml rename to upstream-doc/man2/xhtml/glLoadTransposeMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glLogicOp.xml b/upstream-doc/man2/xhtml/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glLogicOp.xml rename to upstream-doc/man2/xhtml/glLogicOp.xml diff --git a/upstream-man-pages/man2/xhtml/glMap1.xhtml b/upstream-doc/man2/xhtml/glMap1.xhtml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMap1.xhtml rename to upstream-doc/man2/xhtml/glMap1.xhtml diff --git a/upstream-man-pages/man2/xhtml/glMap1.xml b/upstream-doc/man2/xhtml/glMap1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMap1.xml rename to upstream-doc/man2/xhtml/glMap1.xml diff --git a/upstream-man-pages/man2/xhtml/glMap2.xml b/upstream-doc/man2/xhtml/glMap2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMap2.xml rename to upstream-doc/man2/xhtml/glMap2.xml diff --git a/upstream-man-pages/man2/xhtml/glMapBuffer.xml b/upstream-doc/man2/xhtml/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMapBuffer.xml rename to upstream-doc/man2/xhtml/glMapBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glMapGrid.xml b/upstream-doc/man2/xhtml/glMapGrid.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMapGrid.xml rename to upstream-doc/man2/xhtml/glMapGrid.xml diff --git a/upstream-man-pages/man2/xhtml/glMapGrid1.xml b/upstream-doc/man2/xhtml/glMapGrid1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMapGrid1.xml rename to upstream-doc/man2/xhtml/glMapGrid1.xml diff --git a/upstream-man-pages/man2/xhtml/glMapGrid2.xml b/upstream-doc/man2/xhtml/glMapGrid2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMapGrid2.xml rename to upstream-doc/man2/xhtml/glMapGrid2.xml diff --git a/upstream-man-pages/man2/xhtml/glMaterial.xml b/upstream-doc/man2/xhtml/glMaterial.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMaterial.xml rename to upstream-doc/man2/xhtml/glMaterial.xml diff --git a/upstream-man-pages/man2/xhtml/glMatrixMode.xml b/upstream-doc/man2/xhtml/glMatrixMode.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMatrixMode.xml rename to upstream-doc/man2/xhtml/glMatrixMode.xml diff --git a/upstream-man-pages/man2/xhtml/glMinmax.xml b/upstream-doc/man2/xhtml/glMinmax.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMinmax.xml rename to upstream-doc/man2/xhtml/glMinmax.xml diff --git a/upstream-man-pages/man2/xhtml/glMultMatrix.xml b/upstream-doc/man2/xhtml/glMultMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMultMatrix.xml rename to upstream-doc/man2/xhtml/glMultMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glMultTransposeMatrix.xml b/upstream-doc/man2/xhtml/glMultTransposeMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMultTransposeMatrix.xml rename to upstream-doc/man2/xhtml/glMultTransposeMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glMultiDrawArrays.xml b/upstream-doc/man2/xhtml/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMultiDrawArrays.xml rename to upstream-doc/man2/xhtml/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man2/xhtml/glMultiDrawElements.xml b/upstream-doc/man2/xhtml/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMultiDrawElements.xml rename to upstream-doc/man2/xhtml/glMultiDrawElements.xml diff --git a/upstream-man-pages/man2/xhtml/glMultiTexCoord.xml b/upstream-doc/man2/xhtml/glMultiTexCoord.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glMultiTexCoord.xml rename to upstream-doc/man2/xhtml/glMultiTexCoord.xml diff --git a/upstream-man-pages/man2/xhtml/glNewList.xml b/upstream-doc/man2/xhtml/glNewList.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glNewList.xml rename to upstream-doc/man2/xhtml/glNewList.xml diff --git a/upstream-man-pages/man2/xhtml/glNormal.xml b/upstream-doc/man2/xhtml/glNormal.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glNormal.xml rename to upstream-doc/man2/xhtml/glNormal.xml diff --git a/upstream-man-pages/man2/xhtml/glNormalPointer.xml b/upstream-doc/man2/xhtml/glNormalPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glNormalPointer.xml rename to upstream-doc/man2/xhtml/glNormalPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glOrtho.xml b/upstream-doc/man2/xhtml/glOrtho.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glOrtho.xml rename to upstream-doc/man2/xhtml/glOrtho.xml diff --git a/upstream-man-pages/man2/xhtml/glPassThrough.xml b/upstream-doc/man2/xhtml/glPassThrough.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPassThrough.xml rename to upstream-doc/man2/xhtml/glPassThrough.xml diff --git a/upstream-man-pages/man2/xhtml/glPixelMap.xml b/upstream-doc/man2/xhtml/glPixelMap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPixelMap.xml rename to upstream-doc/man2/xhtml/glPixelMap.xml diff --git a/upstream-man-pages/man2/xhtml/glPixelStore.xml b/upstream-doc/man2/xhtml/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPixelStore.xml rename to upstream-doc/man2/xhtml/glPixelStore.xml diff --git a/upstream-man-pages/man2/xhtml/glPixelTransfer.xml b/upstream-doc/man2/xhtml/glPixelTransfer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPixelTransfer.xml rename to upstream-doc/man2/xhtml/glPixelTransfer.xml diff --git a/upstream-man-pages/man2/xhtml/glPixelZoom.xml b/upstream-doc/man2/xhtml/glPixelZoom.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPixelZoom.xml rename to upstream-doc/man2/xhtml/glPixelZoom.xml diff --git a/upstream-man-pages/man2/xhtml/glPointParameter.xml b/upstream-doc/man2/xhtml/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPointParameter.xml rename to upstream-doc/man2/xhtml/glPointParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glPointSize.xml b/upstream-doc/man2/xhtml/glPointSize.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPointSize.xml rename to upstream-doc/man2/xhtml/glPointSize.xml diff --git a/upstream-man-pages/man2/xhtml/glPolygonMode.xml b/upstream-doc/man2/xhtml/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPolygonMode.xml rename to upstream-doc/man2/xhtml/glPolygonMode.xml diff --git a/upstream-man-pages/man2/xhtml/glPolygonOffset.xml b/upstream-doc/man2/xhtml/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPolygonOffset.xml rename to upstream-doc/man2/xhtml/glPolygonOffset.xml diff --git a/upstream-man-pages/man2/xhtml/glPolygonStipple.xml b/upstream-doc/man2/xhtml/glPolygonStipple.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPolygonStipple.xml rename to upstream-doc/man2/xhtml/glPolygonStipple.xml diff --git a/upstream-man-pages/man2/xhtml/glPopAttrib.xml b/upstream-doc/man2/xhtml/glPopAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPopAttrib.xml rename to upstream-doc/man2/xhtml/glPopAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glPopClientAttrib.xml b/upstream-doc/man2/xhtml/glPopClientAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPopClientAttrib.xml rename to upstream-doc/man2/xhtml/glPopClientAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glPopMatrix.xml b/upstream-doc/man2/xhtml/glPopMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPopMatrix.xml rename to upstream-doc/man2/xhtml/glPopMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glPopName.xml b/upstream-doc/man2/xhtml/glPopName.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPopName.xml rename to upstream-doc/man2/xhtml/glPopName.xml diff --git a/upstream-man-pages/man2/xhtml/glPrioritizeTextures.xml b/upstream-doc/man2/xhtml/glPrioritizeTextures.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPrioritizeTextures.xml rename to upstream-doc/man2/xhtml/glPrioritizeTextures.xml diff --git a/upstream-man-pages/man2/xhtml/glPushAttrib.xml b/upstream-doc/man2/xhtml/glPushAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPushAttrib.xml rename to upstream-doc/man2/xhtml/glPushAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glPushClientAttrib.xml b/upstream-doc/man2/xhtml/glPushClientAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPushClientAttrib.xml rename to upstream-doc/man2/xhtml/glPushClientAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glPushMatrix.xml b/upstream-doc/man2/xhtml/glPushMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPushMatrix.xml rename to upstream-doc/man2/xhtml/glPushMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/glPushName.xml b/upstream-doc/man2/xhtml/glPushName.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glPushName.xml rename to upstream-doc/man2/xhtml/glPushName.xml diff --git a/upstream-man-pages/man2/xhtml/glRasterPos.xml b/upstream-doc/man2/xhtml/glRasterPos.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glRasterPos.xml rename to upstream-doc/man2/xhtml/glRasterPos.xml diff --git a/upstream-man-pages/man2/xhtml/glReadBuffer.xml b/upstream-doc/man2/xhtml/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glReadBuffer.xml rename to upstream-doc/man2/xhtml/glReadBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glReadPixels.xml b/upstream-doc/man2/xhtml/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glReadPixels.xml rename to upstream-doc/man2/xhtml/glReadPixels.xml diff --git a/upstream-man-pages/man2/xhtml/glRect.xml b/upstream-doc/man2/xhtml/glRect.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glRect.xml rename to upstream-doc/man2/xhtml/glRect.xml diff --git a/upstream-man-pages/man2/xhtml/glRenderMode.xml b/upstream-doc/man2/xhtml/glRenderMode.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glRenderMode.xml rename to upstream-doc/man2/xhtml/glRenderMode.xml diff --git a/upstream-man-pages/man2/xhtml/glResetHistogram.xml b/upstream-doc/man2/xhtml/glResetHistogram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glResetHistogram.xml rename to upstream-doc/man2/xhtml/glResetHistogram.xml diff --git a/upstream-man-pages/man2/xhtml/glResetMinmax.xml b/upstream-doc/man2/xhtml/glResetMinmax.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glResetMinmax.xml rename to upstream-doc/man2/xhtml/glResetMinmax.xml diff --git a/upstream-man-pages/man2/xhtml/glRotate.xml b/upstream-doc/man2/xhtml/glRotate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glRotate.xml rename to upstream-doc/man2/xhtml/glRotate.xml diff --git a/upstream-man-pages/man2/xhtml/glSampleCoverage.xml b/upstream-doc/man2/xhtml/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glSampleCoverage.xml rename to upstream-doc/man2/xhtml/glSampleCoverage.xml diff --git a/upstream-man-pages/man2/xhtml/glScale.xml b/upstream-doc/man2/xhtml/glScale.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glScale.xml rename to upstream-doc/man2/xhtml/glScale.xml diff --git a/upstream-man-pages/man2/xhtml/glScissor.xml b/upstream-doc/man2/xhtml/glScissor.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glScissor.xml rename to upstream-doc/man2/xhtml/glScissor.xml diff --git a/upstream-man-pages/man2/xhtml/glSecondaryColor.xml b/upstream-doc/man2/xhtml/glSecondaryColor.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glSecondaryColor.xml rename to upstream-doc/man2/xhtml/glSecondaryColor.xml diff --git a/upstream-man-pages/man2/xhtml/glSecondaryColorPointer.xml b/upstream-doc/man2/xhtml/glSecondaryColorPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glSecondaryColorPointer.xml rename to upstream-doc/man2/xhtml/glSecondaryColorPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glSelectBuffer.xml b/upstream-doc/man2/xhtml/glSelectBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glSelectBuffer.xml rename to upstream-doc/man2/xhtml/glSelectBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glSeparableFilter2D.xml b/upstream-doc/man2/xhtml/glSeparableFilter2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glSeparableFilter2D.xml rename to upstream-doc/man2/xhtml/glSeparableFilter2D.xml diff --git a/upstream-man-pages/man2/xhtml/glShadeModel.xml b/upstream-doc/man2/xhtml/glShadeModel.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glShadeModel.xml rename to upstream-doc/man2/xhtml/glShadeModel.xml diff --git a/upstream-man-pages/man2/xhtml/glShaderSource.xml b/upstream-doc/man2/xhtml/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glShaderSource.xml rename to upstream-doc/man2/xhtml/glShaderSource.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilFunc.xml b/upstream-doc/man2/xhtml/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilFunc.xml rename to upstream-doc/man2/xhtml/glStencilFunc.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilFuncSeparate.xml b/upstream-doc/man2/xhtml/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilFuncSeparate.xml rename to upstream-doc/man2/xhtml/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilMask.xml b/upstream-doc/man2/xhtml/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilMask.xml rename to upstream-doc/man2/xhtml/glStencilMask.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilMaskSeparate.xml b/upstream-doc/man2/xhtml/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilMaskSeparate.xml rename to upstream-doc/man2/xhtml/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilOp.xml b/upstream-doc/man2/xhtml/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilOp.xml rename to upstream-doc/man2/xhtml/glStencilOp.xml diff --git a/upstream-man-pages/man2/xhtml/glStencilOpSeparate.xml b/upstream-doc/man2/xhtml/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glStencilOpSeparate.xml rename to upstream-doc/man2/xhtml/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoord.xml b/upstream-doc/man2/xhtml/glTexCoord.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoord.xml rename to upstream-doc/man2/xhtml/glTexCoord.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoord1.xml b/upstream-doc/man2/xhtml/glTexCoord1.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoord1.xml rename to upstream-doc/man2/xhtml/glTexCoord1.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoord2.xml b/upstream-doc/man2/xhtml/glTexCoord2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoord2.xml rename to upstream-doc/man2/xhtml/glTexCoord2.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoord3.xml b/upstream-doc/man2/xhtml/glTexCoord3.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoord3.xml rename to upstream-doc/man2/xhtml/glTexCoord3.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoord4.xml b/upstream-doc/man2/xhtml/glTexCoord4.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoord4.xml rename to upstream-doc/man2/xhtml/glTexCoord4.xml diff --git a/upstream-man-pages/man2/xhtml/glTexCoordPointer.xml b/upstream-doc/man2/xhtml/glTexCoordPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexCoordPointer.xml rename to upstream-doc/man2/xhtml/glTexCoordPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glTexEnv.xml b/upstream-doc/man2/xhtml/glTexEnv.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexEnv.xml rename to upstream-doc/man2/xhtml/glTexEnv.xml diff --git a/upstream-man-pages/man2/xhtml/glTexGen.xml b/upstream-doc/man2/xhtml/glTexGen.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexGen.xml rename to upstream-doc/man2/xhtml/glTexGen.xml diff --git a/upstream-man-pages/man2/xhtml/glTexImage1D.xml b/upstream-doc/man2/xhtml/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexImage1D.xml rename to upstream-doc/man2/xhtml/glTexImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glTexImage2D.xml b/upstream-doc/man2/xhtml/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexImage2D.xml rename to upstream-doc/man2/xhtml/glTexImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glTexImage3D.xml b/upstream-doc/man2/xhtml/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexImage3D.xml rename to upstream-doc/man2/xhtml/glTexImage3D.xml diff --git a/upstream-man-pages/man2/xhtml/glTexParameter.xml b/upstream-doc/man2/xhtml/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexParameter.xml rename to upstream-doc/man2/xhtml/glTexParameter.xml diff --git a/upstream-man-pages/man2/xhtml/glTexSubImage1D.xml b/upstream-doc/man2/xhtml/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexSubImage1D.xml rename to upstream-doc/man2/xhtml/glTexSubImage1D.xml diff --git a/upstream-man-pages/man2/xhtml/glTexSubImage2D.xml b/upstream-doc/man2/xhtml/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexSubImage2D.xml rename to upstream-doc/man2/xhtml/glTexSubImage2D.xml diff --git a/upstream-man-pages/man2/xhtml/glTexSubImage3D.xml b/upstream-doc/man2/xhtml/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTexSubImage3D.xml rename to upstream-doc/man2/xhtml/glTexSubImage3D.xml diff --git a/upstream-man-pages/man2/xhtml/glTranslate.xml b/upstream-doc/man2/xhtml/glTranslate.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glTranslate.xml rename to upstream-doc/man2/xhtml/glTranslate.xml diff --git a/upstream-man-pages/man2/xhtml/glUniform.xml b/upstream-doc/man2/xhtml/glUniform.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glUniform.xml rename to upstream-doc/man2/xhtml/glUniform.xml diff --git a/upstream-man-pages/man2/xhtml/glUnmapBuffer.xml b/upstream-doc/man2/xhtml/glUnmapBuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glUnmapBuffer.xml rename to upstream-doc/man2/xhtml/glUnmapBuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glUseProgram.xml b/upstream-doc/man2/xhtml/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glUseProgram.xml rename to upstream-doc/man2/xhtml/glUseProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glValidateProgram.xml b/upstream-doc/man2/xhtml/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glValidateProgram.xml rename to upstream-doc/man2/xhtml/glValidateProgram.xml diff --git a/upstream-man-pages/man2/xhtml/glVertex.xml b/upstream-doc/man2/xhtml/glVertex.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertex.xml rename to upstream-doc/man2/xhtml/glVertex.xml diff --git a/upstream-man-pages/man2/xhtml/glVertex2.xml b/upstream-doc/man2/xhtml/glVertex2.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertex2.xml rename to upstream-doc/man2/xhtml/glVertex2.xml diff --git a/upstream-man-pages/man2/xhtml/glVertex3.xml b/upstream-doc/man2/xhtml/glVertex3.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertex3.xml rename to upstream-doc/man2/xhtml/glVertex3.xml diff --git a/upstream-man-pages/man2/xhtml/glVertex4.xml b/upstream-doc/man2/xhtml/glVertex4.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertex4.xml rename to upstream-doc/man2/xhtml/glVertex4.xml diff --git a/upstream-man-pages/man2/xhtml/glVertexAttrib.xml b/upstream-doc/man2/xhtml/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertexAttrib.xml rename to upstream-doc/man2/xhtml/glVertexAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glVertexAttribPointer.xml b/upstream-doc/man2/xhtml/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertexAttribPointer.xml rename to upstream-doc/man2/xhtml/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glVertexPointer.xml b/upstream-doc/man2/xhtml/glVertexPointer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glVertexPointer.xml rename to upstream-doc/man2/xhtml/glVertexPointer.xml diff --git a/upstream-man-pages/man2/xhtml/glViewport.xml b/upstream-doc/man2/xhtml/glViewport.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glViewport.xml rename to upstream-doc/man2/xhtml/glViewport.xml diff --git a/upstream-man-pages/man2/xhtml/glWindowPos.xml b/upstream-doc/man2/xhtml/glWindowPos.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glWindowPos.xml rename to upstream-doc/man2/xhtml/glWindowPos.xml diff --git a/upstream-man-pages/man2/xhtml/glXChooseFBConfig.xml b/upstream-doc/man2/xhtml/glXChooseFBConfig.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXChooseFBConfig.xml rename to upstream-doc/man2/xhtml/glXChooseFBConfig.xml diff --git a/upstream-man-pages/man2/xhtml/glXChooseVisual.xml b/upstream-doc/man2/xhtml/glXChooseVisual.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXChooseVisual.xml rename to upstream-doc/man2/xhtml/glXChooseVisual.xml diff --git a/upstream-man-pages/man2/xhtml/glXCopyContext.xml b/upstream-doc/man2/xhtml/glXCopyContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCopyContext.xml rename to upstream-doc/man2/xhtml/glXCopyContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreateContext.xml b/upstream-doc/man2/xhtml/glXCreateContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreateContext.xml rename to upstream-doc/man2/xhtml/glXCreateContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreateGLXPixmap.xml b/upstream-doc/man2/xhtml/glXCreateGLXPixmap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreateGLXPixmap.xml rename to upstream-doc/man2/xhtml/glXCreateGLXPixmap.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreateNewContext.xml b/upstream-doc/man2/xhtml/glXCreateNewContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreateNewContext.xml rename to upstream-doc/man2/xhtml/glXCreateNewContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreatePbuffer.xml b/upstream-doc/man2/xhtml/glXCreatePbuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreatePbuffer.xml rename to upstream-doc/man2/xhtml/glXCreatePbuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreatePixmap.xml b/upstream-doc/man2/xhtml/glXCreatePixmap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreatePixmap.xml rename to upstream-doc/man2/xhtml/glXCreatePixmap.xml diff --git a/upstream-man-pages/man2/xhtml/glXCreateWindow.xml b/upstream-doc/man2/xhtml/glXCreateWindow.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXCreateWindow.xml rename to upstream-doc/man2/xhtml/glXCreateWindow.xml diff --git a/upstream-man-pages/man2/xhtml/glXDestroyContext.xml b/upstream-doc/man2/xhtml/glXDestroyContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXDestroyContext.xml rename to upstream-doc/man2/xhtml/glXDestroyContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXDestroyGLXPixmap.xml b/upstream-doc/man2/xhtml/glXDestroyGLXPixmap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXDestroyGLXPixmap.xml rename to upstream-doc/man2/xhtml/glXDestroyGLXPixmap.xml diff --git a/upstream-man-pages/man2/xhtml/glXDestroyPbuffer.xml b/upstream-doc/man2/xhtml/glXDestroyPbuffer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXDestroyPbuffer.xml rename to upstream-doc/man2/xhtml/glXDestroyPbuffer.xml diff --git a/upstream-man-pages/man2/xhtml/glXDestroyPixmap.xml b/upstream-doc/man2/xhtml/glXDestroyPixmap.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXDestroyPixmap.xml rename to upstream-doc/man2/xhtml/glXDestroyPixmap.xml diff --git a/upstream-man-pages/man2/xhtml/glXDestroyWindow.xml b/upstream-doc/man2/xhtml/glXDestroyWindow.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXDestroyWindow.xml rename to upstream-doc/man2/xhtml/glXDestroyWindow.xml diff --git a/upstream-man-pages/man2/xhtml/glXFreeContextEXT.xml b/upstream-doc/man2/xhtml/glXFreeContextEXT.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXFreeContextEXT.xml rename to upstream-doc/man2/xhtml/glXFreeContextEXT.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetClientString.xml b/upstream-doc/man2/xhtml/glXGetClientString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetClientString.xml rename to upstream-doc/man2/xhtml/glXGetClientString.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetConfig.xml b/upstream-doc/man2/xhtml/glXGetConfig.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetConfig.xml rename to upstream-doc/man2/xhtml/glXGetConfig.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetContextIDEXT.xml b/upstream-doc/man2/xhtml/glXGetContextIDEXT.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetContextIDEXT.xml rename to upstream-doc/man2/xhtml/glXGetContextIDEXT.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetCurrentContext.xml b/upstream-doc/man2/xhtml/glXGetCurrentContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetCurrentContext.xml rename to upstream-doc/man2/xhtml/glXGetCurrentContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetCurrentDisplay.xml b/upstream-doc/man2/xhtml/glXGetCurrentDisplay.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetCurrentDisplay.xml rename to upstream-doc/man2/xhtml/glXGetCurrentDisplay.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetCurrentDrawable.xml b/upstream-doc/man2/xhtml/glXGetCurrentDrawable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetCurrentDrawable.xml rename to upstream-doc/man2/xhtml/glXGetCurrentDrawable.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetCurrentReadDrawable.xml b/upstream-doc/man2/xhtml/glXGetCurrentReadDrawable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetCurrentReadDrawable.xml rename to upstream-doc/man2/xhtml/glXGetCurrentReadDrawable.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetFBConfigAttrib.xml b/upstream-doc/man2/xhtml/glXGetFBConfigAttrib.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetFBConfigAttrib.xml rename to upstream-doc/man2/xhtml/glXGetFBConfigAttrib.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetFBConfigs.xml b/upstream-doc/man2/xhtml/glXGetFBConfigs.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetFBConfigs.xml rename to upstream-doc/man2/xhtml/glXGetFBConfigs.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetProcAddress.xml b/upstream-doc/man2/xhtml/glXGetProcAddress.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetProcAddress.xml rename to upstream-doc/man2/xhtml/glXGetProcAddress.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetSelectedEvent.xml b/upstream-doc/man2/xhtml/glXGetSelectedEvent.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetSelectedEvent.xml rename to upstream-doc/man2/xhtml/glXGetSelectedEvent.xml diff --git a/upstream-man-pages/man2/xhtml/glXGetVisualFromFBConfig.xml b/upstream-doc/man2/xhtml/glXGetVisualFromFBConfig.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXGetVisualFromFBConfig.xml rename to upstream-doc/man2/xhtml/glXGetVisualFromFBConfig.xml diff --git a/upstream-man-pages/man2/xhtml/glXImportContextEXT.xml b/upstream-doc/man2/xhtml/glXImportContextEXT.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXImportContextEXT.xml rename to upstream-doc/man2/xhtml/glXImportContextEXT.xml diff --git a/upstream-man-pages/man2/xhtml/glXIntro.xml b/upstream-doc/man2/xhtml/glXIntro.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXIntro.xml rename to upstream-doc/man2/xhtml/glXIntro.xml diff --git a/upstream-man-pages/man2/xhtml/glXIsDirect.xml b/upstream-doc/man2/xhtml/glXIsDirect.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXIsDirect.xml rename to upstream-doc/man2/xhtml/glXIsDirect.xml diff --git a/upstream-man-pages/man2/xhtml/glXMakeContextCurrent.xml b/upstream-doc/man2/xhtml/glXMakeContextCurrent.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXMakeContextCurrent.xml rename to upstream-doc/man2/xhtml/glXMakeContextCurrent.xml diff --git a/upstream-man-pages/man2/xhtml/glXMakeCurrent.xml b/upstream-doc/man2/xhtml/glXMakeCurrent.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXMakeCurrent.xml rename to upstream-doc/man2/xhtml/glXMakeCurrent.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryContext.xml b/upstream-doc/man2/xhtml/glXQueryContext.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryContext.xml rename to upstream-doc/man2/xhtml/glXQueryContext.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryContextInfoEXT.xml b/upstream-doc/man2/xhtml/glXQueryContextInfoEXT.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryContextInfoEXT.xml rename to upstream-doc/man2/xhtml/glXQueryContextInfoEXT.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryDrawable.xml b/upstream-doc/man2/xhtml/glXQueryDrawable.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryDrawable.xml rename to upstream-doc/man2/xhtml/glXQueryDrawable.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryExtension.xml b/upstream-doc/man2/xhtml/glXQueryExtension.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryExtension.xml rename to upstream-doc/man2/xhtml/glXQueryExtension.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryExtensionsString.xml b/upstream-doc/man2/xhtml/glXQueryExtensionsString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryExtensionsString.xml rename to upstream-doc/man2/xhtml/glXQueryExtensionsString.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryServerString.xml b/upstream-doc/man2/xhtml/glXQueryServerString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryServerString.xml rename to upstream-doc/man2/xhtml/glXQueryServerString.xml diff --git a/upstream-man-pages/man2/xhtml/glXQueryVersion.xml b/upstream-doc/man2/xhtml/glXQueryVersion.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXQueryVersion.xml rename to upstream-doc/man2/xhtml/glXQueryVersion.xml diff --git a/upstream-man-pages/man2/xhtml/glXSelectEvent.xml b/upstream-doc/man2/xhtml/glXSelectEvent.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXSelectEvent.xml rename to upstream-doc/man2/xhtml/glXSelectEvent.xml diff --git a/upstream-man-pages/man2/xhtml/glXSwapBuffers.xml b/upstream-doc/man2/xhtml/glXSwapBuffers.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXSwapBuffers.xml rename to upstream-doc/man2/xhtml/glXSwapBuffers.xml diff --git a/upstream-man-pages/man2/xhtml/glXUseXFont.xml b/upstream-doc/man2/xhtml/glXUseXFont.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXUseXFont.xml rename to upstream-doc/man2/xhtml/glXUseXFont.xml diff --git a/upstream-man-pages/man2/xhtml/glXWaitGL.xml b/upstream-doc/man2/xhtml/glXWaitGL.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXWaitGL.xml rename to upstream-doc/man2/xhtml/glXWaitGL.xml diff --git a/upstream-man-pages/man2/xhtml/glXWaitX.xml b/upstream-doc/man2/xhtml/glXWaitX.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/glXWaitX.xml rename to upstream-doc/man2/xhtml/glXWaitX.xml diff --git a/upstream-man-pages/man2/xhtml/gluBeginCurve.xml b/upstream-doc/man2/xhtml/gluBeginCurve.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBeginCurve.xml rename to upstream-doc/man2/xhtml/gluBeginCurve.xml diff --git a/upstream-man-pages/man2/xhtml/gluBeginPolygon.xml b/upstream-doc/man2/xhtml/gluBeginPolygon.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBeginPolygon.xml rename to upstream-doc/man2/xhtml/gluBeginPolygon.xml diff --git a/upstream-man-pages/man2/xhtml/gluBeginSurface.xml b/upstream-doc/man2/xhtml/gluBeginSurface.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBeginSurface.xml rename to upstream-doc/man2/xhtml/gluBeginSurface.xml diff --git a/upstream-man-pages/man2/xhtml/gluBeginTrim.xml b/upstream-doc/man2/xhtml/gluBeginTrim.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBeginTrim.xml rename to upstream-doc/man2/xhtml/gluBeginTrim.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild1DMipmapLevels.xml b/upstream-doc/man2/xhtml/gluBuild1DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild1DMipmapLevels.xml rename to upstream-doc/man2/xhtml/gluBuild1DMipmapLevels.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild1DMipmaps.xml b/upstream-doc/man2/xhtml/gluBuild1DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild1DMipmaps.xml rename to upstream-doc/man2/xhtml/gluBuild1DMipmaps.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild2DMipmapLevels.xml b/upstream-doc/man2/xhtml/gluBuild2DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild2DMipmapLevels.xml rename to upstream-doc/man2/xhtml/gluBuild2DMipmapLevels.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild2DMipmaps.xml b/upstream-doc/man2/xhtml/gluBuild2DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild2DMipmaps.xml rename to upstream-doc/man2/xhtml/gluBuild2DMipmaps.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild3DMipmapLevels.xml b/upstream-doc/man2/xhtml/gluBuild3DMipmapLevels.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild3DMipmapLevels.xml rename to upstream-doc/man2/xhtml/gluBuild3DMipmapLevels.xml diff --git a/upstream-man-pages/man2/xhtml/gluBuild3DMipmaps.xml b/upstream-doc/man2/xhtml/gluBuild3DMipmaps.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluBuild3DMipmaps.xml rename to upstream-doc/man2/xhtml/gluBuild3DMipmaps.xml diff --git a/upstream-man-pages/man2/xhtml/gluCheckExtension.xml b/upstream-doc/man2/xhtml/gluCheckExtension.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluCheckExtension.xml rename to upstream-doc/man2/xhtml/gluCheckExtension.xml diff --git a/upstream-man-pages/man2/xhtml/gluCylinder.xml b/upstream-doc/man2/xhtml/gluCylinder.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluCylinder.xml rename to upstream-doc/man2/xhtml/gluCylinder.xml diff --git a/upstream-man-pages/man2/xhtml/gluDeleteNurbsRenderer.xml b/upstream-doc/man2/xhtml/gluDeleteNurbsRenderer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluDeleteNurbsRenderer.xml rename to upstream-doc/man2/xhtml/gluDeleteNurbsRenderer.xml diff --git a/upstream-man-pages/man2/xhtml/gluDeleteQuadric.xml b/upstream-doc/man2/xhtml/gluDeleteQuadric.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluDeleteQuadric.xml rename to upstream-doc/man2/xhtml/gluDeleteQuadric.xml diff --git a/upstream-man-pages/man2/xhtml/gluDeleteTess.xml b/upstream-doc/man2/xhtml/gluDeleteTess.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluDeleteTess.xml rename to upstream-doc/man2/xhtml/gluDeleteTess.xml diff --git a/upstream-man-pages/man2/xhtml/gluDisk.xml b/upstream-doc/man2/xhtml/gluDisk.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluDisk.xml rename to upstream-doc/man2/xhtml/gluDisk.xml diff --git a/upstream-man-pages/man2/xhtml/gluEndCurve.xml b/upstream-doc/man2/xhtml/gluEndCurve.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluEndCurve.xml rename to upstream-doc/man2/xhtml/gluEndCurve.xml diff --git a/upstream-man-pages/man2/xhtml/gluEndPolygon.xml b/upstream-doc/man2/xhtml/gluEndPolygon.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluEndPolygon.xml rename to upstream-doc/man2/xhtml/gluEndPolygon.xml diff --git a/upstream-man-pages/man2/xhtml/gluEndSurface.xml b/upstream-doc/man2/xhtml/gluEndSurface.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluEndSurface.xml rename to upstream-doc/man2/xhtml/gluEndSurface.xml diff --git a/upstream-man-pages/man2/xhtml/gluEndTrim.xml b/upstream-doc/man2/xhtml/gluEndTrim.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluEndTrim.xml rename to upstream-doc/man2/xhtml/gluEndTrim.xml diff --git a/upstream-man-pages/man2/xhtml/gluErrorString.xml b/upstream-doc/man2/xhtml/gluErrorString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluErrorString.xml rename to upstream-doc/man2/xhtml/gluErrorString.xml diff --git a/upstream-man-pages/man2/xhtml/gluGetNurbsProperty.xml b/upstream-doc/man2/xhtml/gluGetNurbsProperty.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluGetNurbsProperty.xml rename to upstream-doc/man2/xhtml/gluGetNurbsProperty.xml diff --git a/upstream-man-pages/man2/xhtml/gluGetString.xml b/upstream-doc/man2/xhtml/gluGetString.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluGetString.xml rename to upstream-doc/man2/xhtml/gluGetString.xml diff --git a/upstream-man-pages/man2/xhtml/gluGetTessProperty.xml b/upstream-doc/man2/xhtml/gluGetTessProperty.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluGetTessProperty.xml rename to upstream-doc/man2/xhtml/gluGetTessProperty.xml diff --git a/upstream-man-pages/man2/xhtml/gluLoadSamplingMatrices.xml b/upstream-doc/man2/xhtml/gluLoadSamplingMatrices.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluLoadSamplingMatrices.xml rename to upstream-doc/man2/xhtml/gluLoadSamplingMatrices.xml diff --git a/upstream-man-pages/man2/xhtml/gluLookAt.xml b/upstream-doc/man2/xhtml/gluLookAt.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluLookAt.xml rename to upstream-doc/man2/xhtml/gluLookAt.xml diff --git a/upstream-man-pages/man2/xhtml/gluNewNurbsRenderer.xml b/upstream-doc/man2/xhtml/gluNewNurbsRenderer.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNewNurbsRenderer.xml rename to upstream-doc/man2/xhtml/gluNewNurbsRenderer.xml diff --git a/upstream-man-pages/man2/xhtml/gluNewQuadric.xml b/upstream-doc/man2/xhtml/gluNewQuadric.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNewQuadric.xml rename to upstream-doc/man2/xhtml/gluNewQuadric.xml diff --git a/upstream-man-pages/man2/xhtml/gluNewTess.xml b/upstream-doc/man2/xhtml/gluNewTess.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNewTess.xml rename to upstream-doc/man2/xhtml/gluNewTess.xml diff --git a/upstream-man-pages/man2/xhtml/gluNextContour.xml b/upstream-doc/man2/xhtml/gluNextContour.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNextContour.xml rename to upstream-doc/man2/xhtml/gluNextContour.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsCallback.xml b/upstream-doc/man2/xhtml/gluNurbsCallback.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsCallback.xml rename to upstream-doc/man2/xhtml/gluNurbsCallback.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsCallbackData.xml b/upstream-doc/man2/xhtml/gluNurbsCallbackData.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsCallbackData.xml rename to upstream-doc/man2/xhtml/gluNurbsCallbackData.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsCallbackDataEXT.xml b/upstream-doc/man2/xhtml/gluNurbsCallbackDataEXT.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsCallbackDataEXT.xml rename to upstream-doc/man2/xhtml/gluNurbsCallbackDataEXT.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsCurve.xml b/upstream-doc/man2/xhtml/gluNurbsCurve.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsCurve.xml rename to upstream-doc/man2/xhtml/gluNurbsCurve.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsProperty.xml b/upstream-doc/man2/xhtml/gluNurbsProperty.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsProperty.xml rename to upstream-doc/man2/xhtml/gluNurbsProperty.xml diff --git a/upstream-man-pages/man2/xhtml/gluNurbsSurface.xml b/upstream-doc/man2/xhtml/gluNurbsSurface.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluNurbsSurface.xml rename to upstream-doc/man2/xhtml/gluNurbsSurface.xml diff --git a/upstream-man-pages/man2/xhtml/gluOrtho2D.xml b/upstream-doc/man2/xhtml/gluOrtho2D.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluOrtho2D.xml rename to upstream-doc/man2/xhtml/gluOrtho2D.xml diff --git a/upstream-man-pages/man2/xhtml/gluPartialDisk.xml b/upstream-doc/man2/xhtml/gluPartialDisk.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluPartialDisk.xml rename to upstream-doc/man2/xhtml/gluPartialDisk.xml diff --git a/upstream-man-pages/man2/xhtml/gluPerspective.xml b/upstream-doc/man2/xhtml/gluPerspective.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluPerspective.xml rename to upstream-doc/man2/xhtml/gluPerspective.xml diff --git a/upstream-man-pages/man2/xhtml/gluPickMatrix.xml b/upstream-doc/man2/xhtml/gluPickMatrix.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluPickMatrix.xml rename to upstream-doc/man2/xhtml/gluPickMatrix.xml diff --git a/upstream-man-pages/man2/xhtml/gluProject.xml b/upstream-doc/man2/xhtml/gluProject.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluProject.xml rename to upstream-doc/man2/xhtml/gluProject.xml diff --git a/upstream-man-pages/man2/xhtml/gluPwlCurve.xml b/upstream-doc/man2/xhtml/gluPwlCurve.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluPwlCurve.xml rename to upstream-doc/man2/xhtml/gluPwlCurve.xml diff --git a/upstream-man-pages/man2/xhtml/gluQuadricCallback.xml b/upstream-doc/man2/xhtml/gluQuadricCallback.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluQuadricCallback.xml rename to upstream-doc/man2/xhtml/gluQuadricCallback.xml diff --git a/upstream-man-pages/man2/xhtml/gluQuadricDrawStyle.xml b/upstream-doc/man2/xhtml/gluQuadricDrawStyle.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluQuadricDrawStyle.xml rename to upstream-doc/man2/xhtml/gluQuadricDrawStyle.xml diff --git a/upstream-man-pages/man2/xhtml/gluQuadricNormals.xml b/upstream-doc/man2/xhtml/gluQuadricNormals.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluQuadricNormals.xml rename to upstream-doc/man2/xhtml/gluQuadricNormals.xml diff --git a/upstream-man-pages/man2/xhtml/gluQuadricOrientation.xml b/upstream-doc/man2/xhtml/gluQuadricOrientation.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluQuadricOrientation.xml rename to upstream-doc/man2/xhtml/gluQuadricOrientation.xml diff --git a/upstream-man-pages/man2/xhtml/gluQuadricTexture.xml b/upstream-doc/man2/xhtml/gluQuadricTexture.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluQuadricTexture.xml rename to upstream-doc/man2/xhtml/gluQuadricTexture.xml diff --git a/upstream-man-pages/man2/xhtml/gluScaleImage.xml b/upstream-doc/man2/xhtml/gluScaleImage.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluScaleImage.xml rename to upstream-doc/man2/xhtml/gluScaleImage.xml diff --git a/upstream-man-pages/man2/xhtml/gluSphere.xml b/upstream-doc/man2/xhtml/gluSphere.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluSphere.xml rename to upstream-doc/man2/xhtml/gluSphere.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessBeginContour.xml b/upstream-doc/man2/xhtml/gluTessBeginContour.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessBeginContour.xml rename to upstream-doc/man2/xhtml/gluTessBeginContour.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessBeginPolygon.xml b/upstream-doc/man2/xhtml/gluTessBeginPolygon.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessBeginPolygon.xml rename to upstream-doc/man2/xhtml/gluTessBeginPolygon.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessCallback.xml b/upstream-doc/man2/xhtml/gluTessCallback.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessCallback.xml rename to upstream-doc/man2/xhtml/gluTessCallback.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessEndContour.xml b/upstream-doc/man2/xhtml/gluTessEndContour.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessEndContour.xml rename to upstream-doc/man2/xhtml/gluTessEndContour.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessEndPolygon.xml b/upstream-doc/man2/xhtml/gluTessEndPolygon.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessEndPolygon.xml rename to upstream-doc/man2/xhtml/gluTessEndPolygon.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessNormal.xml b/upstream-doc/man2/xhtml/gluTessNormal.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessNormal.xml rename to upstream-doc/man2/xhtml/gluTessNormal.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessProperty.xml b/upstream-doc/man2/xhtml/gluTessProperty.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessProperty.xml rename to upstream-doc/man2/xhtml/gluTessProperty.xml diff --git a/upstream-man-pages/man2/xhtml/gluTessVertex.xml b/upstream-doc/man2/xhtml/gluTessVertex.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluTessVertex.xml rename to upstream-doc/man2/xhtml/gluTessVertex.xml diff --git a/upstream-man-pages/man2/xhtml/gluUnProject.xml b/upstream-doc/man2/xhtml/gluUnProject.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluUnProject.xml rename to upstream-doc/man2/xhtml/gluUnProject.xml diff --git a/upstream-man-pages/man2/xhtml/gluUnProject4.xml b/upstream-doc/man2/xhtml/gluUnProject4.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/gluUnProject4.xml rename to upstream-doc/man2/xhtml/gluUnProject4.xml diff --git a/upstream-man-pages/man2/xhtml/index.html b/upstream-doc/man2/xhtml/index.html similarity index 100% rename from upstream-man-pages/man2/xhtml/index.html rename to upstream-doc/man2/xhtml/index.html diff --git a/upstream-man-pages/man2/xhtml/makeindex.pl b/upstream-doc/man2/xhtml/makeindex.pl similarity index 100% rename from upstream-man-pages/man2/xhtml/makeindex.pl rename to upstream-doc/man2/xhtml/makeindex.pl diff --git a/upstream-man-pages/man2/xhtml/mathml.xsl b/upstream-doc/man2/xhtml/mathml.xsl similarity index 100% rename from upstream-man-pages/man2/xhtml/mathml.xsl rename to upstream-doc/man2/xhtml/mathml.xsl diff --git a/upstream-man-pages/man2/xhtml/opengl-man.xsl b/upstream-doc/man2/xhtml/opengl-man.xsl similarity index 100% rename from upstream-man-pages/man2/xhtml/opengl-man.xsl rename to upstream-doc/man2/xhtml/opengl-man.xsl diff --git a/upstream-man-pages/man2/xhtml/pmathml.xsl b/upstream-doc/man2/xhtml/pmathml.xsl similarity index 100% rename from upstream-man-pages/man2/xhtml/pmathml.xsl rename to upstream-doc/man2/xhtml/pmathml.xsl diff --git a/upstream-man-pages/man2/xhtml/pmathmlcss.xsl b/upstream-doc/man2/xhtml/pmathmlcss.xsl similarity index 100% rename from upstream-man-pages/man2/xhtml/pmathmlcss.xsl rename to upstream-doc/man2/xhtml/pmathmlcss.xsl diff --git a/upstream-man-pages/man2/xhtml/start.html b/upstream-doc/man2/xhtml/start.html similarity index 100% rename from upstream-man-pages/man2/xhtml/start.html rename to upstream-doc/man2/xhtml/start.html diff --git a/upstream-man-pages/man2/xhtml/test.xml b/upstream-doc/man2/xhtml/test.xml similarity index 100% rename from upstream-man-pages/man2/xhtml/test.xml rename to upstream-doc/man2/xhtml/test.xml diff --git a/upstream-man-pages/man2/xhtml/xhtml-lat1.ent b/upstream-doc/man2/xhtml/xhtml-lat1.ent similarity index 100% rename from upstream-man-pages/man2/xhtml/xhtml-lat1.ent rename to upstream-doc/man2/xhtml/xhtml-lat1.ent diff --git a/upstream-man-pages/man2/xhtml/xhtml-special.ent b/upstream-doc/man2/xhtml/xhtml-special.ent similarity index 100% rename from upstream-man-pages/man2/xhtml/xhtml-special.ent rename to upstream-doc/man2/xhtml/xhtml-special.ent diff --git a/upstream-man-pages/man2/xhtml/xhtml-symbol.ent b/upstream-doc/man2/xhtml/xhtml-symbol.ent similarity index 100% rename from upstream-man-pages/man2/xhtml/xhtml-symbol.ent rename to upstream-doc/man2/xhtml/xhtml-symbol.ent diff --git a/upstream-man-pages/man2/xhtml/xhtml1-transitional.dtd b/upstream-doc/man2/xhtml/xhtml1-transitional.dtd similarity index 100% rename from upstream-man-pages/man2/xhtml/xhtml1-transitional.dtd rename to upstream-doc/man2/xhtml/xhtml1-transitional.dtd diff --git a/upstream-man-pages/man3/Makefile b/upstream-doc/man3/Makefile similarity index 100% rename from upstream-man-pages/man3/Makefile rename to upstream-doc/man3/Makefile diff --git a/upstream-man-pages/man3/README.txt b/upstream-doc/man3/README.txt similarity index 100% rename from upstream-man-pages/man3/README.txt rename to upstream-doc/man3/README.txt diff --git a/upstream-man-pages/man3/bottom.php b/upstream-doc/man3/bottom.php similarity index 100% rename from upstream-man-pages/man3/bottom.php rename to upstream-doc/man3/bottom.php diff --git a/upstream-man-pages/man3/docs/Viewing_XHTML_and_MathML.html b/upstream-doc/man3/docs/Viewing_XHTML_and_MathML.html similarity index 100% rename from upstream-man-pages/man3/docs/Viewing_XHTML_and_MathML.html rename to upstream-doc/man3/docs/Viewing_XHTML_and_MathML.html diff --git a/upstream-man-pages/man3/docs/XML_Toolchain_and_Man_Pages.html b/upstream-doc/man3/docs/XML_Toolchain_and_Man_Pages.html similarity index 100% rename from upstream-man-pages/man3/docs/XML_Toolchain_and_Man_Pages.html rename to upstream-doc/man3/docs/XML_Toolchain_and_Man_Pages.html diff --git a/upstream-man-pages/man3/fo/Makefile b/upstream-doc/man3/fo/Makefile similarity index 100% rename from upstream-man-pages/man3/fo/Makefile rename to upstream-doc/man3/fo/Makefile diff --git a/upstream-man-pages/man3/fo/glTexGen.fo b/upstream-doc/man3/fo/glTexGen.fo similarity index 100% rename from upstream-man-pages/man3/fo/glTexGen.fo rename to upstream-doc/man3/fo/glTexGen.fo diff --git a/upstream-man-pages/man3/fo/glTexGen.pdf b/upstream-doc/man3/fo/glTexGen.pdf similarity index 100% rename from upstream-man-pages/man3/fo/glTexGen.pdf rename to upstream-doc/man3/fo/glTexGen.pdf diff --git a/upstream-man-pages/man3/glActiveTexture.xml b/upstream-doc/man3/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man3/glActiveTexture.xml rename to upstream-doc/man3/glActiveTexture.xml diff --git a/upstream-man-pages/man3/glAttachShader.xml b/upstream-doc/man3/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man3/glAttachShader.xml rename to upstream-doc/man3/glAttachShader.xml diff --git a/upstream-man-pages/man3/glBeginConditionalRender.xml b/upstream-doc/man3/glBeginConditionalRender.xml similarity index 100% rename from upstream-man-pages/man3/glBeginConditionalRender.xml rename to upstream-doc/man3/glBeginConditionalRender.xml diff --git a/upstream-man-pages/man3/glBeginQuery.xml b/upstream-doc/man3/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man3/glBeginQuery.xml rename to upstream-doc/man3/glBeginQuery.xml diff --git a/upstream-man-pages/man3/glBeginTransformFeedback.xml b/upstream-doc/man3/glBeginTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man3/glBeginTransformFeedback.xml rename to upstream-doc/man3/glBeginTransformFeedback.xml diff --git a/upstream-man-pages/man3/glBindAttribLocation.xml b/upstream-doc/man3/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man3/glBindAttribLocation.xml rename to upstream-doc/man3/glBindAttribLocation.xml diff --git a/upstream-man-pages/man3/glBindBuffer.xml b/upstream-doc/man3/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glBindBuffer.xml rename to upstream-doc/man3/glBindBuffer.xml diff --git a/upstream-man-pages/man3/glBindBufferBase.xml b/upstream-doc/man3/glBindBufferBase.xml similarity index 100% rename from upstream-man-pages/man3/glBindBufferBase.xml rename to upstream-doc/man3/glBindBufferBase.xml diff --git a/upstream-man-pages/man3/glBindBufferRange.xml b/upstream-doc/man3/glBindBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/glBindBufferRange.xml rename to upstream-doc/man3/glBindBufferRange.xml diff --git a/upstream-man-pages/man3/glBindFragDataLocation.xml b/upstream-doc/man3/glBindFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man3/glBindFragDataLocation.xml rename to upstream-doc/man3/glBindFragDataLocation.xml diff --git a/upstream-man-pages/man3/glBindFragDataLocationIndexed.xml b/upstream-doc/man3/glBindFragDataLocationIndexed.xml similarity index 100% rename from upstream-man-pages/man3/glBindFragDataLocationIndexed.xml rename to upstream-doc/man3/glBindFragDataLocationIndexed.xml diff --git a/upstream-man-pages/man3/glBindFramebuffer.xml b/upstream-doc/man3/glBindFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/glBindFramebuffer.xml rename to upstream-doc/man3/glBindFramebuffer.xml diff --git a/upstream-man-pages/man3/glBindRenderbuffer.xml b/upstream-doc/man3/glBindRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/glBindRenderbuffer.xml rename to upstream-doc/man3/glBindRenderbuffer.xml diff --git a/upstream-man-pages/man3/glBindSampler.xml b/upstream-doc/man3/glBindSampler.xml similarity index 100% rename from upstream-man-pages/man3/glBindSampler.xml rename to upstream-doc/man3/glBindSampler.xml diff --git a/upstream-man-pages/man3/glBindTexture.xml b/upstream-doc/man3/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man3/glBindTexture.xml rename to upstream-doc/man3/glBindTexture.xml diff --git a/upstream-man-pages/man3/glBindVertexArray.xml b/upstream-doc/man3/glBindVertexArray.xml similarity index 100% rename from upstream-man-pages/man3/glBindVertexArray.xml rename to upstream-doc/man3/glBindVertexArray.xml diff --git a/upstream-man-pages/man3/glBlendColor.xml b/upstream-doc/man3/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man3/glBlendColor.xml rename to upstream-doc/man3/glBlendColor.xml diff --git a/upstream-man-pages/man3/glBlendEquation.xml b/upstream-doc/man3/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man3/glBlendEquation.xml rename to upstream-doc/man3/glBlendEquation.xml diff --git a/upstream-man-pages/man3/glBlendEquationSeparate.xml b/upstream-doc/man3/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man3/glBlendEquationSeparate.xml rename to upstream-doc/man3/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man3/glBlendFunc.xml b/upstream-doc/man3/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man3/glBlendFunc.xml rename to upstream-doc/man3/glBlendFunc.xml diff --git a/upstream-man-pages/man3/glBlendFuncSeparate.xml b/upstream-doc/man3/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man3/glBlendFuncSeparate.xml rename to upstream-doc/man3/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man3/glBlitFramebuffer.xml b/upstream-doc/man3/glBlitFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/glBlitFramebuffer.xml rename to upstream-doc/man3/glBlitFramebuffer.xml diff --git a/upstream-man-pages/man3/glBufferData.xml b/upstream-doc/man3/glBufferData.xml similarity index 100% rename from upstream-man-pages/man3/glBufferData.xml rename to upstream-doc/man3/glBufferData.xml diff --git a/upstream-man-pages/man3/glBufferSubData.xml b/upstream-doc/man3/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/glBufferSubData.xml rename to upstream-doc/man3/glBufferSubData.xml diff --git a/upstream-man-pages/man3/glCheckFramebufferStatus.xml b/upstream-doc/man3/glCheckFramebufferStatus.xml similarity index 100% rename from upstream-man-pages/man3/glCheckFramebufferStatus.xml rename to upstream-doc/man3/glCheckFramebufferStatus.xml diff --git a/upstream-man-pages/man3/glClampColor.xml b/upstream-doc/man3/glClampColor.xml similarity index 100% rename from upstream-man-pages/man3/glClampColor.xml rename to upstream-doc/man3/glClampColor.xml diff --git a/upstream-man-pages/man3/glClear.xml b/upstream-doc/man3/glClear.xml similarity index 100% rename from upstream-man-pages/man3/glClear.xml rename to upstream-doc/man3/glClear.xml diff --git a/upstream-man-pages/man3/glClearBuffer.xml b/upstream-doc/man3/glClearBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glClearBuffer.xml rename to upstream-doc/man3/glClearBuffer.xml diff --git a/upstream-man-pages/man3/glClearColor.xml b/upstream-doc/man3/glClearColor.xml similarity index 100% rename from upstream-man-pages/man3/glClearColor.xml rename to upstream-doc/man3/glClearColor.xml diff --git a/upstream-man-pages/man3/glClearDepth.xml b/upstream-doc/man3/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man3/glClearDepth.xml rename to upstream-doc/man3/glClearDepth.xml diff --git a/upstream-man-pages/man3/glClearStencil.xml b/upstream-doc/man3/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man3/glClearStencil.xml rename to upstream-doc/man3/glClearStencil.xml diff --git a/upstream-man-pages/man3/glClientWaitSync.xml b/upstream-doc/man3/glClientWaitSync.xml similarity index 100% rename from upstream-man-pages/man3/glClientWaitSync.xml rename to upstream-doc/man3/glClientWaitSync.xml diff --git a/upstream-man-pages/man3/glColorMask.xml b/upstream-doc/man3/glColorMask.xml similarity index 100% rename from upstream-man-pages/man3/glColorMask.xml rename to upstream-doc/man3/glColorMask.xml diff --git a/upstream-man-pages/man3/glCompileShader.xml b/upstream-doc/man3/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man3/glCompileShader.xml rename to upstream-doc/man3/glCompileShader.xml diff --git a/upstream-man-pages/man3/glCompressedTexImage1D.xml b/upstream-doc/man3/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexImage1D.xml rename to upstream-doc/man3/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man3/glCompressedTexImage2D.xml b/upstream-doc/man3/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexImage2D.xml rename to upstream-doc/man3/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man3/glCompressedTexImage3D.xml b/upstream-doc/man3/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexImage3D.xml rename to upstream-doc/man3/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man3/glCompressedTexSubImage1D.xml b/upstream-doc/man3/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexSubImage1D.xml rename to upstream-doc/man3/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man3/glCompressedTexSubImage2D.xml b/upstream-doc/man3/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexSubImage2D.xml rename to upstream-doc/man3/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man3/glCompressedTexSubImage3D.xml b/upstream-doc/man3/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/glCompressedTexSubImage3D.xml rename to upstream-doc/man3/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man3/glCopyBufferSubData.xml b/upstream-doc/man3/glCopyBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/glCopyBufferSubData.xml rename to upstream-doc/man3/glCopyBufferSubData.xml diff --git a/upstream-man-pages/man3/glCopyTexImage1D.xml b/upstream-doc/man3/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glCopyTexImage1D.xml rename to upstream-doc/man3/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man3/glCopyTexImage2D.xml b/upstream-doc/man3/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glCopyTexImage2D.xml rename to upstream-doc/man3/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man3/glCopyTexSubImage1D.xml b/upstream-doc/man3/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glCopyTexSubImage1D.xml rename to upstream-doc/man3/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man3/glCopyTexSubImage2D.xml b/upstream-doc/man3/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glCopyTexSubImage2D.xml rename to upstream-doc/man3/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man3/glCopyTexSubImage3D.xml b/upstream-doc/man3/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/glCopyTexSubImage3D.xml rename to upstream-doc/man3/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man3/glCreateProgram.xml b/upstream-doc/man3/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man3/glCreateProgram.xml rename to upstream-doc/man3/glCreateProgram.xml diff --git a/upstream-man-pages/man3/glCreateShader.xml b/upstream-doc/man3/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man3/glCreateShader.xml rename to upstream-doc/man3/glCreateShader.xml diff --git a/upstream-man-pages/man3/glCullFace.xml b/upstream-doc/man3/glCullFace.xml similarity index 100% rename from upstream-man-pages/man3/glCullFace.xml rename to upstream-doc/man3/glCullFace.xml diff --git a/upstream-man-pages/man3/glDeleteBuffers.xml b/upstream-doc/man3/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteBuffers.xml rename to upstream-doc/man3/glDeleteBuffers.xml diff --git a/upstream-man-pages/man3/glDeleteFramebuffers.xml b/upstream-doc/man3/glDeleteFramebuffers.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteFramebuffers.xml rename to upstream-doc/man3/glDeleteFramebuffers.xml diff --git a/upstream-man-pages/man3/glDeleteProgram.xml b/upstream-doc/man3/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteProgram.xml rename to upstream-doc/man3/glDeleteProgram.xml diff --git a/upstream-man-pages/man3/glDeleteQueries.xml b/upstream-doc/man3/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteQueries.xml rename to upstream-doc/man3/glDeleteQueries.xml diff --git a/upstream-man-pages/man3/glDeleteRenderbuffers.xml b/upstream-doc/man3/glDeleteRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteRenderbuffers.xml rename to upstream-doc/man3/glDeleteRenderbuffers.xml diff --git a/upstream-man-pages/man3/glDeleteSamplers.xml b/upstream-doc/man3/glDeleteSamplers.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteSamplers.xml rename to upstream-doc/man3/glDeleteSamplers.xml diff --git a/upstream-man-pages/man3/glDeleteShader.xml b/upstream-doc/man3/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteShader.xml rename to upstream-doc/man3/glDeleteShader.xml diff --git a/upstream-man-pages/man3/glDeleteSync.xml b/upstream-doc/man3/glDeleteSync.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteSync.xml rename to upstream-doc/man3/glDeleteSync.xml diff --git a/upstream-man-pages/man3/glDeleteTextures.xml b/upstream-doc/man3/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteTextures.xml rename to upstream-doc/man3/glDeleteTextures.xml diff --git a/upstream-man-pages/man3/glDeleteVertexArrays.xml b/upstream-doc/man3/glDeleteVertexArrays.xml similarity index 100% rename from upstream-man-pages/man3/glDeleteVertexArrays.xml rename to upstream-doc/man3/glDeleteVertexArrays.xml diff --git a/upstream-man-pages/man3/glDepthFunc.xml b/upstream-doc/man3/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man3/glDepthFunc.xml rename to upstream-doc/man3/glDepthFunc.xml diff --git a/upstream-man-pages/man3/glDepthMask.xml b/upstream-doc/man3/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man3/glDepthMask.xml rename to upstream-doc/man3/glDepthMask.xml diff --git a/upstream-man-pages/man3/glDepthRange.xml b/upstream-doc/man3/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man3/glDepthRange.xml rename to upstream-doc/man3/glDepthRange.xml diff --git a/upstream-man-pages/man3/glDetachShader.xml b/upstream-doc/man3/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man3/glDetachShader.xml rename to upstream-doc/man3/glDetachShader.xml diff --git a/upstream-man-pages/man3/glDrawArrays.xml b/upstream-doc/man3/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man3/glDrawArrays.xml rename to upstream-doc/man3/glDrawArrays.xml diff --git a/upstream-man-pages/man3/glDrawArraysInstanced.xml b/upstream-doc/man3/glDrawArraysInstanced.xml similarity index 100% rename from upstream-man-pages/man3/glDrawArraysInstanced.xml rename to upstream-doc/man3/glDrawArraysInstanced.xml diff --git a/upstream-man-pages/man3/glDrawBuffer.xml b/upstream-doc/man3/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glDrawBuffer.xml rename to upstream-doc/man3/glDrawBuffer.xml diff --git a/upstream-man-pages/man3/glDrawBuffers.xml b/upstream-doc/man3/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man3/glDrawBuffers.xml rename to upstream-doc/man3/glDrawBuffers.xml diff --git a/upstream-man-pages/man3/glDrawElements.xml b/upstream-doc/man3/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man3/glDrawElements.xml rename to upstream-doc/man3/glDrawElements.xml diff --git a/upstream-man-pages/man3/glDrawElementsBaseVertex.xml b/upstream-doc/man3/glDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/glDrawElementsBaseVertex.xml rename to upstream-doc/man3/glDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/glDrawElementsInstanced.xml b/upstream-doc/man3/glDrawElementsInstanced.xml similarity index 100% rename from upstream-man-pages/man3/glDrawElementsInstanced.xml rename to upstream-doc/man3/glDrawElementsInstanced.xml diff --git a/upstream-man-pages/man3/glDrawElementsInstancedBaseVertex.xml b/upstream-doc/man3/glDrawElementsInstancedBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/glDrawElementsInstancedBaseVertex.xml rename to upstream-doc/man3/glDrawElementsInstancedBaseVertex.xml diff --git a/upstream-man-pages/man3/glDrawRangeElements.xml b/upstream-doc/man3/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man3/glDrawRangeElements.xml rename to upstream-doc/man3/glDrawRangeElements.xml diff --git a/upstream-man-pages/man3/glDrawRangeElementsBaseVertex.xml b/upstream-doc/man3/glDrawRangeElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/glDrawRangeElementsBaseVertex.xml rename to upstream-doc/man3/glDrawRangeElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/glEnable.xml b/upstream-doc/man3/glEnable.xml similarity index 100% rename from upstream-man-pages/man3/glEnable.xml rename to upstream-doc/man3/glEnable.xml diff --git a/upstream-man-pages/man3/glEnableVertexAttribArray.xml b/upstream-doc/man3/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man3/glEnableVertexAttribArray.xml rename to upstream-doc/man3/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man3/glFenceSync.xml b/upstream-doc/man3/glFenceSync.xml similarity index 100% rename from upstream-man-pages/man3/glFenceSync.xml rename to upstream-doc/man3/glFenceSync.xml diff --git a/upstream-man-pages/man3/glFinish.xml b/upstream-doc/man3/glFinish.xml similarity index 100% rename from upstream-man-pages/man3/glFinish.xml rename to upstream-doc/man3/glFinish.xml diff --git a/upstream-man-pages/man3/glFlush.xml b/upstream-doc/man3/glFlush.xml similarity index 100% rename from upstream-man-pages/man3/glFlush.xml rename to upstream-doc/man3/glFlush.xml diff --git a/upstream-man-pages/man3/glFlushMappedBufferRange.xml b/upstream-doc/man3/glFlushMappedBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/glFlushMappedBufferRange.xml rename to upstream-doc/man3/glFlushMappedBufferRange.xml diff --git a/upstream-man-pages/man3/glFramebufferRenderbuffer.xml b/upstream-doc/man3/glFramebufferRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/glFramebufferRenderbuffer.xml rename to upstream-doc/man3/glFramebufferRenderbuffer.xml diff --git a/upstream-man-pages/man3/glFramebufferTexture.xml b/upstream-doc/man3/glFramebufferTexture.xml similarity index 100% rename from upstream-man-pages/man3/glFramebufferTexture.xml rename to upstream-doc/man3/glFramebufferTexture.xml diff --git a/upstream-man-pages/man3/glFramebufferTextureLayer.xml b/upstream-doc/man3/glFramebufferTextureLayer.xml similarity index 100% rename from upstream-man-pages/man3/glFramebufferTextureLayer.xml rename to upstream-doc/man3/glFramebufferTextureLayer.xml diff --git a/upstream-man-pages/man3/glFrontFace.xml b/upstream-doc/man3/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man3/glFrontFace.xml rename to upstream-doc/man3/glFrontFace.xml diff --git a/upstream-man-pages/man3/glGenBuffers.xml b/upstream-doc/man3/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man3/glGenBuffers.xml rename to upstream-doc/man3/glGenBuffers.xml diff --git a/upstream-man-pages/man3/glGenFramebuffers.xml b/upstream-doc/man3/glGenFramebuffers.xml similarity index 100% rename from upstream-man-pages/man3/glGenFramebuffers.xml rename to upstream-doc/man3/glGenFramebuffers.xml diff --git a/upstream-man-pages/man3/glGenQueries.xml b/upstream-doc/man3/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man3/glGenQueries.xml rename to upstream-doc/man3/glGenQueries.xml diff --git a/upstream-man-pages/man3/glGenRenderbuffers.xml b/upstream-doc/man3/glGenRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man3/glGenRenderbuffers.xml rename to upstream-doc/man3/glGenRenderbuffers.xml diff --git a/upstream-man-pages/man3/glGenSamplers.xml b/upstream-doc/man3/glGenSamplers.xml similarity index 100% rename from upstream-man-pages/man3/glGenSamplers.xml rename to upstream-doc/man3/glGenSamplers.xml diff --git a/upstream-man-pages/man3/glGenTextures.xml b/upstream-doc/man3/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man3/glGenTextures.xml rename to upstream-doc/man3/glGenTextures.xml diff --git a/upstream-man-pages/man3/glGenVertexArrays.xml b/upstream-doc/man3/glGenVertexArrays.xml similarity index 100% rename from upstream-man-pages/man3/glGenVertexArrays.xml rename to upstream-doc/man3/glGenVertexArrays.xml diff --git a/upstream-man-pages/man3/glGenerateMipmap.xml b/upstream-doc/man3/glGenerateMipmap.xml similarity index 100% rename from upstream-man-pages/man3/glGenerateMipmap.xml rename to upstream-doc/man3/glGenerateMipmap.xml diff --git a/upstream-man-pages/man3/glGet.xml b/upstream-doc/man3/glGet.xml similarity index 100% rename from upstream-man-pages/man3/glGet.xml rename to upstream-doc/man3/glGet.xml diff --git a/upstream-man-pages/man3/glGetActiveAttrib.xml b/upstream-doc/man3/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveAttrib.xml rename to upstream-doc/man3/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man3/glGetActiveUniform.xml b/upstream-doc/man3/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveUniform.xml rename to upstream-doc/man3/glGetActiveUniform.xml diff --git a/upstream-man-pages/man3/glGetActiveUniformBlock.xml b/upstream-doc/man3/glGetActiveUniformBlock.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveUniformBlock.xml rename to upstream-doc/man3/glGetActiveUniformBlock.xml diff --git a/upstream-man-pages/man3/glGetActiveUniformBlockName.xml b/upstream-doc/man3/glGetActiveUniformBlockName.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveUniformBlockName.xml rename to upstream-doc/man3/glGetActiveUniformBlockName.xml diff --git a/upstream-man-pages/man3/glGetActiveUniformName.xml b/upstream-doc/man3/glGetActiveUniformName.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveUniformName.xml rename to upstream-doc/man3/glGetActiveUniformName.xml diff --git a/upstream-man-pages/man3/glGetActiveUniformsiv.xml b/upstream-doc/man3/glGetActiveUniformsiv.xml similarity index 100% rename from upstream-man-pages/man3/glGetActiveUniformsiv.xml rename to upstream-doc/man3/glGetActiveUniformsiv.xml diff --git a/upstream-man-pages/man3/glGetAttachedShaders.xml b/upstream-doc/man3/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man3/glGetAttachedShaders.xml rename to upstream-doc/man3/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man3/glGetAttribLocation.xml b/upstream-doc/man3/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man3/glGetAttribLocation.xml rename to upstream-doc/man3/glGetAttribLocation.xml diff --git a/upstream-man-pages/man3/glGetBufferParameter.xml b/upstream-doc/man3/glGetBufferParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetBufferParameter.xml rename to upstream-doc/man3/glGetBufferParameter.xml diff --git a/upstream-man-pages/man3/glGetBufferParameteriv.xml b/upstream-doc/man3/glGetBufferParameteriv.xml similarity index 100% rename from upstream-man-pages/man3/glGetBufferParameteriv.xml rename to upstream-doc/man3/glGetBufferParameteriv.xml diff --git a/upstream-man-pages/man3/glGetBufferPointerv.xml b/upstream-doc/man3/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man3/glGetBufferPointerv.xml rename to upstream-doc/man3/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man3/glGetBufferSubData.xml b/upstream-doc/man3/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/glGetBufferSubData.xml rename to upstream-doc/man3/glGetBufferSubData.xml diff --git a/upstream-man-pages/man3/glGetCompressedTexImage.xml b/upstream-doc/man3/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man3/glGetCompressedTexImage.xml rename to upstream-doc/man3/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man3/glGetError.xml b/upstream-doc/man3/glGetError.xml similarity index 100% rename from upstream-man-pages/man3/glGetError.xml rename to upstream-doc/man3/glGetError.xml diff --git a/upstream-man-pages/man3/glGetFragDataIndex.xml b/upstream-doc/man3/glGetFragDataIndex.xml similarity index 100% rename from upstream-man-pages/man3/glGetFragDataIndex.xml rename to upstream-doc/man3/glGetFragDataIndex.xml diff --git a/upstream-man-pages/man3/glGetFragDataLocation.xml b/upstream-doc/man3/glGetFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man3/glGetFragDataLocation.xml rename to upstream-doc/man3/glGetFragDataLocation.xml diff --git a/upstream-man-pages/man3/glGetFramebufferAttachmentParameter.xml b/upstream-doc/man3/glGetFramebufferAttachmentParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetFramebufferAttachmentParameter.xml rename to upstream-doc/man3/glGetFramebufferAttachmentParameter.xml diff --git a/upstream-man-pages/man3/glGetMultisample.xml b/upstream-doc/man3/glGetMultisample.xml similarity index 100% rename from upstream-man-pages/man3/glGetMultisample.xml rename to upstream-doc/man3/glGetMultisample.xml diff --git a/upstream-man-pages/man3/glGetProgram.xml b/upstream-doc/man3/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man3/glGetProgram.xml rename to upstream-doc/man3/glGetProgram.xml diff --git a/upstream-man-pages/man3/glGetProgramInfoLog.xml b/upstream-doc/man3/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man3/glGetProgramInfoLog.xml rename to upstream-doc/man3/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man3/glGetQueryObject.xml b/upstream-doc/man3/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man3/glGetQueryObject.xml rename to upstream-doc/man3/glGetQueryObject.xml diff --git a/upstream-man-pages/man3/glGetQueryiv.xml b/upstream-doc/man3/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man3/glGetQueryiv.xml rename to upstream-doc/man3/glGetQueryiv.xml diff --git a/upstream-man-pages/man3/glGetRenderbufferParameter.xml b/upstream-doc/man3/glGetRenderbufferParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetRenderbufferParameter.xml rename to upstream-doc/man3/glGetRenderbufferParameter.xml diff --git a/upstream-man-pages/man3/glGetSamplerParameter.xml b/upstream-doc/man3/glGetSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetSamplerParameter.xml rename to upstream-doc/man3/glGetSamplerParameter.xml diff --git a/upstream-man-pages/man3/glGetShader.xml b/upstream-doc/man3/glGetShader.xml similarity index 100% rename from upstream-man-pages/man3/glGetShader.xml rename to upstream-doc/man3/glGetShader.xml diff --git a/upstream-man-pages/man3/glGetShaderInfoLog.xml b/upstream-doc/man3/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man3/glGetShaderInfoLog.xml rename to upstream-doc/man3/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man3/glGetShaderSource.xml b/upstream-doc/man3/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man3/glGetShaderSource.xml rename to upstream-doc/man3/glGetShaderSource.xml diff --git a/upstream-man-pages/man3/glGetString.xml b/upstream-doc/man3/glGetString.xml similarity index 100% rename from upstream-man-pages/man3/glGetString.xml rename to upstream-doc/man3/glGetString.xml diff --git a/upstream-man-pages/man3/glGetSync.xml b/upstream-doc/man3/glGetSync.xml similarity index 100% rename from upstream-man-pages/man3/glGetSync.xml rename to upstream-doc/man3/glGetSync.xml diff --git a/upstream-man-pages/man3/glGetTexImage.xml b/upstream-doc/man3/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man3/glGetTexImage.xml rename to upstream-doc/man3/glGetTexImage.xml diff --git a/upstream-man-pages/man3/glGetTexLevelParameter.xml b/upstream-doc/man3/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetTexLevelParameter.xml rename to upstream-doc/man3/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man3/glGetTexParameter.xml b/upstream-doc/man3/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man3/glGetTexParameter.xml rename to upstream-doc/man3/glGetTexParameter.xml diff --git a/upstream-man-pages/man3/glGetTransformFeedbackVarying.xml b/upstream-doc/man3/glGetTransformFeedbackVarying.xml similarity index 100% rename from upstream-man-pages/man3/glGetTransformFeedbackVarying.xml rename to upstream-doc/man3/glGetTransformFeedbackVarying.xml diff --git a/upstream-man-pages/man3/glGetUniform.xml b/upstream-doc/man3/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man3/glGetUniform.xml rename to upstream-doc/man3/glGetUniform.xml diff --git a/upstream-man-pages/man3/glGetUniformBlockIndex.xml b/upstream-doc/man3/glGetUniformBlockIndex.xml similarity index 100% rename from upstream-man-pages/man3/glGetUniformBlockIndex.xml rename to upstream-doc/man3/glGetUniformBlockIndex.xml diff --git a/upstream-man-pages/man3/glGetUniformIndices.xml b/upstream-doc/man3/glGetUniformIndices.xml similarity index 100% rename from upstream-man-pages/man3/glGetUniformIndices.xml rename to upstream-doc/man3/glGetUniformIndices.xml diff --git a/upstream-man-pages/man3/glGetUniformLocation.xml b/upstream-doc/man3/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man3/glGetUniformLocation.xml rename to upstream-doc/man3/glGetUniformLocation.xml diff --git a/upstream-man-pages/man3/glGetVertexAttrib.xml b/upstream-doc/man3/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man3/glGetVertexAttrib.xml rename to upstream-doc/man3/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man3/glGetVertexAttribPointerv.xml b/upstream-doc/man3/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man3/glGetVertexAttribPointerv.xml rename to upstream-doc/man3/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man3/glHint.xml b/upstream-doc/man3/glHint.xml similarity index 100% rename from upstream-man-pages/man3/glHint.xml rename to upstream-doc/man3/glHint.xml diff --git a/upstream-man-pages/man3/glIsBuffer.xml b/upstream-doc/man3/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glIsBuffer.xml rename to upstream-doc/man3/glIsBuffer.xml diff --git a/upstream-man-pages/man3/glIsEnabled.xml b/upstream-doc/man3/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man3/glIsEnabled.xml rename to upstream-doc/man3/glIsEnabled.xml diff --git a/upstream-man-pages/man3/glIsFramebuffer.xml b/upstream-doc/man3/glIsFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/glIsFramebuffer.xml rename to upstream-doc/man3/glIsFramebuffer.xml diff --git a/upstream-man-pages/man3/glIsProgram.xml b/upstream-doc/man3/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man3/glIsProgram.xml rename to upstream-doc/man3/glIsProgram.xml diff --git a/upstream-man-pages/man3/glIsQuery.xml b/upstream-doc/man3/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man3/glIsQuery.xml rename to upstream-doc/man3/glIsQuery.xml diff --git a/upstream-man-pages/man3/glIsRenderbuffer.xml b/upstream-doc/man3/glIsRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/glIsRenderbuffer.xml rename to upstream-doc/man3/glIsRenderbuffer.xml diff --git a/upstream-man-pages/man3/glIsSampler.xml b/upstream-doc/man3/glIsSampler.xml similarity index 100% rename from upstream-man-pages/man3/glIsSampler.xml rename to upstream-doc/man3/glIsSampler.xml diff --git a/upstream-man-pages/man3/glIsShader.xml b/upstream-doc/man3/glIsShader.xml similarity index 100% rename from upstream-man-pages/man3/glIsShader.xml rename to upstream-doc/man3/glIsShader.xml diff --git a/upstream-man-pages/man3/glIsSync.xml b/upstream-doc/man3/glIsSync.xml similarity index 100% rename from upstream-man-pages/man3/glIsSync.xml rename to upstream-doc/man3/glIsSync.xml diff --git a/upstream-man-pages/man3/glIsTexture.xml b/upstream-doc/man3/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man3/glIsTexture.xml rename to upstream-doc/man3/glIsTexture.xml diff --git a/upstream-man-pages/man3/glIsVertexArray.xml b/upstream-doc/man3/glIsVertexArray.xml similarity index 100% rename from upstream-man-pages/man3/glIsVertexArray.xml rename to upstream-doc/man3/glIsVertexArray.xml diff --git a/upstream-man-pages/man3/glLineWidth.xml b/upstream-doc/man3/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man3/glLineWidth.xml rename to upstream-doc/man3/glLineWidth.xml diff --git a/upstream-man-pages/man3/glLinkProgram.xml b/upstream-doc/man3/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man3/glLinkProgram.xml rename to upstream-doc/man3/glLinkProgram.xml diff --git a/upstream-man-pages/man3/glLogicOp.xml b/upstream-doc/man3/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man3/glLogicOp.xml rename to upstream-doc/man3/glLogicOp.xml diff --git a/upstream-man-pages/man3/glMapBuffer.xml b/upstream-doc/man3/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glMapBuffer.xml rename to upstream-doc/man3/glMapBuffer.xml diff --git a/upstream-man-pages/man3/glMapBufferRange.xml b/upstream-doc/man3/glMapBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/glMapBufferRange.xml rename to upstream-doc/man3/glMapBufferRange.xml diff --git a/upstream-man-pages/man3/glMultiDrawArrays.xml b/upstream-doc/man3/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man3/glMultiDrawArrays.xml rename to upstream-doc/man3/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man3/glMultiDrawElements.xml b/upstream-doc/man3/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man3/glMultiDrawElements.xml rename to upstream-doc/man3/glMultiDrawElements.xml diff --git a/upstream-man-pages/man3/glMultiDrawElementsBaseVertex.xml b/upstream-doc/man3/glMultiDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/glMultiDrawElementsBaseVertex.xml rename to upstream-doc/man3/glMultiDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/glMultiTexCoord.xml b/upstream-doc/man3/glMultiTexCoord.xml similarity index 100% rename from upstream-man-pages/man3/glMultiTexCoord.xml rename to upstream-doc/man3/glMultiTexCoord.xml diff --git a/upstream-man-pages/man3/glPixelStore.xml b/upstream-doc/man3/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man3/glPixelStore.xml rename to upstream-doc/man3/glPixelStore.xml diff --git a/upstream-man-pages/man3/glPointParameter.xml b/upstream-doc/man3/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man3/glPointParameter.xml rename to upstream-doc/man3/glPointParameter.xml diff --git a/upstream-man-pages/man3/glPointSize.xml b/upstream-doc/man3/glPointSize.xml similarity index 100% rename from upstream-man-pages/man3/glPointSize.xml rename to upstream-doc/man3/glPointSize.xml diff --git a/upstream-man-pages/man3/glPolygonMode.xml b/upstream-doc/man3/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man3/glPolygonMode.xml rename to upstream-doc/man3/glPolygonMode.xml diff --git a/upstream-man-pages/man3/glPolygonOffset.xml b/upstream-doc/man3/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man3/glPolygonOffset.xml rename to upstream-doc/man3/glPolygonOffset.xml diff --git a/upstream-man-pages/man3/glPrimitiveRestartIndex.xml b/upstream-doc/man3/glPrimitiveRestartIndex.xml similarity index 100% rename from upstream-man-pages/man3/glPrimitiveRestartIndex.xml rename to upstream-doc/man3/glPrimitiveRestartIndex.xml diff --git a/upstream-man-pages/man3/glProvokingVertex.xml b/upstream-doc/man3/glProvokingVertex.xml similarity index 100% rename from upstream-man-pages/man3/glProvokingVertex.xml rename to upstream-doc/man3/glProvokingVertex.xml diff --git a/upstream-man-pages/man3/glQueryCounter.xml b/upstream-doc/man3/glQueryCounter.xml similarity index 100% rename from upstream-man-pages/man3/glQueryCounter.xml rename to upstream-doc/man3/glQueryCounter.xml diff --git a/upstream-man-pages/man3/glReadBuffer.xml b/upstream-doc/man3/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glReadBuffer.xml rename to upstream-doc/man3/glReadBuffer.xml diff --git a/upstream-man-pages/man3/glReadPixels.xml b/upstream-doc/man3/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man3/glReadPixels.xml rename to upstream-doc/man3/glReadPixels.xml diff --git a/upstream-man-pages/man3/glRenderbufferStorage.xml b/upstream-doc/man3/glRenderbufferStorage.xml similarity index 100% rename from upstream-man-pages/man3/glRenderbufferStorage.xml rename to upstream-doc/man3/glRenderbufferStorage.xml diff --git a/upstream-man-pages/man3/glRenderbufferStorageMultisample.xml b/upstream-doc/man3/glRenderbufferStorageMultisample.xml similarity index 100% rename from upstream-man-pages/man3/glRenderbufferStorageMultisample.xml rename to upstream-doc/man3/glRenderbufferStorageMultisample.xml diff --git a/upstream-man-pages/man3/glSampleCoverage.xml b/upstream-doc/man3/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man3/glSampleCoverage.xml rename to upstream-doc/man3/glSampleCoverage.xml diff --git a/upstream-man-pages/man3/glSampleMaski.xml b/upstream-doc/man3/glSampleMaski.xml similarity index 100% rename from upstream-man-pages/man3/glSampleMaski.xml rename to upstream-doc/man3/glSampleMaski.xml diff --git a/upstream-man-pages/man3/glSamplerParameter.xml b/upstream-doc/man3/glSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man3/glSamplerParameter.xml rename to upstream-doc/man3/glSamplerParameter.xml diff --git a/upstream-man-pages/man3/glScissor.xml b/upstream-doc/man3/glScissor.xml similarity index 100% rename from upstream-man-pages/man3/glScissor.xml rename to upstream-doc/man3/glScissor.xml diff --git a/upstream-man-pages/man3/glShaderSource.xml b/upstream-doc/man3/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man3/glShaderSource.xml rename to upstream-doc/man3/glShaderSource.xml diff --git a/upstream-man-pages/man3/glStencilFunc.xml b/upstream-doc/man3/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man3/glStencilFunc.xml rename to upstream-doc/man3/glStencilFunc.xml diff --git a/upstream-man-pages/man3/glStencilFuncSeparate.xml b/upstream-doc/man3/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man3/glStencilFuncSeparate.xml rename to upstream-doc/man3/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man3/glStencilMask.xml b/upstream-doc/man3/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man3/glStencilMask.xml rename to upstream-doc/man3/glStencilMask.xml diff --git a/upstream-man-pages/man3/glStencilMaskSeparate.xml b/upstream-doc/man3/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man3/glStencilMaskSeparate.xml rename to upstream-doc/man3/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man3/glStencilOp.xml b/upstream-doc/man3/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man3/glStencilOp.xml rename to upstream-doc/man3/glStencilOp.xml diff --git a/upstream-man-pages/man3/glStencilOpSeparate.xml b/upstream-doc/man3/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man3/glStencilOpSeparate.xml rename to upstream-doc/man3/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man3/glTexBuffer.xml b/upstream-doc/man3/glTexBuffer.xml similarity index 100% rename from upstream-man-pages/man3/glTexBuffer.xml rename to upstream-doc/man3/glTexBuffer.xml diff --git a/upstream-man-pages/man3/glTexImage1D.xml b/upstream-doc/man3/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glTexImage1D.xml rename to upstream-doc/man3/glTexImage1D.xml diff --git a/upstream-man-pages/man3/glTexImage2D.xml b/upstream-doc/man3/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glTexImage2D.xml rename to upstream-doc/man3/glTexImage2D.xml diff --git a/upstream-man-pages/man3/glTexImage2DMultisample.xml b/upstream-doc/man3/glTexImage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man3/glTexImage2DMultisample.xml rename to upstream-doc/man3/glTexImage2DMultisample.xml diff --git a/upstream-man-pages/man3/glTexImage3D.xml b/upstream-doc/man3/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man3/glTexImage3D.xml rename to upstream-doc/man3/glTexImage3D.xml diff --git a/upstream-man-pages/man3/glTexImage3DMultisample.xml b/upstream-doc/man3/glTexImage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man3/glTexImage3DMultisample.xml rename to upstream-doc/man3/glTexImage3DMultisample.xml diff --git a/upstream-man-pages/man3/glTexParameter.xml b/upstream-doc/man3/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man3/glTexParameter.xml rename to upstream-doc/man3/glTexParameter.xml diff --git a/upstream-man-pages/man3/glTexSubImage1D.xml b/upstream-doc/man3/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/glTexSubImage1D.xml rename to upstream-doc/man3/glTexSubImage1D.xml diff --git a/upstream-man-pages/man3/glTexSubImage2D.xml b/upstream-doc/man3/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/glTexSubImage2D.xml rename to upstream-doc/man3/glTexSubImage2D.xml diff --git a/upstream-man-pages/man3/glTexSubImage3D.xml b/upstream-doc/man3/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/glTexSubImage3D.xml rename to upstream-doc/man3/glTexSubImage3D.xml diff --git a/upstream-man-pages/man3/glTransformFeedbackVaryings.xml b/upstream-doc/man3/glTransformFeedbackVaryings.xml similarity index 100% rename from upstream-man-pages/man3/glTransformFeedbackVaryings.xml rename to upstream-doc/man3/glTransformFeedbackVaryings.xml diff --git a/upstream-man-pages/man3/glUniform.xml b/upstream-doc/man3/glUniform.xml similarity index 100% rename from upstream-man-pages/man3/glUniform.xml rename to upstream-doc/man3/glUniform.xml diff --git a/upstream-man-pages/man3/glUniformBlockBinding.xml b/upstream-doc/man3/glUniformBlockBinding.xml similarity index 100% rename from upstream-man-pages/man3/glUniformBlockBinding.xml rename to upstream-doc/man3/glUniformBlockBinding.xml diff --git a/upstream-man-pages/man3/glUseProgram.xml b/upstream-doc/man3/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man3/glUseProgram.xml rename to upstream-doc/man3/glUseProgram.xml diff --git a/upstream-man-pages/man3/glValidateProgram.xml b/upstream-doc/man3/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man3/glValidateProgram.xml rename to upstream-doc/man3/glValidateProgram.xml diff --git a/upstream-man-pages/man3/glVertexAttrib.xml b/upstream-doc/man3/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man3/glVertexAttrib.xml rename to upstream-doc/man3/glVertexAttrib.xml diff --git a/upstream-man-pages/man3/glVertexAttribDivisor.xml b/upstream-doc/man3/glVertexAttribDivisor.xml similarity index 100% rename from upstream-man-pages/man3/glVertexAttribDivisor.xml rename to upstream-doc/man3/glVertexAttribDivisor.xml diff --git a/upstream-man-pages/man3/glVertexAttribPointer.xml b/upstream-doc/man3/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man3/glVertexAttribPointer.xml rename to upstream-doc/man3/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man3/glViewport.xml b/upstream-doc/man3/glViewport.xml similarity index 100% rename from upstream-man-pages/man3/glViewport.xml rename to upstream-doc/man3/glViewport.xml diff --git a/upstream-man-pages/man3/glWaitSync.xml b/upstream-doc/man3/glWaitSync.xml similarity index 100% rename from upstream-man-pages/man3/glWaitSync.xml rename to upstream-doc/man3/glWaitSync.xml diff --git a/upstream-man-pages/man3/index.php b/upstream-doc/man3/index.php similarity index 100% rename from upstream-man-pages/man3/index.php rename to upstream-doc/man3/index.php diff --git a/upstream-man-pages/man3/pdf/DejaVuSans.ttf b/upstream-doc/man3/pdf/DejaVuSans.ttf similarity index 100% rename from upstream-man-pages/man3/pdf/DejaVuSans.ttf rename to upstream-doc/man3/pdf/DejaVuSans.ttf diff --git a/upstream-man-pages/man3/pdf/Makefile b/upstream-doc/man3/pdf/Makefile similarity index 100% rename from upstream-man-pages/man3/pdf/Makefile rename to upstream-doc/man3/pdf/Makefile diff --git a/upstream-man-pages/man3/pdf/footer b/upstream-doc/man3/pdf/footer similarity index 100% rename from upstream-man-pages/man3/pdf/footer rename to upstream-doc/man3/pdf/footer diff --git a/upstream-man-pages/man3/pdf/header b/upstream-doc/man3/pdf/header similarity index 100% rename from upstream-man-pages/man3/pdf/header rename to upstream-doc/man3/pdf/header diff --git a/upstream-man-pages/man3/pdf/ogl_prep_xml.xsl b/upstream-doc/man3/pdf/ogl_prep_xml.xsl similarity index 100% rename from upstream-man-pages/man3/pdf/ogl_prep_xml.xsl rename to upstream-doc/man3/pdf/ogl_prep_xml.xsl diff --git a/upstream-man-pages/man3/pdf/opengl-pdf.xsl b/upstream-doc/man3/pdf/opengl-pdf.xsl similarity index 100% rename from upstream-man-pages/man3/pdf/opengl-pdf.xsl rename to upstream-doc/man3/pdf/opengl-pdf.xsl diff --git a/upstream-man-pages/man3/top.php b/upstream-doc/man3/top.php similarity index 100% rename from upstream-man-pages/man3/top.php rename to upstream-doc/man3/top.php diff --git a/upstream-man-pages/man3/usr/include/make/commondefs b/upstream-doc/man3/usr/include/make/commondefs similarity index 100% rename from upstream-man-pages/man3/usr/include/make/commondefs rename to upstream-doc/man3/usr/include/make/commondefs diff --git a/upstream-man-pages/man3/usr/include/make/commonrules b/upstream-doc/man3/usr/include/make/commonrules similarity index 100% rename from upstream-man-pages/man3/usr/include/make/commonrules rename to upstream-doc/man3/usr/include/make/commonrules diff --git a/upstream-man-pages/man3/usr/include/make/commonrules.win32 b/upstream-doc/man3/usr/include/make/commonrules.win32 similarity index 100% rename from upstream-man-pages/man3/usr/include/make/commonrules.win32 rename to upstream-doc/man3/usr/include/make/commonrules.win32 diff --git a/upstream-man-pages/man3/usr/include/make/linuxdefs b/upstream-doc/man3/usr/include/make/linuxdefs similarity index 100% rename from upstream-man-pages/man3/usr/include/make/linuxdefs rename to upstream-doc/man3/usr/include/make/linuxdefs diff --git a/upstream-man-pages/man3/xhtml/Makefile b/upstream-doc/man3/xhtml/Makefile similarity index 100% rename from upstream-man-pages/man3/xhtml/Makefile rename to upstream-doc/man3/xhtml/Makefile diff --git a/upstream-man-pages/man3/xhtml/ctop.xsl b/upstream-doc/man3/xhtml/ctop.xsl similarity index 100% rename from upstream-man-pages/man3/xhtml/ctop.xsl rename to upstream-doc/man3/xhtml/ctop.xsl diff --git a/upstream-man-pages/man3/xhtml/glActiveTexture.xml b/upstream-doc/man3/xhtml/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glActiveTexture.xml rename to upstream-doc/man3/xhtml/glActiveTexture.xml diff --git a/upstream-man-pages/man3/xhtml/glAttachShader.xml b/upstream-doc/man3/xhtml/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glAttachShader.xml rename to upstream-doc/man3/xhtml/glAttachShader.xml diff --git a/upstream-man-pages/man3/xhtml/glBeginConditionalRender.xml b/upstream-doc/man3/xhtml/glBeginConditionalRender.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBeginConditionalRender.xml rename to upstream-doc/man3/xhtml/glBeginConditionalRender.xml diff --git a/upstream-man-pages/man3/xhtml/glBeginQuery.xml b/upstream-doc/man3/xhtml/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBeginQuery.xml rename to upstream-doc/man3/xhtml/glBeginQuery.xml diff --git a/upstream-man-pages/man3/xhtml/glBeginTransformFeedback.xml b/upstream-doc/man3/xhtml/glBeginTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBeginTransformFeedback.xml rename to upstream-doc/man3/xhtml/glBeginTransformFeedback.xml diff --git a/upstream-man-pages/man3/xhtml/glBindAttribLocation.xml b/upstream-doc/man3/xhtml/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindAttribLocation.xml rename to upstream-doc/man3/xhtml/glBindAttribLocation.xml diff --git a/upstream-man-pages/man3/xhtml/glBindBuffer.xml b/upstream-doc/man3/xhtml/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindBuffer.xml rename to upstream-doc/man3/xhtml/glBindBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glBindBufferBase.xml b/upstream-doc/man3/xhtml/glBindBufferBase.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindBufferBase.xml rename to upstream-doc/man3/xhtml/glBindBufferBase.xml diff --git a/upstream-man-pages/man3/xhtml/glBindBufferRange.xml b/upstream-doc/man3/xhtml/glBindBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindBufferRange.xml rename to upstream-doc/man3/xhtml/glBindBufferRange.xml diff --git a/upstream-man-pages/man3/xhtml/glBindFragDataLocation.xml b/upstream-doc/man3/xhtml/glBindFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindFragDataLocation.xml rename to upstream-doc/man3/xhtml/glBindFragDataLocation.xml diff --git a/upstream-man-pages/man3/xhtml/glBindFragDataLocationIndexed.xml b/upstream-doc/man3/xhtml/glBindFragDataLocationIndexed.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindFragDataLocationIndexed.xml rename to upstream-doc/man3/xhtml/glBindFragDataLocationIndexed.xml diff --git a/upstream-man-pages/man3/xhtml/glBindFramebuffer.xml b/upstream-doc/man3/xhtml/glBindFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindFramebuffer.xml rename to upstream-doc/man3/xhtml/glBindFramebuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glBindRenderbuffer.xml b/upstream-doc/man3/xhtml/glBindRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindRenderbuffer.xml rename to upstream-doc/man3/xhtml/glBindRenderbuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glBindSampler.xml b/upstream-doc/man3/xhtml/glBindSampler.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindSampler.xml rename to upstream-doc/man3/xhtml/glBindSampler.xml diff --git a/upstream-man-pages/man3/xhtml/glBindTexture.xml b/upstream-doc/man3/xhtml/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindTexture.xml rename to upstream-doc/man3/xhtml/glBindTexture.xml diff --git a/upstream-man-pages/man3/xhtml/glBindVertexArray.xml b/upstream-doc/man3/xhtml/glBindVertexArray.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBindVertexArray.xml rename to upstream-doc/man3/xhtml/glBindVertexArray.xml diff --git a/upstream-man-pages/man3/xhtml/glBlendColor.xml b/upstream-doc/man3/xhtml/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlendColor.xml rename to upstream-doc/man3/xhtml/glBlendColor.xml diff --git a/upstream-man-pages/man3/xhtml/glBlendEquation.xml b/upstream-doc/man3/xhtml/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlendEquation.xml rename to upstream-doc/man3/xhtml/glBlendEquation.xml diff --git a/upstream-man-pages/man3/xhtml/glBlendEquationSeparate.xml b/upstream-doc/man3/xhtml/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlendEquationSeparate.xml rename to upstream-doc/man3/xhtml/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man3/xhtml/glBlendFunc.xml b/upstream-doc/man3/xhtml/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlendFunc.xml rename to upstream-doc/man3/xhtml/glBlendFunc.xml diff --git a/upstream-man-pages/man3/xhtml/glBlendFuncSeparate.xml b/upstream-doc/man3/xhtml/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlendFuncSeparate.xml rename to upstream-doc/man3/xhtml/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man3/xhtml/glBlitFramebuffer.xml b/upstream-doc/man3/xhtml/glBlitFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBlitFramebuffer.xml rename to upstream-doc/man3/xhtml/glBlitFramebuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glBufferData.xml b/upstream-doc/man3/xhtml/glBufferData.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBufferData.xml rename to upstream-doc/man3/xhtml/glBufferData.xml diff --git a/upstream-man-pages/man3/xhtml/glBufferSubData.xml b/upstream-doc/man3/xhtml/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glBufferSubData.xml rename to upstream-doc/man3/xhtml/glBufferSubData.xml diff --git a/upstream-man-pages/man3/xhtml/glCheckFramebufferStatus.xml b/upstream-doc/man3/xhtml/glCheckFramebufferStatus.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCheckFramebufferStatus.xml rename to upstream-doc/man3/xhtml/glCheckFramebufferStatus.xml diff --git a/upstream-man-pages/man3/xhtml/glClampColor.xml b/upstream-doc/man3/xhtml/glClampColor.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClampColor.xml rename to upstream-doc/man3/xhtml/glClampColor.xml diff --git a/upstream-man-pages/man3/xhtml/glClear.xml b/upstream-doc/man3/xhtml/glClear.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClear.xml rename to upstream-doc/man3/xhtml/glClear.xml diff --git a/upstream-man-pages/man3/xhtml/glClearBuffer.xml b/upstream-doc/man3/xhtml/glClearBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClearBuffer.xml rename to upstream-doc/man3/xhtml/glClearBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glClearColor.xml b/upstream-doc/man3/xhtml/glClearColor.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClearColor.xml rename to upstream-doc/man3/xhtml/glClearColor.xml diff --git a/upstream-man-pages/man3/xhtml/glClearDepth.xml b/upstream-doc/man3/xhtml/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClearDepth.xml rename to upstream-doc/man3/xhtml/glClearDepth.xml diff --git a/upstream-man-pages/man3/xhtml/glClearStencil.xml b/upstream-doc/man3/xhtml/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClearStencil.xml rename to upstream-doc/man3/xhtml/glClearStencil.xml diff --git a/upstream-man-pages/man3/xhtml/glClientWaitSync.xml b/upstream-doc/man3/xhtml/glClientWaitSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glClientWaitSync.xml rename to upstream-doc/man3/xhtml/glClientWaitSync.xml diff --git a/upstream-man-pages/man3/xhtml/glColorMask.xml b/upstream-doc/man3/xhtml/glColorMask.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glColorMask.xml rename to upstream-doc/man3/xhtml/glColorMask.xml diff --git a/upstream-man-pages/man3/xhtml/glColorMaski.xml b/upstream-doc/man3/xhtml/glColorMaski.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glColorMaski.xml rename to upstream-doc/man3/xhtml/glColorMaski.xml diff --git a/upstream-man-pages/man3/xhtml/glCompileShader.xml b/upstream-doc/man3/xhtml/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompileShader.xml rename to upstream-doc/man3/xhtml/glCompileShader.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexImage1D.xml b/upstream-doc/man3/xhtml/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexImage1D.xml rename to upstream-doc/man3/xhtml/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexImage2D.xml b/upstream-doc/man3/xhtml/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexImage2D.xml rename to upstream-doc/man3/xhtml/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexImage3D.xml b/upstream-doc/man3/xhtml/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexImage3D.xml rename to upstream-doc/man3/xhtml/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexSubImage1D.xml b/upstream-doc/man3/xhtml/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexSubImage1D.xml rename to upstream-doc/man3/xhtml/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexSubImage2D.xml b/upstream-doc/man3/xhtml/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexSubImage2D.xml rename to upstream-doc/man3/xhtml/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glCompressedTexSubImage3D.xml b/upstream-doc/man3/xhtml/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCompressedTexSubImage3D.xml rename to upstream-doc/man3/xhtml/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyBufferSubData.xml b/upstream-doc/man3/xhtml/glCopyBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyBufferSubData.xml rename to upstream-doc/man3/xhtml/glCopyBufferSubData.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyTexImage1D.xml b/upstream-doc/man3/xhtml/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyTexImage1D.xml rename to upstream-doc/man3/xhtml/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyTexImage2D.xml b/upstream-doc/man3/xhtml/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyTexImage2D.xml rename to upstream-doc/man3/xhtml/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyTexSubImage1D.xml b/upstream-doc/man3/xhtml/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyTexSubImage1D.xml rename to upstream-doc/man3/xhtml/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyTexSubImage2D.xml b/upstream-doc/man3/xhtml/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyTexSubImage2D.xml rename to upstream-doc/man3/xhtml/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glCopyTexSubImage3D.xml b/upstream-doc/man3/xhtml/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCopyTexSubImage3D.xml rename to upstream-doc/man3/xhtml/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man3/xhtml/glCreateProgram.xml b/upstream-doc/man3/xhtml/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCreateProgram.xml rename to upstream-doc/man3/xhtml/glCreateProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glCreateShader.xml b/upstream-doc/man3/xhtml/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCreateShader.xml rename to upstream-doc/man3/xhtml/glCreateShader.xml diff --git a/upstream-man-pages/man3/xhtml/glCullFace.xml b/upstream-doc/man3/xhtml/glCullFace.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glCullFace.xml rename to upstream-doc/man3/xhtml/glCullFace.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteBuffers.xml b/upstream-doc/man3/xhtml/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteBuffers.xml rename to upstream-doc/man3/xhtml/glDeleteBuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteFramebuffers.xml b/upstream-doc/man3/xhtml/glDeleteFramebuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteFramebuffers.xml rename to upstream-doc/man3/xhtml/glDeleteFramebuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteProgram.xml b/upstream-doc/man3/xhtml/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteProgram.xml rename to upstream-doc/man3/xhtml/glDeleteProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteQueries.xml b/upstream-doc/man3/xhtml/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteQueries.xml rename to upstream-doc/man3/xhtml/glDeleteQueries.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteRenderbuffers.xml b/upstream-doc/man3/xhtml/glDeleteRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteRenderbuffers.xml rename to upstream-doc/man3/xhtml/glDeleteRenderbuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteSamplers.xml b/upstream-doc/man3/xhtml/glDeleteSamplers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteSamplers.xml rename to upstream-doc/man3/xhtml/glDeleteSamplers.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteShader.xml b/upstream-doc/man3/xhtml/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteShader.xml rename to upstream-doc/man3/xhtml/glDeleteShader.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteSync.xml b/upstream-doc/man3/xhtml/glDeleteSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteSync.xml rename to upstream-doc/man3/xhtml/glDeleteSync.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteTextures.xml b/upstream-doc/man3/xhtml/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteTextures.xml rename to upstream-doc/man3/xhtml/glDeleteTextures.xml diff --git a/upstream-man-pages/man3/xhtml/glDeleteVertexArrays.xml b/upstream-doc/man3/xhtml/glDeleteVertexArrays.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDeleteVertexArrays.xml rename to upstream-doc/man3/xhtml/glDeleteVertexArrays.xml diff --git a/upstream-man-pages/man3/xhtml/glDepthFunc.xml b/upstream-doc/man3/xhtml/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDepthFunc.xml rename to upstream-doc/man3/xhtml/glDepthFunc.xml diff --git a/upstream-man-pages/man3/xhtml/glDepthMask.xml b/upstream-doc/man3/xhtml/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDepthMask.xml rename to upstream-doc/man3/xhtml/glDepthMask.xml diff --git a/upstream-man-pages/man3/xhtml/glDepthRange.xml b/upstream-doc/man3/xhtml/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDepthRange.xml rename to upstream-doc/man3/xhtml/glDepthRange.xml diff --git a/upstream-man-pages/man3/xhtml/glDetachShader.xml b/upstream-doc/man3/xhtml/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDetachShader.xml rename to upstream-doc/man3/xhtml/glDetachShader.xml diff --git a/upstream-man-pages/man3/xhtml/glDisable.xml b/upstream-doc/man3/xhtml/glDisable.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDisable.xml rename to upstream-doc/man3/xhtml/glDisable.xml diff --git a/upstream-man-pages/man3/xhtml/glDisableVertexAttribArray.xml b/upstream-doc/man3/xhtml/glDisableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDisableVertexAttribArray.xml rename to upstream-doc/man3/xhtml/glDisableVertexAttribArray.xml diff --git a/upstream-man-pages/man3/xhtml/glDisablei.xml b/upstream-doc/man3/xhtml/glDisablei.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDisablei.xml rename to upstream-doc/man3/xhtml/glDisablei.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawArrays.xml b/upstream-doc/man3/xhtml/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawArrays.xml rename to upstream-doc/man3/xhtml/glDrawArrays.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawArraysInstanced.xml b/upstream-doc/man3/xhtml/glDrawArraysInstanced.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawArraysInstanced.xml rename to upstream-doc/man3/xhtml/glDrawArraysInstanced.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawBuffer.xml b/upstream-doc/man3/xhtml/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawBuffer.xml rename to upstream-doc/man3/xhtml/glDrawBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawBuffers.xml b/upstream-doc/man3/xhtml/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawBuffers.xml rename to upstream-doc/man3/xhtml/glDrawBuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawElements.xml b/upstream-doc/man3/xhtml/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawElements.xml rename to upstream-doc/man3/xhtml/glDrawElements.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawElementsBaseVertex.xml b/upstream-doc/man3/xhtml/glDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawElementsBaseVertex.xml rename to upstream-doc/man3/xhtml/glDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawElementsInstanced.xml b/upstream-doc/man3/xhtml/glDrawElementsInstanced.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawElementsInstanced.xml rename to upstream-doc/man3/xhtml/glDrawElementsInstanced.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawElementsInstancedBaseVertex.xml b/upstream-doc/man3/xhtml/glDrawElementsInstancedBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawElementsInstancedBaseVertex.xml rename to upstream-doc/man3/xhtml/glDrawElementsInstancedBaseVertex.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawRangeElements.xml b/upstream-doc/man3/xhtml/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawRangeElements.xml rename to upstream-doc/man3/xhtml/glDrawRangeElements.xml diff --git a/upstream-man-pages/man3/xhtml/glDrawRangeElementsBaseVertex.xml b/upstream-doc/man3/xhtml/glDrawRangeElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glDrawRangeElementsBaseVertex.xml rename to upstream-doc/man3/xhtml/glDrawRangeElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/xhtml/glEnable.xml b/upstream-doc/man3/xhtml/glEnable.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEnable.xml rename to upstream-doc/man3/xhtml/glEnable.xml diff --git a/upstream-man-pages/man3/xhtml/glEnableVertexAttribArray.xml b/upstream-doc/man3/xhtml/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEnableVertexAttribArray.xml rename to upstream-doc/man3/xhtml/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man3/xhtml/glEnablei.xml b/upstream-doc/man3/xhtml/glEnablei.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEnablei.xml rename to upstream-doc/man3/xhtml/glEnablei.xml diff --git a/upstream-man-pages/man3/xhtml/glEndConditionalRender.xml b/upstream-doc/man3/xhtml/glEndConditionalRender.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEndConditionalRender.xml rename to upstream-doc/man3/xhtml/glEndConditionalRender.xml diff --git a/upstream-man-pages/man3/xhtml/glEndQuery.xml b/upstream-doc/man3/xhtml/glEndQuery.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEndQuery.xml rename to upstream-doc/man3/xhtml/glEndQuery.xml diff --git a/upstream-man-pages/man3/xhtml/glEndTransformFeedback.xml b/upstream-doc/man3/xhtml/glEndTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glEndTransformFeedback.xml rename to upstream-doc/man3/xhtml/glEndTransformFeedback.xml diff --git a/upstream-man-pages/man3/xhtml/glFenceSync.xml b/upstream-doc/man3/xhtml/glFenceSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFenceSync.xml rename to upstream-doc/man3/xhtml/glFenceSync.xml diff --git a/upstream-man-pages/man3/xhtml/glFinish.xml b/upstream-doc/man3/xhtml/glFinish.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFinish.xml rename to upstream-doc/man3/xhtml/glFinish.xml diff --git a/upstream-man-pages/man3/xhtml/glFlush.xml b/upstream-doc/man3/xhtml/glFlush.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFlush.xml rename to upstream-doc/man3/xhtml/glFlush.xml diff --git a/upstream-man-pages/man3/xhtml/glFlushMappedBufferRange.xml b/upstream-doc/man3/xhtml/glFlushMappedBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFlushMappedBufferRange.xml rename to upstream-doc/man3/xhtml/glFlushMappedBufferRange.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferRenderbuffer.xml b/upstream-doc/man3/xhtml/glFramebufferRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferRenderbuffer.xml rename to upstream-doc/man3/xhtml/glFramebufferRenderbuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferTexture.xml b/upstream-doc/man3/xhtml/glFramebufferTexture.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferTexture.xml rename to upstream-doc/man3/xhtml/glFramebufferTexture.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferTexture1D.xml b/upstream-doc/man3/xhtml/glFramebufferTexture1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferTexture1D.xml rename to upstream-doc/man3/xhtml/glFramebufferTexture1D.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferTexture2D.xml b/upstream-doc/man3/xhtml/glFramebufferTexture2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferTexture2D.xml rename to upstream-doc/man3/xhtml/glFramebufferTexture2D.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferTexture3D.xml b/upstream-doc/man3/xhtml/glFramebufferTexture3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferTexture3D.xml rename to upstream-doc/man3/xhtml/glFramebufferTexture3D.xml diff --git a/upstream-man-pages/man3/xhtml/glFramebufferTextureLayer.xml b/upstream-doc/man3/xhtml/glFramebufferTextureLayer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFramebufferTextureLayer.xml rename to upstream-doc/man3/xhtml/glFramebufferTextureLayer.xml diff --git a/upstream-man-pages/man3/xhtml/glFrontFace.xml b/upstream-doc/man3/xhtml/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glFrontFace.xml rename to upstream-doc/man3/xhtml/glFrontFace.xml diff --git a/upstream-man-pages/man3/xhtml/glGenBuffers.xml b/upstream-doc/man3/xhtml/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenBuffers.xml rename to upstream-doc/man3/xhtml/glGenBuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glGenFramebuffers.xml b/upstream-doc/man3/xhtml/glGenFramebuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenFramebuffers.xml rename to upstream-doc/man3/xhtml/glGenFramebuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glGenQueries.xml b/upstream-doc/man3/xhtml/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenQueries.xml rename to upstream-doc/man3/xhtml/glGenQueries.xml diff --git a/upstream-man-pages/man3/xhtml/glGenRenderbuffers.xml b/upstream-doc/man3/xhtml/glGenRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenRenderbuffers.xml rename to upstream-doc/man3/xhtml/glGenRenderbuffers.xml diff --git a/upstream-man-pages/man3/xhtml/glGenSamplers.xml b/upstream-doc/man3/xhtml/glGenSamplers.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenSamplers.xml rename to upstream-doc/man3/xhtml/glGenSamplers.xml diff --git a/upstream-man-pages/man3/xhtml/glGenTextures.xml b/upstream-doc/man3/xhtml/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenTextures.xml rename to upstream-doc/man3/xhtml/glGenTextures.xml diff --git a/upstream-man-pages/man3/xhtml/glGenVertexArrays.xml b/upstream-doc/man3/xhtml/glGenVertexArrays.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenVertexArrays.xml rename to upstream-doc/man3/xhtml/glGenVertexArrays.xml diff --git a/upstream-man-pages/man3/xhtml/glGenerateMipmap.xml b/upstream-doc/man3/xhtml/glGenerateMipmap.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGenerateMipmap.xml rename to upstream-doc/man3/xhtml/glGenerateMipmap.xml diff --git a/upstream-man-pages/man3/xhtml/glGet.xml b/upstream-doc/man3/xhtml/glGet.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGet.xml rename to upstream-doc/man3/xhtml/glGet.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveAttrib.xml b/upstream-doc/man3/xhtml/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveAttrib.xml rename to upstream-doc/man3/xhtml/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveUniform.xml b/upstream-doc/man3/xhtml/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveUniform.xml rename to upstream-doc/man3/xhtml/glGetActiveUniform.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveUniformBlock.xml b/upstream-doc/man3/xhtml/glGetActiveUniformBlock.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveUniformBlock.xml rename to upstream-doc/man3/xhtml/glGetActiveUniformBlock.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveUniformBlockName.xml b/upstream-doc/man3/xhtml/glGetActiveUniformBlockName.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveUniformBlockName.xml rename to upstream-doc/man3/xhtml/glGetActiveUniformBlockName.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveUniformName.xml b/upstream-doc/man3/xhtml/glGetActiveUniformName.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveUniformName.xml rename to upstream-doc/man3/xhtml/glGetActiveUniformName.xml diff --git a/upstream-man-pages/man3/xhtml/glGetActiveUniformsiv.xml b/upstream-doc/man3/xhtml/glGetActiveUniformsiv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetActiveUniformsiv.xml rename to upstream-doc/man3/xhtml/glGetActiveUniformsiv.xml diff --git a/upstream-man-pages/man3/xhtml/glGetAttachedShaders.xml b/upstream-doc/man3/xhtml/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetAttachedShaders.xml rename to upstream-doc/man3/xhtml/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man3/xhtml/glGetAttribLocation.xml b/upstream-doc/man3/xhtml/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetAttribLocation.xml rename to upstream-doc/man3/xhtml/glGetAttribLocation.xml diff --git a/upstream-man-pages/man3/xhtml/glGetBufferParameter.xml b/upstream-doc/man3/xhtml/glGetBufferParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetBufferParameter.xml rename to upstream-doc/man3/xhtml/glGetBufferParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetBufferPointerv.xml b/upstream-doc/man3/xhtml/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetBufferPointerv.xml rename to upstream-doc/man3/xhtml/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man3/xhtml/glGetBufferSubData.xml b/upstream-doc/man3/xhtml/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetBufferSubData.xml rename to upstream-doc/man3/xhtml/glGetBufferSubData.xml diff --git a/upstream-man-pages/man3/xhtml/glGetCompressedTexImage.xml b/upstream-doc/man3/xhtml/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetCompressedTexImage.xml rename to upstream-doc/man3/xhtml/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man3/xhtml/glGetDoublev.xml b/upstream-doc/man3/xhtml/glGetDoublev.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetDoublev.xml rename to upstream-doc/man3/xhtml/glGetDoublev.xml diff --git a/upstream-man-pages/man3/xhtml/glGetError.xml b/upstream-doc/man3/xhtml/glGetError.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetError.xml rename to upstream-doc/man3/xhtml/glGetError.xml diff --git a/upstream-man-pages/man3/xhtml/glGetFloatv.xml b/upstream-doc/man3/xhtml/glGetFloatv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetFloatv.xml rename to upstream-doc/man3/xhtml/glGetFloatv.xml diff --git a/upstream-man-pages/man3/xhtml/glGetFragDataIndex.xml b/upstream-doc/man3/xhtml/glGetFragDataIndex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetFragDataIndex.xml rename to upstream-doc/man3/xhtml/glGetFragDataIndex.xml diff --git a/upstream-man-pages/man3/xhtml/glGetFragDataLocation.xml b/upstream-doc/man3/xhtml/glGetFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetFragDataLocation.xml rename to upstream-doc/man3/xhtml/glGetFragDataLocation.xml diff --git a/upstream-man-pages/man3/xhtml/glGetFramebufferAttachmentParameter.xml b/upstream-doc/man3/xhtml/glGetFramebufferAttachmentParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetFramebufferAttachmentParameter.xml rename to upstream-doc/man3/xhtml/glGetFramebufferAttachmentParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetIntegerv.xml b/upstream-doc/man3/xhtml/glGetIntegerv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetIntegerv.xml rename to upstream-doc/man3/xhtml/glGetIntegerv.xml diff --git a/upstream-man-pages/man3/xhtml/glGetMultisample.xml b/upstream-doc/man3/xhtml/glGetMultisample.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetMultisample.xml rename to upstream-doc/man3/xhtml/glGetMultisample.xml diff --git a/upstream-man-pages/man3/xhtml/glGetProgram.xml b/upstream-doc/man3/xhtml/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetProgram.xml rename to upstream-doc/man3/xhtml/glGetProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glGetProgramInfoLog.xml b/upstream-doc/man3/xhtml/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetProgramInfoLog.xml rename to upstream-doc/man3/xhtml/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man3/xhtml/glGetQueryObject.xml b/upstream-doc/man3/xhtml/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetQueryObject.xml rename to upstream-doc/man3/xhtml/glGetQueryObject.xml diff --git a/upstream-man-pages/man3/xhtml/glGetQueryiv.xml b/upstream-doc/man3/xhtml/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetQueryiv.xml rename to upstream-doc/man3/xhtml/glGetQueryiv.xml diff --git a/upstream-man-pages/man3/xhtml/glGetRenderbufferParameter.xml b/upstream-doc/man3/xhtml/glGetRenderbufferParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetRenderbufferParameter.xml rename to upstream-doc/man3/xhtml/glGetRenderbufferParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetSamplerParameter.xml b/upstream-doc/man3/xhtml/glGetSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetSamplerParameter.xml rename to upstream-doc/man3/xhtml/glGetSamplerParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetShader.xml b/upstream-doc/man3/xhtml/glGetShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetShader.xml rename to upstream-doc/man3/xhtml/glGetShader.xml diff --git a/upstream-man-pages/man3/xhtml/glGetShaderInfoLog.xml b/upstream-doc/man3/xhtml/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetShaderInfoLog.xml rename to upstream-doc/man3/xhtml/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man3/xhtml/glGetShaderSource.xml b/upstream-doc/man3/xhtml/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetShaderSource.xml rename to upstream-doc/man3/xhtml/glGetShaderSource.xml diff --git a/upstream-man-pages/man3/xhtml/glGetString.xml b/upstream-doc/man3/xhtml/glGetString.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetString.xml rename to upstream-doc/man3/xhtml/glGetString.xml diff --git a/upstream-man-pages/man3/xhtml/glGetSync.xml b/upstream-doc/man3/xhtml/glGetSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetSync.xml rename to upstream-doc/man3/xhtml/glGetSync.xml diff --git a/upstream-man-pages/man3/xhtml/glGetTexImage.xml b/upstream-doc/man3/xhtml/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetTexImage.xml rename to upstream-doc/man3/xhtml/glGetTexImage.xml diff --git a/upstream-man-pages/man3/xhtml/glGetTexLevelParameter.xml b/upstream-doc/man3/xhtml/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetTexLevelParameter.xml rename to upstream-doc/man3/xhtml/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetTexParameter.xml b/upstream-doc/man3/xhtml/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetTexParameter.xml rename to upstream-doc/man3/xhtml/glGetTexParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glGetTransformFeedbackVarying.xml b/upstream-doc/man3/xhtml/glGetTransformFeedbackVarying.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetTransformFeedbackVarying.xml rename to upstream-doc/man3/xhtml/glGetTransformFeedbackVarying.xml diff --git a/upstream-man-pages/man3/xhtml/glGetUniform.xml b/upstream-doc/man3/xhtml/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetUniform.xml rename to upstream-doc/man3/xhtml/glGetUniform.xml diff --git a/upstream-man-pages/man3/xhtml/glGetUniformBlockIndex.xml b/upstream-doc/man3/xhtml/glGetUniformBlockIndex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetUniformBlockIndex.xml rename to upstream-doc/man3/xhtml/glGetUniformBlockIndex.xml diff --git a/upstream-man-pages/man3/xhtml/glGetUniformIndices.xml b/upstream-doc/man3/xhtml/glGetUniformIndices.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetUniformIndices.xml rename to upstream-doc/man3/xhtml/glGetUniformIndices.xml diff --git a/upstream-man-pages/man3/xhtml/glGetUniformLocation.xml b/upstream-doc/man3/xhtml/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetUniformLocation.xml rename to upstream-doc/man3/xhtml/glGetUniformLocation.xml diff --git a/upstream-man-pages/man3/xhtml/glGetVertexAttrib.xml b/upstream-doc/man3/xhtml/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetVertexAttrib.xml rename to upstream-doc/man3/xhtml/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man3/xhtml/glGetVertexAttribPointerv.xml b/upstream-doc/man3/xhtml/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glGetVertexAttribPointerv.xml rename to upstream-doc/man3/xhtml/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man3/xhtml/glHint.xml b/upstream-doc/man3/xhtml/glHint.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glHint.xml rename to upstream-doc/man3/xhtml/glHint.xml diff --git a/upstream-man-pages/man3/xhtml/glIsBuffer.xml b/upstream-doc/man3/xhtml/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsBuffer.xml rename to upstream-doc/man3/xhtml/glIsBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glIsEnabled.xml b/upstream-doc/man3/xhtml/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsEnabled.xml rename to upstream-doc/man3/xhtml/glIsEnabled.xml diff --git a/upstream-man-pages/man3/xhtml/glIsFramebuffer.xml b/upstream-doc/man3/xhtml/glIsFramebuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsFramebuffer.xml rename to upstream-doc/man3/xhtml/glIsFramebuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glIsProgram.xml b/upstream-doc/man3/xhtml/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsProgram.xml rename to upstream-doc/man3/xhtml/glIsProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glIsQuery.xml b/upstream-doc/man3/xhtml/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsQuery.xml rename to upstream-doc/man3/xhtml/glIsQuery.xml diff --git a/upstream-man-pages/man3/xhtml/glIsRenderbuffer.xml b/upstream-doc/man3/xhtml/glIsRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsRenderbuffer.xml rename to upstream-doc/man3/xhtml/glIsRenderbuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glIsSampler.xml b/upstream-doc/man3/xhtml/glIsSampler.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsSampler.xml rename to upstream-doc/man3/xhtml/glIsSampler.xml diff --git a/upstream-man-pages/man3/xhtml/glIsShader.xml b/upstream-doc/man3/xhtml/glIsShader.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsShader.xml rename to upstream-doc/man3/xhtml/glIsShader.xml diff --git a/upstream-man-pages/man3/xhtml/glIsSync.xml b/upstream-doc/man3/xhtml/glIsSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsSync.xml rename to upstream-doc/man3/xhtml/glIsSync.xml diff --git a/upstream-man-pages/man3/xhtml/glIsTexture.xml b/upstream-doc/man3/xhtml/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsTexture.xml rename to upstream-doc/man3/xhtml/glIsTexture.xml diff --git a/upstream-man-pages/man3/xhtml/glIsVertexArray.xml b/upstream-doc/man3/xhtml/glIsVertexArray.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glIsVertexArray.xml rename to upstream-doc/man3/xhtml/glIsVertexArray.xml diff --git a/upstream-man-pages/man3/xhtml/glLineWidth.xml b/upstream-doc/man3/xhtml/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glLineWidth.xml rename to upstream-doc/man3/xhtml/glLineWidth.xml diff --git a/upstream-man-pages/man3/xhtml/glLinkProgram.xml b/upstream-doc/man3/xhtml/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glLinkProgram.xml rename to upstream-doc/man3/xhtml/glLinkProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glLogicOp.xml b/upstream-doc/man3/xhtml/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glLogicOp.xml rename to upstream-doc/man3/xhtml/glLogicOp.xml diff --git a/upstream-man-pages/man3/xhtml/glMapBuffer.xml b/upstream-doc/man3/xhtml/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glMapBuffer.xml rename to upstream-doc/man3/xhtml/glMapBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glMapBufferRange.xml b/upstream-doc/man3/xhtml/glMapBufferRange.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glMapBufferRange.xml rename to upstream-doc/man3/xhtml/glMapBufferRange.xml diff --git a/upstream-man-pages/man3/xhtml/glMultiDrawArrays.xml b/upstream-doc/man3/xhtml/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glMultiDrawArrays.xml rename to upstream-doc/man3/xhtml/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man3/xhtml/glMultiDrawElements.xml b/upstream-doc/man3/xhtml/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glMultiDrawElements.xml rename to upstream-doc/man3/xhtml/glMultiDrawElements.xml diff --git a/upstream-man-pages/man3/xhtml/glMultiDrawElementsBaseVertex.xml b/upstream-doc/man3/xhtml/glMultiDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glMultiDrawElementsBaseVertex.xml rename to upstream-doc/man3/xhtml/glMultiDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man3/xhtml/glPixelStore.xml b/upstream-doc/man3/xhtml/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPixelStore.xml rename to upstream-doc/man3/xhtml/glPixelStore.xml diff --git a/upstream-man-pages/man3/xhtml/glPointParameter.xml b/upstream-doc/man3/xhtml/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPointParameter.xml rename to upstream-doc/man3/xhtml/glPointParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glPointSize.xml b/upstream-doc/man3/xhtml/glPointSize.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPointSize.xml rename to upstream-doc/man3/xhtml/glPointSize.xml diff --git a/upstream-man-pages/man3/xhtml/glPolygonMode.xml b/upstream-doc/man3/xhtml/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPolygonMode.xml rename to upstream-doc/man3/xhtml/glPolygonMode.xml diff --git a/upstream-man-pages/man3/xhtml/glPolygonOffset.xml b/upstream-doc/man3/xhtml/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPolygonOffset.xml rename to upstream-doc/man3/xhtml/glPolygonOffset.xml diff --git a/upstream-man-pages/man3/xhtml/glPrimitiveRestartIndex.xml b/upstream-doc/man3/xhtml/glPrimitiveRestartIndex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glPrimitiveRestartIndex.xml rename to upstream-doc/man3/xhtml/glPrimitiveRestartIndex.xml diff --git a/upstream-man-pages/man3/xhtml/glProvokingVertex.xml b/upstream-doc/man3/xhtml/glProvokingVertex.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glProvokingVertex.xml rename to upstream-doc/man3/xhtml/glProvokingVertex.xml diff --git a/upstream-man-pages/man3/xhtml/glQueryCounter.xml b/upstream-doc/man3/xhtml/glQueryCounter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glQueryCounter.xml rename to upstream-doc/man3/xhtml/glQueryCounter.xml diff --git a/upstream-man-pages/man3/xhtml/glReadBuffer.xml b/upstream-doc/man3/xhtml/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glReadBuffer.xml rename to upstream-doc/man3/xhtml/glReadBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glReadPixels.xml b/upstream-doc/man3/xhtml/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glReadPixels.xml rename to upstream-doc/man3/xhtml/glReadPixels.xml diff --git a/upstream-man-pages/man3/xhtml/glRenderbufferStorage.xml b/upstream-doc/man3/xhtml/glRenderbufferStorage.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glRenderbufferStorage.xml rename to upstream-doc/man3/xhtml/glRenderbufferStorage.xml diff --git a/upstream-man-pages/man3/xhtml/glRenderbufferStorageMultisample.xml b/upstream-doc/man3/xhtml/glRenderbufferStorageMultisample.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glRenderbufferStorageMultisample.xml rename to upstream-doc/man3/xhtml/glRenderbufferStorageMultisample.xml diff --git a/upstream-man-pages/man3/xhtml/glSampleCoverage.xml b/upstream-doc/man3/xhtml/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glSampleCoverage.xml rename to upstream-doc/man3/xhtml/glSampleCoverage.xml diff --git a/upstream-man-pages/man3/xhtml/glSampleMaski.xml b/upstream-doc/man3/xhtml/glSampleMaski.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glSampleMaski.xml rename to upstream-doc/man3/xhtml/glSampleMaski.xml diff --git a/upstream-man-pages/man3/xhtml/glSamplerParameter.xml b/upstream-doc/man3/xhtml/glSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glSamplerParameter.xml rename to upstream-doc/man3/xhtml/glSamplerParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glScissor.xml b/upstream-doc/man3/xhtml/glScissor.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glScissor.xml rename to upstream-doc/man3/xhtml/glScissor.xml diff --git a/upstream-man-pages/man3/xhtml/glShaderSource.xml b/upstream-doc/man3/xhtml/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glShaderSource.xml rename to upstream-doc/man3/xhtml/glShaderSource.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilFunc.xml b/upstream-doc/man3/xhtml/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilFunc.xml rename to upstream-doc/man3/xhtml/glStencilFunc.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilFuncSeparate.xml b/upstream-doc/man3/xhtml/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilFuncSeparate.xml rename to upstream-doc/man3/xhtml/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilMask.xml b/upstream-doc/man3/xhtml/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilMask.xml rename to upstream-doc/man3/xhtml/glStencilMask.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilMaskSeparate.xml b/upstream-doc/man3/xhtml/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilMaskSeparate.xml rename to upstream-doc/man3/xhtml/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilOp.xml b/upstream-doc/man3/xhtml/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilOp.xml rename to upstream-doc/man3/xhtml/glStencilOp.xml diff --git a/upstream-man-pages/man3/xhtml/glStencilOpSeparate.xml b/upstream-doc/man3/xhtml/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glStencilOpSeparate.xml rename to upstream-doc/man3/xhtml/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man3/xhtml/glTexBuffer.xml b/upstream-doc/man3/xhtml/glTexBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexBuffer.xml rename to upstream-doc/man3/xhtml/glTexBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glTexImage1D.xml b/upstream-doc/man3/xhtml/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexImage1D.xml rename to upstream-doc/man3/xhtml/glTexImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glTexImage2D.xml b/upstream-doc/man3/xhtml/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexImage2D.xml rename to upstream-doc/man3/xhtml/glTexImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glTexImage2DMultisample.xml b/upstream-doc/man3/xhtml/glTexImage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexImage2DMultisample.xml rename to upstream-doc/man3/xhtml/glTexImage2DMultisample.xml diff --git a/upstream-man-pages/man3/xhtml/glTexImage3D.xml b/upstream-doc/man3/xhtml/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexImage3D.xml rename to upstream-doc/man3/xhtml/glTexImage3D.xml diff --git a/upstream-man-pages/man3/xhtml/glTexImage3DMultisample.xml b/upstream-doc/man3/xhtml/glTexImage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexImage3DMultisample.xml rename to upstream-doc/man3/xhtml/glTexImage3DMultisample.xml diff --git a/upstream-man-pages/man3/xhtml/glTexParameter.xml b/upstream-doc/man3/xhtml/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexParameter.xml rename to upstream-doc/man3/xhtml/glTexParameter.xml diff --git a/upstream-man-pages/man3/xhtml/glTexSubImage1D.xml b/upstream-doc/man3/xhtml/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexSubImage1D.xml rename to upstream-doc/man3/xhtml/glTexSubImage1D.xml diff --git a/upstream-man-pages/man3/xhtml/glTexSubImage2D.xml b/upstream-doc/man3/xhtml/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexSubImage2D.xml rename to upstream-doc/man3/xhtml/glTexSubImage2D.xml diff --git a/upstream-man-pages/man3/xhtml/glTexSubImage3D.xml b/upstream-doc/man3/xhtml/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTexSubImage3D.xml rename to upstream-doc/man3/xhtml/glTexSubImage3D.xml diff --git a/upstream-man-pages/man3/xhtml/glTransformFeedbackVaryings.xml b/upstream-doc/man3/xhtml/glTransformFeedbackVaryings.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glTransformFeedbackVaryings.xml rename to upstream-doc/man3/xhtml/glTransformFeedbackVaryings.xml diff --git a/upstream-man-pages/man3/xhtml/glUniform.xml b/upstream-doc/man3/xhtml/glUniform.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glUniform.xml rename to upstream-doc/man3/xhtml/glUniform.xml diff --git a/upstream-man-pages/man3/xhtml/glUniformBlockBinding.xml b/upstream-doc/man3/xhtml/glUniformBlockBinding.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glUniformBlockBinding.xml rename to upstream-doc/man3/xhtml/glUniformBlockBinding.xml diff --git a/upstream-man-pages/man3/xhtml/glUnmapBuffer.xml b/upstream-doc/man3/xhtml/glUnmapBuffer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glUnmapBuffer.xml rename to upstream-doc/man3/xhtml/glUnmapBuffer.xml diff --git a/upstream-man-pages/man3/xhtml/glUseProgram.xml b/upstream-doc/man3/xhtml/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glUseProgram.xml rename to upstream-doc/man3/xhtml/glUseProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glValidateProgram.xml b/upstream-doc/man3/xhtml/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glValidateProgram.xml rename to upstream-doc/man3/xhtml/glValidateProgram.xml diff --git a/upstream-man-pages/man3/xhtml/glVertexAttrib.xml b/upstream-doc/man3/xhtml/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glVertexAttrib.xml rename to upstream-doc/man3/xhtml/glVertexAttrib.xml diff --git a/upstream-man-pages/man3/xhtml/glVertexAttribDivisor.xml b/upstream-doc/man3/xhtml/glVertexAttribDivisor.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glVertexAttribDivisor.xml rename to upstream-doc/man3/xhtml/glVertexAttribDivisor.xml diff --git a/upstream-man-pages/man3/xhtml/glVertexAttribIPointer.xml b/upstream-doc/man3/xhtml/glVertexAttribIPointer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glVertexAttribIPointer.xml rename to upstream-doc/man3/xhtml/glVertexAttribIPointer.xml diff --git a/upstream-man-pages/man3/xhtml/glVertexAttribPointer.xml b/upstream-doc/man3/xhtml/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glVertexAttribPointer.xml rename to upstream-doc/man3/xhtml/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man3/xhtml/glViewport.xml b/upstream-doc/man3/xhtml/glViewport.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glViewport.xml rename to upstream-doc/man3/xhtml/glViewport.xml diff --git a/upstream-man-pages/man3/xhtml/glWaitSync.xml b/upstream-doc/man3/xhtml/glWaitSync.xml similarity index 100% rename from upstream-man-pages/man3/xhtml/glWaitSync.xml rename to upstream-doc/man3/xhtml/glWaitSync.xml diff --git a/upstream-man-pages/man3/xhtml/index.html b/upstream-doc/man3/xhtml/index.html similarity index 100% rename from upstream-man-pages/man3/xhtml/index.html rename to upstream-doc/man3/xhtml/index.html diff --git a/upstream-man-pages/man3/xhtml/makeindex.pl b/upstream-doc/man3/xhtml/makeindex.pl similarity index 100% rename from upstream-man-pages/man3/xhtml/makeindex.pl rename to upstream-doc/man3/xhtml/makeindex.pl diff --git a/upstream-man-pages/man3/xhtml/mathml.xsl b/upstream-doc/man3/xhtml/mathml.xsl similarity index 100% rename from upstream-man-pages/man3/xhtml/mathml.xsl rename to upstream-doc/man3/xhtml/mathml.xsl diff --git a/upstream-man-pages/man3/xhtml/opengl-man.css b/upstream-doc/man3/xhtml/opengl-man.css similarity index 100% rename from upstream-man-pages/man3/xhtml/opengl-man.css rename to upstream-doc/man3/xhtml/opengl-man.css diff --git a/upstream-man-pages/man3/xhtml/opengl-man.xsl b/upstream-doc/man3/xhtml/opengl-man.xsl similarity index 100% rename from upstream-man-pages/man3/xhtml/opengl-man.xsl rename to upstream-doc/man3/xhtml/opengl-man.xsl diff --git a/upstream-man-pages/man3/xhtml/pmathml.xsl b/upstream-doc/man3/xhtml/pmathml.xsl similarity index 100% rename from upstream-man-pages/man3/xhtml/pmathml.xsl rename to upstream-doc/man3/xhtml/pmathml.xsl diff --git a/upstream-man-pages/man3/xhtml/pmathmlcss.xsl b/upstream-doc/man3/xhtml/pmathmlcss.xsl similarity index 100% rename from upstream-man-pages/man3/xhtml/pmathmlcss.xsl rename to upstream-doc/man3/xhtml/pmathmlcss.xsl diff --git a/upstream-man-pages/man3/xhtml/start.html b/upstream-doc/man3/xhtml/start.html similarity index 100% rename from upstream-man-pages/man3/xhtml/start.html rename to upstream-doc/man3/xhtml/start.html diff --git a/upstream-man-pages/man3/xhtml/xhtml-lat1.ent b/upstream-doc/man3/xhtml/xhtml-lat1.ent similarity index 100% rename from upstream-man-pages/man3/xhtml/xhtml-lat1.ent rename to upstream-doc/man3/xhtml/xhtml-lat1.ent diff --git a/upstream-man-pages/man3/xhtml/xhtml-special.ent b/upstream-doc/man3/xhtml/xhtml-special.ent similarity index 100% rename from upstream-man-pages/man3/xhtml/xhtml-special.ent rename to upstream-doc/man3/xhtml/xhtml-special.ent diff --git a/upstream-man-pages/man3/xhtml/xhtml-symbol.ent b/upstream-doc/man3/xhtml/xhtml-symbol.ent similarity index 100% rename from upstream-man-pages/man3/xhtml/xhtml-symbol.ent rename to upstream-doc/man3/xhtml/xhtml-symbol.ent diff --git a/upstream-man-pages/man3/xhtml/xhtml1-transitional.dtd b/upstream-doc/man3/xhtml/xhtml1-transitional.dtd similarity index 100% rename from upstream-man-pages/man3/xhtml/xhtml1-transitional.dtd rename to upstream-doc/man3/xhtml/xhtml1-transitional.dtd diff --git a/upstream-man-pages/man4/Makefile b/upstream-doc/man4/Makefile similarity index 100% rename from upstream-man-pages/man4/Makefile rename to upstream-doc/man4/Makefile diff --git a/upstream-man-pages/man4/baseformattable.xml b/upstream-doc/man4/baseformattable.xml similarity index 100% rename from upstream-man-pages/man4/baseformattable.xml rename to upstream-doc/man4/baseformattable.xml diff --git a/upstream-man-pages/man4/bottom.php b/upstream-doc/man4/bottom.php similarity index 100% rename from upstream-man-pages/man4/bottom.php rename to upstream-doc/man4/bottom.php diff --git a/upstream-man-pages/man4/compressedformattable.xml b/upstream-doc/man4/compressedformattable.xml similarity index 100% rename from upstream-man-pages/man4/compressedformattable.xml rename to upstream-doc/man4/compressedformattable.xml diff --git a/upstream-man-pages/man4/glActiveShaderProgram.xml b/upstream-doc/man4/glActiveShaderProgram.xml similarity index 100% rename from upstream-man-pages/man4/glActiveShaderProgram.xml rename to upstream-doc/man4/glActiveShaderProgram.xml diff --git a/upstream-man-pages/man4/glActiveTexture.xml b/upstream-doc/man4/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man4/glActiveTexture.xml rename to upstream-doc/man4/glActiveTexture.xml diff --git a/upstream-man-pages/man4/glAttachShader.xml b/upstream-doc/man4/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man4/glAttachShader.xml rename to upstream-doc/man4/glAttachShader.xml diff --git a/upstream-man-pages/man4/glBeginConditionalRender.xml b/upstream-doc/man4/glBeginConditionalRender.xml similarity index 100% rename from upstream-man-pages/man4/glBeginConditionalRender.xml rename to upstream-doc/man4/glBeginConditionalRender.xml diff --git a/upstream-man-pages/man4/glBeginQuery.xml b/upstream-doc/man4/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man4/glBeginQuery.xml rename to upstream-doc/man4/glBeginQuery.xml diff --git a/upstream-man-pages/man4/glBeginQueryIndexed.xml b/upstream-doc/man4/glBeginQueryIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glBeginQueryIndexed.xml rename to upstream-doc/man4/glBeginQueryIndexed.xml diff --git a/upstream-man-pages/man4/glBeginTransformFeedback.xml b/upstream-doc/man4/glBeginTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glBeginTransformFeedback.xml rename to upstream-doc/man4/glBeginTransformFeedback.xml diff --git a/upstream-man-pages/man4/glBindAttribLocation.xml b/upstream-doc/man4/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man4/glBindAttribLocation.xml rename to upstream-doc/man4/glBindAttribLocation.xml diff --git a/upstream-man-pages/man4/glBindBuffer.xml b/upstream-doc/man4/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glBindBuffer.xml rename to upstream-doc/man4/glBindBuffer.xml diff --git a/upstream-man-pages/man4/glBindBufferBase.xml b/upstream-doc/man4/glBindBufferBase.xml similarity index 100% rename from upstream-man-pages/man4/glBindBufferBase.xml rename to upstream-doc/man4/glBindBufferBase.xml diff --git a/upstream-man-pages/man4/glBindBufferRange.xml b/upstream-doc/man4/glBindBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/glBindBufferRange.xml rename to upstream-doc/man4/glBindBufferRange.xml diff --git a/upstream-man-pages/man4/glBindFragDataLocation.xml b/upstream-doc/man4/glBindFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man4/glBindFragDataLocation.xml rename to upstream-doc/man4/glBindFragDataLocation.xml diff --git a/upstream-man-pages/man4/glBindFragDataLocationIndexed.xml b/upstream-doc/man4/glBindFragDataLocationIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glBindFragDataLocationIndexed.xml rename to upstream-doc/man4/glBindFragDataLocationIndexed.xml diff --git a/upstream-man-pages/man4/glBindFramebuffer.xml b/upstream-doc/man4/glBindFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/glBindFramebuffer.xml rename to upstream-doc/man4/glBindFramebuffer.xml diff --git a/upstream-man-pages/man4/glBindImageTexture.xml b/upstream-doc/man4/glBindImageTexture.xml similarity index 100% rename from upstream-man-pages/man4/glBindImageTexture.xml rename to upstream-doc/man4/glBindImageTexture.xml diff --git a/upstream-man-pages/man4/glBindProgramPipeline.xml b/upstream-doc/man4/glBindProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/glBindProgramPipeline.xml rename to upstream-doc/man4/glBindProgramPipeline.xml diff --git a/upstream-man-pages/man4/glBindRenderbuffer.xml b/upstream-doc/man4/glBindRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/glBindRenderbuffer.xml rename to upstream-doc/man4/glBindRenderbuffer.xml diff --git a/upstream-man-pages/man4/glBindSampler.xml b/upstream-doc/man4/glBindSampler.xml similarity index 100% rename from upstream-man-pages/man4/glBindSampler.xml rename to upstream-doc/man4/glBindSampler.xml diff --git a/upstream-man-pages/man4/glBindTexture.xml b/upstream-doc/man4/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man4/glBindTexture.xml rename to upstream-doc/man4/glBindTexture.xml diff --git a/upstream-man-pages/man4/glBindTransformFeedback.xml b/upstream-doc/man4/glBindTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glBindTransformFeedback.xml rename to upstream-doc/man4/glBindTransformFeedback.xml diff --git a/upstream-man-pages/man4/glBindVertexArray.xml b/upstream-doc/man4/glBindVertexArray.xml similarity index 100% rename from upstream-man-pages/man4/glBindVertexArray.xml rename to upstream-doc/man4/glBindVertexArray.xml diff --git a/upstream-man-pages/man4/glBindVertexBuffer.xml b/upstream-doc/man4/glBindVertexBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glBindVertexBuffer.xml rename to upstream-doc/man4/glBindVertexBuffer.xml diff --git a/upstream-man-pages/man4/glBlendColor.xml b/upstream-doc/man4/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man4/glBlendColor.xml rename to upstream-doc/man4/glBlendColor.xml diff --git a/upstream-man-pages/man4/glBlendEquation.xml b/upstream-doc/man4/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man4/glBlendEquation.xml rename to upstream-doc/man4/glBlendEquation.xml diff --git a/upstream-man-pages/man4/glBlendEquationSeparate.xml b/upstream-doc/man4/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man4/glBlendEquationSeparate.xml rename to upstream-doc/man4/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man4/glBlendFunc.xml b/upstream-doc/man4/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man4/glBlendFunc.xml rename to upstream-doc/man4/glBlendFunc.xml diff --git a/upstream-man-pages/man4/glBlendFuncSeparate.xml b/upstream-doc/man4/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man4/glBlendFuncSeparate.xml rename to upstream-doc/man4/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man4/glBlitFramebuffer.xml b/upstream-doc/man4/glBlitFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/glBlitFramebuffer.xml rename to upstream-doc/man4/glBlitFramebuffer.xml diff --git a/upstream-man-pages/man4/glBufferData.xml b/upstream-doc/man4/glBufferData.xml similarity index 100% rename from upstream-man-pages/man4/glBufferData.xml rename to upstream-doc/man4/glBufferData.xml diff --git a/upstream-man-pages/man4/glBufferSubData.xml b/upstream-doc/man4/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/glBufferSubData.xml rename to upstream-doc/man4/glBufferSubData.xml diff --git a/upstream-man-pages/man4/glCheckFramebufferStatus.xml b/upstream-doc/man4/glCheckFramebufferStatus.xml similarity index 100% rename from upstream-man-pages/man4/glCheckFramebufferStatus.xml rename to upstream-doc/man4/glCheckFramebufferStatus.xml diff --git a/upstream-man-pages/man4/glClampColor.xml b/upstream-doc/man4/glClampColor.xml similarity index 100% rename from upstream-man-pages/man4/glClampColor.xml rename to upstream-doc/man4/glClampColor.xml diff --git a/upstream-man-pages/man4/glClear.xml b/upstream-doc/man4/glClear.xml similarity index 100% rename from upstream-man-pages/man4/glClear.xml rename to upstream-doc/man4/glClear.xml diff --git a/upstream-man-pages/man4/glClearBuffer.xml b/upstream-doc/man4/glClearBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glClearBuffer.xml rename to upstream-doc/man4/glClearBuffer.xml diff --git a/upstream-man-pages/man4/glClearBufferData.xml b/upstream-doc/man4/glClearBufferData.xml similarity index 100% rename from upstream-man-pages/man4/glClearBufferData.xml rename to upstream-doc/man4/glClearBufferData.xml diff --git a/upstream-man-pages/man4/glClearBufferSubData.xml b/upstream-doc/man4/glClearBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/glClearBufferSubData.xml rename to upstream-doc/man4/glClearBufferSubData.xml diff --git a/upstream-man-pages/man4/glClearColor.xml b/upstream-doc/man4/glClearColor.xml similarity index 100% rename from upstream-man-pages/man4/glClearColor.xml rename to upstream-doc/man4/glClearColor.xml diff --git a/upstream-man-pages/man4/glClearDepth.xml b/upstream-doc/man4/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man4/glClearDepth.xml rename to upstream-doc/man4/glClearDepth.xml diff --git a/upstream-man-pages/man4/glClearStencil.xml b/upstream-doc/man4/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man4/glClearStencil.xml rename to upstream-doc/man4/glClearStencil.xml diff --git a/upstream-man-pages/man4/glClientWaitSync.xml b/upstream-doc/man4/glClientWaitSync.xml similarity index 100% rename from upstream-man-pages/man4/glClientWaitSync.xml rename to upstream-doc/man4/glClientWaitSync.xml diff --git a/upstream-man-pages/man4/glColorMask.xml b/upstream-doc/man4/glColorMask.xml similarity index 100% rename from upstream-man-pages/man4/glColorMask.xml rename to upstream-doc/man4/glColorMask.xml diff --git a/upstream-man-pages/man4/glCompileShader.xml b/upstream-doc/man4/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man4/glCompileShader.xml rename to upstream-doc/man4/glCompileShader.xml diff --git a/upstream-man-pages/man4/glCompressedTexImage1D.xml b/upstream-doc/man4/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexImage1D.xml rename to upstream-doc/man4/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man4/glCompressedTexImage2D.xml b/upstream-doc/man4/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexImage2D.xml rename to upstream-doc/man4/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man4/glCompressedTexImage3D.xml b/upstream-doc/man4/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexImage3D.xml rename to upstream-doc/man4/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man4/glCompressedTexSubImage1D.xml b/upstream-doc/man4/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexSubImage1D.xml rename to upstream-doc/man4/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man4/glCompressedTexSubImage2D.xml b/upstream-doc/man4/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexSubImage2D.xml rename to upstream-doc/man4/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man4/glCompressedTexSubImage3D.xml b/upstream-doc/man4/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/glCompressedTexSubImage3D.xml rename to upstream-doc/man4/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man4/glCopyBufferSubData.xml b/upstream-doc/man4/glCopyBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/glCopyBufferSubData.xml rename to upstream-doc/man4/glCopyBufferSubData.xml diff --git a/upstream-man-pages/man4/glCopyImageSubData.xml b/upstream-doc/man4/glCopyImageSubData.xml similarity index 100% rename from upstream-man-pages/man4/glCopyImageSubData.xml rename to upstream-doc/man4/glCopyImageSubData.xml diff --git a/upstream-man-pages/man4/glCopyTexImage1D.xml b/upstream-doc/man4/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glCopyTexImage1D.xml rename to upstream-doc/man4/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man4/glCopyTexImage2D.xml b/upstream-doc/man4/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glCopyTexImage2D.xml rename to upstream-doc/man4/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man4/glCopyTexSubImage1D.xml b/upstream-doc/man4/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glCopyTexSubImage1D.xml rename to upstream-doc/man4/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man4/glCopyTexSubImage2D.xml b/upstream-doc/man4/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glCopyTexSubImage2D.xml rename to upstream-doc/man4/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man4/glCopyTexSubImage3D.xml b/upstream-doc/man4/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/glCopyTexSubImage3D.xml rename to upstream-doc/man4/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man4/glCreateProgram.xml b/upstream-doc/man4/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man4/glCreateProgram.xml rename to upstream-doc/man4/glCreateProgram.xml diff --git a/upstream-man-pages/man4/glCreateShader.xml b/upstream-doc/man4/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man4/glCreateShader.xml rename to upstream-doc/man4/glCreateShader.xml diff --git a/upstream-man-pages/man4/glCreateShaderProgram.xml b/upstream-doc/man4/glCreateShaderProgram.xml similarity index 100% rename from upstream-man-pages/man4/glCreateShaderProgram.xml rename to upstream-doc/man4/glCreateShaderProgram.xml diff --git a/upstream-man-pages/man4/glCullFace.xml b/upstream-doc/man4/glCullFace.xml similarity index 100% rename from upstream-man-pages/man4/glCullFace.xml rename to upstream-doc/man4/glCullFace.xml diff --git a/upstream-man-pages/man4/glDebugMessageCallback.xml b/upstream-doc/man4/glDebugMessageCallback.xml similarity index 100% rename from upstream-man-pages/man4/glDebugMessageCallback.xml rename to upstream-doc/man4/glDebugMessageCallback.xml diff --git a/upstream-man-pages/man4/glDebugMessageControl.xml b/upstream-doc/man4/glDebugMessageControl.xml similarity index 100% rename from upstream-man-pages/man4/glDebugMessageControl.xml rename to upstream-doc/man4/glDebugMessageControl.xml diff --git a/upstream-man-pages/man4/glDebugMessageInsert.xml b/upstream-doc/man4/glDebugMessageInsert.xml similarity index 100% rename from upstream-man-pages/man4/glDebugMessageInsert.xml rename to upstream-doc/man4/glDebugMessageInsert.xml diff --git a/upstream-man-pages/man4/glDeleteBuffers.xml b/upstream-doc/man4/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteBuffers.xml rename to upstream-doc/man4/glDeleteBuffers.xml diff --git a/upstream-man-pages/man4/glDeleteFramebuffers.xml b/upstream-doc/man4/glDeleteFramebuffers.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteFramebuffers.xml rename to upstream-doc/man4/glDeleteFramebuffers.xml diff --git a/upstream-man-pages/man4/glDeleteProgram.xml b/upstream-doc/man4/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteProgram.xml rename to upstream-doc/man4/glDeleteProgram.xml diff --git a/upstream-man-pages/man4/glDeleteProgramPipelines.xml b/upstream-doc/man4/glDeleteProgramPipelines.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteProgramPipelines.xml rename to upstream-doc/man4/glDeleteProgramPipelines.xml diff --git a/upstream-man-pages/man4/glDeleteQueries.xml b/upstream-doc/man4/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteQueries.xml rename to upstream-doc/man4/glDeleteQueries.xml diff --git a/upstream-man-pages/man4/glDeleteRenderbuffers.xml b/upstream-doc/man4/glDeleteRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteRenderbuffers.xml rename to upstream-doc/man4/glDeleteRenderbuffers.xml diff --git a/upstream-man-pages/man4/glDeleteSamplers.xml b/upstream-doc/man4/glDeleteSamplers.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteSamplers.xml rename to upstream-doc/man4/glDeleteSamplers.xml diff --git a/upstream-man-pages/man4/glDeleteShader.xml b/upstream-doc/man4/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteShader.xml rename to upstream-doc/man4/glDeleteShader.xml diff --git a/upstream-man-pages/man4/glDeleteSync.xml b/upstream-doc/man4/glDeleteSync.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteSync.xml rename to upstream-doc/man4/glDeleteSync.xml diff --git a/upstream-man-pages/man4/glDeleteTextures.xml b/upstream-doc/man4/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteTextures.xml rename to upstream-doc/man4/glDeleteTextures.xml diff --git a/upstream-man-pages/man4/glDeleteTransformFeedbacks.xml b/upstream-doc/man4/glDeleteTransformFeedbacks.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteTransformFeedbacks.xml rename to upstream-doc/man4/glDeleteTransformFeedbacks.xml diff --git a/upstream-man-pages/man4/glDeleteVertexArrays.xml b/upstream-doc/man4/glDeleteVertexArrays.xml similarity index 100% rename from upstream-man-pages/man4/glDeleteVertexArrays.xml rename to upstream-doc/man4/glDeleteVertexArrays.xml diff --git a/upstream-man-pages/man4/glDepthFunc.xml b/upstream-doc/man4/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man4/glDepthFunc.xml rename to upstream-doc/man4/glDepthFunc.xml diff --git a/upstream-man-pages/man4/glDepthMask.xml b/upstream-doc/man4/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man4/glDepthMask.xml rename to upstream-doc/man4/glDepthMask.xml diff --git a/upstream-man-pages/man4/glDepthRange.xml b/upstream-doc/man4/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man4/glDepthRange.xml rename to upstream-doc/man4/glDepthRange.xml diff --git a/upstream-man-pages/man4/glDepthRangeArray.xml b/upstream-doc/man4/glDepthRangeArray.xml similarity index 100% rename from upstream-man-pages/man4/glDepthRangeArray.xml rename to upstream-doc/man4/glDepthRangeArray.xml diff --git a/upstream-man-pages/man4/glDepthRangeIndexed.xml b/upstream-doc/man4/glDepthRangeIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glDepthRangeIndexed.xml rename to upstream-doc/man4/glDepthRangeIndexed.xml diff --git a/upstream-man-pages/man4/glDetachShader.xml b/upstream-doc/man4/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man4/glDetachShader.xml rename to upstream-doc/man4/glDetachShader.xml diff --git a/upstream-man-pages/man4/glDispatchCompute.xml b/upstream-doc/man4/glDispatchCompute.xml similarity index 100% rename from upstream-man-pages/man4/glDispatchCompute.xml rename to upstream-doc/man4/glDispatchCompute.xml diff --git a/upstream-man-pages/man4/glDispatchComputeIndirect.xml b/upstream-doc/man4/glDispatchComputeIndirect.xml similarity index 100% rename from upstream-man-pages/man4/glDispatchComputeIndirect.xml rename to upstream-doc/man4/glDispatchComputeIndirect.xml diff --git a/upstream-man-pages/man4/glDrawArrays.xml b/upstream-doc/man4/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man4/glDrawArrays.xml rename to upstream-doc/man4/glDrawArrays.xml diff --git a/upstream-man-pages/man4/glDrawArraysIndirect.xml b/upstream-doc/man4/glDrawArraysIndirect.xml similarity index 100% rename from upstream-man-pages/man4/glDrawArraysIndirect.xml rename to upstream-doc/man4/glDrawArraysIndirect.xml diff --git a/upstream-man-pages/man4/glDrawArraysInstanced.xml b/upstream-doc/man4/glDrawArraysInstanced.xml similarity index 100% rename from upstream-man-pages/man4/glDrawArraysInstanced.xml rename to upstream-doc/man4/glDrawArraysInstanced.xml diff --git a/upstream-man-pages/man4/glDrawArraysInstancedBaseInstance.xml b/upstream-doc/man4/glDrawArraysInstancedBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/glDrawArraysInstancedBaseInstance.xml rename to upstream-doc/man4/glDrawArraysInstancedBaseInstance.xml diff --git a/upstream-man-pages/man4/glDrawBuffer.xml b/upstream-doc/man4/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glDrawBuffer.xml rename to upstream-doc/man4/glDrawBuffer.xml diff --git a/upstream-man-pages/man4/glDrawBuffers.xml b/upstream-doc/man4/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man4/glDrawBuffers.xml rename to upstream-doc/man4/glDrawBuffers.xml diff --git a/upstream-man-pages/man4/glDrawElements.xml b/upstream-doc/man4/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElements.xml rename to upstream-doc/man4/glDrawElements.xml diff --git a/upstream-man-pages/man4/glDrawElementsBaseVertex.xml b/upstream-doc/man4/glDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsBaseVertex.xml rename to upstream-doc/man4/glDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/glDrawElementsIndirect.xml b/upstream-doc/man4/glDrawElementsIndirect.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsIndirect.xml rename to upstream-doc/man4/glDrawElementsIndirect.xml diff --git a/upstream-man-pages/man4/glDrawElementsInstanced.xml b/upstream-doc/man4/glDrawElementsInstanced.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsInstanced.xml rename to upstream-doc/man4/glDrawElementsInstanced.xml diff --git a/upstream-man-pages/man4/glDrawElementsInstancedBaseInstance.xml b/upstream-doc/man4/glDrawElementsInstancedBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsInstancedBaseInstance.xml rename to upstream-doc/man4/glDrawElementsInstancedBaseInstance.xml diff --git a/upstream-man-pages/man4/glDrawElementsInstancedBaseVertex.xml b/upstream-doc/man4/glDrawElementsInstancedBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsInstancedBaseVertex.xml rename to upstream-doc/man4/glDrawElementsInstancedBaseVertex.xml diff --git a/upstream-man-pages/man4/glDrawElementsInstancedBaseVertexBaseInstance.xml b/upstream-doc/man4/glDrawElementsInstancedBaseVertexBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/glDrawElementsInstancedBaseVertexBaseInstance.xml rename to upstream-doc/man4/glDrawElementsInstancedBaseVertexBaseInstance.xml diff --git a/upstream-man-pages/man4/glDrawRangeElements.xml b/upstream-doc/man4/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man4/glDrawRangeElements.xml rename to upstream-doc/man4/glDrawRangeElements.xml diff --git a/upstream-man-pages/man4/glDrawRangeElementsBaseVertex.xml b/upstream-doc/man4/glDrawRangeElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/glDrawRangeElementsBaseVertex.xml rename to upstream-doc/man4/glDrawRangeElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/glDrawTransformFeedback.xml b/upstream-doc/man4/glDrawTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glDrawTransformFeedback.xml rename to upstream-doc/man4/glDrawTransformFeedback.xml diff --git a/upstream-man-pages/man4/glDrawTransformFeedbackInstanced.xml b/upstream-doc/man4/glDrawTransformFeedbackInstanced.xml similarity index 100% rename from upstream-man-pages/man4/glDrawTransformFeedbackInstanced.xml rename to upstream-doc/man4/glDrawTransformFeedbackInstanced.xml diff --git a/upstream-man-pages/man4/glDrawTransformFeedbackStream.xml b/upstream-doc/man4/glDrawTransformFeedbackStream.xml similarity index 100% rename from upstream-man-pages/man4/glDrawTransformFeedbackStream.xml rename to upstream-doc/man4/glDrawTransformFeedbackStream.xml diff --git a/upstream-man-pages/man4/glDrawTransformFeedbackStreamInstanced.xml b/upstream-doc/man4/glDrawTransformFeedbackStreamInstanced.xml similarity index 100% rename from upstream-man-pages/man4/glDrawTransformFeedbackStreamInstanced.xml rename to upstream-doc/man4/glDrawTransformFeedbackStreamInstanced.xml diff --git a/upstream-man-pages/man4/glEnable.xml b/upstream-doc/man4/glEnable.xml similarity index 100% rename from upstream-man-pages/man4/glEnable.xml rename to upstream-doc/man4/glEnable.xml diff --git a/upstream-man-pages/man4/glEnableVertexAttribArray.xml b/upstream-doc/man4/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man4/glEnableVertexAttribArray.xml rename to upstream-doc/man4/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man4/glFenceSync.xml b/upstream-doc/man4/glFenceSync.xml similarity index 100% rename from upstream-man-pages/man4/glFenceSync.xml rename to upstream-doc/man4/glFenceSync.xml diff --git a/upstream-man-pages/man4/glFinish.xml b/upstream-doc/man4/glFinish.xml similarity index 100% rename from upstream-man-pages/man4/glFinish.xml rename to upstream-doc/man4/glFinish.xml diff --git a/upstream-man-pages/man4/glFlush.xml b/upstream-doc/man4/glFlush.xml similarity index 100% rename from upstream-man-pages/man4/glFlush.xml rename to upstream-doc/man4/glFlush.xml diff --git a/upstream-man-pages/man4/glFlushMappedBufferRange.xml b/upstream-doc/man4/glFlushMappedBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/glFlushMappedBufferRange.xml rename to upstream-doc/man4/glFlushMappedBufferRange.xml diff --git a/upstream-man-pages/man4/glFramebufferParameteri.xml b/upstream-doc/man4/glFramebufferParameteri.xml similarity index 100% rename from upstream-man-pages/man4/glFramebufferParameteri.xml rename to upstream-doc/man4/glFramebufferParameteri.xml diff --git a/upstream-man-pages/man4/glFramebufferRenderbuffer.xml b/upstream-doc/man4/glFramebufferRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/glFramebufferRenderbuffer.xml rename to upstream-doc/man4/glFramebufferRenderbuffer.xml diff --git a/upstream-man-pages/man4/glFramebufferTexture.xml b/upstream-doc/man4/glFramebufferTexture.xml similarity index 100% rename from upstream-man-pages/man4/glFramebufferTexture.xml rename to upstream-doc/man4/glFramebufferTexture.xml diff --git a/upstream-man-pages/man4/glFramebufferTextureLayer.xml b/upstream-doc/man4/glFramebufferTextureLayer.xml similarity index 100% rename from upstream-man-pages/man4/glFramebufferTextureLayer.xml rename to upstream-doc/man4/glFramebufferTextureLayer.xml diff --git a/upstream-man-pages/man4/glFrontFace.xml b/upstream-doc/man4/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man4/glFrontFace.xml rename to upstream-doc/man4/glFrontFace.xml diff --git a/upstream-man-pages/man4/glGenBuffers.xml b/upstream-doc/man4/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man4/glGenBuffers.xml rename to upstream-doc/man4/glGenBuffers.xml diff --git a/upstream-man-pages/man4/glGenFramebuffers.xml b/upstream-doc/man4/glGenFramebuffers.xml similarity index 100% rename from upstream-man-pages/man4/glGenFramebuffers.xml rename to upstream-doc/man4/glGenFramebuffers.xml diff --git a/upstream-man-pages/man4/glGenProgramPipelines.xml b/upstream-doc/man4/glGenProgramPipelines.xml similarity index 100% rename from upstream-man-pages/man4/glGenProgramPipelines.xml rename to upstream-doc/man4/glGenProgramPipelines.xml diff --git a/upstream-man-pages/man4/glGenQueries.xml b/upstream-doc/man4/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man4/glGenQueries.xml rename to upstream-doc/man4/glGenQueries.xml diff --git a/upstream-man-pages/man4/glGenRenderbuffers.xml b/upstream-doc/man4/glGenRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man4/glGenRenderbuffers.xml rename to upstream-doc/man4/glGenRenderbuffers.xml diff --git a/upstream-man-pages/man4/glGenSamplers.xml b/upstream-doc/man4/glGenSamplers.xml similarity index 100% rename from upstream-man-pages/man4/glGenSamplers.xml rename to upstream-doc/man4/glGenSamplers.xml diff --git a/upstream-man-pages/man4/glGenTextures.xml b/upstream-doc/man4/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man4/glGenTextures.xml rename to upstream-doc/man4/glGenTextures.xml diff --git a/upstream-man-pages/man4/glGenTransformFeedbacks.xml b/upstream-doc/man4/glGenTransformFeedbacks.xml similarity index 100% rename from upstream-man-pages/man4/glGenTransformFeedbacks.xml rename to upstream-doc/man4/glGenTransformFeedbacks.xml diff --git a/upstream-man-pages/man4/glGenVertexArrays.xml b/upstream-doc/man4/glGenVertexArrays.xml similarity index 100% rename from upstream-man-pages/man4/glGenVertexArrays.xml rename to upstream-doc/man4/glGenVertexArrays.xml diff --git a/upstream-man-pages/man4/glGenerateMipmap.xml b/upstream-doc/man4/glGenerateMipmap.xml similarity index 100% rename from upstream-man-pages/man4/glGenerateMipmap.xml rename to upstream-doc/man4/glGenerateMipmap.xml diff --git a/upstream-man-pages/man4/glGet.xml b/upstream-doc/man4/glGet.xml similarity index 100% rename from upstream-man-pages/man4/glGet.xml rename to upstream-doc/man4/glGet.xml diff --git a/upstream-man-pages/man4/glGetActiveAtomicCounterBufferiv.xml b/upstream-doc/man4/glGetActiveAtomicCounterBufferiv.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveAtomicCounterBufferiv.xml rename to upstream-doc/man4/glGetActiveAtomicCounterBufferiv.xml diff --git a/upstream-man-pages/man4/glGetActiveAttrib.xml b/upstream-doc/man4/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveAttrib.xml rename to upstream-doc/man4/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man4/glGetActiveSubroutineName.xml b/upstream-doc/man4/glGetActiveSubroutineName.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveSubroutineName.xml rename to upstream-doc/man4/glGetActiveSubroutineName.xml diff --git a/upstream-man-pages/man4/glGetActiveSubroutineUniform.xml b/upstream-doc/man4/glGetActiveSubroutineUniform.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveSubroutineUniform.xml rename to upstream-doc/man4/glGetActiveSubroutineUniform.xml diff --git a/upstream-man-pages/man4/glGetActiveSubroutineUniformName.xml b/upstream-doc/man4/glGetActiveSubroutineUniformName.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveSubroutineUniformName.xml rename to upstream-doc/man4/glGetActiveSubroutineUniformName.xml diff --git a/upstream-man-pages/man4/glGetActiveUniform.xml b/upstream-doc/man4/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveUniform.xml rename to upstream-doc/man4/glGetActiveUniform.xml diff --git a/upstream-man-pages/man4/glGetActiveUniformBlock.xml b/upstream-doc/man4/glGetActiveUniformBlock.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveUniformBlock.xml rename to upstream-doc/man4/glGetActiveUniformBlock.xml diff --git a/upstream-man-pages/man4/glGetActiveUniformBlockName.xml b/upstream-doc/man4/glGetActiveUniformBlockName.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveUniformBlockName.xml rename to upstream-doc/man4/glGetActiveUniformBlockName.xml diff --git a/upstream-man-pages/man4/glGetActiveUniformName.xml b/upstream-doc/man4/glGetActiveUniformName.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveUniformName.xml rename to upstream-doc/man4/glGetActiveUniformName.xml diff --git a/upstream-man-pages/man4/glGetActiveUniformsiv.xml b/upstream-doc/man4/glGetActiveUniformsiv.xml similarity index 100% rename from upstream-man-pages/man4/glGetActiveUniformsiv.xml rename to upstream-doc/man4/glGetActiveUniformsiv.xml diff --git a/upstream-man-pages/man4/glGetAttachedShaders.xml b/upstream-doc/man4/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man4/glGetAttachedShaders.xml rename to upstream-doc/man4/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man4/glGetAttribLocation.xml b/upstream-doc/man4/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man4/glGetAttribLocation.xml rename to upstream-doc/man4/glGetAttribLocation.xml diff --git a/upstream-man-pages/man4/glGetBufferParameter.xml b/upstream-doc/man4/glGetBufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetBufferParameter.xml rename to upstream-doc/man4/glGetBufferParameter.xml diff --git a/upstream-man-pages/man4/glGetBufferPointerv.xml b/upstream-doc/man4/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man4/glGetBufferPointerv.xml rename to upstream-doc/man4/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man4/glGetBufferSubData.xml b/upstream-doc/man4/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/glGetBufferSubData.xml rename to upstream-doc/man4/glGetBufferSubData.xml diff --git a/upstream-man-pages/man4/glGetCompressedTexImage.xml b/upstream-doc/man4/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man4/glGetCompressedTexImage.xml rename to upstream-doc/man4/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man4/glGetDebugMessageLog.xml b/upstream-doc/man4/glGetDebugMessageLog.xml similarity index 100% rename from upstream-man-pages/man4/glGetDebugMessageLog.xml rename to upstream-doc/man4/glGetDebugMessageLog.xml diff --git a/upstream-man-pages/man4/glGetError.xml b/upstream-doc/man4/glGetError.xml similarity index 100% rename from upstream-man-pages/man4/glGetError.xml rename to upstream-doc/man4/glGetError.xml diff --git a/upstream-man-pages/man4/glGetFragDataIndex.xml b/upstream-doc/man4/glGetFragDataIndex.xml similarity index 100% rename from upstream-man-pages/man4/glGetFragDataIndex.xml rename to upstream-doc/man4/glGetFragDataIndex.xml diff --git a/upstream-man-pages/man4/glGetFragDataLocation.xml b/upstream-doc/man4/glGetFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man4/glGetFragDataLocation.xml rename to upstream-doc/man4/glGetFragDataLocation.xml diff --git a/upstream-man-pages/man4/glGetFramebufferAttachmentParameter.xml b/upstream-doc/man4/glGetFramebufferAttachmentParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetFramebufferAttachmentParameter.xml rename to upstream-doc/man4/glGetFramebufferAttachmentParameter.xml diff --git a/upstream-man-pages/man4/glGetFramebufferParameter.xml b/upstream-doc/man4/glGetFramebufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetFramebufferParameter.xml rename to upstream-doc/man4/glGetFramebufferParameter.xml diff --git a/upstream-man-pages/man4/glGetInternalFormativ.xml b/upstream-doc/man4/glGetInternalFormativ.xml similarity index 100% rename from upstream-man-pages/man4/glGetInternalFormativ.xml rename to upstream-doc/man4/glGetInternalFormativ.xml diff --git a/upstream-man-pages/man4/glGetMultisample.xml b/upstream-doc/man4/glGetMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glGetMultisample.xml rename to upstream-doc/man4/glGetMultisample.xml diff --git a/upstream-man-pages/man4/glGetObjectLabel.xml b/upstream-doc/man4/glGetObjectLabel.xml similarity index 100% rename from upstream-man-pages/man4/glGetObjectLabel.xml rename to upstream-doc/man4/glGetObjectLabel.xml diff --git a/upstream-man-pages/man4/glGetObjectPtrLabel.xml b/upstream-doc/man4/glGetObjectPtrLabel.xml similarity index 100% rename from upstream-man-pages/man4/glGetObjectPtrLabel.xml rename to upstream-doc/man4/glGetObjectPtrLabel.xml diff --git a/upstream-man-pages/man4/glGetProgram.xml b/upstream-doc/man4/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgram.xml rename to upstream-doc/man4/glGetProgram.xml diff --git a/upstream-man-pages/man4/glGetProgramBinary.xml b/upstream-doc/man4/glGetProgramBinary.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramBinary.xml rename to upstream-doc/man4/glGetProgramBinary.xml diff --git a/upstream-man-pages/man4/glGetProgramInfoLog.xml b/upstream-doc/man4/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramInfoLog.xml rename to upstream-doc/man4/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man4/glGetProgramInterface.xml b/upstream-doc/man4/glGetProgramInterface.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramInterface.xml rename to upstream-doc/man4/glGetProgramInterface.xml diff --git a/upstream-man-pages/man4/glGetProgramPipeline.xml b/upstream-doc/man4/glGetProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramPipeline.xml rename to upstream-doc/man4/glGetProgramPipeline.xml diff --git a/upstream-man-pages/man4/glGetProgramPipelineInfoLog.xml b/upstream-doc/man4/glGetProgramPipelineInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramPipelineInfoLog.xml rename to upstream-doc/man4/glGetProgramPipelineInfoLog.xml diff --git a/upstream-man-pages/man4/glGetProgramResource.xml b/upstream-doc/man4/glGetProgramResource.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramResource.xml rename to upstream-doc/man4/glGetProgramResource.xml diff --git a/upstream-man-pages/man4/glGetProgramResourceIndex.xml b/upstream-doc/man4/glGetProgramResourceIndex.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramResourceIndex.xml rename to upstream-doc/man4/glGetProgramResourceIndex.xml diff --git a/upstream-man-pages/man4/glGetProgramResourceLocation.xml b/upstream-doc/man4/glGetProgramResourceLocation.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramResourceLocation.xml rename to upstream-doc/man4/glGetProgramResourceLocation.xml diff --git a/upstream-man-pages/man4/glGetProgramResourceLocationIndex.xml b/upstream-doc/man4/glGetProgramResourceLocationIndex.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramResourceLocationIndex.xml rename to upstream-doc/man4/glGetProgramResourceLocationIndex.xml diff --git a/upstream-man-pages/man4/glGetProgramResourceName.xml b/upstream-doc/man4/glGetProgramResourceName.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramResourceName.xml rename to upstream-doc/man4/glGetProgramResourceName.xml diff --git a/upstream-man-pages/man4/glGetProgramStage.xml b/upstream-doc/man4/glGetProgramStage.xml similarity index 100% rename from upstream-man-pages/man4/glGetProgramStage.xml rename to upstream-doc/man4/glGetProgramStage.xml diff --git a/upstream-man-pages/man4/glGetQueryIndexed.xml b/upstream-doc/man4/glGetQueryIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glGetQueryIndexed.xml rename to upstream-doc/man4/glGetQueryIndexed.xml diff --git a/upstream-man-pages/man4/glGetQueryObject.xml b/upstream-doc/man4/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man4/glGetQueryObject.xml rename to upstream-doc/man4/glGetQueryObject.xml diff --git a/upstream-man-pages/man4/glGetQueryiv.xml b/upstream-doc/man4/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man4/glGetQueryiv.xml rename to upstream-doc/man4/glGetQueryiv.xml diff --git a/upstream-man-pages/man4/glGetRenderbufferParameter.xml b/upstream-doc/man4/glGetRenderbufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetRenderbufferParameter.xml rename to upstream-doc/man4/glGetRenderbufferParameter.xml diff --git a/upstream-man-pages/man4/glGetSamplerParameter.xml b/upstream-doc/man4/glGetSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetSamplerParameter.xml rename to upstream-doc/man4/glGetSamplerParameter.xml diff --git a/upstream-man-pages/man4/glGetShader.xml b/upstream-doc/man4/glGetShader.xml similarity index 100% rename from upstream-man-pages/man4/glGetShader.xml rename to upstream-doc/man4/glGetShader.xml diff --git a/upstream-man-pages/man4/glGetShaderInfoLog.xml b/upstream-doc/man4/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/glGetShaderInfoLog.xml rename to upstream-doc/man4/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man4/glGetShaderPrecisionFormat.xml b/upstream-doc/man4/glGetShaderPrecisionFormat.xml similarity index 100% rename from upstream-man-pages/man4/glGetShaderPrecisionFormat.xml rename to upstream-doc/man4/glGetShaderPrecisionFormat.xml diff --git a/upstream-man-pages/man4/glGetShaderSource.xml b/upstream-doc/man4/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man4/glGetShaderSource.xml rename to upstream-doc/man4/glGetShaderSource.xml diff --git a/upstream-man-pages/man4/glGetString.xml b/upstream-doc/man4/glGetString.xml similarity index 100% rename from upstream-man-pages/man4/glGetString.xml rename to upstream-doc/man4/glGetString.xml diff --git a/upstream-man-pages/man4/glGetSubroutineIndex.xml b/upstream-doc/man4/glGetSubroutineIndex.xml similarity index 100% rename from upstream-man-pages/man4/glGetSubroutineIndex.xml rename to upstream-doc/man4/glGetSubroutineIndex.xml diff --git a/upstream-man-pages/man4/glGetSubroutineUniformLocation.xml b/upstream-doc/man4/glGetSubroutineUniformLocation.xml similarity index 100% rename from upstream-man-pages/man4/glGetSubroutineUniformLocation.xml rename to upstream-doc/man4/glGetSubroutineUniformLocation.xml diff --git a/upstream-man-pages/man4/glGetSync.xml b/upstream-doc/man4/glGetSync.xml similarity index 100% rename from upstream-man-pages/man4/glGetSync.xml rename to upstream-doc/man4/glGetSync.xml diff --git a/upstream-man-pages/man4/glGetTexImage.xml b/upstream-doc/man4/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man4/glGetTexImage.xml rename to upstream-doc/man4/glGetTexImage.xml diff --git a/upstream-man-pages/man4/glGetTexLevelParameter.xml b/upstream-doc/man4/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetTexLevelParameter.xml rename to upstream-doc/man4/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man4/glGetTexParameter.xml b/upstream-doc/man4/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man4/glGetTexParameter.xml rename to upstream-doc/man4/glGetTexParameter.xml diff --git a/upstream-man-pages/man4/glGetTransformFeedbackVarying.xml b/upstream-doc/man4/glGetTransformFeedbackVarying.xml similarity index 100% rename from upstream-man-pages/man4/glGetTransformFeedbackVarying.xml rename to upstream-doc/man4/glGetTransformFeedbackVarying.xml diff --git a/upstream-man-pages/man4/glGetUniform.xml b/upstream-doc/man4/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man4/glGetUniform.xml rename to upstream-doc/man4/glGetUniform.xml diff --git a/upstream-man-pages/man4/glGetUniformBlockIndex.xml b/upstream-doc/man4/glGetUniformBlockIndex.xml similarity index 100% rename from upstream-man-pages/man4/glGetUniformBlockIndex.xml rename to upstream-doc/man4/glGetUniformBlockIndex.xml diff --git a/upstream-man-pages/man4/glGetUniformIndices.xml b/upstream-doc/man4/glGetUniformIndices.xml similarity index 100% rename from upstream-man-pages/man4/glGetUniformIndices.xml rename to upstream-doc/man4/glGetUniformIndices.xml diff --git a/upstream-man-pages/man4/glGetUniformLocation.xml b/upstream-doc/man4/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man4/glGetUniformLocation.xml rename to upstream-doc/man4/glGetUniformLocation.xml diff --git a/upstream-man-pages/man4/glGetUniformSubroutine.xml b/upstream-doc/man4/glGetUniformSubroutine.xml similarity index 100% rename from upstream-man-pages/man4/glGetUniformSubroutine.xml rename to upstream-doc/man4/glGetUniformSubroutine.xml diff --git a/upstream-man-pages/man4/glGetVertexAttrib.xml b/upstream-doc/man4/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man4/glGetVertexAttrib.xml rename to upstream-doc/man4/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man4/glGetVertexAttribPointerv.xml b/upstream-doc/man4/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man4/glGetVertexAttribPointerv.xml rename to upstream-doc/man4/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man4/glHint.xml b/upstream-doc/man4/glHint.xml similarity index 100% rename from upstream-man-pages/man4/glHint.xml rename to upstream-doc/man4/glHint.xml diff --git a/upstream-man-pages/man4/glInvalidateBufferData.xml b/upstream-doc/man4/glInvalidateBufferData.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateBufferData.xml rename to upstream-doc/man4/glInvalidateBufferData.xml diff --git a/upstream-man-pages/man4/glInvalidateBufferSubData.xml b/upstream-doc/man4/glInvalidateBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateBufferSubData.xml rename to upstream-doc/man4/glInvalidateBufferSubData.xml diff --git a/upstream-man-pages/man4/glInvalidateFramebuffer.xml b/upstream-doc/man4/glInvalidateFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateFramebuffer.xml rename to upstream-doc/man4/glInvalidateFramebuffer.xml diff --git a/upstream-man-pages/man4/glInvalidateSubFramebuffer.xml b/upstream-doc/man4/glInvalidateSubFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateSubFramebuffer.xml rename to upstream-doc/man4/glInvalidateSubFramebuffer.xml diff --git a/upstream-man-pages/man4/glInvalidateTexImage.xml b/upstream-doc/man4/glInvalidateTexImage.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateTexImage.xml rename to upstream-doc/man4/glInvalidateTexImage.xml diff --git a/upstream-man-pages/man4/glInvalidateTexSubImage.xml b/upstream-doc/man4/glInvalidateTexSubImage.xml similarity index 100% rename from upstream-man-pages/man4/glInvalidateTexSubImage.xml rename to upstream-doc/man4/glInvalidateTexSubImage.xml diff --git a/upstream-man-pages/man4/glIsBuffer.xml b/upstream-doc/man4/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glIsBuffer.xml rename to upstream-doc/man4/glIsBuffer.xml diff --git a/upstream-man-pages/man4/glIsEnabled.xml b/upstream-doc/man4/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man4/glIsEnabled.xml rename to upstream-doc/man4/glIsEnabled.xml diff --git a/upstream-man-pages/man4/glIsFramebuffer.xml b/upstream-doc/man4/glIsFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/glIsFramebuffer.xml rename to upstream-doc/man4/glIsFramebuffer.xml diff --git a/upstream-man-pages/man4/glIsProgram.xml b/upstream-doc/man4/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man4/glIsProgram.xml rename to upstream-doc/man4/glIsProgram.xml diff --git a/upstream-man-pages/man4/glIsProgramPipeline.xml b/upstream-doc/man4/glIsProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/glIsProgramPipeline.xml rename to upstream-doc/man4/glIsProgramPipeline.xml diff --git a/upstream-man-pages/man4/glIsQuery.xml b/upstream-doc/man4/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man4/glIsQuery.xml rename to upstream-doc/man4/glIsQuery.xml diff --git a/upstream-man-pages/man4/glIsRenderbuffer.xml b/upstream-doc/man4/glIsRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/glIsRenderbuffer.xml rename to upstream-doc/man4/glIsRenderbuffer.xml diff --git a/upstream-man-pages/man4/glIsSampler.xml b/upstream-doc/man4/glIsSampler.xml similarity index 100% rename from upstream-man-pages/man4/glIsSampler.xml rename to upstream-doc/man4/glIsSampler.xml diff --git a/upstream-man-pages/man4/glIsShader.xml b/upstream-doc/man4/glIsShader.xml similarity index 100% rename from upstream-man-pages/man4/glIsShader.xml rename to upstream-doc/man4/glIsShader.xml diff --git a/upstream-man-pages/man4/glIsSync.xml b/upstream-doc/man4/glIsSync.xml similarity index 100% rename from upstream-man-pages/man4/glIsSync.xml rename to upstream-doc/man4/glIsSync.xml diff --git a/upstream-man-pages/man4/glIsTexture.xml b/upstream-doc/man4/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man4/glIsTexture.xml rename to upstream-doc/man4/glIsTexture.xml diff --git a/upstream-man-pages/man4/glIsTransformFeedback.xml b/upstream-doc/man4/glIsTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glIsTransformFeedback.xml rename to upstream-doc/man4/glIsTransformFeedback.xml diff --git a/upstream-man-pages/man4/glIsVertexArray.xml b/upstream-doc/man4/glIsVertexArray.xml similarity index 100% rename from upstream-man-pages/man4/glIsVertexArray.xml rename to upstream-doc/man4/glIsVertexArray.xml diff --git a/upstream-man-pages/man4/glLineWidth.xml b/upstream-doc/man4/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man4/glLineWidth.xml rename to upstream-doc/man4/glLineWidth.xml diff --git a/upstream-man-pages/man4/glLinkProgram.xml b/upstream-doc/man4/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man4/glLinkProgram.xml rename to upstream-doc/man4/glLinkProgram.xml diff --git a/upstream-man-pages/man4/glLogicOp.xml b/upstream-doc/man4/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man4/glLogicOp.xml rename to upstream-doc/man4/glLogicOp.xml diff --git a/upstream-man-pages/man4/glMapBuffer.xml b/upstream-doc/man4/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glMapBuffer.xml rename to upstream-doc/man4/glMapBuffer.xml diff --git a/upstream-man-pages/man4/glMapBufferRange.xml b/upstream-doc/man4/glMapBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/glMapBufferRange.xml rename to upstream-doc/man4/glMapBufferRange.xml diff --git a/upstream-man-pages/man4/glMemoryBarrier.xml b/upstream-doc/man4/glMemoryBarrier.xml similarity index 100% rename from upstream-man-pages/man4/glMemoryBarrier.xml rename to upstream-doc/man4/glMemoryBarrier.xml diff --git a/upstream-man-pages/man4/glMinSampleShading.xml b/upstream-doc/man4/glMinSampleShading.xml similarity index 100% rename from upstream-man-pages/man4/glMinSampleShading.xml rename to upstream-doc/man4/glMinSampleShading.xml diff --git a/upstream-man-pages/man4/glMultiDrawArrays.xml b/upstream-doc/man4/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man4/glMultiDrawArrays.xml rename to upstream-doc/man4/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man4/glMultiDrawArraysIndirect.xml b/upstream-doc/man4/glMultiDrawArraysIndirect.xml similarity index 100% rename from upstream-man-pages/man4/glMultiDrawArraysIndirect.xml rename to upstream-doc/man4/glMultiDrawArraysIndirect.xml diff --git a/upstream-man-pages/man4/glMultiDrawElements.xml b/upstream-doc/man4/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man4/glMultiDrawElements.xml rename to upstream-doc/man4/glMultiDrawElements.xml diff --git a/upstream-man-pages/man4/glMultiDrawElementsBaseVertex.xml b/upstream-doc/man4/glMultiDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/glMultiDrawElementsBaseVertex.xml rename to upstream-doc/man4/glMultiDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/glMultiDrawElementsIndirect.xml b/upstream-doc/man4/glMultiDrawElementsIndirect.xml similarity index 100% rename from upstream-man-pages/man4/glMultiDrawElementsIndirect.xml rename to upstream-doc/man4/glMultiDrawElementsIndirect.xml diff --git a/upstream-man-pages/man4/glObjectLabel.xml b/upstream-doc/man4/glObjectLabel.xml similarity index 100% rename from upstream-man-pages/man4/glObjectLabel.xml rename to upstream-doc/man4/glObjectLabel.xml diff --git a/upstream-man-pages/man4/glObjectPtrLabel.xml b/upstream-doc/man4/glObjectPtrLabel.xml similarity index 100% rename from upstream-man-pages/man4/glObjectPtrLabel.xml rename to upstream-doc/man4/glObjectPtrLabel.xml diff --git a/upstream-man-pages/man4/glPatchParameter.xml b/upstream-doc/man4/glPatchParameter.xml similarity index 100% rename from upstream-man-pages/man4/glPatchParameter.xml rename to upstream-doc/man4/glPatchParameter.xml diff --git a/upstream-man-pages/man4/glPauseTransformFeedback.xml b/upstream-doc/man4/glPauseTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glPauseTransformFeedback.xml rename to upstream-doc/man4/glPauseTransformFeedback.xml diff --git a/upstream-man-pages/man4/glPixelStore.xml b/upstream-doc/man4/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man4/glPixelStore.xml rename to upstream-doc/man4/glPixelStore.xml diff --git a/upstream-man-pages/man4/glPointParameter.xml b/upstream-doc/man4/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man4/glPointParameter.xml rename to upstream-doc/man4/glPointParameter.xml diff --git a/upstream-man-pages/man4/glPointSize.xml b/upstream-doc/man4/glPointSize.xml similarity index 100% rename from upstream-man-pages/man4/glPointSize.xml rename to upstream-doc/man4/glPointSize.xml diff --git a/upstream-man-pages/man4/glPolygonMode.xml b/upstream-doc/man4/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man4/glPolygonMode.xml rename to upstream-doc/man4/glPolygonMode.xml diff --git a/upstream-man-pages/man4/glPolygonOffset.xml b/upstream-doc/man4/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man4/glPolygonOffset.xml rename to upstream-doc/man4/glPolygonOffset.xml diff --git a/upstream-man-pages/man4/glPopDebugGroup.xml b/upstream-doc/man4/glPopDebugGroup.xml similarity index 100% rename from upstream-man-pages/man4/glPopDebugGroup.xml rename to upstream-doc/man4/glPopDebugGroup.xml diff --git a/upstream-man-pages/man4/glPrimitiveRestartIndex.xml b/upstream-doc/man4/glPrimitiveRestartIndex.xml similarity index 100% rename from upstream-man-pages/man4/glPrimitiveRestartIndex.xml rename to upstream-doc/man4/glPrimitiveRestartIndex.xml diff --git a/upstream-man-pages/man4/glProgramBinary.xml b/upstream-doc/man4/glProgramBinary.xml similarity index 100% rename from upstream-man-pages/man4/glProgramBinary.xml rename to upstream-doc/man4/glProgramBinary.xml diff --git a/upstream-man-pages/man4/glProgramParameter.xml b/upstream-doc/man4/glProgramParameter.xml similarity index 100% rename from upstream-man-pages/man4/glProgramParameter.xml rename to upstream-doc/man4/glProgramParameter.xml diff --git a/upstream-man-pages/man4/glProgramUniform.xml b/upstream-doc/man4/glProgramUniform.xml similarity index 100% rename from upstream-man-pages/man4/glProgramUniform.xml rename to upstream-doc/man4/glProgramUniform.xml diff --git a/upstream-man-pages/man4/glProvokingVertex.xml b/upstream-doc/man4/glProvokingVertex.xml similarity index 100% rename from upstream-man-pages/man4/glProvokingVertex.xml rename to upstream-doc/man4/glProvokingVertex.xml diff --git a/upstream-man-pages/man4/glPushDebugGroup.xml b/upstream-doc/man4/glPushDebugGroup.xml similarity index 100% rename from upstream-man-pages/man4/glPushDebugGroup.xml rename to upstream-doc/man4/glPushDebugGroup.xml diff --git a/upstream-man-pages/man4/glQueryCounter.xml b/upstream-doc/man4/glQueryCounter.xml similarity index 100% rename from upstream-man-pages/man4/glQueryCounter.xml rename to upstream-doc/man4/glQueryCounter.xml diff --git a/upstream-man-pages/man4/glReadBuffer.xml b/upstream-doc/man4/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glReadBuffer.xml rename to upstream-doc/man4/glReadBuffer.xml diff --git a/upstream-man-pages/man4/glReadPixels.xml b/upstream-doc/man4/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man4/glReadPixels.xml rename to upstream-doc/man4/glReadPixels.xml diff --git a/upstream-man-pages/man4/glReleaseShaderCompiler.xml b/upstream-doc/man4/glReleaseShaderCompiler.xml similarity index 100% rename from upstream-man-pages/man4/glReleaseShaderCompiler.xml rename to upstream-doc/man4/glReleaseShaderCompiler.xml diff --git a/upstream-man-pages/man4/glRenderbufferStorage.xml b/upstream-doc/man4/glRenderbufferStorage.xml similarity index 100% rename from upstream-man-pages/man4/glRenderbufferStorage.xml rename to upstream-doc/man4/glRenderbufferStorage.xml diff --git a/upstream-man-pages/man4/glRenderbufferStorageMultisample.xml b/upstream-doc/man4/glRenderbufferStorageMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glRenderbufferStorageMultisample.xml rename to upstream-doc/man4/glRenderbufferStorageMultisample.xml diff --git a/upstream-man-pages/man4/glResumeTransformFeedback.xml b/upstream-doc/man4/glResumeTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/glResumeTransformFeedback.xml rename to upstream-doc/man4/glResumeTransformFeedback.xml diff --git a/upstream-man-pages/man4/glSampleCoverage.xml b/upstream-doc/man4/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man4/glSampleCoverage.xml rename to upstream-doc/man4/glSampleCoverage.xml diff --git a/upstream-man-pages/man4/glSampleMaski.xml b/upstream-doc/man4/glSampleMaski.xml similarity index 100% rename from upstream-man-pages/man4/glSampleMaski.xml rename to upstream-doc/man4/glSampleMaski.xml diff --git a/upstream-man-pages/man4/glSamplerParameter.xml b/upstream-doc/man4/glSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man4/glSamplerParameter.xml rename to upstream-doc/man4/glSamplerParameter.xml diff --git a/upstream-man-pages/man4/glScissor.xml b/upstream-doc/man4/glScissor.xml similarity index 100% rename from upstream-man-pages/man4/glScissor.xml rename to upstream-doc/man4/glScissor.xml diff --git a/upstream-man-pages/man4/glScissorArray.xml b/upstream-doc/man4/glScissorArray.xml similarity index 100% rename from upstream-man-pages/man4/glScissorArray.xml rename to upstream-doc/man4/glScissorArray.xml diff --git a/upstream-man-pages/man4/glScissorIndexed.xml b/upstream-doc/man4/glScissorIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glScissorIndexed.xml rename to upstream-doc/man4/glScissorIndexed.xml diff --git a/upstream-man-pages/man4/glShaderBinary.xml b/upstream-doc/man4/glShaderBinary.xml similarity index 100% rename from upstream-man-pages/man4/glShaderBinary.xml rename to upstream-doc/man4/glShaderBinary.xml diff --git a/upstream-man-pages/man4/glShaderSource.xml b/upstream-doc/man4/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man4/glShaderSource.xml rename to upstream-doc/man4/glShaderSource.xml diff --git a/upstream-man-pages/man4/glShaderStorageBlockBinding.xml b/upstream-doc/man4/glShaderStorageBlockBinding.xml similarity index 100% rename from upstream-man-pages/man4/glShaderStorageBlockBinding.xml rename to upstream-doc/man4/glShaderStorageBlockBinding.xml diff --git a/upstream-man-pages/man4/glStencilFunc.xml b/upstream-doc/man4/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man4/glStencilFunc.xml rename to upstream-doc/man4/glStencilFunc.xml diff --git a/upstream-man-pages/man4/glStencilFuncSeparate.xml b/upstream-doc/man4/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man4/glStencilFuncSeparate.xml rename to upstream-doc/man4/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man4/glStencilMask.xml b/upstream-doc/man4/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man4/glStencilMask.xml rename to upstream-doc/man4/glStencilMask.xml diff --git a/upstream-man-pages/man4/glStencilMaskSeparate.xml b/upstream-doc/man4/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man4/glStencilMaskSeparate.xml rename to upstream-doc/man4/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man4/glStencilOp.xml b/upstream-doc/man4/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man4/glStencilOp.xml rename to upstream-doc/man4/glStencilOp.xml diff --git a/upstream-man-pages/man4/glStencilOpSeparate.xml b/upstream-doc/man4/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man4/glStencilOpSeparate.xml rename to upstream-doc/man4/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man4/glTexBuffer.xml b/upstream-doc/man4/glTexBuffer.xml similarity index 100% rename from upstream-man-pages/man4/glTexBuffer.xml rename to upstream-doc/man4/glTexBuffer.xml diff --git a/upstream-man-pages/man4/glTexBufferRange.xml b/upstream-doc/man4/glTexBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/glTexBufferRange.xml rename to upstream-doc/man4/glTexBufferRange.xml diff --git a/upstream-man-pages/man4/glTexImage1D.xml b/upstream-doc/man4/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glTexImage1D.xml rename to upstream-doc/man4/glTexImage1D.xml diff --git a/upstream-man-pages/man4/glTexImage2D.xml b/upstream-doc/man4/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glTexImage2D.xml rename to upstream-doc/man4/glTexImage2D.xml diff --git a/upstream-man-pages/man4/glTexImage2DMultisample.xml b/upstream-doc/man4/glTexImage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glTexImage2DMultisample.xml rename to upstream-doc/man4/glTexImage2DMultisample.xml diff --git a/upstream-man-pages/man4/glTexImage3D.xml b/upstream-doc/man4/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man4/glTexImage3D.xml rename to upstream-doc/man4/glTexImage3D.xml diff --git a/upstream-man-pages/man4/glTexImage3DMultisample.xml b/upstream-doc/man4/glTexImage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glTexImage3DMultisample.xml rename to upstream-doc/man4/glTexImage3DMultisample.xml diff --git a/upstream-man-pages/man4/glTexParameter.xml b/upstream-doc/man4/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man4/glTexParameter.xml rename to upstream-doc/man4/glTexParameter.xml diff --git a/upstream-man-pages/man4/glTexStorage1D.xml b/upstream-doc/man4/glTexStorage1D.xml similarity index 100% rename from upstream-man-pages/man4/glTexStorage1D.xml rename to upstream-doc/man4/glTexStorage1D.xml diff --git a/upstream-man-pages/man4/glTexStorage2D.xml b/upstream-doc/man4/glTexStorage2D.xml similarity index 100% rename from upstream-man-pages/man4/glTexStorage2D.xml rename to upstream-doc/man4/glTexStorage2D.xml diff --git a/upstream-man-pages/man4/glTexStorage2DMultisample.xml b/upstream-doc/man4/glTexStorage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glTexStorage2DMultisample.xml rename to upstream-doc/man4/glTexStorage2DMultisample.xml diff --git a/upstream-man-pages/man4/glTexStorage3D.xml b/upstream-doc/man4/glTexStorage3D.xml similarity index 100% rename from upstream-man-pages/man4/glTexStorage3D.xml rename to upstream-doc/man4/glTexStorage3D.xml diff --git a/upstream-man-pages/man4/glTexStorage3DMultisample.xml b/upstream-doc/man4/glTexStorage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/glTexStorage3DMultisample.xml rename to upstream-doc/man4/glTexStorage3DMultisample.xml diff --git a/upstream-man-pages/man4/glTexSubImage1D.xml b/upstream-doc/man4/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/glTexSubImage1D.xml rename to upstream-doc/man4/glTexSubImage1D.xml diff --git a/upstream-man-pages/man4/glTexSubImage2D.xml b/upstream-doc/man4/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/glTexSubImage2D.xml rename to upstream-doc/man4/glTexSubImage2D.xml diff --git a/upstream-man-pages/man4/glTexSubImage3D.xml b/upstream-doc/man4/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/glTexSubImage3D.xml rename to upstream-doc/man4/glTexSubImage3D.xml diff --git a/upstream-man-pages/man4/glTextureView.xml b/upstream-doc/man4/glTextureView.xml similarity index 100% rename from upstream-man-pages/man4/glTextureView.xml rename to upstream-doc/man4/glTextureView.xml diff --git a/upstream-man-pages/man4/glTransformFeedbackVaryings.xml b/upstream-doc/man4/glTransformFeedbackVaryings.xml similarity index 100% rename from upstream-man-pages/man4/glTransformFeedbackVaryings.xml rename to upstream-doc/man4/glTransformFeedbackVaryings.xml diff --git a/upstream-man-pages/man4/glUniform.xml b/upstream-doc/man4/glUniform.xml similarity index 100% rename from upstream-man-pages/man4/glUniform.xml rename to upstream-doc/man4/glUniform.xml diff --git a/upstream-man-pages/man4/glUniformBlockBinding.xml b/upstream-doc/man4/glUniformBlockBinding.xml similarity index 100% rename from upstream-man-pages/man4/glUniformBlockBinding.xml rename to upstream-doc/man4/glUniformBlockBinding.xml diff --git a/upstream-man-pages/man4/glUniformSubroutines.xml b/upstream-doc/man4/glUniformSubroutines.xml similarity index 100% rename from upstream-man-pages/man4/glUniformSubroutines.xml rename to upstream-doc/man4/glUniformSubroutines.xml diff --git a/upstream-man-pages/man4/glUseProgram.xml b/upstream-doc/man4/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man4/glUseProgram.xml rename to upstream-doc/man4/glUseProgram.xml diff --git a/upstream-man-pages/man4/glUseProgramStages.xml b/upstream-doc/man4/glUseProgramStages.xml similarity index 100% rename from upstream-man-pages/man4/glUseProgramStages.xml rename to upstream-doc/man4/glUseProgramStages.xml diff --git a/upstream-man-pages/man4/glValidateProgram.xml b/upstream-doc/man4/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man4/glValidateProgram.xml rename to upstream-doc/man4/glValidateProgram.xml diff --git a/upstream-man-pages/man4/glValidateProgramPipeline.xml b/upstream-doc/man4/glValidateProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/glValidateProgramPipeline.xml rename to upstream-doc/man4/glValidateProgramPipeline.xml diff --git a/upstream-man-pages/man4/glVertexAttrib.xml b/upstream-doc/man4/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man4/glVertexAttrib.xml rename to upstream-doc/man4/glVertexAttrib.xml diff --git a/upstream-man-pages/man4/glVertexAttribBinding.xml b/upstream-doc/man4/glVertexAttribBinding.xml similarity index 100% rename from upstream-man-pages/man4/glVertexAttribBinding.xml rename to upstream-doc/man4/glVertexAttribBinding.xml diff --git a/upstream-man-pages/man4/glVertexAttribDivisor.xml b/upstream-doc/man4/glVertexAttribDivisor.xml similarity index 100% rename from upstream-man-pages/man4/glVertexAttribDivisor.xml rename to upstream-doc/man4/glVertexAttribDivisor.xml diff --git a/upstream-man-pages/man4/glVertexAttribFormat.xml b/upstream-doc/man4/glVertexAttribFormat.xml similarity index 100% rename from upstream-man-pages/man4/glVertexAttribFormat.xml rename to upstream-doc/man4/glVertexAttribFormat.xml diff --git a/upstream-man-pages/man4/glVertexAttribPointer.xml b/upstream-doc/man4/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man4/glVertexAttribPointer.xml rename to upstream-doc/man4/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man4/glVertexBindingDivisor.xml b/upstream-doc/man4/glVertexBindingDivisor.xml similarity index 100% rename from upstream-man-pages/man4/glVertexBindingDivisor.xml rename to upstream-doc/man4/glVertexBindingDivisor.xml diff --git a/upstream-man-pages/man4/glViewport.xml b/upstream-doc/man4/glViewport.xml similarity index 100% rename from upstream-man-pages/man4/glViewport.xml rename to upstream-doc/man4/glViewport.xml diff --git a/upstream-man-pages/man4/glViewportArray.xml b/upstream-doc/man4/glViewportArray.xml similarity index 100% rename from upstream-man-pages/man4/glViewportArray.xml rename to upstream-doc/man4/glViewportArray.xml diff --git a/upstream-man-pages/man4/glViewportIndexed.xml b/upstream-doc/man4/glViewportIndexed.xml similarity index 100% rename from upstream-man-pages/man4/glViewportIndexed.xml rename to upstream-doc/man4/glViewportIndexed.xml diff --git a/upstream-man-pages/man4/glWaitSync.xml b/upstream-doc/man4/glWaitSync.xml similarity index 100% rename from upstream-man-pages/man4/glWaitSync.xml rename to upstream-doc/man4/glWaitSync.xml diff --git a/upstream-man-pages/man4/index.php b/upstream-doc/man4/index.php similarity index 100% rename from upstream-man-pages/man4/index.php rename to upstream-doc/man4/index.php diff --git a/upstream-man-pages/man4/internalformattable.xml b/upstream-doc/man4/internalformattable.xml similarity index 100% rename from upstream-man-pages/man4/internalformattable.xml rename to upstream-doc/man4/internalformattable.xml diff --git a/upstream-man-pages/man4/removedTypes.xml b/upstream-doc/man4/removedTypes.xml similarity index 100% rename from upstream-man-pages/man4/removedTypes.xml rename to upstream-doc/man4/removedTypes.xml diff --git a/upstream-man-pages/man4/top.php b/upstream-doc/man4/top.php similarity index 100% rename from upstream-man-pages/man4/top.php rename to upstream-doc/man4/top.php diff --git a/upstream-man-pages/man4/usr/include/make/commondefs b/upstream-doc/man4/usr/include/make/commondefs similarity index 100% rename from upstream-man-pages/man4/usr/include/make/commondefs rename to upstream-doc/man4/usr/include/make/commondefs diff --git a/upstream-man-pages/man4/usr/include/make/commonrules b/upstream-doc/man4/usr/include/make/commonrules similarity index 100% rename from upstream-man-pages/man4/usr/include/make/commonrules rename to upstream-doc/man4/usr/include/make/commonrules diff --git a/upstream-man-pages/man4/usr/include/make/commonrules.win32 b/upstream-doc/man4/usr/include/make/commonrules.win32 similarity index 100% rename from upstream-man-pages/man4/usr/include/make/commonrules.win32 rename to upstream-doc/man4/usr/include/make/commonrules.win32 diff --git a/upstream-man-pages/man4/usr/include/make/linuxdefs b/upstream-doc/man4/usr/include/make/linuxdefs similarity index 100% rename from upstream-man-pages/man4/usr/include/make/linuxdefs rename to upstream-doc/man4/usr/include/make/linuxdefs diff --git a/upstream-man-pages/man4/xhtml/Makefile b/upstream-doc/man4/xhtml/Makefile similarity index 100% rename from upstream-man-pages/man4/xhtml/Makefile rename to upstream-doc/man4/xhtml/Makefile diff --git a/upstream-man-pages/man4/xhtml/ctop.xsl b/upstream-doc/man4/xhtml/ctop.xsl similarity index 100% rename from upstream-man-pages/man4/xhtml/ctop.xsl rename to upstream-doc/man4/xhtml/ctop.xsl diff --git a/upstream-man-pages/man4/xhtml/glActiveShaderProgram.xml b/upstream-doc/man4/xhtml/glActiveShaderProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glActiveShaderProgram.xml rename to upstream-doc/man4/xhtml/glActiveShaderProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glActiveTexture.xml b/upstream-doc/man4/xhtml/glActiveTexture.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glActiveTexture.xml rename to upstream-doc/man4/xhtml/glActiveTexture.xml diff --git a/upstream-man-pages/man4/xhtml/glAttachShader.xml b/upstream-doc/man4/xhtml/glAttachShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glAttachShader.xml rename to upstream-doc/man4/xhtml/glAttachShader.xml diff --git a/upstream-man-pages/man4/xhtml/glBeginConditionalRender.xml b/upstream-doc/man4/xhtml/glBeginConditionalRender.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBeginConditionalRender.xml rename to upstream-doc/man4/xhtml/glBeginConditionalRender.xml diff --git a/upstream-man-pages/man4/xhtml/glBeginQuery.xml b/upstream-doc/man4/xhtml/glBeginQuery.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBeginQuery.xml rename to upstream-doc/man4/xhtml/glBeginQuery.xml diff --git a/upstream-man-pages/man4/xhtml/glBeginQueryIndexed.xml b/upstream-doc/man4/xhtml/glBeginQueryIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBeginQueryIndexed.xml rename to upstream-doc/man4/xhtml/glBeginQueryIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glBeginTransformFeedback.xml b/upstream-doc/man4/xhtml/glBeginTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBeginTransformFeedback.xml rename to upstream-doc/man4/xhtml/glBeginTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glBindAttribLocation.xml b/upstream-doc/man4/xhtml/glBindAttribLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindAttribLocation.xml rename to upstream-doc/man4/xhtml/glBindAttribLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glBindBuffer.xml b/upstream-doc/man4/xhtml/glBindBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindBuffer.xml rename to upstream-doc/man4/xhtml/glBindBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glBindBufferBase.xml b/upstream-doc/man4/xhtml/glBindBufferBase.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindBufferBase.xml rename to upstream-doc/man4/xhtml/glBindBufferBase.xml diff --git a/upstream-man-pages/man4/xhtml/glBindBufferRange.xml b/upstream-doc/man4/xhtml/glBindBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindBufferRange.xml rename to upstream-doc/man4/xhtml/glBindBufferRange.xml diff --git a/upstream-man-pages/man4/xhtml/glBindFragDataLocation.xml b/upstream-doc/man4/xhtml/glBindFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindFragDataLocation.xml rename to upstream-doc/man4/xhtml/glBindFragDataLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glBindFragDataLocationIndexed.xml b/upstream-doc/man4/xhtml/glBindFragDataLocationIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindFragDataLocationIndexed.xml rename to upstream-doc/man4/xhtml/glBindFragDataLocationIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glBindFramebuffer.xml b/upstream-doc/man4/xhtml/glBindFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindFramebuffer.xml rename to upstream-doc/man4/xhtml/glBindFramebuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glBindImageTexture.xml b/upstream-doc/man4/xhtml/glBindImageTexture.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindImageTexture.xml rename to upstream-doc/man4/xhtml/glBindImageTexture.xml diff --git a/upstream-man-pages/man4/xhtml/glBindProgramPipeline.xml b/upstream-doc/man4/xhtml/glBindProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindProgramPipeline.xml rename to upstream-doc/man4/xhtml/glBindProgramPipeline.xml diff --git a/upstream-man-pages/man4/xhtml/glBindRenderbuffer.xml b/upstream-doc/man4/xhtml/glBindRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindRenderbuffer.xml rename to upstream-doc/man4/xhtml/glBindRenderbuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glBindSampler.xml b/upstream-doc/man4/xhtml/glBindSampler.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindSampler.xml rename to upstream-doc/man4/xhtml/glBindSampler.xml diff --git a/upstream-man-pages/man4/xhtml/glBindTexture.xml b/upstream-doc/man4/xhtml/glBindTexture.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindTexture.xml rename to upstream-doc/man4/xhtml/glBindTexture.xml diff --git a/upstream-man-pages/man4/xhtml/glBindTransformFeedback.xml b/upstream-doc/man4/xhtml/glBindTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindTransformFeedback.xml rename to upstream-doc/man4/xhtml/glBindTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glBindVertexArray.xml b/upstream-doc/man4/xhtml/glBindVertexArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindVertexArray.xml rename to upstream-doc/man4/xhtml/glBindVertexArray.xml diff --git a/upstream-man-pages/man4/xhtml/glBindVertexBuffer.xml b/upstream-doc/man4/xhtml/glBindVertexBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBindVertexBuffer.xml rename to upstream-doc/man4/xhtml/glBindVertexBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glBlendColor.xml b/upstream-doc/man4/xhtml/glBlendColor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlendColor.xml rename to upstream-doc/man4/xhtml/glBlendColor.xml diff --git a/upstream-man-pages/man4/xhtml/glBlendEquation.xml b/upstream-doc/man4/xhtml/glBlendEquation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlendEquation.xml rename to upstream-doc/man4/xhtml/glBlendEquation.xml diff --git a/upstream-man-pages/man4/xhtml/glBlendEquationSeparate.xml b/upstream-doc/man4/xhtml/glBlendEquationSeparate.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlendEquationSeparate.xml rename to upstream-doc/man4/xhtml/glBlendEquationSeparate.xml diff --git a/upstream-man-pages/man4/xhtml/glBlendFunc.xml b/upstream-doc/man4/xhtml/glBlendFunc.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlendFunc.xml rename to upstream-doc/man4/xhtml/glBlendFunc.xml diff --git a/upstream-man-pages/man4/xhtml/glBlendFuncSeparate.xml b/upstream-doc/man4/xhtml/glBlendFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlendFuncSeparate.xml rename to upstream-doc/man4/xhtml/glBlendFuncSeparate.xml diff --git a/upstream-man-pages/man4/xhtml/glBlitFramebuffer.xml b/upstream-doc/man4/xhtml/glBlitFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBlitFramebuffer.xml rename to upstream-doc/man4/xhtml/glBlitFramebuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glBufferData.xml b/upstream-doc/man4/xhtml/glBufferData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBufferData.xml rename to upstream-doc/man4/xhtml/glBufferData.xml diff --git a/upstream-man-pages/man4/xhtml/glBufferSubData.xml b/upstream-doc/man4/xhtml/glBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glBufferSubData.xml rename to upstream-doc/man4/xhtml/glBufferSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glCheckFramebufferStatus.xml b/upstream-doc/man4/xhtml/glCheckFramebufferStatus.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCheckFramebufferStatus.xml rename to upstream-doc/man4/xhtml/glCheckFramebufferStatus.xml diff --git a/upstream-man-pages/man4/xhtml/glClampColor.xml b/upstream-doc/man4/xhtml/glClampColor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClampColor.xml rename to upstream-doc/man4/xhtml/glClampColor.xml diff --git a/upstream-man-pages/man4/xhtml/glClear.xml b/upstream-doc/man4/xhtml/glClear.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClear.xml rename to upstream-doc/man4/xhtml/glClear.xml diff --git a/upstream-man-pages/man4/xhtml/glClearBuffer.xml b/upstream-doc/man4/xhtml/glClearBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearBuffer.xml rename to upstream-doc/man4/xhtml/glClearBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glClearBufferData.xml b/upstream-doc/man4/xhtml/glClearBufferData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearBufferData.xml rename to upstream-doc/man4/xhtml/glClearBufferData.xml diff --git a/upstream-man-pages/man4/xhtml/glClearBufferSubData.xml b/upstream-doc/man4/xhtml/glClearBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearBufferSubData.xml rename to upstream-doc/man4/xhtml/glClearBufferSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glClearColor.xml b/upstream-doc/man4/xhtml/glClearColor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearColor.xml rename to upstream-doc/man4/xhtml/glClearColor.xml diff --git a/upstream-man-pages/man4/xhtml/glClearDepth.xml b/upstream-doc/man4/xhtml/glClearDepth.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearDepth.xml rename to upstream-doc/man4/xhtml/glClearDepth.xml diff --git a/upstream-man-pages/man4/xhtml/glClearStencil.xml b/upstream-doc/man4/xhtml/glClearStencil.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClearStencil.xml rename to upstream-doc/man4/xhtml/glClearStencil.xml diff --git a/upstream-man-pages/man4/xhtml/glClientWaitSync.xml b/upstream-doc/man4/xhtml/glClientWaitSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glClientWaitSync.xml rename to upstream-doc/man4/xhtml/glClientWaitSync.xml diff --git a/upstream-man-pages/man4/xhtml/glColorMask.xml b/upstream-doc/man4/xhtml/glColorMask.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glColorMask.xml rename to upstream-doc/man4/xhtml/glColorMask.xml diff --git a/upstream-man-pages/man4/xhtml/glColorMaski.xml b/upstream-doc/man4/xhtml/glColorMaski.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glColorMaski.xml rename to upstream-doc/man4/xhtml/glColorMaski.xml diff --git a/upstream-man-pages/man4/xhtml/glCompileShader.xml b/upstream-doc/man4/xhtml/glCompileShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompileShader.xml rename to upstream-doc/man4/xhtml/glCompileShader.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexImage1D.xml b/upstream-doc/man4/xhtml/glCompressedTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexImage1D.xml rename to upstream-doc/man4/xhtml/glCompressedTexImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexImage2D.xml b/upstream-doc/man4/xhtml/glCompressedTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexImage2D.xml rename to upstream-doc/man4/xhtml/glCompressedTexImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexImage3D.xml b/upstream-doc/man4/xhtml/glCompressedTexImage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexImage3D.xml rename to upstream-doc/man4/xhtml/glCompressedTexImage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexSubImage1D.xml b/upstream-doc/man4/xhtml/glCompressedTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexSubImage1D.xml rename to upstream-doc/man4/xhtml/glCompressedTexSubImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexSubImage2D.xml b/upstream-doc/man4/xhtml/glCompressedTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexSubImage2D.xml rename to upstream-doc/man4/xhtml/glCompressedTexSubImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glCompressedTexSubImage3D.xml b/upstream-doc/man4/xhtml/glCompressedTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCompressedTexSubImage3D.xml rename to upstream-doc/man4/xhtml/glCompressedTexSubImage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyBufferSubData.xml b/upstream-doc/man4/xhtml/glCopyBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyBufferSubData.xml rename to upstream-doc/man4/xhtml/glCopyBufferSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyImageSubData.xml b/upstream-doc/man4/xhtml/glCopyImageSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyImageSubData.xml rename to upstream-doc/man4/xhtml/glCopyImageSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyTexImage1D.xml b/upstream-doc/man4/xhtml/glCopyTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyTexImage1D.xml rename to upstream-doc/man4/xhtml/glCopyTexImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyTexImage2D.xml b/upstream-doc/man4/xhtml/glCopyTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyTexImage2D.xml rename to upstream-doc/man4/xhtml/glCopyTexImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyTexSubImage1D.xml b/upstream-doc/man4/xhtml/glCopyTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyTexSubImage1D.xml rename to upstream-doc/man4/xhtml/glCopyTexSubImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyTexSubImage2D.xml b/upstream-doc/man4/xhtml/glCopyTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyTexSubImage2D.xml rename to upstream-doc/man4/xhtml/glCopyTexSubImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glCopyTexSubImage3D.xml b/upstream-doc/man4/xhtml/glCopyTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCopyTexSubImage3D.xml rename to upstream-doc/man4/xhtml/glCopyTexSubImage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glCreateProgram.xml b/upstream-doc/man4/xhtml/glCreateProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCreateProgram.xml rename to upstream-doc/man4/xhtml/glCreateProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glCreateShader.xml b/upstream-doc/man4/xhtml/glCreateShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCreateShader.xml rename to upstream-doc/man4/xhtml/glCreateShader.xml diff --git a/upstream-man-pages/man4/xhtml/glCreateShaderProgram.xml b/upstream-doc/man4/xhtml/glCreateShaderProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCreateShaderProgram.xml rename to upstream-doc/man4/xhtml/glCreateShaderProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glCullFace.xml b/upstream-doc/man4/xhtml/glCullFace.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glCullFace.xml rename to upstream-doc/man4/xhtml/glCullFace.xml diff --git a/upstream-man-pages/man4/xhtml/glDebugMessageCallback.xml b/upstream-doc/man4/xhtml/glDebugMessageCallback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDebugMessageCallback.xml rename to upstream-doc/man4/xhtml/glDebugMessageCallback.xml diff --git a/upstream-man-pages/man4/xhtml/glDebugMessageControl.xml b/upstream-doc/man4/xhtml/glDebugMessageControl.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDebugMessageControl.xml rename to upstream-doc/man4/xhtml/glDebugMessageControl.xml diff --git a/upstream-man-pages/man4/xhtml/glDebugMessageInsert.xml b/upstream-doc/man4/xhtml/glDebugMessageInsert.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDebugMessageInsert.xml rename to upstream-doc/man4/xhtml/glDebugMessageInsert.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteBuffers.xml b/upstream-doc/man4/xhtml/glDeleteBuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteBuffers.xml rename to upstream-doc/man4/xhtml/glDeleteBuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteFramebuffers.xml b/upstream-doc/man4/xhtml/glDeleteFramebuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteFramebuffers.xml rename to upstream-doc/man4/xhtml/glDeleteFramebuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteProgram.xml b/upstream-doc/man4/xhtml/glDeleteProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteProgram.xml rename to upstream-doc/man4/xhtml/glDeleteProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteProgramPipelines.xml b/upstream-doc/man4/xhtml/glDeleteProgramPipelines.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteProgramPipelines.xml rename to upstream-doc/man4/xhtml/glDeleteProgramPipelines.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteQueries.xml b/upstream-doc/man4/xhtml/glDeleteQueries.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteQueries.xml rename to upstream-doc/man4/xhtml/glDeleteQueries.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteRenderbuffers.xml b/upstream-doc/man4/xhtml/glDeleteRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteRenderbuffers.xml rename to upstream-doc/man4/xhtml/glDeleteRenderbuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteSamplers.xml b/upstream-doc/man4/xhtml/glDeleteSamplers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteSamplers.xml rename to upstream-doc/man4/xhtml/glDeleteSamplers.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteShader.xml b/upstream-doc/man4/xhtml/glDeleteShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteShader.xml rename to upstream-doc/man4/xhtml/glDeleteShader.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteSync.xml b/upstream-doc/man4/xhtml/glDeleteSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteSync.xml rename to upstream-doc/man4/xhtml/glDeleteSync.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteTextures.xml b/upstream-doc/man4/xhtml/glDeleteTextures.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteTextures.xml rename to upstream-doc/man4/xhtml/glDeleteTextures.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteTransformFeedbacks.xml b/upstream-doc/man4/xhtml/glDeleteTransformFeedbacks.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteTransformFeedbacks.xml rename to upstream-doc/man4/xhtml/glDeleteTransformFeedbacks.xml diff --git a/upstream-man-pages/man4/xhtml/glDeleteVertexArrays.xml b/upstream-doc/man4/xhtml/glDeleteVertexArrays.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDeleteVertexArrays.xml rename to upstream-doc/man4/xhtml/glDeleteVertexArrays.xml diff --git a/upstream-man-pages/man4/xhtml/glDepthFunc.xml b/upstream-doc/man4/xhtml/glDepthFunc.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDepthFunc.xml rename to upstream-doc/man4/xhtml/glDepthFunc.xml diff --git a/upstream-man-pages/man4/xhtml/glDepthMask.xml b/upstream-doc/man4/xhtml/glDepthMask.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDepthMask.xml rename to upstream-doc/man4/xhtml/glDepthMask.xml diff --git a/upstream-man-pages/man4/xhtml/glDepthRange.xml b/upstream-doc/man4/xhtml/glDepthRange.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDepthRange.xml rename to upstream-doc/man4/xhtml/glDepthRange.xml diff --git a/upstream-man-pages/man4/xhtml/glDepthRangeArray.xml b/upstream-doc/man4/xhtml/glDepthRangeArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDepthRangeArray.xml rename to upstream-doc/man4/xhtml/glDepthRangeArray.xml diff --git a/upstream-man-pages/man4/xhtml/glDepthRangeIndexed.xml b/upstream-doc/man4/xhtml/glDepthRangeIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDepthRangeIndexed.xml rename to upstream-doc/man4/xhtml/glDepthRangeIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glDetachShader.xml b/upstream-doc/man4/xhtml/glDetachShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDetachShader.xml rename to upstream-doc/man4/xhtml/glDetachShader.xml diff --git a/upstream-man-pages/man4/xhtml/glDisable.xml b/upstream-doc/man4/xhtml/glDisable.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDisable.xml rename to upstream-doc/man4/xhtml/glDisable.xml diff --git a/upstream-man-pages/man4/xhtml/glDisableVertexAttribArray.xml b/upstream-doc/man4/xhtml/glDisableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDisableVertexAttribArray.xml rename to upstream-doc/man4/xhtml/glDisableVertexAttribArray.xml diff --git a/upstream-man-pages/man4/xhtml/glDispatchCompute.xml b/upstream-doc/man4/xhtml/glDispatchCompute.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDispatchCompute.xml rename to upstream-doc/man4/xhtml/glDispatchCompute.xml diff --git a/upstream-man-pages/man4/xhtml/glDispatchComputeIndirect.xml b/upstream-doc/man4/xhtml/glDispatchComputeIndirect.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDispatchComputeIndirect.xml rename to upstream-doc/man4/xhtml/glDispatchComputeIndirect.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawArrays.xml b/upstream-doc/man4/xhtml/glDrawArrays.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawArrays.xml rename to upstream-doc/man4/xhtml/glDrawArrays.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawArraysIndirect.xml b/upstream-doc/man4/xhtml/glDrawArraysIndirect.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawArraysIndirect.xml rename to upstream-doc/man4/xhtml/glDrawArraysIndirect.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawArraysInstanced.xml b/upstream-doc/man4/xhtml/glDrawArraysInstanced.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawArraysInstanced.xml rename to upstream-doc/man4/xhtml/glDrawArraysInstanced.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawArraysInstancedBaseInstance.xml b/upstream-doc/man4/xhtml/glDrawArraysInstancedBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawArraysInstancedBaseInstance.xml rename to upstream-doc/man4/xhtml/glDrawArraysInstancedBaseInstance.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawBuffer.xml b/upstream-doc/man4/xhtml/glDrawBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawBuffer.xml rename to upstream-doc/man4/xhtml/glDrawBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawBuffers.xml b/upstream-doc/man4/xhtml/glDrawBuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawBuffers.xml rename to upstream-doc/man4/xhtml/glDrawBuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElements.xml b/upstream-doc/man4/xhtml/glDrawElements.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElements.xml rename to upstream-doc/man4/xhtml/glDrawElements.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsBaseVertex.xml b/upstream-doc/man4/xhtml/glDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsBaseVertex.xml rename to upstream-doc/man4/xhtml/glDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsIndirect.xml b/upstream-doc/man4/xhtml/glDrawElementsIndirect.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsIndirect.xml rename to upstream-doc/man4/xhtml/glDrawElementsIndirect.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsInstanced.xml b/upstream-doc/man4/xhtml/glDrawElementsInstanced.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsInstanced.xml rename to upstream-doc/man4/xhtml/glDrawElementsInstanced.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseInstance.xml b/upstream-doc/man4/xhtml/glDrawElementsInstancedBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseInstance.xml rename to upstream-doc/man4/xhtml/glDrawElementsInstancedBaseInstance.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseVertex.xml b/upstream-doc/man4/xhtml/glDrawElementsInstancedBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseVertex.xml rename to upstream-doc/man4/xhtml/glDrawElementsInstancedBaseVertex.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseVertexBaseInstance.xml b/upstream-doc/man4/xhtml/glDrawElementsInstancedBaseVertexBaseInstance.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawElementsInstancedBaseVertexBaseInstance.xml rename to upstream-doc/man4/xhtml/glDrawElementsInstancedBaseVertexBaseInstance.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawRangeElements.xml b/upstream-doc/man4/xhtml/glDrawRangeElements.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawRangeElements.xml rename to upstream-doc/man4/xhtml/glDrawRangeElements.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawRangeElementsBaseVertex.xml b/upstream-doc/man4/xhtml/glDrawRangeElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawRangeElementsBaseVertex.xml rename to upstream-doc/man4/xhtml/glDrawRangeElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawTransformFeedback.xml b/upstream-doc/man4/xhtml/glDrawTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawTransformFeedback.xml rename to upstream-doc/man4/xhtml/glDrawTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawTransformFeedbackInstanced.xml b/upstream-doc/man4/xhtml/glDrawTransformFeedbackInstanced.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawTransformFeedbackInstanced.xml rename to upstream-doc/man4/xhtml/glDrawTransformFeedbackInstanced.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawTransformFeedbackStream.xml b/upstream-doc/man4/xhtml/glDrawTransformFeedbackStream.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawTransformFeedbackStream.xml rename to upstream-doc/man4/xhtml/glDrawTransformFeedbackStream.xml diff --git a/upstream-man-pages/man4/xhtml/glDrawTransformFeedbackStreamInstanced.xml b/upstream-doc/man4/xhtml/glDrawTransformFeedbackStreamInstanced.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glDrawTransformFeedbackStreamInstanced.xml rename to upstream-doc/man4/xhtml/glDrawTransformFeedbackStreamInstanced.xml diff --git a/upstream-man-pages/man4/xhtml/glEnable.xml b/upstream-doc/man4/xhtml/glEnable.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEnable.xml rename to upstream-doc/man4/xhtml/glEnable.xml diff --git a/upstream-man-pages/man4/xhtml/glEnableVertexAttribArray.xml b/upstream-doc/man4/xhtml/glEnableVertexAttribArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEnableVertexAttribArray.xml rename to upstream-doc/man4/xhtml/glEnableVertexAttribArray.xml diff --git a/upstream-man-pages/man4/xhtml/glEndConditionalRender.xml b/upstream-doc/man4/xhtml/glEndConditionalRender.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEndConditionalRender.xml rename to upstream-doc/man4/xhtml/glEndConditionalRender.xml diff --git a/upstream-man-pages/man4/xhtml/glEndQuery.xml b/upstream-doc/man4/xhtml/glEndQuery.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEndQuery.xml rename to upstream-doc/man4/xhtml/glEndQuery.xml diff --git a/upstream-man-pages/man4/xhtml/glEndQueryIndexed.xml b/upstream-doc/man4/xhtml/glEndQueryIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEndQueryIndexed.xml rename to upstream-doc/man4/xhtml/glEndQueryIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glEndTransformFeedback.xml b/upstream-doc/man4/xhtml/glEndTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glEndTransformFeedback.xml rename to upstream-doc/man4/xhtml/glEndTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glFenceSync.xml b/upstream-doc/man4/xhtml/glFenceSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFenceSync.xml rename to upstream-doc/man4/xhtml/glFenceSync.xml diff --git a/upstream-man-pages/man4/xhtml/glFinish.xml b/upstream-doc/man4/xhtml/glFinish.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFinish.xml rename to upstream-doc/man4/xhtml/glFinish.xml diff --git a/upstream-man-pages/man4/xhtml/glFlush.xml b/upstream-doc/man4/xhtml/glFlush.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFlush.xml rename to upstream-doc/man4/xhtml/glFlush.xml diff --git a/upstream-man-pages/man4/xhtml/glFlushMappedBufferRange.xml b/upstream-doc/man4/xhtml/glFlushMappedBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFlushMappedBufferRange.xml rename to upstream-doc/man4/xhtml/glFlushMappedBufferRange.xml diff --git a/upstream-man-pages/man4/xhtml/glFramebufferParameteri.xml b/upstream-doc/man4/xhtml/glFramebufferParameteri.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFramebufferParameteri.xml rename to upstream-doc/man4/xhtml/glFramebufferParameteri.xml diff --git a/upstream-man-pages/man4/xhtml/glFramebufferRenderbuffer.xml b/upstream-doc/man4/xhtml/glFramebufferRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFramebufferRenderbuffer.xml rename to upstream-doc/man4/xhtml/glFramebufferRenderbuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glFramebufferTexture.xml b/upstream-doc/man4/xhtml/glFramebufferTexture.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFramebufferTexture.xml rename to upstream-doc/man4/xhtml/glFramebufferTexture.xml diff --git a/upstream-man-pages/man4/xhtml/glFramebufferTextureLayer.xml b/upstream-doc/man4/xhtml/glFramebufferTextureLayer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFramebufferTextureLayer.xml rename to upstream-doc/man4/xhtml/glFramebufferTextureLayer.xml diff --git a/upstream-man-pages/man4/xhtml/glFrontFace.xml b/upstream-doc/man4/xhtml/glFrontFace.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glFrontFace.xml rename to upstream-doc/man4/xhtml/glFrontFace.xml diff --git a/upstream-man-pages/man4/xhtml/glGenBuffers.xml b/upstream-doc/man4/xhtml/glGenBuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenBuffers.xml rename to upstream-doc/man4/xhtml/glGenBuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glGenFramebuffers.xml b/upstream-doc/man4/xhtml/glGenFramebuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenFramebuffers.xml rename to upstream-doc/man4/xhtml/glGenFramebuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glGenProgramPipelines.xml b/upstream-doc/man4/xhtml/glGenProgramPipelines.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenProgramPipelines.xml rename to upstream-doc/man4/xhtml/glGenProgramPipelines.xml diff --git a/upstream-man-pages/man4/xhtml/glGenQueries.xml b/upstream-doc/man4/xhtml/glGenQueries.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenQueries.xml rename to upstream-doc/man4/xhtml/glGenQueries.xml diff --git a/upstream-man-pages/man4/xhtml/glGenRenderbuffers.xml b/upstream-doc/man4/xhtml/glGenRenderbuffers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenRenderbuffers.xml rename to upstream-doc/man4/xhtml/glGenRenderbuffers.xml diff --git a/upstream-man-pages/man4/xhtml/glGenSamplers.xml b/upstream-doc/man4/xhtml/glGenSamplers.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenSamplers.xml rename to upstream-doc/man4/xhtml/glGenSamplers.xml diff --git a/upstream-man-pages/man4/xhtml/glGenTextures.xml b/upstream-doc/man4/xhtml/glGenTextures.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenTextures.xml rename to upstream-doc/man4/xhtml/glGenTextures.xml diff --git a/upstream-man-pages/man4/xhtml/glGenTransformFeedbacks.xml b/upstream-doc/man4/xhtml/glGenTransformFeedbacks.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenTransformFeedbacks.xml rename to upstream-doc/man4/xhtml/glGenTransformFeedbacks.xml diff --git a/upstream-man-pages/man4/xhtml/glGenVertexArrays.xml b/upstream-doc/man4/xhtml/glGenVertexArrays.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenVertexArrays.xml rename to upstream-doc/man4/xhtml/glGenVertexArrays.xml diff --git a/upstream-man-pages/man4/xhtml/glGenerateMipmap.xml b/upstream-doc/man4/xhtml/glGenerateMipmap.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGenerateMipmap.xml rename to upstream-doc/man4/xhtml/glGenerateMipmap.xml diff --git a/upstream-man-pages/man4/xhtml/glGet.xml b/upstream-doc/man4/xhtml/glGet.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGet.xml rename to upstream-doc/man4/xhtml/glGet.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveAtomicCounterBufferiv.xml b/upstream-doc/man4/xhtml/glGetActiveAtomicCounterBufferiv.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveAtomicCounterBufferiv.xml rename to upstream-doc/man4/xhtml/glGetActiveAtomicCounterBufferiv.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveAttrib.xml b/upstream-doc/man4/xhtml/glGetActiveAttrib.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveAttrib.xml rename to upstream-doc/man4/xhtml/glGetActiveAttrib.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveSubroutineName.xml b/upstream-doc/man4/xhtml/glGetActiveSubroutineName.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveSubroutineName.xml rename to upstream-doc/man4/xhtml/glGetActiveSubroutineName.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveSubroutineUniform.xml b/upstream-doc/man4/xhtml/glGetActiveSubroutineUniform.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveSubroutineUniform.xml rename to upstream-doc/man4/xhtml/glGetActiveSubroutineUniform.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveSubroutineUniformName.xml b/upstream-doc/man4/xhtml/glGetActiveSubroutineUniformName.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveSubroutineUniformName.xml rename to upstream-doc/man4/xhtml/glGetActiveSubroutineUniformName.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveUniform.xml b/upstream-doc/man4/xhtml/glGetActiveUniform.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveUniform.xml rename to upstream-doc/man4/xhtml/glGetActiveUniform.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveUniformBlock.xml b/upstream-doc/man4/xhtml/glGetActiveUniformBlock.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveUniformBlock.xml rename to upstream-doc/man4/xhtml/glGetActiveUniformBlock.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveUniformBlockName.xml b/upstream-doc/man4/xhtml/glGetActiveUniformBlockName.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveUniformBlockName.xml rename to upstream-doc/man4/xhtml/glGetActiveUniformBlockName.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveUniformName.xml b/upstream-doc/man4/xhtml/glGetActiveUniformName.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveUniformName.xml rename to upstream-doc/man4/xhtml/glGetActiveUniformName.xml diff --git a/upstream-man-pages/man4/xhtml/glGetActiveUniformsiv.xml b/upstream-doc/man4/xhtml/glGetActiveUniformsiv.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetActiveUniformsiv.xml rename to upstream-doc/man4/xhtml/glGetActiveUniformsiv.xml diff --git a/upstream-man-pages/man4/xhtml/glGetAttachedShaders.xml b/upstream-doc/man4/xhtml/glGetAttachedShaders.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetAttachedShaders.xml rename to upstream-doc/man4/xhtml/glGetAttachedShaders.xml diff --git a/upstream-man-pages/man4/xhtml/glGetAttribLocation.xml b/upstream-doc/man4/xhtml/glGetAttribLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetAttribLocation.xml rename to upstream-doc/man4/xhtml/glGetAttribLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glGetBufferParameter.xml b/upstream-doc/man4/xhtml/glGetBufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetBufferParameter.xml rename to upstream-doc/man4/xhtml/glGetBufferParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetBufferPointerv.xml b/upstream-doc/man4/xhtml/glGetBufferPointerv.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetBufferPointerv.xml rename to upstream-doc/man4/xhtml/glGetBufferPointerv.xml diff --git a/upstream-man-pages/man4/xhtml/glGetBufferSubData.xml b/upstream-doc/man4/xhtml/glGetBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetBufferSubData.xml rename to upstream-doc/man4/xhtml/glGetBufferSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glGetCompressedTexImage.xml b/upstream-doc/man4/xhtml/glGetCompressedTexImage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetCompressedTexImage.xml rename to upstream-doc/man4/xhtml/glGetCompressedTexImage.xml diff --git a/upstream-man-pages/man4/xhtml/glGetDebugMessageLog.xml b/upstream-doc/man4/xhtml/glGetDebugMessageLog.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetDebugMessageLog.xml rename to upstream-doc/man4/xhtml/glGetDebugMessageLog.xml diff --git a/upstream-man-pages/man4/xhtml/glGetError.xml b/upstream-doc/man4/xhtml/glGetError.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetError.xml rename to upstream-doc/man4/xhtml/glGetError.xml diff --git a/upstream-man-pages/man4/xhtml/glGetFragDataIndex.xml b/upstream-doc/man4/xhtml/glGetFragDataIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetFragDataIndex.xml rename to upstream-doc/man4/xhtml/glGetFragDataIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glGetFragDataLocation.xml b/upstream-doc/man4/xhtml/glGetFragDataLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetFragDataLocation.xml rename to upstream-doc/man4/xhtml/glGetFragDataLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glGetFramebufferAttachmentParameter.xml b/upstream-doc/man4/xhtml/glGetFramebufferAttachmentParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetFramebufferAttachmentParameter.xml rename to upstream-doc/man4/xhtml/glGetFramebufferAttachmentParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetFramebufferParameter.xml b/upstream-doc/man4/xhtml/glGetFramebufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetFramebufferParameter.xml rename to upstream-doc/man4/xhtml/glGetFramebufferParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetInternalFormativ.xml b/upstream-doc/man4/xhtml/glGetInternalFormativ.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetInternalFormativ.xml rename to upstream-doc/man4/xhtml/glGetInternalFormativ.xml diff --git a/upstream-man-pages/man4/xhtml/glGetMultisample.xml b/upstream-doc/man4/xhtml/glGetMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetMultisample.xml rename to upstream-doc/man4/xhtml/glGetMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glGetObjectLabel.xml b/upstream-doc/man4/xhtml/glGetObjectLabel.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetObjectLabel.xml rename to upstream-doc/man4/xhtml/glGetObjectLabel.xml diff --git a/upstream-man-pages/man4/xhtml/glGetObjectPtrLabel.xml b/upstream-doc/man4/xhtml/glGetObjectPtrLabel.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetObjectPtrLabel.xml rename to upstream-doc/man4/xhtml/glGetObjectPtrLabel.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgram.xml b/upstream-doc/man4/xhtml/glGetProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgram.xml rename to upstream-doc/man4/xhtml/glGetProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramBinary.xml b/upstream-doc/man4/xhtml/glGetProgramBinary.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramBinary.xml rename to upstream-doc/man4/xhtml/glGetProgramBinary.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramInfoLog.xml b/upstream-doc/man4/xhtml/glGetProgramInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramInfoLog.xml rename to upstream-doc/man4/xhtml/glGetProgramInfoLog.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramInterface.xml b/upstream-doc/man4/xhtml/glGetProgramInterface.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramInterface.xml rename to upstream-doc/man4/xhtml/glGetProgramInterface.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramPipeline.xml b/upstream-doc/man4/xhtml/glGetProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramPipeline.xml rename to upstream-doc/man4/xhtml/glGetProgramPipeline.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramPipelineInfoLog.xml b/upstream-doc/man4/xhtml/glGetProgramPipelineInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramPipelineInfoLog.xml rename to upstream-doc/man4/xhtml/glGetProgramPipelineInfoLog.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramResource.xml b/upstream-doc/man4/xhtml/glGetProgramResource.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramResource.xml rename to upstream-doc/man4/xhtml/glGetProgramResource.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramResourceIndex.xml b/upstream-doc/man4/xhtml/glGetProgramResourceIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramResourceIndex.xml rename to upstream-doc/man4/xhtml/glGetProgramResourceIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramResourceLocation.xml b/upstream-doc/man4/xhtml/glGetProgramResourceLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramResourceLocation.xml rename to upstream-doc/man4/xhtml/glGetProgramResourceLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramResourceLocationIndex.xml b/upstream-doc/man4/xhtml/glGetProgramResourceLocationIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramResourceLocationIndex.xml rename to upstream-doc/man4/xhtml/glGetProgramResourceLocationIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramResourceName.xml b/upstream-doc/man4/xhtml/glGetProgramResourceName.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramResourceName.xml rename to upstream-doc/man4/xhtml/glGetProgramResourceName.xml diff --git a/upstream-man-pages/man4/xhtml/glGetProgramStage.xml b/upstream-doc/man4/xhtml/glGetProgramStage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetProgramStage.xml rename to upstream-doc/man4/xhtml/glGetProgramStage.xml diff --git a/upstream-man-pages/man4/xhtml/glGetQueryIndexed.xml b/upstream-doc/man4/xhtml/glGetQueryIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetQueryIndexed.xml rename to upstream-doc/man4/xhtml/glGetQueryIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glGetQueryObject.xml b/upstream-doc/man4/xhtml/glGetQueryObject.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetQueryObject.xml rename to upstream-doc/man4/xhtml/glGetQueryObject.xml diff --git a/upstream-man-pages/man4/xhtml/glGetQueryiv.xml b/upstream-doc/man4/xhtml/glGetQueryiv.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetQueryiv.xml rename to upstream-doc/man4/xhtml/glGetQueryiv.xml diff --git a/upstream-man-pages/man4/xhtml/glGetRenderbufferParameter.xml b/upstream-doc/man4/xhtml/glGetRenderbufferParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetRenderbufferParameter.xml rename to upstream-doc/man4/xhtml/glGetRenderbufferParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetSamplerParameter.xml b/upstream-doc/man4/xhtml/glGetSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetSamplerParameter.xml rename to upstream-doc/man4/xhtml/glGetSamplerParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetShader.xml b/upstream-doc/man4/xhtml/glGetShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetShader.xml rename to upstream-doc/man4/xhtml/glGetShader.xml diff --git a/upstream-man-pages/man4/xhtml/glGetShaderInfoLog.xml b/upstream-doc/man4/xhtml/glGetShaderInfoLog.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetShaderInfoLog.xml rename to upstream-doc/man4/xhtml/glGetShaderInfoLog.xml diff --git a/upstream-man-pages/man4/xhtml/glGetShaderPrecisionFormat.xml b/upstream-doc/man4/xhtml/glGetShaderPrecisionFormat.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetShaderPrecisionFormat.xml rename to upstream-doc/man4/xhtml/glGetShaderPrecisionFormat.xml diff --git a/upstream-man-pages/man4/xhtml/glGetShaderSource.xml b/upstream-doc/man4/xhtml/glGetShaderSource.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetShaderSource.xml rename to upstream-doc/man4/xhtml/glGetShaderSource.xml diff --git a/upstream-man-pages/man4/xhtml/glGetString.xml b/upstream-doc/man4/xhtml/glGetString.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetString.xml rename to upstream-doc/man4/xhtml/glGetString.xml diff --git a/upstream-man-pages/man4/xhtml/glGetSubroutineIndex.xml b/upstream-doc/man4/xhtml/glGetSubroutineIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetSubroutineIndex.xml rename to upstream-doc/man4/xhtml/glGetSubroutineIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glGetSubroutineUniformLocation.xml b/upstream-doc/man4/xhtml/glGetSubroutineUniformLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetSubroutineUniformLocation.xml rename to upstream-doc/man4/xhtml/glGetSubroutineUniformLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glGetSync.xml b/upstream-doc/man4/xhtml/glGetSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetSync.xml rename to upstream-doc/man4/xhtml/glGetSync.xml diff --git a/upstream-man-pages/man4/xhtml/glGetTexImage.xml b/upstream-doc/man4/xhtml/glGetTexImage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetTexImage.xml rename to upstream-doc/man4/xhtml/glGetTexImage.xml diff --git a/upstream-man-pages/man4/xhtml/glGetTexLevelParameter.xml b/upstream-doc/man4/xhtml/glGetTexLevelParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetTexLevelParameter.xml rename to upstream-doc/man4/xhtml/glGetTexLevelParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetTexParameter.xml b/upstream-doc/man4/xhtml/glGetTexParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetTexParameter.xml rename to upstream-doc/man4/xhtml/glGetTexParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glGetTransformFeedbackVarying.xml b/upstream-doc/man4/xhtml/glGetTransformFeedbackVarying.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetTransformFeedbackVarying.xml rename to upstream-doc/man4/xhtml/glGetTransformFeedbackVarying.xml diff --git a/upstream-man-pages/man4/xhtml/glGetUniform.xml b/upstream-doc/man4/xhtml/glGetUniform.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetUniform.xml rename to upstream-doc/man4/xhtml/glGetUniform.xml diff --git a/upstream-man-pages/man4/xhtml/glGetUniformBlockIndex.xml b/upstream-doc/man4/xhtml/glGetUniformBlockIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetUniformBlockIndex.xml rename to upstream-doc/man4/xhtml/glGetUniformBlockIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glGetUniformIndices.xml b/upstream-doc/man4/xhtml/glGetUniformIndices.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetUniformIndices.xml rename to upstream-doc/man4/xhtml/glGetUniformIndices.xml diff --git a/upstream-man-pages/man4/xhtml/glGetUniformLocation.xml b/upstream-doc/man4/xhtml/glGetUniformLocation.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetUniformLocation.xml rename to upstream-doc/man4/xhtml/glGetUniformLocation.xml diff --git a/upstream-man-pages/man4/xhtml/glGetUniformSubroutine.xml b/upstream-doc/man4/xhtml/glGetUniformSubroutine.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetUniformSubroutine.xml rename to upstream-doc/man4/xhtml/glGetUniformSubroutine.xml diff --git a/upstream-man-pages/man4/xhtml/glGetVertexAttrib.xml b/upstream-doc/man4/xhtml/glGetVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetVertexAttrib.xml rename to upstream-doc/man4/xhtml/glGetVertexAttrib.xml diff --git a/upstream-man-pages/man4/xhtml/glGetVertexAttribPointerv.xml b/upstream-doc/man4/xhtml/glGetVertexAttribPointerv.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glGetVertexAttribPointerv.xml rename to upstream-doc/man4/xhtml/glGetVertexAttribPointerv.xml diff --git a/upstream-man-pages/man4/xhtml/glHint.xml b/upstream-doc/man4/xhtml/glHint.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glHint.xml rename to upstream-doc/man4/xhtml/glHint.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateBufferData.xml b/upstream-doc/man4/xhtml/glInvalidateBufferData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateBufferData.xml rename to upstream-doc/man4/xhtml/glInvalidateBufferData.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateBufferSubData.xml b/upstream-doc/man4/xhtml/glInvalidateBufferSubData.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateBufferSubData.xml rename to upstream-doc/man4/xhtml/glInvalidateBufferSubData.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateFramebuffer.xml b/upstream-doc/man4/xhtml/glInvalidateFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateFramebuffer.xml rename to upstream-doc/man4/xhtml/glInvalidateFramebuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateSubFramebuffer.xml b/upstream-doc/man4/xhtml/glInvalidateSubFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateSubFramebuffer.xml rename to upstream-doc/man4/xhtml/glInvalidateSubFramebuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateTexImage.xml b/upstream-doc/man4/xhtml/glInvalidateTexImage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateTexImage.xml rename to upstream-doc/man4/xhtml/glInvalidateTexImage.xml diff --git a/upstream-man-pages/man4/xhtml/glInvalidateTexSubImage.xml b/upstream-doc/man4/xhtml/glInvalidateTexSubImage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glInvalidateTexSubImage.xml rename to upstream-doc/man4/xhtml/glInvalidateTexSubImage.xml diff --git a/upstream-man-pages/man4/xhtml/glIsBuffer.xml b/upstream-doc/man4/xhtml/glIsBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsBuffer.xml rename to upstream-doc/man4/xhtml/glIsBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glIsEnabled.xml b/upstream-doc/man4/xhtml/glIsEnabled.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsEnabled.xml rename to upstream-doc/man4/xhtml/glIsEnabled.xml diff --git a/upstream-man-pages/man4/xhtml/glIsFramebuffer.xml b/upstream-doc/man4/xhtml/glIsFramebuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsFramebuffer.xml rename to upstream-doc/man4/xhtml/glIsFramebuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glIsProgram.xml b/upstream-doc/man4/xhtml/glIsProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsProgram.xml rename to upstream-doc/man4/xhtml/glIsProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glIsProgramPipeline.xml b/upstream-doc/man4/xhtml/glIsProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsProgramPipeline.xml rename to upstream-doc/man4/xhtml/glIsProgramPipeline.xml diff --git a/upstream-man-pages/man4/xhtml/glIsQuery.xml b/upstream-doc/man4/xhtml/glIsQuery.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsQuery.xml rename to upstream-doc/man4/xhtml/glIsQuery.xml diff --git a/upstream-man-pages/man4/xhtml/glIsRenderbuffer.xml b/upstream-doc/man4/xhtml/glIsRenderbuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsRenderbuffer.xml rename to upstream-doc/man4/xhtml/glIsRenderbuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glIsSampler.xml b/upstream-doc/man4/xhtml/glIsSampler.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsSampler.xml rename to upstream-doc/man4/xhtml/glIsSampler.xml diff --git a/upstream-man-pages/man4/xhtml/glIsShader.xml b/upstream-doc/man4/xhtml/glIsShader.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsShader.xml rename to upstream-doc/man4/xhtml/glIsShader.xml diff --git a/upstream-man-pages/man4/xhtml/glIsSync.xml b/upstream-doc/man4/xhtml/glIsSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsSync.xml rename to upstream-doc/man4/xhtml/glIsSync.xml diff --git a/upstream-man-pages/man4/xhtml/glIsTexture.xml b/upstream-doc/man4/xhtml/glIsTexture.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsTexture.xml rename to upstream-doc/man4/xhtml/glIsTexture.xml diff --git a/upstream-man-pages/man4/xhtml/glIsTransformFeedback.xml b/upstream-doc/man4/xhtml/glIsTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsTransformFeedback.xml rename to upstream-doc/man4/xhtml/glIsTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glIsVertexArray.xml b/upstream-doc/man4/xhtml/glIsVertexArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glIsVertexArray.xml rename to upstream-doc/man4/xhtml/glIsVertexArray.xml diff --git a/upstream-man-pages/man4/xhtml/glLineWidth.xml b/upstream-doc/man4/xhtml/glLineWidth.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glLineWidth.xml rename to upstream-doc/man4/xhtml/glLineWidth.xml diff --git a/upstream-man-pages/man4/xhtml/glLinkProgram.xml b/upstream-doc/man4/xhtml/glLinkProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glLinkProgram.xml rename to upstream-doc/man4/xhtml/glLinkProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glLogicOp.xml b/upstream-doc/man4/xhtml/glLogicOp.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glLogicOp.xml rename to upstream-doc/man4/xhtml/glLogicOp.xml diff --git a/upstream-man-pages/man4/xhtml/glMapBuffer.xml b/upstream-doc/man4/xhtml/glMapBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMapBuffer.xml rename to upstream-doc/man4/xhtml/glMapBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glMapBufferRange.xml b/upstream-doc/man4/xhtml/glMapBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMapBufferRange.xml rename to upstream-doc/man4/xhtml/glMapBufferRange.xml diff --git a/upstream-man-pages/man4/xhtml/glMemoryBarrier.xml b/upstream-doc/man4/xhtml/glMemoryBarrier.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMemoryBarrier.xml rename to upstream-doc/man4/xhtml/glMemoryBarrier.xml diff --git a/upstream-man-pages/man4/xhtml/glMinSampleShading.xml b/upstream-doc/man4/xhtml/glMinSampleShading.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMinSampleShading.xml rename to upstream-doc/man4/xhtml/glMinSampleShading.xml diff --git a/upstream-man-pages/man4/xhtml/glMultiDrawArrays.xml b/upstream-doc/man4/xhtml/glMultiDrawArrays.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMultiDrawArrays.xml rename to upstream-doc/man4/xhtml/glMultiDrawArrays.xml diff --git a/upstream-man-pages/man4/xhtml/glMultiDrawArraysIndirect.xml b/upstream-doc/man4/xhtml/glMultiDrawArraysIndirect.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMultiDrawArraysIndirect.xml rename to upstream-doc/man4/xhtml/glMultiDrawArraysIndirect.xml diff --git a/upstream-man-pages/man4/xhtml/glMultiDrawElements.xml b/upstream-doc/man4/xhtml/glMultiDrawElements.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMultiDrawElements.xml rename to upstream-doc/man4/xhtml/glMultiDrawElements.xml diff --git a/upstream-man-pages/man4/xhtml/glMultiDrawElementsBaseVertex.xml b/upstream-doc/man4/xhtml/glMultiDrawElementsBaseVertex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMultiDrawElementsBaseVertex.xml rename to upstream-doc/man4/xhtml/glMultiDrawElementsBaseVertex.xml diff --git a/upstream-man-pages/man4/xhtml/glMultiDrawElementsIndirect.xml b/upstream-doc/man4/xhtml/glMultiDrawElementsIndirect.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glMultiDrawElementsIndirect.xml rename to upstream-doc/man4/xhtml/glMultiDrawElementsIndirect.xml diff --git a/upstream-man-pages/man4/xhtml/glObjectLabel.xml b/upstream-doc/man4/xhtml/glObjectLabel.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glObjectLabel.xml rename to upstream-doc/man4/xhtml/glObjectLabel.xml diff --git a/upstream-man-pages/man4/xhtml/glObjectPtrLabel.xml b/upstream-doc/man4/xhtml/glObjectPtrLabel.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glObjectPtrLabel.xml rename to upstream-doc/man4/xhtml/glObjectPtrLabel.xml diff --git a/upstream-man-pages/man4/xhtml/glPatchParameter.xml b/upstream-doc/man4/xhtml/glPatchParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPatchParameter.xml rename to upstream-doc/man4/xhtml/glPatchParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glPauseTransformFeedback.xml b/upstream-doc/man4/xhtml/glPauseTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPauseTransformFeedback.xml rename to upstream-doc/man4/xhtml/glPauseTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glPixelStore.xml b/upstream-doc/man4/xhtml/glPixelStore.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPixelStore.xml rename to upstream-doc/man4/xhtml/glPixelStore.xml diff --git a/upstream-man-pages/man4/xhtml/glPointParameter.xml b/upstream-doc/man4/xhtml/glPointParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPointParameter.xml rename to upstream-doc/man4/xhtml/glPointParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glPointSize.xml b/upstream-doc/man4/xhtml/glPointSize.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPointSize.xml rename to upstream-doc/man4/xhtml/glPointSize.xml diff --git a/upstream-man-pages/man4/xhtml/glPolygonMode.xml b/upstream-doc/man4/xhtml/glPolygonMode.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPolygonMode.xml rename to upstream-doc/man4/xhtml/glPolygonMode.xml diff --git a/upstream-man-pages/man4/xhtml/glPolygonOffset.xml b/upstream-doc/man4/xhtml/glPolygonOffset.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPolygonOffset.xml rename to upstream-doc/man4/xhtml/glPolygonOffset.xml diff --git a/upstream-man-pages/man4/xhtml/glPopDebugGroup.xml b/upstream-doc/man4/xhtml/glPopDebugGroup.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPopDebugGroup.xml rename to upstream-doc/man4/xhtml/glPopDebugGroup.xml diff --git a/upstream-man-pages/man4/xhtml/glPrimitiveRestartIndex.xml b/upstream-doc/man4/xhtml/glPrimitiveRestartIndex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPrimitiveRestartIndex.xml rename to upstream-doc/man4/xhtml/glPrimitiveRestartIndex.xml diff --git a/upstream-man-pages/man4/xhtml/glProgramBinary.xml b/upstream-doc/man4/xhtml/glProgramBinary.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glProgramBinary.xml rename to upstream-doc/man4/xhtml/glProgramBinary.xml diff --git a/upstream-man-pages/man4/xhtml/glProgramParameter.xml b/upstream-doc/man4/xhtml/glProgramParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glProgramParameter.xml rename to upstream-doc/man4/xhtml/glProgramParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glProgramUniform.xml b/upstream-doc/man4/xhtml/glProgramUniform.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glProgramUniform.xml rename to upstream-doc/man4/xhtml/glProgramUniform.xml diff --git a/upstream-man-pages/man4/xhtml/glProvokingVertex.xml b/upstream-doc/man4/xhtml/glProvokingVertex.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glProvokingVertex.xml rename to upstream-doc/man4/xhtml/glProvokingVertex.xml diff --git a/upstream-man-pages/man4/xhtml/glPushDebugGroup.xml b/upstream-doc/man4/xhtml/glPushDebugGroup.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glPushDebugGroup.xml rename to upstream-doc/man4/xhtml/glPushDebugGroup.xml diff --git a/upstream-man-pages/man4/xhtml/glQueryCounter.xml b/upstream-doc/man4/xhtml/glQueryCounter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glQueryCounter.xml rename to upstream-doc/man4/xhtml/glQueryCounter.xml diff --git a/upstream-man-pages/man4/xhtml/glReadBuffer.xml b/upstream-doc/man4/xhtml/glReadBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glReadBuffer.xml rename to upstream-doc/man4/xhtml/glReadBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glReadPixels.xml b/upstream-doc/man4/xhtml/glReadPixels.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glReadPixels.xml rename to upstream-doc/man4/xhtml/glReadPixels.xml diff --git a/upstream-man-pages/man4/xhtml/glReleaseShaderCompiler.xml b/upstream-doc/man4/xhtml/glReleaseShaderCompiler.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glReleaseShaderCompiler.xml rename to upstream-doc/man4/xhtml/glReleaseShaderCompiler.xml diff --git a/upstream-man-pages/man4/xhtml/glRenderbufferStorage.xml b/upstream-doc/man4/xhtml/glRenderbufferStorage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glRenderbufferStorage.xml rename to upstream-doc/man4/xhtml/glRenderbufferStorage.xml diff --git a/upstream-man-pages/man4/xhtml/glRenderbufferStorageMultisample.xml b/upstream-doc/man4/xhtml/glRenderbufferStorageMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glRenderbufferStorageMultisample.xml rename to upstream-doc/man4/xhtml/glRenderbufferStorageMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glResumeTransformFeedback.xml b/upstream-doc/man4/xhtml/glResumeTransformFeedback.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glResumeTransformFeedback.xml rename to upstream-doc/man4/xhtml/glResumeTransformFeedback.xml diff --git a/upstream-man-pages/man4/xhtml/glSampleCoverage.xml b/upstream-doc/man4/xhtml/glSampleCoverage.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glSampleCoverage.xml rename to upstream-doc/man4/xhtml/glSampleCoverage.xml diff --git a/upstream-man-pages/man4/xhtml/glSampleMaski.xml b/upstream-doc/man4/xhtml/glSampleMaski.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glSampleMaski.xml rename to upstream-doc/man4/xhtml/glSampleMaski.xml diff --git a/upstream-man-pages/man4/xhtml/glSamplerParameter.xml b/upstream-doc/man4/xhtml/glSamplerParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glSamplerParameter.xml rename to upstream-doc/man4/xhtml/glSamplerParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glScissor.xml b/upstream-doc/man4/xhtml/glScissor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glScissor.xml rename to upstream-doc/man4/xhtml/glScissor.xml diff --git a/upstream-man-pages/man4/xhtml/glScissorArray.xml b/upstream-doc/man4/xhtml/glScissorArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glScissorArray.xml rename to upstream-doc/man4/xhtml/glScissorArray.xml diff --git a/upstream-man-pages/man4/xhtml/glScissorIndexed.xml b/upstream-doc/man4/xhtml/glScissorIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glScissorIndexed.xml rename to upstream-doc/man4/xhtml/glScissorIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glShaderBinary.xml b/upstream-doc/man4/xhtml/glShaderBinary.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glShaderBinary.xml rename to upstream-doc/man4/xhtml/glShaderBinary.xml diff --git a/upstream-man-pages/man4/xhtml/glShaderSource.xml b/upstream-doc/man4/xhtml/glShaderSource.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glShaderSource.xml rename to upstream-doc/man4/xhtml/glShaderSource.xml diff --git a/upstream-man-pages/man4/xhtml/glShaderStorageBlockBinding.xml b/upstream-doc/man4/xhtml/glShaderStorageBlockBinding.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glShaderStorageBlockBinding.xml rename to upstream-doc/man4/xhtml/glShaderStorageBlockBinding.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilFunc.xml b/upstream-doc/man4/xhtml/glStencilFunc.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilFunc.xml rename to upstream-doc/man4/xhtml/glStencilFunc.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilFuncSeparate.xml b/upstream-doc/man4/xhtml/glStencilFuncSeparate.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilFuncSeparate.xml rename to upstream-doc/man4/xhtml/glStencilFuncSeparate.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilMask.xml b/upstream-doc/man4/xhtml/glStencilMask.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilMask.xml rename to upstream-doc/man4/xhtml/glStencilMask.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilMaskSeparate.xml b/upstream-doc/man4/xhtml/glStencilMaskSeparate.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilMaskSeparate.xml rename to upstream-doc/man4/xhtml/glStencilMaskSeparate.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilOp.xml b/upstream-doc/man4/xhtml/glStencilOp.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilOp.xml rename to upstream-doc/man4/xhtml/glStencilOp.xml diff --git a/upstream-man-pages/man4/xhtml/glStencilOpSeparate.xml b/upstream-doc/man4/xhtml/glStencilOpSeparate.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glStencilOpSeparate.xml rename to upstream-doc/man4/xhtml/glStencilOpSeparate.xml diff --git a/upstream-man-pages/man4/xhtml/glTexBuffer.xml b/upstream-doc/man4/xhtml/glTexBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexBuffer.xml rename to upstream-doc/man4/xhtml/glTexBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glTexBufferRange.xml b/upstream-doc/man4/xhtml/glTexBufferRange.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexBufferRange.xml rename to upstream-doc/man4/xhtml/glTexBufferRange.xml diff --git a/upstream-man-pages/man4/xhtml/glTexImage1D.xml b/upstream-doc/man4/xhtml/glTexImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexImage1D.xml rename to upstream-doc/man4/xhtml/glTexImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexImage2D.xml b/upstream-doc/man4/xhtml/glTexImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexImage2D.xml rename to upstream-doc/man4/xhtml/glTexImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexImage2DMultisample.xml b/upstream-doc/man4/xhtml/glTexImage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexImage2DMultisample.xml rename to upstream-doc/man4/xhtml/glTexImage2DMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glTexImage3D.xml b/upstream-doc/man4/xhtml/glTexImage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexImage3D.xml rename to upstream-doc/man4/xhtml/glTexImage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexImage3DMultisample.xml b/upstream-doc/man4/xhtml/glTexImage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexImage3DMultisample.xml rename to upstream-doc/man4/xhtml/glTexImage3DMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glTexParameter.xml b/upstream-doc/man4/xhtml/glTexParameter.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexParameter.xml rename to upstream-doc/man4/xhtml/glTexParameter.xml diff --git a/upstream-man-pages/man4/xhtml/glTexStorage1D.xml b/upstream-doc/man4/xhtml/glTexStorage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexStorage1D.xml rename to upstream-doc/man4/xhtml/glTexStorage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexStorage2D.xml b/upstream-doc/man4/xhtml/glTexStorage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexStorage2D.xml rename to upstream-doc/man4/xhtml/glTexStorage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexStorage2DMultisample.xml b/upstream-doc/man4/xhtml/glTexStorage2DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexStorage2DMultisample.xml rename to upstream-doc/man4/xhtml/glTexStorage2DMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glTexStorage3D.xml b/upstream-doc/man4/xhtml/glTexStorage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexStorage3D.xml rename to upstream-doc/man4/xhtml/glTexStorage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexStorage3DMultisample.xml b/upstream-doc/man4/xhtml/glTexStorage3DMultisample.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexStorage3DMultisample.xml rename to upstream-doc/man4/xhtml/glTexStorage3DMultisample.xml diff --git a/upstream-man-pages/man4/xhtml/glTexSubImage1D.xml b/upstream-doc/man4/xhtml/glTexSubImage1D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexSubImage1D.xml rename to upstream-doc/man4/xhtml/glTexSubImage1D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexSubImage2D.xml b/upstream-doc/man4/xhtml/glTexSubImage2D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexSubImage2D.xml rename to upstream-doc/man4/xhtml/glTexSubImage2D.xml diff --git a/upstream-man-pages/man4/xhtml/glTexSubImage3D.xml b/upstream-doc/man4/xhtml/glTexSubImage3D.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTexSubImage3D.xml rename to upstream-doc/man4/xhtml/glTexSubImage3D.xml diff --git a/upstream-man-pages/man4/xhtml/glTextureView.xml b/upstream-doc/man4/xhtml/glTextureView.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTextureView.xml rename to upstream-doc/man4/xhtml/glTextureView.xml diff --git a/upstream-man-pages/man4/xhtml/glTransformFeedbackVaryings.xml b/upstream-doc/man4/xhtml/glTransformFeedbackVaryings.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glTransformFeedbackVaryings.xml rename to upstream-doc/man4/xhtml/glTransformFeedbackVaryings.xml diff --git a/upstream-man-pages/man4/xhtml/glUniform.xml b/upstream-doc/man4/xhtml/glUniform.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUniform.xml rename to upstream-doc/man4/xhtml/glUniform.xml diff --git a/upstream-man-pages/man4/xhtml/glUniformBlockBinding.xml b/upstream-doc/man4/xhtml/glUniformBlockBinding.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUniformBlockBinding.xml rename to upstream-doc/man4/xhtml/glUniformBlockBinding.xml diff --git a/upstream-man-pages/man4/xhtml/glUniformSubroutines.xml b/upstream-doc/man4/xhtml/glUniformSubroutines.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUniformSubroutines.xml rename to upstream-doc/man4/xhtml/glUniformSubroutines.xml diff --git a/upstream-man-pages/man4/xhtml/glUnmapBuffer.xml b/upstream-doc/man4/xhtml/glUnmapBuffer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUnmapBuffer.xml rename to upstream-doc/man4/xhtml/glUnmapBuffer.xml diff --git a/upstream-man-pages/man4/xhtml/glUseProgram.xml b/upstream-doc/man4/xhtml/glUseProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUseProgram.xml rename to upstream-doc/man4/xhtml/glUseProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glUseProgramStages.xml b/upstream-doc/man4/xhtml/glUseProgramStages.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glUseProgramStages.xml rename to upstream-doc/man4/xhtml/glUseProgramStages.xml diff --git a/upstream-man-pages/man4/xhtml/glValidateProgram.xml b/upstream-doc/man4/xhtml/glValidateProgram.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glValidateProgram.xml rename to upstream-doc/man4/xhtml/glValidateProgram.xml diff --git a/upstream-man-pages/man4/xhtml/glValidateProgramPipeline.xml b/upstream-doc/man4/xhtml/glValidateProgramPipeline.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glValidateProgramPipeline.xml rename to upstream-doc/man4/xhtml/glValidateProgramPipeline.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexAttrib.xml b/upstream-doc/man4/xhtml/glVertexAttrib.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexAttrib.xml rename to upstream-doc/man4/xhtml/glVertexAttrib.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexAttribBinding.xml b/upstream-doc/man4/xhtml/glVertexAttribBinding.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexAttribBinding.xml rename to upstream-doc/man4/xhtml/glVertexAttribBinding.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexAttribDivisor.xml b/upstream-doc/man4/xhtml/glVertexAttribDivisor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexAttribDivisor.xml rename to upstream-doc/man4/xhtml/glVertexAttribDivisor.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexAttribFormat.xml b/upstream-doc/man4/xhtml/glVertexAttribFormat.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexAttribFormat.xml rename to upstream-doc/man4/xhtml/glVertexAttribFormat.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexAttribPointer.xml b/upstream-doc/man4/xhtml/glVertexAttribPointer.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexAttribPointer.xml rename to upstream-doc/man4/xhtml/glVertexAttribPointer.xml diff --git a/upstream-man-pages/man4/xhtml/glVertexBindingDivisor.xml b/upstream-doc/man4/xhtml/glVertexBindingDivisor.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glVertexBindingDivisor.xml rename to upstream-doc/man4/xhtml/glVertexBindingDivisor.xml diff --git a/upstream-man-pages/man4/xhtml/glViewport.xml b/upstream-doc/man4/xhtml/glViewport.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glViewport.xml rename to upstream-doc/man4/xhtml/glViewport.xml diff --git a/upstream-man-pages/man4/xhtml/glViewportArray.xml b/upstream-doc/man4/xhtml/glViewportArray.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glViewportArray.xml rename to upstream-doc/man4/xhtml/glViewportArray.xml diff --git a/upstream-man-pages/man4/xhtml/glViewportIndexed.xml b/upstream-doc/man4/xhtml/glViewportIndexed.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glViewportIndexed.xml rename to upstream-doc/man4/xhtml/glViewportIndexed.xml diff --git a/upstream-man-pages/man4/xhtml/glWaitSync.xml b/upstream-doc/man4/xhtml/glWaitSync.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/glWaitSync.xml rename to upstream-doc/man4/xhtml/glWaitSync.xml diff --git a/upstream-man-pages/man4/xhtml/index.html b/upstream-doc/man4/xhtml/index.html similarity index 100% rename from upstream-man-pages/man4/xhtml/index.html rename to upstream-doc/man4/xhtml/index.html diff --git a/upstream-man-pages/man4/xhtml/makeindex.pl b/upstream-doc/man4/xhtml/makeindex.pl similarity index 100% rename from upstream-man-pages/man4/xhtml/makeindex.pl rename to upstream-doc/man4/xhtml/makeindex.pl diff --git a/upstream-man-pages/man4/xhtml/mathml.xsl b/upstream-doc/man4/xhtml/mathml.xsl similarity index 100% rename from upstream-man-pages/man4/xhtml/mathml.xsl rename to upstream-doc/man4/xhtml/mathml.xsl diff --git a/upstream-man-pages/man4/xhtml/opengl-man.css b/upstream-doc/man4/xhtml/opengl-man.css similarity index 100% rename from upstream-man-pages/man4/xhtml/opengl-man.css rename to upstream-doc/man4/xhtml/opengl-man.css diff --git a/upstream-man-pages/man4/xhtml/opengl-man.xsl b/upstream-doc/man4/xhtml/opengl-man.xsl similarity index 100% rename from upstream-man-pages/man4/xhtml/opengl-man.xsl rename to upstream-doc/man4/xhtml/opengl-man.xsl diff --git a/upstream-man-pages/man4/xhtml/pmathml.xsl b/upstream-doc/man4/xhtml/pmathml.xsl similarity index 100% rename from upstream-man-pages/man4/xhtml/pmathml.xsl rename to upstream-doc/man4/xhtml/pmathml.xsl diff --git a/upstream-man-pages/man4/xhtml/pmathmlcss.xsl b/upstream-doc/man4/xhtml/pmathmlcss.xsl similarity index 100% rename from upstream-man-pages/man4/xhtml/pmathmlcss.xsl rename to upstream-doc/man4/xhtml/pmathmlcss.xsl diff --git a/upstream-man-pages/man4/xhtml/preproc.sed b/upstream-doc/man4/xhtml/preproc.sed similarity index 100% rename from upstream-man-pages/man4/xhtml/preproc.sed rename to upstream-doc/man4/xhtml/preproc.sed diff --git a/upstream-man-pages/man4/xhtml/removedTypes.xml b/upstream-doc/man4/xhtml/removedTypes.xml similarity index 100% rename from upstream-man-pages/man4/xhtml/removedTypes.xml rename to upstream-doc/man4/xhtml/removedTypes.xml diff --git a/upstream-man-pages/man4/xhtml/start.html b/upstream-doc/man4/xhtml/start.html similarity index 100% rename from upstream-man-pages/man4/xhtml/start.html rename to upstream-doc/man4/xhtml/start.html diff --git a/upstream-man-pages/man4/xhtml/xhtml-lat1.ent b/upstream-doc/man4/xhtml/xhtml-lat1.ent similarity index 100% rename from upstream-man-pages/man4/xhtml/xhtml-lat1.ent rename to upstream-doc/man4/xhtml/xhtml-lat1.ent diff --git a/upstream-man-pages/man4/xhtml/xhtml-special.ent b/upstream-doc/man4/xhtml/xhtml-special.ent similarity index 100% rename from upstream-man-pages/man4/xhtml/xhtml-special.ent rename to upstream-doc/man4/xhtml/xhtml-special.ent diff --git a/upstream-man-pages/man4/xhtml/xhtml-symbol.ent b/upstream-doc/man4/xhtml/xhtml-symbol.ent similarity index 100% rename from upstream-man-pages/man4/xhtml/xhtml-symbol.ent rename to upstream-doc/man4/xhtml/xhtml-symbol.ent diff --git a/upstream-man-pages/man4/xhtml/xhtml1-transitional.dtd b/upstream-doc/man4/xhtml/xhtml1-transitional.dtd similarity index 100% rename from upstream-man-pages/man4/xhtml/xhtml1-transitional.dtd rename to upstream-doc/man4/xhtml/xhtml1-transitional.dtd diff --git a/upstream-man-pages/manglsl/EmitStreamVertex.xml b/upstream-doc/manglsl/EmitStreamVertex.xml similarity index 100% rename from upstream-man-pages/manglsl/EmitStreamVertex.xml rename to upstream-doc/manglsl/EmitStreamVertex.xml diff --git a/upstream-man-pages/manglsl/EmitVertex.xml b/upstream-doc/manglsl/EmitVertex.xml similarity index 100% rename from upstream-man-pages/manglsl/EmitVertex.xml rename to upstream-doc/manglsl/EmitVertex.xml diff --git a/upstream-man-pages/manglsl/EndPrimitive.xml b/upstream-doc/manglsl/EndPrimitive.xml similarity index 100% rename from upstream-man-pages/manglsl/EndPrimitive.xml rename to upstream-doc/manglsl/EndPrimitive.xml diff --git a/upstream-man-pages/manglsl/EndStreamPrimitive.xml b/upstream-doc/manglsl/EndStreamPrimitive.xml similarity index 100% rename from upstream-man-pages/manglsl/EndStreamPrimitive.xml rename to upstream-doc/manglsl/EndStreamPrimitive.xml diff --git a/upstream-man-pages/manglsl/Makefile b/upstream-doc/manglsl/Makefile similarity index 100% rename from upstream-man-pages/manglsl/Makefile rename to upstream-doc/manglsl/Makefile diff --git a/upstream-man-pages/manglsl/abs.xml b/upstream-doc/manglsl/abs.xml similarity index 100% rename from upstream-man-pages/manglsl/abs.xml rename to upstream-doc/manglsl/abs.xml diff --git a/upstream-man-pages/manglsl/acos.xml b/upstream-doc/manglsl/acos.xml similarity index 100% rename from upstream-man-pages/manglsl/acos.xml rename to upstream-doc/manglsl/acos.xml diff --git a/upstream-man-pages/manglsl/acosh.xml b/upstream-doc/manglsl/acosh.xml similarity index 100% rename from upstream-man-pages/manglsl/acosh.xml rename to upstream-doc/manglsl/acosh.xml diff --git a/upstream-man-pages/manglsl/all.xml b/upstream-doc/manglsl/all.xml similarity index 100% rename from upstream-man-pages/manglsl/all.xml rename to upstream-doc/manglsl/all.xml diff --git a/upstream-man-pages/manglsl/any.xml b/upstream-doc/manglsl/any.xml similarity index 100% rename from upstream-man-pages/manglsl/any.xml rename to upstream-doc/manglsl/any.xml diff --git a/upstream-man-pages/manglsl/asin.xml b/upstream-doc/manglsl/asin.xml similarity index 100% rename from upstream-man-pages/manglsl/asin.xml rename to upstream-doc/manglsl/asin.xml diff --git a/upstream-man-pages/manglsl/asinh.xml b/upstream-doc/manglsl/asinh.xml similarity index 100% rename from upstream-man-pages/manglsl/asinh.xml rename to upstream-doc/manglsl/asinh.xml diff --git a/upstream-man-pages/manglsl/atan.xml b/upstream-doc/manglsl/atan.xml similarity index 100% rename from upstream-man-pages/manglsl/atan.xml rename to upstream-doc/manglsl/atan.xml diff --git a/upstream-man-pages/manglsl/atanh.xml b/upstream-doc/manglsl/atanh.xml similarity index 100% rename from upstream-man-pages/manglsl/atanh.xml rename to upstream-doc/manglsl/atanh.xml diff --git a/upstream-man-pages/manglsl/atomicAdd.xml b/upstream-doc/manglsl/atomicAdd.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicAdd.xml rename to upstream-doc/manglsl/atomicAdd.xml diff --git a/upstream-man-pages/manglsl/atomicAnd.xml b/upstream-doc/manglsl/atomicAnd.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicAnd.xml rename to upstream-doc/manglsl/atomicAnd.xml diff --git a/upstream-man-pages/manglsl/atomicCompSwap.xml b/upstream-doc/manglsl/atomicCompSwap.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicCompSwap.xml rename to upstream-doc/manglsl/atomicCompSwap.xml diff --git a/upstream-man-pages/manglsl/atomicCounter.xml b/upstream-doc/manglsl/atomicCounter.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicCounter.xml rename to upstream-doc/manglsl/atomicCounter.xml diff --git a/upstream-man-pages/manglsl/atomicCounterDecrement.xml b/upstream-doc/manglsl/atomicCounterDecrement.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicCounterDecrement.xml rename to upstream-doc/manglsl/atomicCounterDecrement.xml diff --git a/upstream-man-pages/manglsl/atomicCounterIncrement.xml b/upstream-doc/manglsl/atomicCounterIncrement.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicCounterIncrement.xml rename to upstream-doc/manglsl/atomicCounterIncrement.xml diff --git a/upstream-man-pages/manglsl/atomicExchange.xml b/upstream-doc/manglsl/atomicExchange.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicExchange.xml rename to upstream-doc/manglsl/atomicExchange.xml diff --git a/upstream-man-pages/manglsl/atomicMax.xml b/upstream-doc/manglsl/atomicMax.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicMax.xml rename to upstream-doc/manglsl/atomicMax.xml diff --git a/upstream-man-pages/manglsl/atomicMin.xml b/upstream-doc/manglsl/atomicMin.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicMin.xml rename to upstream-doc/manglsl/atomicMin.xml diff --git a/upstream-man-pages/manglsl/atomicOr.xml b/upstream-doc/manglsl/atomicOr.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicOr.xml rename to upstream-doc/manglsl/atomicOr.xml diff --git a/upstream-man-pages/manglsl/atomicXor.xml b/upstream-doc/manglsl/atomicXor.xml similarity index 100% rename from upstream-man-pages/manglsl/atomicXor.xml rename to upstream-doc/manglsl/atomicXor.xml diff --git a/upstream-man-pages/manglsl/barrier.xml b/upstream-doc/manglsl/barrier.xml similarity index 100% rename from upstream-man-pages/manglsl/barrier.xml rename to upstream-doc/manglsl/barrier.xml diff --git a/upstream-man-pages/manglsl/bitCount.xml b/upstream-doc/manglsl/bitCount.xml similarity index 100% rename from upstream-man-pages/manglsl/bitCount.xml rename to upstream-doc/manglsl/bitCount.xml diff --git a/upstream-man-pages/manglsl/bitfieldExtract.xml b/upstream-doc/manglsl/bitfieldExtract.xml similarity index 100% rename from upstream-man-pages/manglsl/bitfieldExtract.xml rename to upstream-doc/manglsl/bitfieldExtract.xml diff --git a/upstream-man-pages/manglsl/bitfieldInsert.xml b/upstream-doc/manglsl/bitfieldInsert.xml similarity index 100% rename from upstream-man-pages/manglsl/bitfieldInsert.xml rename to upstream-doc/manglsl/bitfieldInsert.xml diff --git a/upstream-man-pages/manglsl/bitfieldReverse.xml b/upstream-doc/manglsl/bitfieldReverse.xml similarity index 100% rename from upstream-man-pages/manglsl/bitfieldReverse.xml rename to upstream-doc/manglsl/bitfieldReverse.xml diff --git a/upstream-man-pages/manglsl/bottom.php b/upstream-doc/manglsl/bottom.php similarity index 100% rename from upstream-man-pages/manglsl/bottom.php rename to upstream-doc/manglsl/bottom.php diff --git a/upstream-man-pages/manglsl/ceil.xml b/upstream-doc/manglsl/ceil.xml similarity index 100% rename from upstream-man-pages/manglsl/ceil.xml rename to upstream-doc/manglsl/ceil.xml diff --git a/upstream-man-pages/manglsl/clamp.xml b/upstream-doc/manglsl/clamp.xml similarity index 100% rename from upstream-man-pages/manglsl/clamp.xml rename to upstream-doc/manglsl/clamp.xml diff --git a/upstream-man-pages/manglsl/cos.xml b/upstream-doc/manglsl/cos.xml similarity index 100% rename from upstream-man-pages/manglsl/cos.xml rename to upstream-doc/manglsl/cos.xml diff --git a/upstream-man-pages/manglsl/cosh.xml b/upstream-doc/manglsl/cosh.xml similarity index 100% rename from upstream-man-pages/manglsl/cosh.xml rename to upstream-doc/manglsl/cosh.xml diff --git a/upstream-man-pages/manglsl/cross.xml b/upstream-doc/manglsl/cross.xml similarity index 100% rename from upstream-man-pages/manglsl/cross.xml rename to upstream-doc/manglsl/cross.xml diff --git a/upstream-man-pages/manglsl/dFdx.xml b/upstream-doc/manglsl/dFdx.xml similarity index 100% rename from upstream-man-pages/manglsl/dFdx.xml rename to upstream-doc/manglsl/dFdx.xml diff --git a/upstream-man-pages/manglsl/degrees.xml b/upstream-doc/manglsl/degrees.xml similarity index 100% rename from upstream-man-pages/manglsl/degrees.xml rename to upstream-doc/manglsl/degrees.xml diff --git a/upstream-man-pages/manglsl/determinant.xml b/upstream-doc/manglsl/determinant.xml similarity index 100% rename from upstream-man-pages/manglsl/determinant.xml rename to upstream-doc/manglsl/determinant.xml diff --git a/upstream-man-pages/manglsl/distance.xml b/upstream-doc/manglsl/distance.xml similarity index 100% rename from upstream-man-pages/manglsl/distance.xml rename to upstream-doc/manglsl/distance.xml diff --git a/upstream-man-pages/manglsl/dot.xml b/upstream-doc/manglsl/dot.xml similarity index 100% rename from upstream-man-pages/manglsl/dot.xml rename to upstream-doc/manglsl/dot.xml diff --git a/upstream-man-pages/manglsl/equal.xml b/upstream-doc/manglsl/equal.xml similarity index 100% rename from upstream-man-pages/manglsl/equal.xml rename to upstream-doc/manglsl/equal.xml diff --git a/upstream-man-pages/manglsl/exp.xml b/upstream-doc/manglsl/exp.xml similarity index 100% rename from upstream-man-pages/manglsl/exp.xml rename to upstream-doc/manglsl/exp.xml diff --git a/upstream-man-pages/manglsl/exp2.xml b/upstream-doc/manglsl/exp2.xml similarity index 100% rename from upstream-man-pages/manglsl/exp2.xml rename to upstream-doc/manglsl/exp2.xml diff --git a/upstream-man-pages/manglsl/faceforward.xml b/upstream-doc/manglsl/faceforward.xml similarity index 100% rename from upstream-man-pages/manglsl/faceforward.xml rename to upstream-doc/manglsl/faceforward.xml diff --git a/upstream-man-pages/manglsl/findLSB.xml b/upstream-doc/manglsl/findLSB.xml similarity index 100% rename from upstream-man-pages/manglsl/findLSB.xml rename to upstream-doc/manglsl/findLSB.xml diff --git a/upstream-man-pages/manglsl/findMSB.xml b/upstream-doc/manglsl/findMSB.xml similarity index 100% rename from upstream-man-pages/manglsl/findMSB.xml rename to upstream-doc/manglsl/findMSB.xml diff --git a/upstream-man-pages/manglsl/floatBitsToInt.xml b/upstream-doc/manglsl/floatBitsToInt.xml similarity index 100% rename from upstream-man-pages/manglsl/floatBitsToInt.xml rename to upstream-doc/manglsl/floatBitsToInt.xml diff --git a/upstream-man-pages/manglsl/floor.xml b/upstream-doc/manglsl/floor.xml similarity index 100% rename from upstream-man-pages/manglsl/floor.xml rename to upstream-doc/manglsl/floor.xml diff --git a/upstream-man-pages/manglsl/fma.xml b/upstream-doc/manglsl/fma.xml similarity index 100% rename from upstream-man-pages/manglsl/fma.xml rename to upstream-doc/manglsl/fma.xml diff --git a/upstream-man-pages/manglsl/fract.xml b/upstream-doc/manglsl/fract.xml similarity index 100% rename from upstream-man-pages/manglsl/fract.xml rename to upstream-doc/manglsl/fract.xml diff --git a/upstream-man-pages/manglsl/frexp.xml b/upstream-doc/manglsl/frexp.xml similarity index 100% rename from upstream-man-pages/manglsl/frexp.xml rename to upstream-doc/manglsl/frexp.xml diff --git a/upstream-man-pages/manglsl/fwidth.xml b/upstream-doc/manglsl/fwidth.xml similarity index 100% rename from upstream-man-pages/manglsl/fwidth.xml rename to upstream-doc/manglsl/fwidth.xml diff --git a/upstream-man-pages/manglsl/gl_ClipDistance.xml b/upstream-doc/manglsl/gl_ClipDistance.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_ClipDistance.xml rename to upstream-doc/manglsl/gl_ClipDistance.xml diff --git a/upstream-man-pages/manglsl/gl_FragCoord.xml b/upstream-doc/manglsl/gl_FragCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_FragCoord.xml rename to upstream-doc/manglsl/gl_FragCoord.xml diff --git a/upstream-man-pages/manglsl/gl_FragDepth.xml b/upstream-doc/manglsl/gl_FragDepth.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_FragDepth.xml rename to upstream-doc/manglsl/gl_FragDepth.xml diff --git a/upstream-man-pages/manglsl/gl_FrontFacing.xml b/upstream-doc/manglsl/gl_FrontFacing.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_FrontFacing.xml rename to upstream-doc/manglsl/gl_FrontFacing.xml diff --git a/upstream-man-pages/manglsl/gl_GlobalInvocationID.xml b/upstream-doc/manglsl/gl_GlobalInvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_GlobalInvocationID.xml rename to upstream-doc/manglsl/gl_GlobalInvocationID.xml diff --git a/upstream-man-pages/manglsl/gl_InstanceID.xml b/upstream-doc/manglsl/gl_InstanceID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_InstanceID.xml rename to upstream-doc/manglsl/gl_InstanceID.xml diff --git a/upstream-man-pages/manglsl/gl_InvocationID.xml b/upstream-doc/manglsl/gl_InvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_InvocationID.xml rename to upstream-doc/manglsl/gl_InvocationID.xml diff --git a/upstream-man-pages/manglsl/gl_Layer.xml b/upstream-doc/manglsl/gl_Layer.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_Layer.xml rename to upstream-doc/manglsl/gl_Layer.xml diff --git a/upstream-man-pages/manglsl/gl_LocalInvocationID.xml b/upstream-doc/manglsl/gl_LocalInvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_LocalInvocationID.xml rename to upstream-doc/manglsl/gl_LocalInvocationID.xml diff --git a/upstream-man-pages/manglsl/gl_LocalInvocationIndex.xml b/upstream-doc/manglsl/gl_LocalInvocationIndex.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_LocalInvocationIndex.xml rename to upstream-doc/manglsl/gl_LocalInvocationIndex.xml diff --git a/upstream-man-pages/manglsl/gl_NumSamples.xml b/upstream-doc/manglsl/gl_NumSamples.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_NumSamples.xml rename to upstream-doc/manglsl/gl_NumSamples.xml diff --git a/upstream-man-pages/manglsl/gl_NumWorkGroups.xml b/upstream-doc/manglsl/gl_NumWorkGroups.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_NumWorkGroups.xml rename to upstream-doc/manglsl/gl_NumWorkGroups.xml diff --git a/upstream-man-pages/manglsl/gl_PatchVerticesIn.xml b/upstream-doc/manglsl/gl_PatchVerticesIn.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_PatchVerticesIn.xml rename to upstream-doc/manglsl/gl_PatchVerticesIn.xml diff --git a/upstream-man-pages/manglsl/gl_PointCoord.xml b/upstream-doc/manglsl/gl_PointCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_PointCoord.xml rename to upstream-doc/manglsl/gl_PointCoord.xml diff --git a/upstream-man-pages/manglsl/gl_PointSize.xml b/upstream-doc/manglsl/gl_PointSize.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_PointSize.xml rename to upstream-doc/manglsl/gl_PointSize.xml diff --git a/upstream-man-pages/manglsl/gl_Position.xml b/upstream-doc/manglsl/gl_Position.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_Position.xml rename to upstream-doc/manglsl/gl_Position.xml diff --git a/upstream-man-pages/manglsl/gl_PrimitiveID.xml b/upstream-doc/manglsl/gl_PrimitiveID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_PrimitiveID.xml rename to upstream-doc/manglsl/gl_PrimitiveID.xml diff --git a/upstream-man-pages/manglsl/gl_PrimitiveIDIn.xml b/upstream-doc/manglsl/gl_PrimitiveIDIn.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_PrimitiveIDIn.xml rename to upstream-doc/manglsl/gl_PrimitiveIDIn.xml diff --git a/upstream-man-pages/manglsl/gl_SampleID.xml b/upstream-doc/manglsl/gl_SampleID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_SampleID.xml rename to upstream-doc/manglsl/gl_SampleID.xml diff --git a/upstream-man-pages/manglsl/gl_SampleMask.xml b/upstream-doc/manglsl/gl_SampleMask.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_SampleMask.xml rename to upstream-doc/manglsl/gl_SampleMask.xml diff --git a/upstream-man-pages/manglsl/gl_SampleMaskIn.xml b/upstream-doc/manglsl/gl_SampleMaskIn.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_SampleMaskIn.xml rename to upstream-doc/manglsl/gl_SampleMaskIn.xml diff --git a/upstream-man-pages/manglsl/gl_SamplePosition.xml b/upstream-doc/manglsl/gl_SamplePosition.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_SamplePosition.xml rename to upstream-doc/manglsl/gl_SamplePosition.xml diff --git a/upstream-man-pages/manglsl/gl_TessCoord.xml b/upstream-doc/manglsl/gl_TessCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_TessCoord.xml rename to upstream-doc/manglsl/gl_TessCoord.xml diff --git a/upstream-man-pages/manglsl/gl_TessLevelInner.xml b/upstream-doc/manglsl/gl_TessLevelInner.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_TessLevelInner.xml rename to upstream-doc/manglsl/gl_TessLevelInner.xml diff --git a/upstream-man-pages/manglsl/gl_TessLevelOuter.xml b/upstream-doc/manglsl/gl_TessLevelOuter.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_TessLevelOuter.xml rename to upstream-doc/manglsl/gl_TessLevelOuter.xml diff --git a/upstream-man-pages/manglsl/gl_VertexID.xml b/upstream-doc/manglsl/gl_VertexID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_VertexID.xml rename to upstream-doc/manglsl/gl_VertexID.xml diff --git a/upstream-man-pages/manglsl/gl_ViewportIndex.xml b/upstream-doc/manglsl/gl_ViewportIndex.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_ViewportIndex.xml rename to upstream-doc/manglsl/gl_ViewportIndex.xml diff --git a/upstream-man-pages/manglsl/gl_WorkGroupID.xml b/upstream-doc/manglsl/gl_WorkGroupID.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_WorkGroupID.xml rename to upstream-doc/manglsl/gl_WorkGroupID.xml diff --git a/upstream-man-pages/manglsl/gl_WorkGroupSize.xml b/upstream-doc/manglsl/gl_WorkGroupSize.xml similarity index 100% rename from upstream-man-pages/manglsl/gl_WorkGroupSize.xml rename to upstream-doc/manglsl/gl_WorkGroupSize.xml diff --git a/upstream-man-pages/manglsl/greaterThan.xml b/upstream-doc/manglsl/greaterThan.xml similarity index 100% rename from upstream-man-pages/manglsl/greaterThan.xml rename to upstream-doc/manglsl/greaterThan.xml diff --git a/upstream-man-pages/manglsl/greaterThanEqual.xml b/upstream-doc/manglsl/greaterThanEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/greaterThanEqual.xml rename to upstream-doc/manglsl/greaterThanEqual.xml diff --git a/upstream-man-pages/manglsl/groupMemoryBarrier.xml b/upstream-doc/manglsl/groupMemoryBarrier.xml similarity index 100% rename from upstream-man-pages/manglsl/groupMemoryBarrier.xml rename to upstream-doc/manglsl/groupMemoryBarrier.xml diff --git a/upstream-man-pages/manglsl/imageAtomicAdd.xml b/upstream-doc/manglsl/imageAtomicAdd.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicAdd.xml rename to upstream-doc/manglsl/imageAtomicAdd.xml diff --git a/upstream-man-pages/manglsl/imageAtomicAnd.xml b/upstream-doc/manglsl/imageAtomicAnd.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicAnd.xml rename to upstream-doc/manglsl/imageAtomicAnd.xml diff --git a/upstream-man-pages/manglsl/imageAtomicCompSwap.xml b/upstream-doc/manglsl/imageAtomicCompSwap.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicCompSwap.xml rename to upstream-doc/manglsl/imageAtomicCompSwap.xml diff --git a/upstream-man-pages/manglsl/imageAtomicExchange.xml b/upstream-doc/manglsl/imageAtomicExchange.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicExchange.xml rename to upstream-doc/manglsl/imageAtomicExchange.xml diff --git a/upstream-man-pages/manglsl/imageAtomicMax.xml b/upstream-doc/manglsl/imageAtomicMax.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicMax.xml rename to upstream-doc/manglsl/imageAtomicMax.xml diff --git a/upstream-man-pages/manglsl/imageAtomicMin.xml b/upstream-doc/manglsl/imageAtomicMin.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicMin.xml rename to upstream-doc/manglsl/imageAtomicMin.xml diff --git a/upstream-man-pages/manglsl/imageAtomicOr.xml b/upstream-doc/manglsl/imageAtomicOr.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicOr.xml rename to upstream-doc/manglsl/imageAtomicOr.xml diff --git a/upstream-man-pages/manglsl/imageAtomicXor.xml b/upstream-doc/manglsl/imageAtomicXor.xml similarity index 100% rename from upstream-man-pages/manglsl/imageAtomicXor.xml rename to upstream-doc/manglsl/imageAtomicXor.xml diff --git a/upstream-man-pages/manglsl/imageLoad.xml b/upstream-doc/manglsl/imageLoad.xml similarity index 100% rename from upstream-man-pages/manglsl/imageLoad.xml rename to upstream-doc/manglsl/imageLoad.xml diff --git a/upstream-man-pages/manglsl/imageSize.xml b/upstream-doc/manglsl/imageSize.xml similarity index 100% rename from upstream-man-pages/manglsl/imageSize.xml rename to upstream-doc/manglsl/imageSize.xml diff --git a/upstream-man-pages/manglsl/imageStore.xml b/upstream-doc/manglsl/imageStore.xml similarity index 100% rename from upstream-man-pages/manglsl/imageStore.xml rename to upstream-doc/manglsl/imageStore.xml diff --git a/upstream-man-pages/manglsl/index.php b/upstream-doc/manglsl/index.php similarity index 100% rename from upstream-man-pages/manglsl/index.php rename to upstream-doc/manglsl/index.php diff --git a/upstream-man-pages/manglsl/intBitsToFloat.xml b/upstream-doc/manglsl/intBitsToFloat.xml similarity index 100% rename from upstream-man-pages/manglsl/intBitsToFloat.xml rename to upstream-doc/manglsl/intBitsToFloat.xml diff --git a/upstream-man-pages/manglsl/interpolateAtCentroid.xml b/upstream-doc/manglsl/interpolateAtCentroid.xml similarity index 100% rename from upstream-man-pages/manglsl/interpolateAtCentroid.xml rename to upstream-doc/manglsl/interpolateAtCentroid.xml diff --git a/upstream-man-pages/manglsl/interpolateAtOffset.xml b/upstream-doc/manglsl/interpolateAtOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/interpolateAtOffset.xml rename to upstream-doc/manglsl/interpolateAtOffset.xml diff --git a/upstream-man-pages/manglsl/interpolateAtSample.xml b/upstream-doc/manglsl/interpolateAtSample.xml similarity index 100% rename from upstream-man-pages/manglsl/interpolateAtSample.xml rename to upstream-doc/manglsl/interpolateAtSample.xml diff --git a/upstream-man-pages/manglsl/inverse.xml b/upstream-doc/manglsl/inverse.xml similarity index 100% rename from upstream-man-pages/manglsl/inverse.xml rename to upstream-doc/manglsl/inverse.xml diff --git a/upstream-man-pages/manglsl/inversesqrt.xml b/upstream-doc/manglsl/inversesqrt.xml similarity index 100% rename from upstream-man-pages/manglsl/inversesqrt.xml rename to upstream-doc/manglsl/inversesqrt.xml diff --git a/upstream-man-pages/manglsl/isinf.xml b/upstream-doc/manglsl/isinf.xml similarity index 100% rename from upstream-man-pages/manglsl/isinf.xml rename to upstream-doc/manglsl/isinf.xml diff --git a/upstream-man-pages/manglsl/isnan.xml b/upstream-doc/manglsl/isnan.xml similarity index 100% rename from upstream-man-pages/manglsl/isnan.xml rename to upstream-doc/manglsl/isnan.xml diff --git a/upstream-man-pages/manglsl/ldexp.xml b/upstream-doc/manglsl/ldexp.xml similarity index 100% rename from upstream-man-pages/manglsl/ldexp.xml rename to upstream-doc/manglsl/ldexp.xml diff --git a/upstream-man-pages/manglsl/length.xml b/upstream-doc/manglsl/length.xml similarity index 100% rename from upstream-man-pages/manglsl/length.xml rename to upstream-doc/manglsl/length.xml diff --git a/upstream-man-pages/manglsl/lessThan.xml b/upstream-doc/manglsl/lessThan.xml similarity index 100% rename from upstream-man-pages/manglsl/lessThan.xml rename to upstream-doc/manglsl/lessThan.xml diff --git a/upstream-man-pages/manglsl/lessThanEqual.xml b/upstream-doc/manglsl/lessThanEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/lessThanEqual.xml rename to upstream-doc/manglsl/lessThanEqual.xml diff --git a/upstream-man-pages/manglsl/log.xml b/upstream-doc/manglsl/log.xml similarity index 100% rename from upstream-man-pages/manglsl/log.xml rename to upstream-doc/manglsl/log.xml diff --git a/upstream-man-pages/manglsl/log2.xml b/upstream-doc/manglsl/log2.xml similarity index 100% rename from upstream-man-pages/manglsl/log2.xml rename to upstream-doc/manglsl/log2.xml diff --git a/upstream-man-pages/manglsl/matrixCompMult.xml b/upstream-doc/manglsl/matrixCompMult.xml similarity index 100% rename from upstream-man-pages/manglsl/matrixCompMult.xml rename to upstream-doc/manglsl/matrixCompMult.xml diff --git a/upstream-man-pages/manglsl/max.xml b/upstream-doc/manglsl/max.xml similarity index 100% rename from upstream-man-pages/manglsl/max.xml rename to upstream-doc/manglsl/max.xml diff --git a/upstream-man-pages/manglsl/memoryBarrier.xml b/upstream-doc/manglsl/memoryBarrier.xml similarity index 100% rename from upstream-man-pages/manglsl/memoryBarrier.xml rename to upstream-doc/manglsl/memoryBarrier.xml diff --git a/upstream-man-pages/manglsl/memoryBarrierAtomicCounter.xml b/upstream-doc/manglsl/memoryBarrierAtomicCounter.xml similarity index 100% rename from upstream-man-pages/manglsl/memoryBarrierAtomicCounter.xml rename to upstream-doc/manglsl/memoryBarrierAtomicCounter.xml diff --git a/upstream-man-pages/manglsl/memoryBarrierBuffer.xml b/upstream-doc/manglsl/memoryBarrierBuffer.xml similarity index 100% rename from upstream-man-pages/manglsl/memoryBarrierBuffer.xml rename to upstream-doc/manglsl/memoryBarrierBuffer.xml diff --git a/upstream-man-pages/manglsl/memoryBarrierImage.xml b/upstream-doc/manglsl/memoryBarrierImage.xml similarity index 100% rename from upstream-man-pages/manglsl/memoryBarrierImage.xml rename to upstream-doc/manglsl/memoryBarrierImage.xml diff --git a/upstream-man-pages/manglsl/memoryBarrierShared.xml b/upstream-doc/manglsl/memoryBarrierShared.xml similarity index 100% rename from upstream-man-pages/manglsl/memoryBarrierShared.xml rename to upstream-doc/manglsl/memoryBarrierShared.xml diff --git a/upstream-man-pages/manglsl/min.xml b/upstream-doc/manglsl/min.xml similarity index 100% rename from upstream-man-pages/manglsl/min.xml rename to upstream-doc/manglsl/min.xml diff --git a/upstream-man-pages/manglsl/mix.xml b/upstream-doc/manglsl/mix.xml similarity index 100% rename from upstream-man-pages/manglsl/mix.xml rename to upstream-doc/manglsl/mix.xml diff --git a/upstream-man-pages/manglsl/mod.xml b/upstream-doc/manglsl/mod.xml similarity index 100% rename from upstream-man-pages/manglsl/mod.xml rename to upstream-doc/manglsl/mod.xml diff --git a/upstream-man-pages/manglsl/modf.xml b/upstream-doc/manglsl/modf.xml similarity index 100% rename from upstream-man-pages/manglsl/modf.xml rename to upstream-doc/manglsl/modf.xml diff --git a/upstream-man-pages/manglsl/noise.xml b/upstream-doc/manglsl/noise.xml similarity index 100% rename from upstream-man-pages/manglsl/noise.xml rename to upstream-doc/manglsl/noise.xml diff --git a/upstream-man-pages/manglsl/normalize.xml b/upstream-doc/manglsl/normalize.xml similarity index 100% rename from upstream-man-pages/manglsl/normalize.xml rename to upstream-doc/manglsl/normalize.xml diff --git a/upstream-man-pages/manglsl/not.xml b/upstream-doc/manglsl/not.xml similarity index 100% rename from upstream-man-pages/manglsl/not.xml rename to upstream-doc/manglsl/not.xml diff --git a/upstream-man-pages/manglsl/notEqual.xml b/upstream-doc/manglsl/notEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/notEqual.xml rename to upstream-doc/manglsl/notEqual.xml diff --git a/upstream-man-pages/manglsl/outerProduct.xml b/upstream-doc/manglsl/outerProduct.xml similarity index 100% rename from upstream-man-pages/manglsl/outerProduct.xml rename to upstream-doc/manglsl/outerProduct.xml diff --git a/upstream-man-pages/manglsl/packDouble2x32.xml b/upstream-doc/manglsl/packDouble2x32.xml similarity index 100% rename from upstream-man-pages/manglsl/packDouble2x32.xml rename to upstream-doc/manglsl/packDouble2x32.xml diff --git a/upstream-man-pages/manglsl/packHalf2x16.xml b/upstream-doc/manglsl/packHalf2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/packHalf2x16.xml rename to upstream-doc/manglsl/packHalf2x16.xml diff --git a/upstream-man-pages/manglsl/packUnorm2x16.xml b/upstream-doc/manglsl/packUnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/packUnorm2x16.xml rename to upstream-doc/manglsl/packUnorm2x16.xml diff --git a/upstream-man-pages/manglsl/pow.xml b/upstream-doc/manglsl/pow.xml similarity index 100% rename from upstream-man-pages/manglsl/pow.xml rename to upstream-doc/manglsl/pow.xml diff --git a/upstream-man-pages/manglsl/radians.xml b/upstream-doc/manglsl/radians.xml similarity index 100% rename from upstream-man-pages/manglsl/radians.xml rename to upstream-doc/manglsl/radians.xml diff --git a/upstream-man-pages/manglsl/reflect.xml b/upstream-doc/manglsl/reflect.xml similarity index 100% rename from upstream-man-pages/manglsl/reflect.xml rename to upstream-doc/manglsl/reflect.xml diff --git a/upstream-man-pages/manglsl/refract.xml b/upstream-doc/manglsl/refract.xml similarity index 100% rename from upstream-man-pages/manglsl/refract.xml rename to upstream-doc/manglsl/refract.xml diff --git a/upstream-man-pages/manglsl/round.xml b/upstream-doc/manglsl/round.xml similarity index 100% rename from upstream-man-pages/manglsl/round.xml rename to upstream-doc/manglsl/round.xml diff --git a/upstream-man-pages/manglsl/roundEven.xml b/upstream-doc/manglsl/roundEven.xml similarity index 100% rename from upstream-man-pages/manglsl/roundEven.xml rename to upstream-doc/manglsl/roundEven.xml diff --git a/upstream-man-pages/manglsl/sign.xml b/upstream-doc/manglsl/sign.xml similarity index 100% rename from upstream-man-pages/manglsl/sign.xml rename to upstream-doc/manglsl/sign.xml diff --git a/upstream-man-pages/manglsl/sin.xml b/upstream-doc/manglsl/sin.xml similarity index 100% rename from upstream-man-pages/manglsl/sin.xml rename to upstream-doc/manglsl/sin.xml diff --git a/upstream-man-pages/manglsl/sinh.xml b/upstream-doc/manglsl/sinh.xml similarity index 100% rename from upstream-man-pages/manglsl/sinh.xml rename to upstream-doc/manglsl/sinh.xml diff --git a/upstream-man-pages/manglsl/smoothstep.xml b/upstream-doc/manglsl/smoothstep.xml similarity index 100% rename from upstream-man-pages/manglsl/smoothstep.xml rename to upstream-doc/manglsl/smoothstep.xml diff --git a/upstream-man-pages/manglsl/sqrt.xml b/upstream-doc/manglsl/sqrt.xml similarity index 100% rename from upstream-man-pages/manglsl/sqrt.xml rename to upstream-doc/manglsl/sqrt.xml diff --git a/upstream-man-pages/manglsl/step.xml b/upstream-doc/manglsl/step.xml similarity index 100% rename from upstream-man-pages/manglsl/step.xml rename to upstream-doc/manglsl/step.xml diff --git a/upstream-man-pages/manglsl/tan.xml b/upstream-doc/manglsl/tan.xml similarity index 100% rename from upstream-man-pages/manglsl/tan.xml rename to upstream-doc/manglsl/tan.xml diff --git a/upstream-man-pages/manglsl/tanh.xml b/upstream-doc/manglsl/tanh.xml similarity index 100% rename from upstream-man-pages/manglsl/tanh.xml rename to upstream-doc/manglsl/tanh.xml diff --git a/upstream-man-pages/manglsl/texelFetch.xml b/upstream-doc/manglsl/texelFetch.xml similarity index 100% rename from upstream-man-pages/manglsl/texelFetch.xml rename to upstream-doc/manglsl/texelFetch.xml diff --git a/upstream-man-pages/manglsl/texelFetchOffset.xml b/upstream-doc/manglsl/texelFetchOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/texelFetchOffset.xml rename to upstream-doc/manglsl/texelFetchOffset.xml diff --git a/upstream-man-pages/manglsl/texture.xml b/upstream-doc/manglsl/texture.xml similarity index 100% rename from upstream-man-pages/manglsl/texture.xml rename to upstream-doc/manglsl/texture.xml diff --git a/upstream-man-pages/manglsl/textureGather.xml b/upstream-doc/manglsl/textureGather.xml similarity index 100% rename from upstream-man-pages/manglsl/textureGather.xml rename to upstream-doc/manglsl/textureGather.xml diff --git a/upstream-man-pages/manglsl/textureGatherOffset.xml b/upstream-doc/manglsl/textureGatherOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureGatherOffset.xml rename to upstream-doc/manglsl/textureGatherOffset.xml diff --git a/upstream-man-pages/manglsl/textureGatherOffsets.xml b/upstream-doc/manglsl/textureGatherOffsets.xml similarity index 100% rename from upstream-man-pages/manglsl/textureGatherOffsets.xml rename to upstream-doc/manglsl/textureGatherOffsets.xml diff --git a/upstream-man-pages/manglsl/textureGrad.xml b/upstream-doc/manglsl/textureGrad.xml similarity index 100% rename from upstream-man-pages/manglsl/textureGrad.xml rename to upstream-doc/manglsl/textureGrad.xml diff --git a/upstream-man-pages/manglsl/textureGradOffset.xml b/upstream-doc/manglsl/textureGradOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureGradOffset.xml rename to upstream-doc/manglsl/textureGradOffset.xml diff --git a/upstream-man-pages/manglsl/textureLod.xml b/upstream-doc/manglsl/textureLod.xml similarity index 100% rename from upstream-man-pages/manglsl/textureLod.xml rename to upstream-doc/manglsl/textureLod.xml diff --git a/upstream-man-pages/manglsl/textureLodOffset.xml b/upstream-doc/manglsl/textureLodOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureLodOffset.xml rename to upstream-doc/manglsl/textureLodOffset.xml diff --git a/upstream-man-pages/manglsl/textureOffset.xml b/upstream-doc/manglsl/textureOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureOffset.xml rename to upstream-doc/manglsl/textureOffset.xml diff --git a/upstream-man-pages/manglsl/textureProj.xml b/upstream-doc/manglsl/textureProj.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProj.xml rename to upstream-doc/manglsl/textureProj.xml diff --git a/upstream-man-pages/manglsl/textureProjGrad.xml b/upstream-doc/manglsl/textureProjGrad.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProjGrad.xml rename to upstream-doc/manglsl/textureProjGrad.xml diff --git a/upstream-man-pages/manglsl/textureProjGradOffset.xml b/upstream-doc/manglsl/textureProjGradOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProjGradOffset.xml rename to upstream-doc/manglsl/textureProjGradOffset.xml diff --git a/upstream-man-pages/manglsl/textureProjLod.xml b/upstream-doc/manglsl/textureProjLod.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProjLod.xml rename to upstream-doc/manglsl/textureProjLod.xml diff --git a/upstream-man-pages/manglsl/textureProjLodOffset.xml b/upstream-doc/manglsl/textureProjLodOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProjLodOffset.xml rename to upstream-doc/manglsl/textureProjLodOffset.xml diff --git a/upstream-man-pages/manglsl/textureProjOffset.xml b/upstream-doc/manglsl/textureProjOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/textureProjOffset.xml rename to upstream-doc/manglsl/textureProjOffset.xml diff --git a/upstream-man-pages/manglsl/textureQueryLevels.xml b/upstream-doc/manglsl/textureQueryLevels.xml similarity index 100% rename from upstream-man-pages/manglsl/textureQueryLevels.xml rename to upstream-doc/manglsl/textureQueryLevels.xml diff --git a/upstream-man-pages/manglsl/textureQueryLod.xml b/upstream-doc/manglsl/textureQueryLod.xml similarity index 100% rename from upstream-man-pages/manglsl/textureQueryLod.xml rename to upstream-doc/manglsl/textureQueryLod.xml diff --git a/upstream-man-pages/manglsl/textureSize.xml b/upstream-doc/manglsl/textureSize.xml similarity index 100% rename from upstream-man-pages/manglsl/textureSize.xml rename to upstream-doc/manglsl/textureSize.xml diff --git a/upstream-man-pages/manglsl/top.php b/upstream-doc/manglsl/top.php similarity index 100% rename from upstream-man-pages/manglsl/top.php rename to upstream-doc/manglsl/top.php diff --git a/upstream-man-pages/manglsl/transpose.xml b/upstream-doc/manglsl/transpose.xml similarity index 100% rename from upstream-man-pages/manglsl/transpose.xml rename to upstream-doc/manglsl/transpose.xml diff --git a/upstream-man-pages/manglsl/trunc.xml b/upstream-doc/manglsl/trunc.xml similarity index 100% rename from upstream-man-pages/manglsl/trunc.xml rename to upstream-doc/manglsl/trunc.xml diff --git a/upstream-man-pages/manglsl/uaddCarry.xml b/upstream-doc/manglsl/uaddCarry.xml similarity index 100% rename from upstream-man-pages/manglsl/uaddCarry.xml rename to upstream-doc/manglsl/uaddCarry.xml diff --git a/upstream-man-pages/manglsl/umulExtended.xml b/upstream-doc/manglsl/umulExtended.xml similarity index 100% rename from upstream-man-pages/manglsl/umulExtended.xml rename to upstream-doc/manglsl/umulExtended.xml diff --git a/upstream-man-pages/manglsl/unpackDouble2x32.xml b/upstream-doc/manglsl/unpackDouble2x32.xml similarity index 100% rename from upstream-man-pages/manglsl/unpackDouble2x32.xml rename to upstream-doc/manglsl/unpackDouble2x32.xml diff --git a/upstream-man-pages/manglsl/unpackHalf2x16.xml b/upstream-doc/manglsl/unpackHalf2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/unpackHalf2x16.xml rename to upstream-doc/manglsl/unpackHalf2x16.xml diff --git a/upstream-man-pages/manglsl/unpackUnorm2x16.xml b/upstream-doc/manglsl/unpackUnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/unpackUnorm2x16.xml rename to upstream-doc/manglsl/unpackUnorm2x16.xml diff --git a/upstream-man-pages/manglsl/usubBorrow.xml b/upstream-doc/manglsl/usubBorrow.xml similarity index 100% rename from upstream-man-pages/manglsl/usubBorrow.xml rename to upstream-doc/manglsl/usubBorrow.xml diff --git a/upstream-man-pages/manglsl/xhtml/EmitStreamVertex.xml b/upstream-doc/manglsl/xhtml/EmitStreamVertex.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/EmitStreamVertex.xml rename to upstream-doc/manglsl/xhtml/EmitStreamVertex.xml diff --git a/upstream-man-pages/manglsl/xhtml/EmitVertex.xml b/upstream-doc/manglsl/xhtml/EmitVertex.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/EmitVertex.xml rename to upstream-doc/manglsl/xhtml/EmitVertex.xml diff --git a/upstream-man-pages/manglsl/xhtml/EndPrimitive.xml b/upstream-doc/manglsl/xhtml/EndPrimitive.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/EndPrimitive.xml rename to upstream-doc/manglsl/xhtml/EndPrimitive.xml diff --git a/upstream-man-pages/manglsl/xhtml/EndStreamPrimitive.xml b/upstream-doc/manglsl/xhtml/EndStreamPrimitive.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/EndStreamPrimitive.xml rename to upstream-doc/manglsl/xhtml/EndStreamPrimitive.xml diff --git a/upstream-man-pages/manglsl/xhtml/Makefile b/upstream-doc/manglsl/xhtml/Makefile similarity index 100% rename from upstream-man-pages/manglsl/xhtml/Makefile rename to upstream-doc/manglsl/xhtml/Makefile diff --git a/upstream-man-pages/manglsl/xhtml/abs.xml b/upstream-doc/manglsl/xhtml/abs.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/abs.xml rename to upstream-doc/manglsl/xhtml/abs.xml diff --git a/upstream-man-pages/manglsl/xhtml/acos.xml b/upstream-doc/manglsl/xhtml/acos.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/acos.xml rename to upstream-doc/manglsl/xhtml/acos.xml diff --git a/upstream-man-pages/manglsl/xhtml/acosh.xml b/upstream-doc/manglsl/xhtml/acosh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/acosh.xml rename to upstream-doc/manglsl/xhtml/acosh.xml diff --git a/upstream-man-pages/manglsl/xhtml/all.xml b/upstream-doc/manglsl/xhtml/all.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/all.xml rename to upstream-doc/manglsl/xhtml/all.xml diff --git a/upstream-man-pages/manglsl/xhtml/any.xml b/upstream-doc/manglsl/xhtml/any.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/any.xml rename to upstream-doc/manglsl/xhtml/any.xml diff --git a/upstream-man-pages/manglsl/xhtml/asin.xml b/upstream-doc/manglsl/xhtml/asin.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/asin.xml rename to upstream-doc/manglsl/xhtml/asin.xml diff --git a/upstream-man-pages/manglsl/xhtml/asinh.xml b/upstream-doc/manglsl/xhtml/asinh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/asinh.xml rename to upstream-doc/manglsl/xhtml/asinh.xml diff --git a/upstream-man-pages/manglsl/xhtml/atan.xml b/upstream-doc/manglsl/xhtml/atan.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atan.xml rename to upstream-doc/manglsl/xhtml/atan.xml diff --git a/upstream-man-pages/manglsl/xhtml/atanh.xml b/upstream-doc/manglsl/xhtml/atanh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atanh.xml rename to upstream-doc/manglsl/xhtml/atanh.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicAdd.xml b/upstream-doc/manglsl/xhtml/atomicAdd.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicAdd.xml rename to upstream-doc/manglsl/xhtml/atomicAdd.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicAnd.xml b/upstream-doc/manglsl/xhtml/atomicAnd.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicAnd.xml rename to upstream-doc/manglsl/xhtml/atomicAnd.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicCompSwap.xml b/upstream-doc/manglsl/xhtml/atomicCompSwap.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicCompSwap.xml rename to upstream-doc/manglsl/xhtml/atomicCompSwap.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicCounter.xml b/upstream-doc/manglsl/xhtml/atomicCounter.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicCounter.xml rename to upstream-doc/manglsl/xhtml/atomicCounter.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicCounterDecrement.xml b/upstream-doc/manglsl/xhtml/atomicCounterDecrement.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicCounterDecrement.xml rename to upstream-doc/manglsl/xhtml/atomicCounterDecrement.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicCounterIncrement.xml b/upstream-doc/manglsl/xhtml/atomicCounterIncrement.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicCounterIncrement.xml rename to upstream-doc/manglsl/xhtml/atomicCounterIncrement.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicExchange.xml b/upstream-doc/manglsl/xhtml/atomicExchange.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicExchange.xml rename to upstream-doc/manglsl/xhtml/atomicExchange.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicMax.xml b/upstream-doc/manglsl/xhtml/atomicMax.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicMax.xml rename to upstream-doc/manglsl/xhtml/atomicMax.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicMin.xml b/upstream-doc/manglsl/xhtml/atomicMin.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicMin.xml rename to upstream-doc/manglsl/xhtml/atomicMin.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicOr.xml b/upstream-doc/manglsl/xhtml/atomicOr.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicOr.xml rename to upstream-doc/manglsl/xhtml/atomicOr.xml diff --git a/upstream-man-pages/manglsl/xhtml/atomicXor.xml b/upstream-doc/manglsl/xhtml/atomicXor.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/atomicXor.xml rename to upstream-doc/manglsl/xhtml/atomicXor.xml diff --git a/upstream-man-pages/manglsl/xhtml/barrier.xml b/upstream-doc/manglsl/xhtml/barrier.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/barrier.xml rename to upstream-doc/manglsl/xhtml/barrier.xml diff --git a/upstream-man-pages/manglsl/xhtml/bitCount.xml b/upstream-doc/manglsl/xhtml/bitCount.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/bitCount.xml rename to upstream-doc/manglsl/xhtml/bitCount.xml diff --git a/upstream-man-pages/manglsl/xhtml/bitfieldExtract.xml b/upstream-doc/manglsl/xhtml/bitfieldExtract.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/bitfieldExtract.xml rename to upstream-doc/manglsl/xhtml/bitfieldExtract.xml diff --git a/upstream-man-pages/manglsl/xhtml/bitfieldInsert.xml b/upstream-doc/manglsl/xhtml/bitfieldInsert.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/bitfieldInsert.xml rename to upstream-doc/manglsl/xhtml/bitfieldInsert.xml diff --git a/upstream-man-pages/manglsl/xhtml/bitfieldReverse.xml b/upstream-doc/manglsl/xhtml/bitfieldReverse.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/bitfieldReverse.xml rename to upstream-doc/manglsl/xhtml/bitfieldReverse.xml diff --git a/upstream-man-pages/manglsl/xhtml/ceil.xml b/upstream-doc/manglsl/xhtml/ceil.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/ceil.xml rename to upstream-doc/manglsl/xhtml/ceil.xml diff --git a/upstream-man-pages/manglsl/xhtml/clamp.xml b/upstream-doc/manglsl/xhtml/clamp.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/clamp.xml rename to upstream-doc/manglsl/xhtml/clamp.xml diff --git a/upstream-man-pages/manglsl/xhtml/cos.xml b/upstream-doc/manglsl/xhtml/cos.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/cos.xml rename to upstream-doc/manglsl/xhtml/cos.xml diff --git a/upstream-man-pages/manglsl/xhtml/cosh.xml b/upstream-doc/manglsl/xhtml/cosh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/cosh.xml rename to upstream-doc/manglsl/xhtml/cosh.xml diff --git a/upstream-man-pages/manglsl/xhtml/cross.xml b/upstream-doc/manglsl/xhtml/cross.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/cross.xml rename to upstream-doc/manglsl/xhtml/cross.xml diff --git a/upstream-man-pages/manglsl/xhtml/ctop.xsl b/upstream-doc/manglsl/xhtml/ctop.xsl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/ctop.xsl rename to upstream-doc/manglsl/xhtml/ctop.xsl diff --git a/upstream-man-pages/manglsl/xhtml/dFdx.xml b/upstream-doc/manglsl/xhtml/dFdx.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/dFdx.xml rename to upstream-doc/manglsl/xhtml/dFdx.xml diff --git a/upstream-man-pages/manglsl/xhtml/dFdy.xml b/upstream-doc/manglsl/xhtml/dFdy.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/dFdy.xml rename to upstream-doc/manglsl/xhtml/dFdy.xml diff --git a/upstream-man-pages/manglsl/xhtml/degrees.xml b/upstream-doc/manglsl/xhtml/degrees.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/degrees.xml rename to upstream-doc/manglsl/xhtml/degrees.xml diff --git a/upstream-man-pages/manglsl/xhtml/determinant.xml b/upstream-doc/manglsl/xhtml/determinant.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/determinant.xml rename to upstream-doc/manglsl/xhtml/determinant.xml diff --git a/upstream-man-pages/manglsl/xhtml/distance.xml b/upstream-doc/manglsl/xhtml/distance.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/distance.xml rename to upstream-doc/manglsl/xhtml/distance.xml diff --git a/upstream-man-pages/manglsl/xhtml/dot.xml b/upstream-doc/manglsl/xhtml/dot.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/dot.xml rename to upstream-doc/manglsl/xhtml/dot.xml diff --git a/upstream-man-pages/manglsl/xhtml/equal.xml b/upstream-doc/manglsl/xhtml/equal.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/equal.xml rename to upstream-doc/manglsl/xhtml/equal.xml diff --git a/upstream-man-pages/manglsl/xhtml/exp.xml b/upstream-doc/manglsl/xhtml/exp.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/exp.xml rename to upstream-doc/manglsl/xhtml/exp.xml diff --git a/upstream-man-pages/manglsl/xhtml/exp2.xml b/upstream-doc/manglsl/xhtml/exp2.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/exp2.xml rename to upstream-doc/manglsl/xhtml/exp2.xml diff --git a/upstream-man-pages/manglsl/xhtml/faceforward.xml b/upstream-doc/manglsl/xhtml/faceforward.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/faceforward.xml rename to upstream-doc/manglsl/xhtml/faceforward.xml diff --git a/upstream-man-pages/manglsl/xhtml/findLSB.xml b/upstream-doc/manglsl/xhtml/findLSB.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/findLSB.xml rename to upstream-doc/manglsl/xhtml/findLSB.xml diff --git a/upstream-man-pages/manglsl/xhtml/findMSB.xml b/upstream-doc/manglsl/xhtml/findMSB.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/findMSB.xml rename to upstream-doc/manglsl/xhtml/findMSB.xml diff --git a/upstream-man-pages/manglsl/xhtml/floatBitsToInt.xml b/upstream-doc/manglsl/xhtml/floatBitsToInt.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/floatBitsToInt.xml rename to upstream-doc/manglsl/xhtml/floatBitsToInt.xml diff --git a/upstream-man-pages/manglsl/xhtml/floatBitsToUint.xml b/upstream-doc/manglsl/xhtml/floatBitsToUint.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/floatBitsToUint.xml rename to upstream-doc/manglsl/xhtml/floatBitsToUint.xml diff --git a/upstream-man-pages/manglsl/xhtml/floor.xml b/upstream-doc/manglsl/xhtml/floor.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/floor.xml rename to upstream-doc/manglsl/xhtml/floor.xml diff --git a/upstream-man-pages/manglsl/xhtml/fma.xml b/upstream-doc/manglsl/xhtml/fma.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/fma.xml rename to upstream-doc/manglsl/xhtml/fma.xml diff --git a/upstream-man-pages/manglsl/xhtml/fract.xml b/upstream-doc/manglsl/xhtml/fract.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/fract.xml rename to upstream-doc/manglsl/xhtml/fract.xml diff --git a/upstream-man-pages/manglsl/xhtml/frexp.xml b/upstream-doc/manglsl/xhtml/frexp.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/frexp.xml rename to upstream-doc/manglsl/xhtml/frexp.xml diff --git a/upstream-man-pages/manglsl/xhtml/fwidth.xml b/upstream-doc/manglsl/xhtml/fwidth.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/fwidth.xml rename to upstream-doc/manglsl/xhtml/fwidth.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_ClipDistance.xml b/upstream-doc/manglsl/xhtml/gl_ClipDistance.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_ClipDistance.xml rename to upstream-doc/manglsl/xhtml/gl_ClipDistance.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_FragCoord.xml b/upstream-doc/manglsl/xhtml/gl_FragCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_FragCoord.xml rename to upstream-doc/manglsl/xhtml/gl_FragCoord.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_FragDepth.xml b/upstream-doc/manglsl/xhtml/gl_FragDepth.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_FragDepth.xml rename to upstream-doc/manglsl/xhtml/gl_FragDepth.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_FrontFacing.xml b/upstream-doc/manglsl/xhtml/gl_FrontFacing.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_FrontFacing.xml rename to upstream-doc/manglsl/xhtml/gl_FrontFacing.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_GlobalInvocationID.xml b/upstream-doc/manglsl/xhtml/gl_GlobalInvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_GlobalInvocationID.xml rename to upstream-doc/manglsl/xhtml/gl_GlobalInvocationID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_InstanceID.xml b/upstream-doc/manglsl/xhtml/gl_InstanceID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_InstanceID.xml rename to upstream-doc/manglsl/xhtml/gl_InstanceID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_InvocationID.xml b/upstream-doc/manglsl/xhtml/gl_InvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_InvocationID.xml rename to upstream-doc/manglsl/xhtml/gl_InvocationID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_Layer.xml b/upstream-doc/manglsl/xhtml/gl_Layer.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_Layer.xml rename to upstream-doc/manglsl/xhtml/gl_Layer.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_LocalInvocationID.xml b/upstream-doc/manglsl/xhtml/gl_LocalInvocationID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_LocalInvocationID.xml rename to upstream-doc/manglsl/xhtml/gl_LocalInvocationID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_LocalInvocationIndex.xml b/upstream-doc/manglsl/xhtml/gl_LocalInvocationIndex.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_LocalInvocationIndex.xml rename to upstream-doc/manglsl/xhtml/gl_LocalInvocationIndex.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_NumSamples.xml b/upstream-doc/manglsl/xhtml/gl_NumSamples.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_NumSamples.xml rename to upstream-doc/manglsl/xhtml/gl_NumSamples.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_NumWorkGroups.xml b/upstream-doc/manglsl/xhtml/gl_NumWorkGroups.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_NumWorkGroups.xml rename to upstream-doc/manglsl/xhtml/gl_NumWorkGroups.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_PatchVerticesIn.xml b/upstream-doc/manglsl/xhtml/gl_PatchVerticesIn.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_PatchVerticesIn.xml rename to upstream-doc/manglsl/xhtml/gl_PatchVerticesIn.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_PointCoord.xml b/upstream-doc/manglsl/xhtml/gl_PointCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_PointCoord.xml rename to upstream-doc/manglsl/xhtml/gl_PointCoord.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_PointSize.xml b/upstream-doc/manglsl/xhtml/gl_PointSize.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_PointSize.xml rename to upstream-doc/manglsl/xhtml/gl_PointSize.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_Position.xml b/upstream-doc/manglsl/xhtml/gl_Position.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_Position.xml rename to upstream-doc/manglsl/xhtml/gl_Position.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_PrimitiveID.xml b/upstream-doc/manglsl/xhtml/gl_PrimitiveID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_PrimitiveID.xml rename to upstream-doc/manglsl/xhtml/gl_PrimitiveID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_PrimitiveIDIn.xml b/upstream-doc/manglsl/xhtml/gl_PrimitiveIDIn.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_PrimitiveIDIn.xml rename to upstream-doc/manglsl/xhtml/gl_PrimitiveIDIn.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_SampleID.xml b/upstream-doc/manglsl/xhtml/gl_SampleID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_SampleID.xml rename to upstream-doc/manglsl/xhtml/gl_SampleID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_SampleMask.xml b/upstream-doc/manglsl/xhtml/gl_SampleMask.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_SampleMask.xml rename to upstream-doc/manglsl/xhtml/gl_SampleMask.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_SampleMaskIn.xml b/upstream-doc/manglsl/xhtml/gl_SampleMaskIn.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_SampleMaskIn.xml rename to upstream-doc/manglsl/xhtml/gl_SampleMaskIn.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_SamplePosition.xml b/upstream-doc/manglsl/xhtml/gl_SamplePosition.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_SamplePosition.xml rename to upstream-doc/manglsl/xhtml/gl_SamplePosition.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_TessCoord.xml b/upstream-doc/manglsl/xhtml/gl_TessCoord.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_TessCoord.xml rename to upstream-doc/manglsl/xhtml/gl_TessCoord.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_TessLevelInner.xml b/upstream-doc/manglsl/xhtml/gl_TessLevelInner.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_TessLevelInner.xml rename to upstream-doc/manglsl/xhtml/gl_TessLevelInner.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_TessLevelOuter.xml b/upstream-doc/manglsl/xhtml/gl_TessLevelOuter.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_TessLevelOuter.xml rename to upstream-doc/manglsl/xhtml/gl_TessLevelOuter.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_VertexID.xml b/upstream-doc/manglsl/xhtml/gl_VertexID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_VertexID.xml rename to upstream-doc/manglsl/xhtml/gl_VertexID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_ViewportIndex.xml b/upstream-doc/manglsl/xhtml/gl_ViewportIndex.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_ViewportIndex.xml rename to upstream-doc/manglsl/xhtml/gl_ViewportIndex.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_WorkGroupID.xml b/upstream-doc/manglsl/xhtml/gl_WorkGroupID.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_WorkGroupID.xml rename to upstream-doc/manglsl/xhtml/gl_WorkGroupID.xml diff --git a/upstream-man-pages/manglsl/xhtml/gl_WorkGroupSize.xml b/upstream-doc/manglsl/xhtml/gl_WorkGroupSize.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/gl_WorkGroupSize.xml rename to upstream-doc/manglsl/xhtml/gl_WorkGroupSize.xml diff --git a/upstream-man-pages/manglsl/xhtml/greaterThan.xml b/upstream-doc/manglsl/xhtml/greaterThan.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/greaterThan.xml rename to upstream-doc/manglsl/xhtml/greaterThan.xml diff --git a/upstream-man-pages/manglsl/xhtml/greaterThanEqual.xml b/upstream-doc/manglsl/xhtml/greaterThanEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/greaterThanEqual.xml rename to upstream-doc/manglsl/xhtml/greaterThanEqual.xml diff --git a/upstream-man-pages/manglsl/xhtml/groupMemoryBarrier.xml b/upstream-doc/manglsl/xhtml/groupMemoryBarrier.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/groupMemoryBarrier.xml rename to upstream-doc/manglsl/xhtml/groupMemoryBarrier.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicAdd.xml b/upstream-doc/manglsl/xhtml/imageAtomicAdd.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicAdd.xml rename to upstream-doc/manglsl/xhtml/imageAtomicAdd.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicAnd.xml b/upstream-doc/manglsl/xhtml/imageAtomicAnd.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicAnd.xml rename to upstream-doc/manglsl/xhtml/imageAtomicAnd.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicCompSwap.xml b/upstream-doc/manglsl/xhtml/imageAtomicCompSwap.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicCompSwap.xml rename to upstream-doc/manglsl/xhtml/imageAtomicCompSwap.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicExchange.xml b/upstream-doc/manglsl/xhtml/imageAtomicExchange.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicExchange.xml rename to upstream-doc/manglsl/xhtml/imageAtomicExchange.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicMax.xml b/upstream-doc/manglsl/xhtml/imageAtomicMax.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicMax.xml rename to upstream-doc/manglsl/xhtml/imageAtomicMax.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicMin.xml b/upstream-doc/manglsl/xhtml/imageAtomicMin.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicMin.xml rename to upstream-doc/manglsl/xhtml/imageAtomicMin.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicOr.xml b/upstream-doc/manglsl/xhtml/imageAtomicOr.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicOr.xml rename to upstream-doc/manglsl/xhtml/imageAtomicOr.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageAtomicXor.xml b/upstream-doc/manglsl/xhtml/imageAtomicXor.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageAtomicXor.xml rename to upstream-doc/manglsl/xhtml/imageAtomicXor.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageLoad.xml b/upstream-doc/manglsl/xhtml/imageLoad.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageLoad.xml rename to upstream-doc/manglsl/xhtml/imageLoad.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageSize.xml b/upstream-doc/manglsl/xhtml/imageSize.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageSize.xml rename to upstream-doc/manglsl/xhtml/imageSize.xml diff --git a/upstream-man-pages/manglsl/xhtml/imageStore.xml b/upstream-doc/manglsl/xhtml/imageStore.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imageStore.xml rename to upstream-doc/manglsl/xhtml/imageStore.xml diff --git a/upstream-man-pages/manglsl/xhtml/imulExtended.xml b/upstream-doc/manglsl/xhtml/imulExtended.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/imulExtended.xml rename to upstream-doc/manglsl/xhtml/imulExtended.xml diff --git a/upstream-man-pages/manglsl/xhtml/index.html b/upstream-doc/manglsl/xhtml/index.html similarity index 100% rename from upstream-man-pages/manglsl/xhtml/index.html rename to upstream-doc/manglsl/xhtml/index.html diff --git a/upstream-man-pages/manglsl/xhtml/intBitsToFloat.xml b/upstream-doc/manglsl/xhtml/intBitsToFloat.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/intBitsToFloat.xml rename to upstream-doc/manglsl/xhtml/intBitsToFloat.xml diff --git a/upstream-man-pages/manglsl/xhtml/interpolateAtCentroid.xml b/upstream-doc/manglsl/xhtml/interpolateAtCentroid.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/interpolateAtCentroid.xml rename to upstream-doc/manglsl/xhtml/interpolateAtCentroid.xml diff --git a/upstream-man-pages/manglsl/xhtml/interpolateAtOffset.xml b/upstream-doc/manglsl/xhtml/interpolateAtOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/interpolateAtOffset.xml rename to upstream-doc/manglsl/xhtml/interpolateAtOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/interpolateAtSample.xml b/upstream-doc/manglsl/xhtml/interpolateAtSample.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/interpolateAtSample.xml rename to upstream-doc/manglsl/xhtml/interpolateAtSample.xml diff --git a/upstream-man-pages/manglsl/xhtml/inverse.xml b/upstream-doc/manglsl/xhtml/inverse.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/inverse.xml rename to upstream-doc/manglsl/xhtml/inverse.xml diff --git a/upstream-man-pages/manglsl/xhtml/inversesqrt.xml b/upstream-doc/manglsl/xhtml/inversesqrt.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/inversesqrt.xml rename to upstream-doc/manglsl/xhtml/inversesqrt.xml diff --git a/upstream-man-pages/manglsl/xhtml/isinf.xml b/upstream-doc/manglsl/xhtml/isinf.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/isinf.xml rename to upstream-doc/manglsl/xhtml/isinf.xml diff --git a/upstream-man-pages/manglsl/xhtml/isnan.xml b/upstream-doc/manglsl/xhtml/isnan.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/isnan.xml rename to upstream-doc/manglsl/xhtml/isnan.xml diff --git a/upstream-man-pages/manglsl/xhtml/ldexp.xml b/upstream-doc/manglsl/xhtml/ldexp.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/ldexp.xml rename to upstream-doc/manglsl/xhtml/ldexp.xml diff --git a/upstream-man-pages/manglsl/xhtml/length.xml b/upstream-doc/manglsl/xhtml/length.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/length.xml rename to upstream-doc/manglsl/xhtml/length.xml diff --git a/upstream-man-pages/manglsl/xhtml/lessThan.xml b/upstream-doc/manglsl/xhtml/lessThan.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/lessThan.xml rename to upstream-doc/manglsl/xhtml/lessThan.xml diff --git a/upstream-man-pages/manglsl/xhtml/lessThanEqual.xml b/upstream-doc/manglsl/xhtml/lessThanEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/lessThanEqual.xml rename to upstream-doc/manglsl/xhtml/lessThanEqual.xml diff --git a/upstream-man-pages/manglsl/xhtml/log.xml b/upstream-doc/manglsl/xhtml/log.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/log.xml rename to upstream-doc/manglsl/xhtml/log.xml diff --git a/upstream-man-pages/manglsl/xhtml/log2.xml b/upstream-doc/manglsl/xhtml/log2.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/log2.xml rename to upstream-doc/manglsl/xhtml/log2.xml diff --git a/upstream-man-pages/manglsl/xhtml/makeindex.pl b/upstream-doc/manglsl/xhtml/makeindex.pl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/makeindex.pl rename to upstream-doc/manglsl/xhtml/makeindex.pl diff --git a/upstream-man-pages/manglsl/xhtml/mathml.xsl b/upstream-doc/manglsl/xhtml/mathml.xsl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/mathml.xsl rename to upstream-doc/manglsl/xhtml/mathml.xsl diff --git a/upstream-man-pages/manglsl/xhtml/matrixCompMult.xml b/upstream-doc/manglsl/xhtml/matrixCompMult.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/matrixCompMult.xml rename to upstream-doc/manglsl/xhtml/matrixCompMult.xml diff --git a/upstream-man-pages/manglsl/xhtml/max.xml b/upstream-doc/manglsl/xhtml/max.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/max.xml rename to upstream-doc/manglsl/xhtml/max.xml diff --git a/upstream-man-pages/manglsl/xhtml/memoryBarrier.xml b/upstream-doc/manglsl/xhtml/memoryBarrier.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/memoryBarrier.xml rename to upstream-doc/manglsl/xhtml/memoryBarrier.xml diff --git a/upstream-man-pages/manglsl/xhtml/memoryBarrierAtomicCounter.xml b/upstream-doc/manglsl/xhtml/memoryBarrierAtomicCounter.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/memoryBarrierAtomicCounter.xml rename to upstream-doc/manglsl/xhtml/memoryBarrierAtomicCounter.xml diff --git a/upstream-man-pages/manglsl/xhtml/memoryBarrierBuffer.xml b/upstream-doc/manglsl/xhtml/memoryBarrierBuffer.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/memoryBarrierBuffer.xml rename to upstream-doc/manglsl/xhtml/memoryBarrierBuffer.xml diff --git a/upstream-man-pages/manglsl/xhtml/memoryBarrierImage.xml b/upstream-doc/manglsl/xhtml/memoryBarrierImage.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/memoryBarrierImage.xml rename to upstream-doc/manglsl/xhtml/memoryBarrierImage.xml diff --git a/upstream-man-pages/manglsl/xhtml/memoryBarrierShared.xml b/upstream-doc/manglsl/xhtml/memoryBarrierShared.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/memoryBarrierShared.xml rename to upstream-doc/manglsl/xhtml/memoryBarrierShared.xml diff --git a/upstream-man-pages/manglsl/xhtml/min.xml b/upstream-doc/manglsl/xhtml/min.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/min.xml rename to upstream-doc/manglsl/xhtml/min.xml diff --git a/upstream-man-pages/manglsl/xhtml/mix.xml b/upstream-doc/manglsl/xhtml/mix.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/mix.xml rename to upstream-doc/manglsl/xhtml/mix.xml diff --git a/upstream-man-pages/manglsl/xhtml/mod.xml b/upstream-doc/manglsl/xhtml/mod.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/mod.xml rename to upstream-doc/manglsl/xhtml/mod.xml diff --git a/upstream-man-pages/manglsl/xhtml/modf.xml b/upstream-doc/manglsl/xhtml/modf.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/modf.xml rename to upstream-doc/manglsl/xhtml/modf.xml diff --git a/upstream-man-pages/manglsl/xhtml/noise.xml b/upstream-doc/manglsl/xhtml/noise.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/noise.xml rename to upstream-doc/manglsl/xhtml/noise.xml diff --git a/upstream-man-pages/manglsl/xhtml/normalize.xml b/upstream-doc/manglsl/xhtml/normalize.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/normalize.xml rename to upstream-doc/manglsl/xhtml/normalize.xml diff --git a/upstream-man-pages/manglsl/xhtml/not.xml b/upstream-doc/manglsl/xhtml/not.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/not.xml rename to upstream-doc/manglsl/xhtml/not.xml diff --git a/upstream-man-pages/manglsl/xhtml/notEqual.xml b/upstream-doc/manglsl/xhtml/notEqual.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/notEqual.xml rename to upstream-doc/manglsl/xhtml/notEqual.xml diff --git a/upstream-man-pages/manglsl/xhtml/opengl-man.css b/upstream-doc/manglsl/xhtml/opengl-man.css similarity index 100% rename from upstream-man-pages/manglsl/xhtml/opengl-man.css rename to upstream-doc/manglsl/xhtml/opengl-man.css diff --git a/upstream-man-pages/manglsl/xhtml/opengl-man.xsl b/upstream-doc/manglsl/xhtml/opengl-man.xsl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/opengl-man.xsl rename to upstream-doc/manglsl/xhtml/opengl-man.xsl diff --git a/upstream-man-pages/manglsl/xhtml/outerProduct.xml b/upstream-doc/manglsl/xhtml/outerProduct.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/outerProduct.xml rename to upstream-doc/manglsl/xhtml/outerProduct.xml diff --git a/upstream-man-pages/manglsl/xhtml/packDouble2x32.xml b/upstream-doc/manglsl/xhtml/packDouble2x32.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packDouble2x32.xml rename to upstream-doc/manglsl/xhtml/packDouble2x32.xml diff --git a/upstream-man-pages/manglsl/xhtml/packHalf2x16.xml b/upstream-doc/manglsl/xhtml/packHalf2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packHalf2x16.xml rename to upstream-doc/manglsl/xhtml/packHalf2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/packSnorm2x16.xml b/upstream-doc/manglsl/xhtml/packSnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packSnorm2x16.xml rename to upstream-doc/manglsl/xhtml/packSnorm2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/packSnorm4x8.xml b/upstream-doc/manglsl/xhtml/packSnorm4x8.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packSnorm4x8.xml rename to upstream-doc/manglsl/xhtml/packSnorm4x8.xml diff --git a/upstream-man-pages/manglsl/xhtml/packUnorm2x16.xml b/upstream-doc/manglsl/xhtml/packUnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packUnorm2x16.xml rename to upstream-doc/manglsl/xhtml/packUnorm2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/packUnorm4x8.xml b/upstream-doc/manglsl/xhtml/packUnorm4x8.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/packUnorm4x8.xml rename to upstream-doc/manglsl/xhtml/packUnorm4x8.xml diff --git a/upstream-man-pages/manglsl/xhtml/pmathml.xsl b/upstream-doc/manglsl/xhtml/pmathml.xsl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/pmathml.xsl rename to upstream-doc/manglsl/xhtml/pmathml.xsl diff --git a/upstream-man-pages/manglsl/xhtml/pmathmlcss.xsl b/upstream-doc/manglsl/xhtml/pmathmlcss.xsl similarity index 100% rename from upstream-man-pages/manglsl/xhtml/pmathmlcss.xsl rename to upstream-doc/manglsl/xhtml/pmathmlcss.xsl diff --git a/upstream-man-pages/manglsl/xhtml/postprocess.sed b/upstream-doc/manglsl/xhtml/postprocess.sed similarity index 100% rename from upstream-man-pages/manglsl/xhtml/postprocess.sed rename to upstream-doc/manglsl/xhtml/postprocess.sed diff --git a/upstream-man-pages/manglsl/xhtml/pow.xml b/upstream-doc/manglsl/xhtml/pow.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/pow.xml rename to upstream-doc/manglsl/xhtml/pow.xml diff --git a/upstream-man-pages/manglsl/xhtml/preprocess.sed b/upstream-doc/manglsl/xhtml/preprocess.sed similarity index 100% rename from upstream-man-pages/manglsl/xhtml/preprocess.sed rename to upstream-doc/manglsl/xhtml/preprocess.sed diff --git a/upstream-man-pages/manglsl/xhtml/radians.xml b/upstream-doc/manglsl/xhtml/radians.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/radians.xml rename to upstream-doc/manglsl/xhtml/radians.xml diff --git a/upstream-man-pages/manglsl/xhtml/reflect.xml b/upstream-doc/manglsl/xhtml/reflect.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/reflect.xml rename to upstream-doc/manglsl/xhtml/reflect.xml diff --git a/upstream-man-pages/manglsl/xhtml/refract.xml b/upstream-doc/manglsl/xhtml/refract.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/refract.xml rename to upstream-doc/manglsl/xhtml/refract.xml diff --git a/upstream-man-pages/manglsl/xhtml/round.xml b/upstream-doc/manglsl/xhtml/round.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/round.xml rename to upstream-doc/manglsl/xhtml/round.xml diff --git a/upstream-man-pages/manglsl/xhtml/roundEven.xml b/upstream-doc/manglsl/xhtml/roundEven.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/roundEven.xml rename to upstream-doc/manglsl/xhtml/roundEven.xml diff --git a/upstream-man-pages/manglsl/xhtml/sign.xml b/upstream-doc/manglsl/xhtml/sign.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/sign.xml rename to upstream-doc/manglsl/xhtml/sign.xml diff --git a/upstream-man-pages/manglsl/xhtml/sin.xml b/upstream-doc/manglsl/xhtml/sin.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/sin.xml rename to upstream-doc/manglsl/xhtml/sin.xml diff --git a/upstream-man-pages/manglsl/xhtml/sinh.xml b/upstream-doc/manglsl/xhtml/sinh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/sinh.xml rename to upstream-doc/manglsl/xhtml/sinh.xml diff --git a/upstream-man-pages/manglsl/xhtml/smoothstep.xml b/upstream-doc/manglsl/xhtml/smoothstep.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/smoothstep.xml rename to upstream-doc/manglsl/xhtml/smoothstep.xml diff --git a/upstream-man-pages/manglsl/xhtml/sqrt.xml b/upstream-doc/manglsl/xhtml/sqrt.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/sqrt.xml rename to upstream-doc/manglsl/xhtml/sqrt.xml diff --git a/upstream-man-pages/manglsl/xhtml/start.html b/upstream-doc/manglsl/xhtml/start.html similarity index 100% rename from upstream-man-pages/manglsl/xhtml/start.html rename to upstream-doc/manglsl/xhtml/start.html diff --git a/upstream-man-pages/manglsl/xhtml/step.xml b/upstream-doc/manglsl/xhtml/step.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/step.xml rename to upstream-doc/manglsl/xhtml/step.xml diff --git a/upstream-man-pages/manglsl/xhtml/tan.xml b/upstream-doc/manglsl/xhtml/tan.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/tan.xml rename to upstream-doc/manglsl/xhtml/tan.xml diff --git a/upstream-man-pages/manglsl/xhtml/tanh.xml b/upstream-doc/manglsl/xhtml/tanh.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/tanh.xml rename to upstream-doc/manglsl/xhtml/tanh.xml diff --git a/upstream-man-pages/manglsl/xhtml/texelFetch.xml b/upstream-doc/manglsl/xhtml/texelFetch.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/texelFetch.xml rename to upstream-doc/manglsl/xhtml/texelFetch.xml diff --git a/upstream-man-pages/manglsl/xhtml/texelFetchOffset.xml b/upstream-doc/manglsl/xhtml/texelFetchOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/texelFetchOffset.xml rename to upstream-doc/manglsl/xhtml/texelFetchOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/texture.xml b/upstream-doc/manglsl/xhtml/texture.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/texture.xml rename to upstream-doc/manglsl/xhtml/texture.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureGather.xml b/upstream-doc/manglsl/xhtml/textureGather.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureGather.xml rename to upstream-doc/manglsl/xhtml/textureGather.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureGatherOffset.xml b/upstream-doc/manglsl/xhtml/textureGatherOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureGatherOffset.xml rename to upstream-doc/manglsl/xhtml/textureGatherOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureGatherOffsets.xml b/upstream-doc/manglsl/xhtml/textureGatherOffsets.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureGatherOffsets.xml rename to upstream-doc/manglsl/xhtml/textureGatherOffsets.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureGrad.xml b/upstream-doc/manglsl/xhtml/textureGrad.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureGrad.xml rename to upstream-doc/manglsl/xhtml/textureGrad.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureGradOffset.xml b/upstream-doc/manglsl/xhtml/textureGradOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureGradOffset.xml rename to upstream-doc/manglsl/xhtml/textureGradOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureLod.xml b/upstream-doc/manglsl/xhtml/textureLod.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureLod.xml rename to upstream-doc/manglsl/xhtml/textureLod.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureLodOffset.xml b/upstream-doc/manglsl/xhtml/textureLodOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureLodOffset.xml rename to upstream-doc/manglsl/xhtml/textureLodOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureOffset.xml b/upstream-doc/manglsl/xhtml/textureOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureOffset.xml rename to upstream-doc/manglsl/xhtml/textureOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProj.xml b/upstream-doc/manglsl/xhtml/textureProj.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProj.xml rename to upstream-doc/manglsl/xhtml/textureProj.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProjGrad.xml b/upstream-doc/manglsl/xhtml/textureProjGrad.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProjGrad.xml rename to upstream-doc/manglsl/xhtml/textureProjGrad.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProjGradOffset.xml b/upstream-doc/manglsl/xhtml/textureProjGradOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProjGradOffset.xml rename to upstream-doc/manglsl/xhtml/textureProjGradOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProjLod.xml b/upstream-doc/manglsl/xhtml/textureProjLod.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProjLod.xml rename to upstream-doc/manglsl/xhtml/textureProjLod.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProjLodOffset.xml b/upstream-doc/manglsl/xhtml/textureProjLodOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProjLodOffset.xml rename to upstream-doc/manglsl/xhtml/textureProjLodOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureProjOffset.xml b/upstream-doc/manglsl/xhtml/textureProjOffset.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureProjOffset.xml rename to upstream-doc/manglsl/xhtml/textureProjOffset.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureQueryLevels.xml b/upstream-doc/manglsl/xhtml/textureQueryLevels.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureQueryLevels.xml rename to upstream-doc/manglsl/xhtml/textureQueryLevels.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureQueryLod.xml b/upstream-doc/manglsl/xhtml/textureQueryLod.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureQueryLod.xml rename to upstream-doc/manglsl/xhtml/textureQueryLod.xml diff --git a/upstream-man-pages/manglsl/xhtml/textureSize.xml b/upstream-doc/manglsl/xhtml/textureSize.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/textureSize.xml rename to upstream-doc/manglsl/xhtml/textureSize.xml diff --git a/upstream-man-pages/manglsl/xhtml/transpose.xml b/upstream-doc/manglsl/xhtml/transpose.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/transpose.xml rename to upstream-doc/manglsl/xhtml/transpose.xml diff --git a/upstream-man-pages/manglsl/xhtml/trunc.xml b/upstream-doc/manglsl/xhtml/trunc.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/trunc.xml rename to upstream-doc/manglsl/xhtml/trunc.xml diff --git a/upstream-man-pages/manglsl/xhtml/uaddCarry.xml b/upstream-doc/manglsl/xhtml/uaddCarry.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/uaddCarry.xml rename to upstream-doc/manglsl/xhtml/uaddCarry.xml diff --git a/upstream-man-pages/manglsl/xhtml/uintBitsToFloat.xml b/upstream-doc/manglsl/xhtml/uintBitsToFloat.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/uintBitsToFloat.xml rename to upstream-doc/manglsl/xhtml/uintBitsToFloat.xml diff --git a/upstream-man-pages/manglsl/xhtml/umulExtended.xml b/upstream-doc/manglsl/xhtml/umulExtended.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/umulExtended.xml rename to upstream-doc/manglsl/xhtml/umulExtended.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackDouble2x32.xml b/upstream-doc/manglsl/xhtml/unpackDouble2x32.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackDouble2x32.xml rename to upstream-doc/manglsl/xhtml/unpackDouble2x32.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackHalf2x16.xml b/upstream-doc/manglsl/xhtml/unpackHalf2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackHalf2x16.xml rename to upstream-doc/manglsl/xhtml/unpackHalf2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackSnorm2x16.xml b/upstream-doc/manglsl/xhtml/unpackSnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackSnorm2x16.xml rename to upstream-doc/manglsl/xhtml/unpackSnorm2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackSnorm4x8.xml b/upstream-doc/manglsl/xhtml/unpackSnorm4x8.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackSnorm4x8.xml rename to upstream-doc/manglsl/xhtml/unpackSnorm4x8.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackUnorm2x16.xml b/upstream-doc/manglsl/xhtml/unpackUnorm2x16.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackUnorm2x16.xml rename to upstream-doc/manglsl/xhtml/unpackUnorm2x16.xml diff --git a/upstream-man-pages/manglsl/xhtml/unpackUnorm4x8.xml b/upstream-doc/manglsl/xhtml/unpackUnorm4x8.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/unpackUnorm4x8.xml rename to upstream-doc/manglsl/xhtml/unpackUnorm4x8.xml diff --git a/upstream-man-pages/manglsl/xhtml/usubBorrow.xml b/upstream-doc/manglsl/xhtml/usubBorrow.xml similarity index 100% rename from upstream-man-pages/manglsl/xhtml/usubBorrow.xml rename to upstream-doc/manglsl/xhtml/usubBorrow.xml diff --git a/upstream-man-pages/manglsl/xhtml/xhtml-lat1.ent b/upstream-doc/manglsl/xhtml/xhtml-lat1.ent similarity index 100% rename from upstream-man-pages/manglsl/xhtml/xhtml-lat1.ent rename to upstream-doc/manglsl/xhtml/xhtml-lat1.ent diff --git a/upstream-man-pages/manglsl/xhtml/xhtml-special.ent b/upstream-doc/manglsl/xhtml/xhtml-special.ent similarity index 100% rename from upstream-man-pages/manglsl/xhtml/xhtml-special.ent rename to upstream-doc/manglsl/xhtml/xhtml-special.ent diff --git a/upstream-man-pages/manglsl/xhtml/xhtml-symbol.ent b/upstream-doc/manglsl/xhtml/xhtml-symbol.ent similarity index 100% rename from upstream-man-pages/manglsl/xhtml/xhtml-symbol.ent rename to upstream-doc/manglsl/xhtml/xhtml-symbol.ent diff --git a/upstream-man-pages/manglsl/xhtml/xhtml1-transitional.dtd b/upstream-doc/manglsl/xhtml/xhtml1-transitional.dtd similarity index 100% rename from upstream-man-pages/manglsl/xhtml/xhtml1-transitional.dtd rename to upstream-doc/manglsl/xhtml/xhtml1-transitional.dtd diff --git a/upstream-man-pages/update b/upstream-doc/update similarity index 100% rename from upstream-man-pages/update rename to upstream-doc/update