diff options
Diffstat (limited to 'docs/architecture.md')
| -rw-r--r-- | docs/architecture.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/architecture.md b/docs/architecture.md index d867d4a..9edf086 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -55,7 +55,8 @@ the node names its types as `document` re-exports them (`Document`, `ChangeHash` `Change`, `ActorId`) and works through `document`'s functions. Two views of it: * **The store** (`document::store`): JSON over slash-separated paths, with Automerge's - concurrent values merged into one view (maps union, scalars newest-wins) and + concurrent values merged into one view (maps union, scalars newest-wins; where the + policy asks for signed values, a signed value by its `seq` before anything else) and reported on request (`?conflicts=true`). The HTTP API and the remake kinds work through it; nothing else reads Automerge objects directly. Within a list, a path segment is an index (`servers/0/name`); a negative one counts from the end. A key with `/` in it, or |
