diff --git a/manual/modeling/geometry_nodes/input/scene/self_object.rst b/manual/modeling/geometry_nodes/input/scene/self_object.rst
index 45ab6384e..5e88aea86 100644
--- a/manual/modeling/geometry_nodes/input/scene/self_object.rst
+++ b/manual/modeling/geometry_nodes/input/scene/self_object.rst
@@ -12,6 +12,8 @@ Self Object Node
 The *Self Object* node outputs the object that contains the geometry nodes modifier
 currently being executed. This can be used to retrieve the original transforms.
 
+When evaluated in the :ref:`Tool context <tool_context>`, this node returns the Active object.
+
 .. note::
 
    The geometry cannot be retrieved from this object with the
diff --git a/manual/modeling/geometry_nodes/output/viewer.rst b/manual/modeling/geometry_nodes/output/viewer.rst
index 18cf05c85..1eaaaf1b1 100644
--- a/manual/modeling/geometry_nodes/output/viewer.rst
+++ b/manual/modeling/geometry_nodes/output/viewer.rst
@@ -15,6 +15,10 @@ The *Viewer* node allows viewing data from inside a geometry node group in the
 Any geometry connected can be visualized in the viewport and its attribute values
 can be read in the spreadsheet.
 
+.. note::
+
+   This node cannot be used in the :ref:`Tool context <tool_context>`—only in the *Modifier* context.
+
 
 Usage
 =====
diff --git a/manual/modeling/geometry_nodes/simulation/simulation_zone.rst b/manual/modeling/geometry_nodes/simulation/simulation_zone.rst
index ee316119a..cf67c4f46 100644
--- a/manual/modeling/geometry_nodes/simulation/simulation_zone.rst
+++ b/manual/modeling/geometry_nodes/simulation/simulation_zone.rst
@@ -26,6 +26,10 @@ It is not possible to have any link going towards outside.
 The result of the simulation can only be accessed via the Simulation Output node.
 This also allows sub-frame interpolation for motion blur.
 
+.. note::
+
+   This node cannot be used in the :ref:`Tool context <tool_context>`—only in the *Modifier* context.
+
 
 Clock
 =====
diff --git a/manual/modeling/geometry_nodes/tools.rst b/manual/modeling/geometry_nodes/tools.rst
index 62461ad7b..2e991ef32 100644
--- a/manual/modeling/geometry_nodes/tools.rst
+++ b/manual/modeling/geometry_nodes/tools.rst
@@ -5,7 +5,7 @@
 Node-Based Tools
 ****************
 
-Geometry Nodes can be used to expand the core functionality of Blender via node group defined tools.
+Geometry Nodes can be used to expand the core functionality of Blender via node-group-defined tools.
 They can be shared as any regular node group assets.
 
 .. figure:: /images/modeling_geometry-nodes_tools.png
@@ -50,17 +50,17 @@ The node group inputs will be exposed as in the :doc:`Adjust Last Operation </in
 Supported Modes and Data-Types
 ==============================
 
-Node groups must specify which mode and object types they support.
+Node groups must specify which modes and object types they support.
 This helps to determine where the tool is available in the user interface.
-These properties can be configured in popover menus in the :doc:`/editors/geometry_node`.
+These properties can be configured in popover menus in the :doc:`/editors/geometry_node` when in the *Tool* context.
 
-Currently, only Edit and Sculpting mode, for Mesh and Curve objects are supported.
+Currently only Edit and Sculpting modes are supported, and only for the Mesh and Hair Curves object types.
 
 
 Tool-specific Nodes
 ===================
 
-The following nodes are only supported in the tool context:
+The following nodes are only supported in the *Tool* context:
 
    - 3D Cursor
    - Face Set
@@ -71,13 +71,13 @@ The following nodes are only supported in the tool context:
 .. note::
 
    The :doc:`Self Object </modeling/geometry_nodes/input/scene/self_object>`
-   node returns the Active object when inside a Tool node group.
+   node returns the Active object when inside a *Tool* node group.
 
 
 Non-supported Nodes
 ===================
 
-These nodes are only supported in the modifier context:
+These nodes are only supported in the *Modifier* context:
 
   - :doc:`/modeling/geometry_nodes/simulation/simulation_zone`
   - :doc:`/modeling/geometry_nodes/output/viewer`