summaryrefslogtreecommitdiff
path: root/doc/assistant/pairing_walkthrough.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-11 17:36:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-11 17:36:57 -0400
commit8881c671d3bbd0c7a31fac0746146a4dea5729b1 (patch)
tree5823ea397ffaa6b46fbf9e3d8e529dc2b634d873 /doc/assistant/pairing_walkthrough.mdwn
parent6068fd160ffeb930368a4c4c2a8818ace71f29ab (diff)
add a new walkthrough for xmpp pairing
Diffstat (limited to 'doc/assistant/pairing_walkthrough.mdwn')
-rw-r--r--doc/assistant/pairing_walkthrough.mdwn13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/assistant/pairing_walkthrough.mdwn b/doc/assistant/pairing_walkthrough.mdwn
index 4c0b7f2df..07b639910 100644
--- a/doc/assistant/pairing_walkthrough.mdwn
+++ b/doc/assistant/pairing_walkthrough.mdwn
@@ -10,7 +10,9 @@ We'll start on your computer, where you open up your git annex dashboard.
`*click*`
-[[!img pairing.png alt="Pair with local computer"]]
+[[!img pairing.png alt="Pair with another computer"]]
+
+`*click*`
Now the hard bit. You have to think up a secret phrase, and type it in,
(and perhaps get the spelling correct).
@@ -41,10 +43,11 @@ plugged into the same router.
Also, the file sharing set up by this pairing only works when both
computers are on the same network. If you go on a trip, any files you
-edit will not be visible to your friend until you get back. **But**,
-you can get around this by hooking both computers up to a server on the
-internet, which they can use to exchange files while disconnected. The
-git annex assistant makes that easy too.
+edit will not be visible to your friend until you get back.
+
+To get around this, you'll often also want to set up
+[[jabber_pairing|share_with_a_friend_walkthrough]], and a server
+in the cloud, which they can use to exchange files while away.
And also, you can pair with as many other computers as you like, not just
one!