aboutsummaryrefslogtreecommitdiff
path: root/doc/tips
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-16 18:26:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-16 18:26:07 -0400
commit82bb3565a3b4ae4442d006b06c1bd487cba783a8 (patch)
tree6d7681bed722e263a67770852930bdd1754e07b5 /doc/tips
parent097c82b17ed0f3c96d1ca1617f42c39650dc9ab2 (diff)
Revert "p2p --link now defaults to setting up a bi-directional link"
This reverts commit 6aa7e136b5d246228723f4c9996bda11f66c4445. On second thought, this was an overcomplication of what should be the lowest-level primitive. Let's build bi-directional links at the pairing level with eg magic wormhole.
Diffstat (limited to 'doc/tips')
-rw-r--r--doc/tips/peer_to_peer_network_with_tor.mdwn10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/tips/peer_to_peer_network_with_tor.mdwn b/doc/tips/peer_to_peer_network_with_tor.mdwn
index 13a7f0cc7..9c97735e4 100644
--- a/doc/tips/peer_to_peer_network_with_tor.mdwn
+++ b/doc/tips/peer_to_peer_network_with_tor.mdwn
@@ -56,12 +56,12 @@ peer1 remote:
git annex sync --content peer1
-Any number of peers can be connected this way, within reason.
+You can also generate an address for this new peer, by running `git annex
+p2p --gen-addresses`, and link other peers to that address using `git annex
+p2p --link`. It's often useful to link peers up in both directions,
+so peer1 is a remote of peer2 and peer2 is a remote of peer1.
-(When the second peer links to it, the first peer also
-gets a new remote added to it, which points to the second peer.
-So, on the first peer, you can also sync with the second peer.
-The name of the that remote will be "peer1", or "peer2", etc.)
+Any number of peers can be connected this way, within reason.
## starting git-annex remotedaemon