Merge pull request #48 from delphix/projects/merge-upstream/master

Merge remote-tracking branch '6.0/stage' into 'master'

docs/advanced_usage.rst

@@ -92,7 +92,7 @@ Some of drgn's behavior can be modified through environment variables:
     :exc:`drgn.MissingDebugInfoError`. Any additional errors are truncated. The
     default is 5; -1 is unlimited.
 
-``DRGN_PREFER_ORC_UNWINDER```
+``DRGN_PREFER_ORC_UNWINDER``
     Whether to prefer using `ORC
     <https://www.kernel.org/doc/html/latest/x86/orc-unwinder.html>`_ over DWARF
     for stack unwinding (0 or 1). The default is 0. Note that drgn will always
@@ -110,8 +110,8 @@ Some of drgn's behavior can be modified through environment variables:
     Whether drgn should use libkdumpfile for ELF vmcores (0 or 1). The default
     is 0. This functionality will be removed in the future.
 
-``DRGN_USE_PROC_AND_SYS_MODULES``
-    Whether drgn should use ``/proc/modules`` and ``/sys/module`` to find
-    loaded kernel modules for the running kernel instead of getting them from
-    the core dump (0 or 1). The default is 1. This environment variable is
-    mainly intended for testing and may be ignored in the future.
+``DRGN_USE_SYS_MODULE``
+    Whether drgn should use ``/sys/module`` to find information about loaded
+    kernel modules for the running kernel instead of getting them from the core
+    dump (0 or 1). The default is 1. This environment variable is mainly
+    intended for testing and may be ignored in the future.