Merge pull request #12679 from devtooligan/tweak/expand-collide-definition

Marenz · web-flow · commit 45f5616b12e3 · 2022-07-06T15:04:40.000+02:00
tweak: expand definition of suggested collision naming convention
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
@@ -1256,8 +1256,8 @@ Avoiding Naming Collisions
 
 * ``singleTrailingUnderscore_``
 
-This convention is suggested when the desired name collides with that of a
-built-in or otherwise reserved name.
+This convention is suggested when the desired name collides with that of
+an existing state variable, function, built-in or otherwise reserved name.
 
 .. _style_guide_natspec:
 
