From c0530746bc35d1c697740deaa45c330f9dbf2565 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 2 Apr 2013 16:54:26 -0400 Subject: new screencast --- doc/assistant.mdwn | 5 +- doc/assistant/local_pairing_walkthrough.mdwn | 60 +++++++++++++++++++++ .../local_pairing_walkthrough/addrepository.png | Bin 0 -> 2259 bytes ...ent_1_b33deed054d3aa8cfa6c9e3958643f16._comment | 8 +++ ...ent_2_39f1162b4d43b61e957e7497df4b9e2b._comment | 8 +++ .../local_pairing_walkthrough/pairing.png | Bin 0 -> 6771 bytes .../local_pairing_walkthrough/pairrequest.png | Bin 0 -> 5383 bytes doc/assistant/local_pairing_walkthrough/secret.png | Bin 0 -> 5132 bytes .../local_pairing_walkthrough/secretempty.png | Bin 0 -> 9575 bytes doc/assistant/pairing_walkthrough.mdwn | 60 --------------------- .../pairing_walkthrough/addrepository.png | Bin 2259 -> 0 bytes ...ent_1_b33deed054d3aa8cfa6c9e3958643f16._comment | 8 --- ...ent_2_39f1162b4d43b61e957e7497df4b9e2b._comment | 8 --- doc/assistant/pairing_walkthrough/pairing.png | Bin 6771 -> 0 bytes doc/assistant/pairing_walkthrough/pairrequest.png | Bin 5383 -> 0 bytes doc/assistant/pairing_walkthrough/secret.png | Bin 5132 -> 0 bytes doc/assistant/pairing_walkthrough/secretempty.png | Bin 9575 -> 0 bytes doc/assistant/release_notes.mdwn | 10 ++-- doc/assistant/remote_sharing_walkthrough.mdwn | 6 +++ doc/assistant/share_with_a_friend_walkthrough.mdwn | 2 +- ...ent_8_07a13b6f000ddc0ac4472b863d8b50bd._comment | 2 +- doc/videos/git-annex_assistant_archiving.mdwn | 2 +- doc/videos/git-annex_assistant_introduction.mdwn | 2 +- doc/videos/git-annex_assistant_remote_sharing.mdwn | 6 +++ 24 files changed, 101 insertions(+), 86 deletions(-) create mode 100644 doc/assistant/local_pairing_walkthrough.mdwn create mode 100644 doc/assistant/local_pairing_walkthrough/addrepository.png create mode 100644 doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment create mode 100644 doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment create mode 100644 doc/assistant/local_pairing_walkthrough/pairing.png create mode 100644 doc/assistant/local_pairing_walkthrough/pairrequest.png create mode 100644 doc/assistant/local_pairing_walkthrough/secret.png create mode 100644 doc/assistant/local_pairing_walkthrough/secretempty.png delete mode 100644 doc/assistant/pairing_walkthrough.mdwn delete mode 100644 doc/assistant/pairing_walkthrough/addrepository.png delete mode 100644 doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment delete mode 100644 doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment delete mode 100644 doc/assistant/pairing_walkthrough/pairing.png delete mode 100644 doc/assistant/pairing_walkthrough/pairrequest.png delete mode 100644 doc/assistant/pairing_walkthrough/secret.png delete mode 100644 doc/assistant/pairing_walkthrough/secretempty.png create mode 100644 doc/assistant/remote_sharing_walkthrough.mdwn create mode 100644 doc/videos/git-annex_assistant_remote_sharing.mdwn diff --git a/doc/assistant.mdwn b/doc/assistant.mdwn index 0f6c46b8b..891d0e174 100644 --- a/doc/assistant.mdwn +++ b/doc/assistant.mdwn @@ -19,7 +19,10 @@ the [[release_notes]] for known infelicities and upgrade instructions. * [[Basic usage|quickstart]] * Want to make two nearby computers share the same synchronised folder? - Follow the [[pairing_walkthrough]]. + Follow the [[local_pairing_walkthrough]]. +* Or perhaps you want to share files between computers in different + locations, like home and work? + Follow the [[remote_sharing_walkthrough]]. * Want to share a synchronised folder with a friend? Follow the [[share_with_a_friend_walkthrough]]. * Want to archive data to a drive or the cloud? diff --git a/doc/assistant/local_pairing_walkthrough.mdwn b/doc/assistant/local_pairing_walkthrough.mdwn new file mode 100644 index 000000000..07b639910 --- /dev/null +++ b/doc/assistant/local_pairing_walkthrough.mdwn @@ -0,0 +1,60 @@ +So you have two computers in the same building, and you want them to share +the same synchronised folder, communicating directly with each other. + +This is incredibly easy to set up with the git annex assistant. + +Let's say the two computers are your computer and your friend's computer. +We'll start on your computer, where you open up your git annex dashboard. + +[[!img addrepository.png alt="Add another repository button"]] + +`*click*` + +[[!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). + +[[!img secret.png alt="Enter secret phrase"]] + +Now your computer is in pairing mode. When your friend looks at her git +annex dashboard, she sees something like this. + +[[!img pairrequest.png alt="Pair request"]] + +`*click*` + +[[!img secretempty.png alt="Enter same secret phrase"]] + +Now it's up to you to let her know what the secret is. As soon as she +enters it, both your computers will be paired, and will begin to sync their +git-annex folders. Just like that you can share files. + +---- + +Something to keep in mind, especially if pairing doesn't seem to be +working, is that the two computers need to be on the same network for this +pairing process to work. Sometimes a building will have more than one +network inside it, and you'll need to connect them both to the same one. +Make sure the wireless network name is the same, or that they're both +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. + +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! + +## What does pairing actually do behind the scenes? + +It ensures that both repositories have correctly configured +[[remotes|walkthrough/adding_a_remote]] pointing to each other. +If you have already configured this manually, you do not need to +perform pairing. diff --git a/doc/assistant/local_pairing_walkthrough/addrepository.png b/doc/assistant/local_pairing_walkthrough/addrepository.png new file mode 100644 index 000000000..b82efdbea Binary files /dev/null and b/doc/assistant/local_pairing_walkthrough/addrepository.png differ diff --git a/doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment b/doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment new file mode 100644 index 000000000..52bdc7f4e --- /dev/null +++ b/doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://launchpad.net/~mattharrison" + ip="69.193.72.98" + subject="Pairing" + date="2012-10-29T17:56:06Z" + content=""" +Is there a way to do this pairing with one machine being a desktop machine and one a headless machine? +"""]] diff --git a/doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment b/doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment new file mode 100644 index 000000000..32d56c907 --- /dev/null +++ b/doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.152.108.194" + subject="easy peasy" + date="2012-10-29T19:09:43Z" + content=""" +A headless machine is probably a server. On the same page that has the \"local computer\" link, there's a \"remote server\" link that'll get you set up. +"""]] diff --git a/doc/assistant/local_pairing_walkthrough/pairing.png b/doc/assistant/local_pairing_walkthrough/pairing.png new file mode 100644 index 000000000..dfbbf0641 Binary files /dev/null and b/doc/assistant/local_pairing_walkthrough/pairing.png differ diff --git a/doc/assistant/local_pairing_walkthrough/pairrequest.png b/doc/assistant/local_pairing_walkthrough/pairrequest.png new file mode 100644 index 000000000..8d3f603bf Binary files /dev/null and b/doc/assistant/local_pairing_walkthrough/pairrequest.png differ diff --git a/doc/assistant/local_pairing_walkthrough/secret.png b/doc/assistant/local_pairing_walkthrough/secret.png new file mode 100644 index 000000000..1eb805122 Binary files /dev/null and b/doc/assistant/local_pairing_walkthrough/secret.png differ diff --git a/doc/assistant/local_pairing_walkthrough/secretempty.png b/doc/assistant/local_pairing_walkthrough/secretempty.png new file mode 100644 index 000000000..491878784 Binary files /dev/null and b/doc/assistant/local_pairing_walkthrough/secretempty.png differ diff --git a/doc/assistant/pairing_walkthrough.mdwn b/doc/assistant/pairing_walkthrough.mdwn deleted file mode 100644 index 07b639910..000000000 --- a/doc/assistant/pairing_walkthrough.mdwn +++ /dev/null @@ -1,60 +0,0 @@ -So you have two computers in the same building, and you want them to share -the same synchronised folder, communicating directly with each other. - -This is incredibly easy to set up with the git annex assistant. - -Let's say the two computers are your computer and your friend's computer. -We'll start on your computer, where you open up your git annex dashboard. - -[[!img addrepository.png alt="Add another repository button"]] - -`*click*` - -[[!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). - -[[!img secret.png alt="Enter secret phrase"]] - -Now your computer is in pairing mode. When your friend looks at her git -annex dashboard, she sees something like this. - -[[!img pairrequest.png alt="Pair request"]] - -`*click*` - -[[!img secretempty.png alt="Enter same secret phrase"]] - -Now it's up to you to let her know what the secret is. As soon as she -enters it, both your computers will be paired, and will begin to sync their -git-annex folders. Just like that you can share files. - ----- - -Something to keep in mind, especially if pairing doesn't seem to be -working, is that the two computers need to be on the same network for this -pairing process to work. Sometimes a building will have more than one -network inside it, and you'll need to connect them both to the same one. -Make sure the wireless network name is the same, or that they're both -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. - -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! - -## What does pairing actually do behind the scenes? - -It ensures that both repositories have correctly configured -[[remotes|walkthrough/adding_a_remote]] pointing to each other. -If you have already configured this manually, you do not need to -perform pairing. diff --git a/doc/assistant/pairing_walkthrough/addrepository.png b/doc/assistant/pairing_walkthrough/addrepository.png deleted file mode 100644 index b82efdbea..000000000 Binary files a/doc/assistant/pairing_walkthrough/addrepository.png and /dev/null differ diff --git a/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment b/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment deleted file mode 100644 index 52bdc7f4e..000000000 --- a/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="https://launchpad.net/~mattharrison" - ip="69.193.72.98" - subject="Pairing" - date="2012-10-29T17:56:06Z" - content=""" -Is there a way to do this pairing with one machine being a desktop machine and one a headless machine? -"""]] diff --git a/doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment b/doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment deleted file mode 100644 index 32d56c907..000000000 --- a/doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://joeyh.name/" - ip="4.152.108.194" - subject="easy peasy" - date="2012-10-29T19:09:43Z" - content=""" -A headless machine is probably a server. On the same page that has the \"local computer\" link, there's a \"remote server\" link that'll get you set up. -"""]] diff --git a/doc/assistant/pairing_walkthrough/pairing.png b/doc/assistant/pairing_walkthrough/pairing.png deleted file mode 100644 index dfbbf0641..000000000 Binary files a/doc/assistant/pairing_walkthrough/pairing.png and /dev/null differ diff --git a/doc/assistant/pairing_walkthrough/pairrequest.png b/doc/assistant/pairing_walkthrough/pairrequest.png deleted file mode 100644 index 8d3f603bf..000000000 Binary files a/doc/assistant/pairing_walkthrough/pairrequest.png and /dev/null differ diff --git a/doc/assistant/pairing_walkthrough/secret.png b/doc/assistant/pairing_walkthrough/secret.png deleted file mode 100644 index 1eb805122..000000000 Binary files a/doc/assistant/pairing_walkthrough/secret.png and /dev/null differ diff --git a/doc/assistant/pairing_walkthrough/secretempty.png b/doc/assistant/pairing_walkthrough/secretempty.png deleted file mode 100644 index 491878784..000000000 Binary files a/doc/assistant/pairing_walkthrough/secretempty.png and /dev/null differ diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn index bdbf65e29..496560145 100644 --- a/doc/assistant/release_notes.mdwn +++ b/doc/assistant/release_notes.mdwn @@ -71,7 +71,7 @@ will work. Some examples of use cases supported by this release include: * Archiving or backing up files to Amazon Glacier. See [[archival_walkthrough]]. * [[Sharing repositories with friends|share_with_a_friend_walkthrough]] contacted through a Jabber server (such as Google Talk). -* [[Pairing|pairing_walkthrough]] two computers that are on the same local +* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local network (or VPN) and automatically keeping the files in the annex in sync as changes are made to them. * Cloning your repository to removable drives, USB keys, etc. The assistant @@ -104,7 +104,7 @@ will work. Some examples of use cases supported by this release include: * Archiving or backing up files to Amazon Glacier. * [[Sharing repositories with friends|share_with_a_friend_walkthrough]] contacted through a Jabber server (such as Google Talk). -* [[Pairing|pairing_walkthrough]] two computers that are on the same local +* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local network (or VPN) and automatically keeping the files in the annex in sync as changes are made to them. * Cloning your repository to removable drives, USB keys, etc. The assistant @@ -137,7 +137,7 @@ will work. Some examples of use cases supported by this release include: * Setting up cloud repositories, that are used as backups, archives, or transfer points between repositories that cannot directly contact one-another. -* [[Pairing|pairing_walkthrough]] two computers that are on the same local +* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local network (or VPN) and automatically keeping the files in the annex in sync as changes are made to them. * Cloning your repository to removable drives, USB keys, etc. The assistant @@ -179,7 +179,7 @@ beta. In general, anything you can configure with the assistant's web app will work. Some examples of use cases supported by this release include: -* [[Pairing|pairing_walkthrough]] two computers that are on the same local +* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local network (or VPN) and automatically keeping the files in the annex in sync as changes are made to them. * Cloning your repository to removable drives, USB keys, etc. The assistant @@ -211,7 +211,7 @@ This is the first beta release of the git-annex assistant. In general, anything you can configure with the assistant's web app will work. Some examples of use cases supported by this release include: -* [[Pairing|pairing_walkthrough]] two computers that are on the same local +* [[Pairing|local_pairing_walkthrough]] two computers that are on the same local network (or VPN) and automatically keeping the files in the annex in sync as changes are made to them. * Cloning your repository to removable drives, USB keys, etc. The assistant diff --git a/doc/assistant/remote_sharing_walkthrough.mdwn b/doc/assistant/remote_sharing_walkthrough.mdwn new file mode 100644 index 000000000..4adfa0c91 --- /dev/null +++ b/doc/assistant/remote_sharing_walkthrough.mdwn @@ -0,0 +1,6 @@ +So you have two computers that are not in the same place, and you want them +to share the same synchronised folder, communicating directly with each other. + +[[!inline feeds=no template=bare pages=videos/git-annex_assistant_remote_sharing]] + +You can add even more computers using the same method show here. diff --git a/doc/assistant/share_with_a_friend_walkthrough.mdwn b/doc/assistant/share_with_a_friend_walkthrough.mdwn index a748ebdce..38544d111 100644 --- a/doc/assistant/share_with_a_friend_walkthrough.mdwn +++ b/doc/assistant/share_with_a_friend_walkthrough.mdwn @@ -7,7 +7,7 @@ works with any Jabber account you use, not just Google Talk.) Start by opening up your git annex dashboard. -[[!img pairing_walkthrough/addrepository.png alt="Add another repository button"]] +[[!img local_pairing_walkthrough/addrepository.png alt="Add another repository button"]] `*click*` diff --git a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment index c28b60a2b..8bbd57b5d 100644 --- a/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment +++ b/doc/design/assistant/polls/what_is_preventing_me_from_using_git-annex_assistant/comment_8_07a13b6f000ddc0ac4472b863d8b50bd._comment @@ -4,7 +4,7 @@ subject="comment 8" date="2013-01-11T20:02:39Z" content=""" -@Alexandre, what you want can be achieved by setting up XMPP pairing, and also [[local pairing|assistant/pairing_walkthrough]]. Then when computers are on the same network, transfers are done via the LAN. +@Alexandre, what you want can be achieved by setting up XMPP pairing, and also [[local pairing|assistant/local_pairing_walkthrough]]. Then when computers are on the same network, transfers are done via the LAN. @Laszlo, this can be set up without using the webapp. Just make the two repositories, using the webapp. Then go into each and run \"git remote add myotherrepo $path_to_other_repo\". Then assistant will automatically sync them. I *have* thought about adding a configurator for this to the webapp. It would help to know what use cases you're getting at with this. diff --git a/doc/videos/git-annex_assistant_archiving.mdwn b/doc/videos/git-annex_assistant_archiving.mdwn index c8486dd6d..6e400ae0f 100644 --- a/doc/videos/git-annex_assistant_archiving.mdwn +++ b/doc/videos/git-annex_assistant_archiving.mdwn @@ -1,5 +1,5 @@
A 9 minute screencast covering archiving your files with the [[git-annex assistant|/assistant]]. diff --git a/doc/videos/git-annex_assistant_introduction.mdwn b/doc/videos/git-annex_assistant_introduction.mdwn index 7be2a27de..7014da24e 100644 --- a/doc/videos/git-annex_assistant_introduction.mdwn +++ b/doc/videos/git-annex_assistant_introduction.mdwn @@ -1,5 +1,5 @@
A 8 minute screencast introducing the [[git-annex assistant|/assistant]]. diff --git a/doc/videos/git-annex_assistant_remote_sharing.mdwn b/doc/videos/git-annex_assistant_remote_sharing.mdwn new file mode 100644 index 000000000..5aacc6e06 --- /dev/null +++ b/doc/videos/git-annex_assistant_remote_sharing.mdwn @@ -0,0 +1,6 @@ +
+A 6 minute screencast +showing how to share files between your computers in different locations, +such as home and work. -- cgit v1.2.3