add back share_with_a_friend_walkthrough, adapted for tor pairing

and some other xmpp to tor related changes

15 files changed, 38 insertions, 100 deletions

diff --git a/doc/assistant/local_pairing_walkthrough.mdwn b/doc/assistant/local_pairing_walkthrough.mdwn
index f6282ec28..c0a760ef5 100644
--- a/doc/assistant/local_pairing_walkthrough.mdwn
+++ b/doc/assistant/local_pairing_walkthrough.mdwn
@@ -76,8 +76,8 @@ 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. 
 
 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.
+[[tor_pairing|share_with_a_friend_walkthrough]] too, 
+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!
diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn
index 52749dda7..dc3b7b7b7 100644
--- a/doc/assistant/release_notes.mdwn
+++ b/doc/assistant/release_notes.mdwn
@@ -1,3 +1,7 @@
+## version 6.20170101
+
+This release removes XMPP support. Instead, the new Tor support can be used.
+
 ## version 5.20140421
 
 This release begins to deprecate XMPP support. In particular, if you use
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment b/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment
deleted file mode 100644
index cac5295a7..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_1_e0187b0a926904b363065ab0f850f0b2._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmG4rlD9k1ezNkYZ8jDbITrycUmHV-P8Qs"
- nickname="Jeroen"
- subject="Synced vs. unsynced"
- date="2013-07-29T18:07:45Z"
- content="""
-I've noticed that it is also possible to add an existing annex folder on a remote server without using syncing. Are there any dangers in doing this?
-
-Could you explain what syncing does and when it is needed? Thanks.
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment b/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment
deleted file mode 100644
index b99d9e22b..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_2_dabcbc9aaf0bdb82716f5a5d55807a21._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="4.154.0.21"
- subject="comment 2"
- date="2013-07-30T18:08:38Z"
- content="""
-I'm afraid I don't quite understand the question.
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_4_978fab3cd165b4ca245e32fc48cf0970._comment b/doc/assistant/remote_sharing_walkthrough/comment_4_978fab3cd165b4ca245e32fc48cf0970._comment
deleted file mode 100644
index ab0b19160..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_4_978fab3cd165b4ca245e32fc48cf0970._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="209.250.56.246"
- subject="comment 4"
- date="2013-11-12T18:18:16Z"
- content="""
-You can easily use a removable drive as a transfer repository to sync two computers that have no network connection. Just use the webapp to add the drive on one computer. The drive will be set up as a transfer repository by default. The webapp will automatically start copying all your files to it. Then you can disconnect the drive, bring it to the other computer, and repeat the process. Everything from the first computer will then sync over from the drive to the second computer. And repeat moving the drive back and forth to keep things in sync.
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_4_d7e879f7b098964040df2e27a18eda72._comment b/doc/assistant/remote_sharing_walkthrough/comment_4_d7e879f7b098964040df2e27a18eda72._comment
deleted file mode 100644
index 71f57e9b3..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_4_d7e879f7b098964040df2e27a18eda72._comment
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU"
- nickname="Ulrich"
- subject="Using a portable drive as another transfer device?"
- date="2013-11-12T16:52:12Z"
- content="""
-I try to understand how to setup git-annex for the following use case:
-
-Two computers, that are paired via remote sharing, using some cloud repository for transfer, and a local NAS for backups.
-
-These two computers are sometimes in the same network, sometimes in different networks, and sometimes even without network at all. From what I read, it should be possible to bypass the cloud when these two machines are on the same network, which sounds great.
-
-Would it be possible to use a portable drive as \"another link\" between these two computers that can be used to sync them even if there is no network between them?
-
-And as you write, if the pairing has been set up manually, then everything is fine - so could it be that it is really easy and only necessary to setup the git-annex on the local drive as an additional remote on both (or only one?) machine?
-
-thanks for any insight!
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_5_00852736d47c05772b15c5ff54ae7da7._comment b/doc/assistant/remote_sharing_walkthrough/comment_5_00852736d47c05772b15c5ff54ae7da7._comment
deleted file mode 100644
index a66fcd098..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_5_00852736d47c05772b15c5ff54ae7da7._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU"
- nickname="Ulrich"
- subject="Using a portable drive as another transfer device? – cool."
- date="2013-11-14T19:05:56Z"
- content="""
-Thanks - I was hoping that it is that easy. I'll try that as soon as I have a working version of the latest git-annex (trying to build with brew for Mac OS X 10.9, but without success so far). 
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment b/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment
deleted file mode 100644
index 69ae139b2..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_6_770c4f1802fc40d76bbaf7783bb3b4ac._comment
+++ /dev/null
@@ -1,14 +0,0 @@
-[[!comment format=mdwn
- username="severo"
- ip="88.182.182.135"
- subject="git-assistant and transfer repository"
- date="2014-03-16T17:05:43Z"
- content="""
-In your comment http://git-annex.branchable.com/assistant/remote_sharing_walkthrough/#comment-f97efe1d05c0101232684b4e4edc4866, you describe a way to synchronize two devices using an intermediate USB drive configured as a \"transfer repository\".
-
-I understand that in that case, the USB drive can only be used as a \"transmitter\", in a git repository form, not as a copy of the files structure. This means the files contained by the USB drive cannot be accessed without git/git-annnex.
-
-Is there a way to use the USB drive as a \"client repository\" in order to allow synchronization, as described earlier, but also as a simple copy of the files, in order to access them from any device (opening them with windows in a cyber coffee for example).
-
-Thanks
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_7_61c1f5b00381b2fa891a8578267881ab._comment b/doc/assistant/remote_sharing_walkthrough/comment_7_61c1f5b00381b2fa891a8578267881ab._comment
deleted file mode 100644
index e34a462da..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_7_61c1f5b00381b2fa891a8578267881ab._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="http://joeyh.name/"
- ip="209.250.56.154"
- subject="comment 7"
- date="2014-03-17T19:50:48Z"
- content="""
-@severo the web app does not support setting up that use case. However, you can make a non-bare clone of your repository onto a removable drive, and if you do the assistant will use it just the same as if you'd set up a removable drive using the webapp. Note that you will need to run `git annex sync` inside that repository in order to update the tree it displays.
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment b/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment
deleted file mode 100644
index 994d969e6..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_8_35e00cd10e89ae4bcc66af7dadf6bb5c._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="severo"
- ip="95.152.107.168"
- subject="comment 8"
- date="2014-03-18T10:06:50Z"
- content="""
-Thansk @joeyh.name for your answer. Do you think this feature could be integrated into the git-annex assistant ?
-"""]]
diff --git a/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment b/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment
deleted file mode 100644
index 1766fcf63..000000000
--- a/doc/assistant/remote_sharing_walkthrough/comment_9_c900e4ef49388826c87cadef4235c073._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="severo"
- ip="95.152.107.168"
- subject="comment 9"
- date="2014-03-18T11:16:19Z"
- content="""
-Some explanations in French on how to do: http://seenthis.net/messages/237648#message238202
-"""]]
diff --git a/doc/assistant/share_with_a_friend_walkthrough.mdwn b/doc/assistant/share_with_a_friend_walkthrough.mdwn
new file mode 100644
index 000000000..a478fb327
--- /dev/null
+++ b/doc/assistant/share_with_a_friend_walkthrough.mdwn
@@ -0,0 +1,32 @@
+Want to share all the files in your repository securely with a friend?
+
+This connects to your friend's repository using
+[Tor](https://torproject.org/). Both you and your friend will need to
+install [Tor](https://torproject.org/) and
+[Magic Wormhole](https://github.com/warner/magic-wormhole), and then both
+follow these steps to connect your repositories.
+
+Start by opening up your git annex dashboard.
+
+[[!img local_pairing_walkthrough/addrepository.png alt="Add another repository button"]]
+
+`*click*`
+
+[[!img pairing.png alt="Share with a friend"]]
+
+`*click*`
+
+Now you will probably be prompted to enter a password, to configure Tor.
+(Depending on how your system is configured, this may be the root password,
+or your user account's password.)
+
+Then, a pairing code will be generated. Tell it to your friend. Ask them
+for their pairing code, and enter it in the form.
+
+Once you've exchanged pairing codes, your repositories will be connected
+over Tor. They will begin to sync files back and forth, which can take a
+while since Tor is not super-fast.
+
+---
+
+See [[tips/peer_to_peer_network_with_tor]] for more details.
diff --git a/doc/assistant/share_with_a_friend_walkthrough/buddylist.png b/doc/assistant/share_with_a_friend_walkthrough/buddylist.png
deleted file mode 100644
index ce3d61a96..000000000
--- a/doc/assistant/share_with_a_friend_walkthrough/buddylist.png
+++ /dev/null
diff --git a/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment b/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment
deleted file mode 100644
index 527ac9ce8..000000000
--- a/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawl6RDLuI2b2fHkTRseVQGUNjcQ2qUrOaE0"
- nickname="Фёдор"
- subject="comment 1"
- date="2014-05-25T15:10:34Z"
- content="""
-Do we need a cloud repository just to bypass NAT? I understand it can't share files within Jabber, but it just looks unpolished. Maybe some punching techniques might be handy, pwnat for example.
-"""]]
diff --git a/doc/assistant/share_with_a_friend_walkthrough/repolist.png b/doc/assistant/share_with_a_friend_walkthrough/repolist.png
deleted file mode 100644
index 409da4aa4..000000000
--- a/doc/assistant/share_with_a_friend_walkthrough/repolist.png
+++ /dev/null