summaryrefslogtreecommitdiff
path: root/doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn
diff options
context:
space:
mode:
authorGravatar Richard Hartmann <richih.mailinglist@gmail.com>2012-07-08 20:53:50 +0200
committerGravatar Joey Hess <joey@kitenet.net>2012-07-08 13:04:35 -0600
commit619297e1a7ba89f50fa5be9d7dfdfe5a9510129a (patch)
tree425a9931a9caa211ae24f9d8c05976757c2203a6 /doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn
parentb64a489a07f5e5be5b722ec3b942f505756ce853 (diff)
Fix typos on blog
Diffstat (limited to 'doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn')
-rw-r--r--doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn b/doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn
index c4a700d13..4173fbf77 100644
--- a/doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn
+++ b/doc/design/assistant/blog/day_14__thinking_about_syncing.mdwn
@@ -10,13 +10,13 @@ But it's not all easy. Syncing should happen as fast as possible, so
changes show up without delay. Eventually it'll need to support syncing
between nodes that cannot directly contact one-another. Syncing needs to
deal with nodes coming and going; one example of that is a USB drive being
-plugged in, which should immediatly be synced, but network can also come
+plugged in, which should immediately be synced, but network can also come
and go, so it should periodically retry nodes it failed to sync with. To
start with, I'll be focusing on fast syncing between directly connected
nodes, but I have to keep this wider problem space in mind.
One problem with `git annex sync` is that it has to be run in both clones
-in order for changes to fully propigate. This is because git doesn't allow
+in order for changes to fully propagate. This is because git doesn't allow
pushing changes into a non-bare repository; so instead it drops off a new
branch in `.git/refs/remotes/$foo/synced/master`. Then when it's run locally
it merges that new branch into `master`.