diff --git a/docs/drivers/anv.rst b/docs/drivers/anv.rst
index d7d73983990..d68006bdbc3 100644
--- a/docs/drivers/anv.rst
+++ b/docs/drivers/anv.rst
@@ -1,49 +1,6 @@
 ANV
 ===
 
-Debugging
----------
-
-Here are a few environment variable debug environment variables
-specific to ANV:
-
-.. envvar:: ANV_ENABLE_PIPELINE_CACHE
-
-   If defined to ``0`` or ``false``, this will disable pipeline
-   caching, forcing ANV to reparse and recompile any VkShaderModule
-   (SPIRV) it is given.
-
-.. envvar:: ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS
-
-   If defined to ``1`` or ``true``, this will prevent usage of self
-   modifying command buffers to implement ``vkCmdExecuteCommands``. As
-   a result of this, it will also disable :ext:`VK_KHR_performance_query`.
-
-.. envvar:: ANV_ALWAYS_BINDLESS
-
-   If defined to ``1`` or ``true``, this forces all descriptor sets to
-   use the internal `Bindless model`_.
-
-.. envvar:: ANV_QUEUE_THREAD_DISABLE
-
-   If defined to ``1`` or ``true``, this disables support for timeline
-   semaphores.
-
-.. envvar:: ANV_USERSPACE_RELOCS
-
-   If defined to ``1`` or ``true``, this forces ANV to always do
-   kernel relocations in command buffers. This should only have an
-   effect on hardware that doesn't support soft-pinning (Ivybridge,
-   Haswell, Cherryview).
-
-.. envvar:: ANV_PRIMITIVE_REPLICATION_MAX_VIEWS
-
-   Specifies up to how many view shaders can be lowered to handle
-   :ext:`VK_KHR_multiview`. Beyond this number, multiview is implemented
-   using instanced rendering. If unspecified, the value default to
-   ``2``.
-
-
 Experimental features
 ---------------------
 
diff --git a/docs/envvars.rst b/docs/envvars.rst
index 62b9cd38aec..7606e0717a8 100644
--- a/docs/envvars.rst
+++ b/docs/envvars.rst
@@ -472,11 +472,6 @@ on Windows.
 Intel driver environment variables
 ----------------------------------------------------
 
-.. envvar:: ANV_NO_GPL
-
-   If set to 1, true, or yes, then VK_EXT_graphics_pipeline_library
-   will be disabled.
-
 .. envvar:: INTEL_BLACKHOLE_DEFAULT
 
    if set to 1, true or yes, then the OpenGL implementation will
@@ -857,6 +852,50 @@ Intel driver environment variables
    If none of widths for particular shader stage was specified, then all
    widths are allowed.
 
+Anvil(ANV) driver environment variables
+---------------------------------------
+
+.. envvar:: ANV_ENABLE_PIPELINE_CACHE
+
+   If defined to ``0`` or ``false``, this will disable pipeline
+   caching, forcing ANV to reparse and recompile any VkShaderModule
+   (SPIRV) it is given.
+
+.. envvar:: ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS
+
+   If defined to ``1`` or ``true``, this will prevent usage of self
+   modifying command buffers to implement ``vkCmdExecuteCommands``. As
+   a result of this, it will also disable :ext:`VK_KHR_performance_query`.
+
+.. envvar:: ANV_ALWAYS_BINDLESS
+
+   If defined to ``1`` or ``true``, this forces all descriptor sets to
+   use the internal `Bindless model`_.
+
+.. envvar:: ANV_QUEUE_THREAD_DISABLE
+
+   If defined to ``1`` or ``true``, this disables support for timeline
+   semaphores.
+
+.. envvar:: ANV_USERSPACE_RELOCS
+
+   If defined to ``1`` or ``true``, this forces ANV to always do
+   kernel relocations in command buffers. This should only have an
+   effect on hardware that doesn't support soft-pinning (Ivybridge,
+   Haswell, Cherryview).
+
+.. envvar:: ANV_PRIMITIVE_REPLICATION_MAX_VIEWS
+
+   Specifies up to how many view shaders can be lowered to handle
+   :ext:`VK_KHR_multiview`. Beyond this number, multiview is implemented
+   using instanced rendering. If unspecified, the value default to
+   ``2``.
+
+.. envvar:: ANV_NO_GPL
+
+   If set to 1, true, or yes, then VK_EXT_graphics_pipeline_library
+   will be disabled.
+
 DRI environment variables
 -------------------------