From e54b547d4b494c3100e948bca0bb18861f402c1e Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Mon, 2 Dec 2024 18:48:12 -0500 Subject: [PATCH] docs: Clarify project name and include Mesa3D Mesa3D is commonly used, as evidenced by the use of the Mesa3D.org domain. Additionally, it is unnecessary to advise against using "MesaGL" since we do not use it ourselves. Cc: mesa-stable Signed-off-by: David Heidelberg (cherry picked from commit 6f08f921bf8ad7f8d9fc580eb127a66a6d993655) Part-of: --- .pick_status.json | 2 +- docs/license.rst | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8b9daa0319a..d6b78aeee2b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2024,7 +2024,7 @@ "description": "docs: Clarify project name and include Mesa3D", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/docs/license.rst b/docs/license.rst index 7cf7c02e9af..4a6ad5e2d6f 100644 --- a/docs/license.rst +++ b/docs/license.rst @@ -10,8 +10,7 @@ implementation isn't formally conformant on all combinations of drivers and hardware. `Khronos`_ maintains lists of conformant implementations for each of their APIs, as well as `trademark details`_. -Please do not refer to the library as *MesaGL* (for legal reasons). It's -just *Mesa* or *The Mesa 3-D graphics library*. +This project is called *Mesa*, *Mesa3D*, or *The Mesa 3-D graphics library*. .. _OpenGL: https://www.opengl.org/ .. _OpenGL ES: https://www.khronos.org/opengles/