aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/federation.md5
-rw-r--r--docs/guides/federation/running-a-node.md4
-rw-r--r--docs/guides/federation/watching.md5
3 files changed, 11 insertions, 3 deletions
diff --git a/docs/federation.md b/docs/federation.md
index ecc3f21..d10a220 100644
--- a/docs/federation.md
+++ b/docs/federation.md
@@ -595,7 +595,10 @@ puts whatever events it is given, its party's and others' alike: what counts is
an event, not which node put it. So a party without nodes of its own writes through any
node that takes its events. Under a revision with merge events, a node its party lists
signs merge events with its own key ([Events](#events)): they count for nothing, and only
-gather what they build on into the history of what builds on them.
+gather what they build on into the history of what builds on them. It does so by itself
+where its store holds more heads than an event may name, a random wait after it first
+did, so that of the members few do at once: each on as many as an event may name, the
+earliest taken first, until no more are left.
### Forks
diff --git a/docs/guides/federation/running-a-node.md b/docs/guides/federation/running-a-node.md
index 6444bbd..94781d4 100644
--- a/docs/guides/federation/running-a-node.md
+++ b/docs/guides/federation/running-a-node.md
@@ -109,6 +109,10 @@ it takes the checkpoint only where its operator pins it. Pin it, and restart the
* **Events its document lacks**, that its store would take and that it has: after a
remake, a rejoin, or a change of another node it refused (`Put again events the
document lacked`).
+* **Merge events**, under a revision with them, where its party lists it and its store
+ holds more heads than an event may name (64): signed with its node key, a random wait
+ after there first were (`Merged heads beyond what an event may name`). They count for
+ nothing, and gather the heads apart, so that what is written after builds on them all.
* **Its own protocol data**: its entry, its acks of remakes, and the remakes it
coordinates. Remakes are compactions only, acked by the members
([`remakes.md`](../../remakes.md)).
diff --git a/docs/guides/federation/watching.md b/docs/guides/federation/watching.md
index a54dd7f..da4a93f 100644
--- a/docs/guides/federation/watching.md
+++ b/docs/guides/federation/watching.md
@@ -55,9 +55,10 @@ At warn or error:
read-only disk;
* `Couldn't vote by itself`, `Voting by itself, without its party's record: votes none`;
* `Couldn't put what it signed for its party: put again later`, `Couldn't write a version
- that passed: put again later`, `Couldn't put again events the document lacks`;
+ that passed: put again later`, `Couldn't put again events the document lacks`,
+ `Couldn't put a merge event: put again later`;
* `Dropped events, as this node's operator says`: whoever may use the node's API did it.
At info, worth knowing: `The store's members, as it reads now`, `Writing a version that
passed`, `Voting for its party`, `Proposing a checkpoint for its party`, `This node is a
-member of its store`.
+member of its store`, `Merged heads beyond what an event may name`.