Consistently avoid "derived function" for trains: use "compound function" instead

4 files changed, 5 insertions, 5 deletions

diff --git a/docs/spec/evaluate.html b/docs/spec/evaluate.html
index 4e14aefa..50e42796 100644
--- a/docs/spec/evaluate.html
+++ b/docs/spec/evaluate.html
@@ -64,8 +64,8 @@
 </tbody>
 </table>
 <p>In each case the constituent expressions are evaluated in reverse source order: Right, then Called, then Left. Then the expression's result is obtained by calling the Called value on its parameters. A left argument of <code><span class='Value'>nothing</span></code> is not used as a parameter, leaving only a right argument in that case. The type of the Called value must be appropriate to the expression type, as indicated in the &quot;Types&quot; column. For function application, a data type (number, character, or array) is allowed. It is called simply by returning itself. Although the arguments are ignored in this case, they are still evaluated. A block is evaluated by binding the parameter names given in columns L and R to the corresponding values. Then if all parameter levels present have been bound, its body is evaluated to give the result of application.</p>
-<p>Modifiers that are evaluated when they receive operands are called <em>immediate</em>. Other modifiers, including primitives and some kinds of block, simply record the operands and are called <em>deferred</em>. The result of applying a deferred modifier once is called a <em>derived function</em>.</p>
-<p>The rules for trains create another kind of derived function. A derived function is identified by the rule that created it, and the values of its parts.</p>
+<p>Modifiers that are evaluated when they receive operands are called <em>immediate</em>. Other modifiers, including primitives and some kinds of block, simply record the operands and are called <em>deferred</em>. The result of applying a deferred modifier once is called a <em>derived function</em>, and is one kind of <em>compound function</em>.</p>
+<p>The rules for trains create another kind of compound function. A compound function is identified by the rule that created it, and the values of its parts.</p>
 <table>
 <thead>
 <tr>
diff --git a/docs/spec/inferred.html b/docs/spec/inferred.html
index 11c27867..47cb341e 100644
--- a/docs/spec/inferred.html
+++ b/docs/spec/inferred.html
@@ -364,7 +364,7 @@
 </tr>
 </tbody>
 </table>
-<p>Inverses of other modifiers and derived functions or modifiers obtained from them are given below. Here the &quot;inverse&quot; of a modifier is another modifier that, if applied to the same operands as the original operator, gives its inverse function. A constant is either a data value or <code><span class='Function'>𝔽</span><span class='Modifier'>˙</span></code> for an arbitrary value <code><span class='Function'>𝔽</span></code>.</p>
+<p>Inverses of other modifiers and compound functions are given below. Here the &quot;inverse&quot; of a modifier is another modifier that, if applied to the same operands as the original operator, gives its inverse function. A constant is either a data value or <code><span class='Function'>𝔽</span><span class='Modifier'>˙</span></code> for an arbitrary value <code><span class='Function'>𝔽</span></code>.</p>
 <table>
 <thead>
 <tr>
diff --git a/docs/spec/primitive.html b/docs/spec/primitive.html
index 1f9990a2..b68073b0 100644
--- a/docs/spec/primitive.html
+++ b/docs/spec/primitive.html
@@ -37,7 +37,7 @@
 <p>Operations are split into subtypes depending on how they were created.</p>
 <ul>
 <li>Primitives are equal if they have the same token spelling.</li>
-<li>Derived operations are equal if they are derived by the same rule and each corresponding component is the same.</li>
+<li>Compound functions are equal if they are produced by the same rule and each corresponding component is the same.</li>
 <li>Block instances are equal if they are the same instance.</li>
 </ul>
 <p>This means that block instance equality indicates identity in the context of mutability: two block instances are equal if any change of state in one would be reflected in the other as well. The concept of identity holds even if the blocks in question have no way of changing or accessing state. For example, <code><span class='Function'>=</span><span class='Modifier2'>○</span><span class='Brace'>{</span><span class='Value'>𝕩</span><span class='Separator'>⋄</span><span class='Brace'>{</span><span class='Value'>𝕩</span><span class='Brace'>}}</span><span class='Modifier'>˜</span><span class='String'>@</span></code> is <code><span class='Number'>0</span></code> while <code><span class='Function'>=</span><span class='Modifier'>˜</span><span class='Modifier2'>○</span><span class='Brace'>{</span><span class='Value'>𝕩</span><span class='Separator'>⋄</span><span class='Brace'>{</span><span class='Value'>𝕩</span><span class='Brace'>}}</span><span class='String'>@</span></code> is <code><span class='Number'>1</span></code>.</p>
diff --git a/docs/spec/system.html b/docs/spec/system.html
index 01c69287..4fe4dd89 100644
--- a/docs/spec/system.html
+++ b/docs/spec/system.html
@@ -517,7 +517,7 @@
 </table>
 <p><code><span class='Function'>•Glyph</span></code> gives the glyph corresponding to a primitive as a single character, for example returning <code><span class='String'>'+'</span></code> given an argument matching <code><span class='Function'>+</span></code>. It causes an error if the argument is not a primitive.</p>
 <p><code><span class='Function'>•Source</span></code> gives a string containing a block's source, including the enclosing braces <code><span class='Brace'>{}</span></code>. It causes an error if the argument is not a block. In contrast to <code><span class='Function'>•Glyph</span></code>, this function does not give full information about <code><span class='Value'>𝕩</span></code> because the result cannot convey environment or mutable identity.</p>
-<p><code><span class='Function'>•Decompose</span></code> breaks down one level of a compound function, returning a list with a code giving what kind of structure it has followed by each of its components. Possible codes are listed in the table below according to the rule that forms the derived function—train or 2-modifier application. Non-function values, and some functions, can't be broken down. They are still classified with a code: -1 for a non-operation, 0 for a primitive, and 1 for other operations. &quot;Other&quot; includes blocks and system operations. The result is thus a list of length 2 to 4, and <code><span class='Function'>•Decompose</span></code> cannot cause an error.</p>
+<p><code><span class='Function'>•Decompose</span></code> breaks down one level of a compound function, returning a list with a code giving what kind of structure it has followed by each of its components. Possible codes are listed in the table below according to the rule that forms the function—train or modifier application. Non-function values, and some functions, can't be broken down. They are still classified with a code: -1 for a non-operation, 0 for a primitive, and 1 for other operations. &quot;Other&quot; includes blocks and system operations. The result is thus a list of length 2 to 4, and <code><span class='Function'>•Decompose</span></code> cannot cause an error.</p>
 <table>
 <thead>
 <tr>