aboutsummaryrefslogtreecommitdiffstats
path: root/docs/federation.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/federation.md')
-rw-r--r--docs/federation.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/federation.md b/docs/federation.md
index 63aab69..6bdc4e4 100644
--- a/docs/federation.md
+++ b/docs/federation.md
@@ -278,9 +278,9 @@ refuses, with everything built on it, reports, and leaves to its operator; anoth
node's refusal doesn't make it drop what it took. One valid at its history breaks no
rule: its committer isn't refused as a whole, as a member whose own change broke a rule
is ([`access.md`](access.md)), and the node reports it apart from changes against the
-rules. Where it holds two that change the one it reads, having taken neither, it takes
-neither until its operator names one. Without keys voting twice, every version written
-changes the one every node reads, and none is refused.
+rules. Of two that change the one it reads, it takes the first it judges. Without keys
+voting twice, every version written changes the one every node reads, and none is
+refused.
**The current version** is the written version with the highest number: the end of the
chain the node took, read from what the document holds without the versions behind it,
@@ -623,7 +623,7 @@ What an attacker does, and what happens. *Unit*: the judging, with crafted chang
| 19 | The parties beyond two thirds never vote, or vote `false` on everything | Nothing passes; the others fork | sim |
| 20 | The party a version takes out writes that version itself | Written: a version counts by its votes, not its writer | unit |
| 21 | The keys an earlier version named, for two thirds of its parties, pass another proposal on it at a history from before, and raise its number | Refused by every node that took the version after it, and reported; a node that lagged may take it: keys voted twice | unit |
-| 22 | Two versions changing the one a node reads, coming together | It takes neither until its operator names one | unit |
+| 22 | Two versions changing the one a node reads, coming together | It takes the first it judges, and refuses the other | unit |
| 23 | Values signed with a key a party's set holds, stolen | Count until the party drops the key | unit |
| 24 | A key a version names, stolen, votes, or writes its party's set or list | Counts while that version is current; the party's own vote beside it is voting twice, answered by a fork | unit |
| 25 | A write in another party's namespace, or at an identifier of another's | Refused by the rule | unit |