summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar https://thargos.myopenid.com/ <https://thargos.myopenid.com/@web>2014-01-27 12:47:03 +0000
committerGravatar admin <admin@branchable.com>2014-01-27 12:47:03 +0000
commit379fc33f6b2dae3b993251cfd61bcaf362ae24fa (patch)
tree4ef2e903a2ef7a3cc0d810d869aa432c3b21a05a
parentb5cb8116c9d67a6052003c68cababd67f6473c60 (diff)
typo
-rw-r--r--doc/design/assistant/telehash.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/telehash.mdwn b/doc/design/assistant/telehash.mdwn
index 777bce646..ad692a4d1 100644
--- a/doc/design/assistant/telehash.mdwn
+++ b/doc/design/assistant/telehash.mdwn
@@ -33,7 +33,7 @@ git-annex (assistant) repositories.
* XMPP pairing can also be used for telehash address discovery. (Note that
MITM attacks are possible.) Is it worth keeping XMPP in git-annex just
for this?
-* Telehash addresses of repoitories can be communicated out of band (eg,
+* Telehash addresses of repositories can be communicated out of band (eg,
via an OTR session or gpg signed mail), and pasted into the webapp to
initiate a repository pairing that then proceeds entirely over telehash.
Once both sides do this, the pairing can proceed automatically.