summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-01-07 02:33:55 -0800
committerJakob Borg <jakob@nym.se>2014-01-07 02:33:55 -0800
commit2a0d1ab29401af1252fd00a90c7c0cf4e8e712f3 (patch)
treeb52988e72b0ec2d5e98547af5b54e5f1b53ec252
parente769de9986c73c953e8f9b0a6a6ddad98ad04109 (diff)
parent2bdab426ff7a6e7a3c872269dda26dd49f6eb390 (diff)
downloadsyncthing-2a0d1ab29401af1252fd00a90c7c0cf4e8e712f3.tar.gz
syncthing-2a0d1ab29401af1252fd00a90c7c0cf4e8e712f3.zip
Merge pull request #18 from jpjp/patch-1v0.3.2
synch -> sync
-rw-r--r--protocol/PROTOCOL.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/protocol/PROTOCOL.md b/protocol/PROTOCOL.md
index c00f448d4..9a2c264f2 100644
--- a/protocol/PROTOCOL.md
+++ b/protocol/PROTOCOL.md
@@ -9,7 +9,7 @@ Each node has a _repository_ of files described by the _local model_,
containing modifications times and block hashes. The local model is sent
to the other nodes in the cluster. The union of all files in the local
models, with files selected for most recent modification time, forms the
-_global model_. Each node strives to get it's repository in synch with
+_global model_. Each node strives to get it's repository in sync with
the global model by requesting missing blocks from the other nodes.
Transport and Authentication