X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Flicense.rst;h=2d8cdfe780f5f8e5d6a09d167d462c6345b78237;hb=e3e45e2456d2dc7eccf03d7c93bc9cee823a1eec;hp=4fdbf2db675f2ea37a0fd0e90955eb2180fdb509;hpb=4d066836e3cf307431a74eafcc8a404ce5ccea69;p=mesa.git
diff --git a/docs/license.rst b/docs/license.rst
index 4fdbf2db675..2d8cdfe780f 100644
--- a/docs/license.rst
+++ b/docs/license.rst
@@ -5,8 +5,7 @@ Disclaimer
----------
Mesa is a 3-D graphics library with an API which is very similar to that
-of
-`OpenGL `__\ :sup:`[`\ `1 <#trademark>`__\ :sup:`]`.
+of `OpenGL `_ [1]_.
To the extent that Mesa utilizes the OpenGL command syntax or state
machine, it is being used with authorization from `Silicon Graphics,
Inc. `__\ (SGI). However, the author does not
@@ -18,8 +17,8 @@ licensed vendor.
Please do not refer to the library as *MesaGL* (for legal reasons). It's
just *Mesa* or *The Mesa 3-D graphics library*.
-[1]: OpenGL is a trademark of `Silicon Graphics
-Incorporated `__.
+.. [1] OpenGL is a trademark of `Silicon Graphics
+ Incorporated `__.
License / Copyright Information
-------------------------------
@@ -69,22 +68,22 @@ respective licenses.
Mesa Component Licenses
-----------------------
-::
-
- Component Location License
- ------------------------------------------------------------------
- Main Mesa code src/mesa/ MIT
-
- Device drivers src/mesa/drivers/* MIT, generally
-
- Gallium code src/gallium/ MIT
-
- Ext headers include/GL/glext.h Khronos
- include/GL/glxext.h
-
- GLX client code src/glx/ SGI Free Software License B
-
- C11 thread include/c11/threads*.h Boost (permissive)
- emulation
++-----------------+------------------------+-----------------------------+
+| Component | Location | License |
++=================+========================+=============================+
+| Main Mesa code | src/mesa/ | MIT |
++-----------------+------------------------+-----------------------------+
+| Device drivers | src/mesa/drivers/* | MIT, generally |
++-----------------+------------------------+-----------------------------+
+| Gallium code | src/gallium/ | MIT |
++-----------------+------------------------+-----------------------------+
+| Ext headers | include/GL/glext.h, | Khronos |
+| | include/GL/glxext.h | |
++-----------------+------------------------+-----------------------------+
+| GLX client code | src/glx/ | SGI Free Software License B |
++-----------------+------------------------+-----------------------------+
+| C11 thread | include/c11/threads*.h | Boost (permissive) |
+| emulation | | |
++-----------------+------------------------+-----------------------------+
In general, consult the source files for license terms.