Merge branch 'jk/am-i-resolved-fix' into maint

diff --git a/trace2/tr2_sysenv.h b/trace2/tr2_sysenv.h
index 369b20bd87f5894a92cd206559e9f84b9ccde4b1..8dd82a7a56bb04e71e5343cf8bee095240ff0839 100644 (file)
--- a/trace2/tr2_sysenv.h
+++ b/trace2/tr2_sysenv.h
@@ -7,7 +7,7 @@
  *
  * Note that this set does not contain any of the transient
  * environment variables used to pass information from parent
- * to child git processes, such "GIT_TR2_PARENT_SID".
+ * to child git processes, such "GIT_TRACE2_PARENT_SID".
  */
 enum tr2_sysenv_variable {
        TR2_SYSENV_CFG_PARAM = 0,