docs/guide/cancellation.rst

@@ -230,23 +230,22 @@ Graceful first, hard as a last resort
 
    The hard-kill path is *skipped* whenever an actor in the tree
    holds the debug-REPL lock (``debug_mode=True`` flavors):
-   Process signals raining down on a tree mid-``pdb`` session would
+   SIGTERM raining down on a tree mid-``pdb`` session would
    clobber your prompt. See :doc:`/guide/debugging`.
 
-Owned-child teardown in ``tractor`` begins with the same graceful
-steps, then selects the escalation path used by its supervisor,
+Every process teardown in ``tractor`` walks the same escalation
+ladder, top rung first,
 
 1. **graceful cancel request**: a runtime-cancel msg over IPC; the
    target actor cancels its tasks, closes its channels and exits
    its :func:`trio.run` cleanly,
 2. **soft wait**: the parent waits (bounded) for the child process
    to exit on its own,
-3. **actor-nursery hard reap**: no cancel ack within the bounded wait
-   (internally an ``ActorTooSlowError``) escalates directly to
-   ``proc.kill()`` before the child monitor joins the process,
-4. **legacy soft-kill path**: older teardown callers may first issue
-   ``proc.terminate()`` and then deploy the "T-800" ``proc.kill()``
-   ultimatum if the process survives that additional bounded wait.
+3. **SIGTERM**: no ack within the bounded wait (internally an
+   ``ActorTooSlowError``) escalates to ``proc.terminate()``,
+4. **SIGKILL ultimatum**: still alive after the hard-kill timeout
+   (~1.6s)? The runtime logs that the "T-800" has been deployed to
+   collect the zombie and issues ``proc.kill()``. No survivors.
 
 The result is the **no-zombies guarantee**: ``tractor`` tries to
 protect you from zombies, no matter what. Quoting the project

docs/guide/rpc.rst

@@ -100,7 +100,7 @@ Semantics worth knowing:
 - it blocks until the remote task returns, re-raising any
   remote error in the usual boxed form right in the calling
   task.
-- lifetime mode also determines process ownership: ``an=`` spawns and
+- placement also determines process ownership: ``an=`` spawns and
   reaps a fresh child in an existing actor nursery, while passing
   neither does the same in a private call-scoped nursery (booting
   the runtime if needed). ``portal=`` instead runs one linked task
@@ -108,7 +108,7 @@ Semantics worth knowing:
   the portal's owner remains responsible for its lifetime.
 - concurrency composes the plain ``trio`` way: schedule
   multiple ``run()`` calls into a local task nursery (see
-  ``examples/parallelism/concurrent_toactor_primes.py``).
+  ``examples/parallelism/to_actor_one_shots.py``).
 
 A reused actor must expose both the target module and the
 ``to_actor`` context trampoline:

examples/a_trynamic_first_scene.py

@@ -35,12 +35,8 @@ async def main():
             for name in ('donny', 'gretchen')
         }
 
-        async def run_and_print(
-            name: str,
-            other_actor: str,
-        ) -> None:
+        async def run_and_print(name: str, other_actor: str):
             print(
-                # RPC through an existing actor's `Portal`.
                 await portals[name].run(
                     say_hello,
                     other_actor=other_actor,

examples/debugging/multi_nested_subactors_error_up_through_nurseries.py

@@ -37,8 +37,6 @@ async def spawn_until(depth=0):
                 )
             )
 
-            # Let the background one-shot enter `breakpoint_forever()`
-            # before its sibling raises and cancellation propagates.
             await trio.sleep(0.5)
             # rx and propagate error from child
             await tractor.to_actor.run(

examples/debugging/root_cancelled_but_child_is_in_tty_lock.py

@@ -44,7 +44,7 @@ async def main():
     async with (
         tractor.open_nursery(
             debug_mode=True,
-            enable_transports=['uds'],  # TODO, pass this via osenv?
+            enable_transports=['uds'],  # TODO, apss this via osenv?
             loglevel='devx',  # XXX, required for test!
         ) as an,
         trio.open_nursery() as tn,

examples/parallelism/single_func.py

@@ -31,7 +31,7 @@ async def main():
         tn.start_soon(burn_cpu)
 
         # run the same func as the lone task in a subactor,
-        # block on and collect its PID as the caller-side result
+        # block on (and collect) its result
         pid = await tractor.to_actor.run(burn_cpu)
 
     print(f"Collected subproc {pid}")

examples/parallelism/to_actor_one_shots.py

@@ -1,5 +1,5 @@
 '''
-`tractor.to_actor.run()`: concurrent one-shot prime checks
+`tractor.to_actor.run()`: one-shot single-task subactor
 invocation, the SC-parallelism sibling of
 `trio.to_thread.run_sync()` (and `anyio.to_process`).
 

tests/discovery/test_multi_program.py

@@ -207,7 +207,7 @@ def test_dup_name_cancel_cascade_escalates_to_hard_kill(
 
     Post-fix, `Portal.cancel_actor()` raises `ActorTooSlowError` on
     the bounded-wait timeout, and `ActorNursery.cancel()`'s
-    per-child wrapper escalates directly to `proc.kill()` (hard-reap).
+    per-child wrapper escalates to `proc.terminate()` (hard-kill).
     The full nursery teardown therefore stays bounded even under
     pathological timing.
 
@@ -266,7 +266,7 @@ def test_dup_name_cancel_cascade_escalates_to_hard_kill(
 
         # post-teardown sanity: every child proc must be reaped.
         # If escalation worked, even timed-out cancel-RPCs would
-        # have triggered `proc.kill()` and the procs are dead.
+        # have triggered `proc.terminate()` and the procs are dead.
         for p in portals:
             # `Portal.channel.connected()` -> False once the
             # underlying chan disconnected (clean exit OR

tractor/runtime/_portal.py

@@ -292,7 +292,7 @@ class Portal:
         - `True`: on bounded-wait expiry, raise `ActorTooSlowError`
           so the caller MUST handle the failure explicitly.
           `ActorNursery.cancel()` opts in so it can escalate via
-          direct `proc.kill()` hard-reaping per SC-discipline.
+          `proc.terminate()` per SC-discipline.
 
         '''
         __runtimeframe__: int = 1  # noqa