diff --git a/doc/assistant.mdwn b/doc/assistant.mdwn index 0f6c46b8b3..891d0e174d 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/pairing_walkthrough.mdwn b/doc/assistant/local_pairing_walkthrough.mdwn similarity index 100% rename from doc/assistant/pairing_walkthrough.mdwn rename to doc/assistant/local_pairing_walkthrough.mdwn diff --git a/doc/assistant/pairing_walkthrough/addrepository.png b/doc/assistant/local_pairing_walkthrough/addrepository.png similarity index 100% rename from doc/assistant/pairing_walkthrough/addrepository.png rename to doc/assistant/local_pairing_walkthrough/addrepository.png diff --git a/doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment b/doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment similarity index 100% rename from doc/assistant/pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment rename to doc/assistant/local_pairing_walkthrough/comment_1_b33deed054d3aa8cfa6c9e3958643f16._comment diff --git a/doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment b/doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment similarity index 100% rename from doc/assistant/pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment rename to doc/assistant/local_pairing_walkthrough/comment_2_39f1162b4d43b61e957e7497df4b9e2b._comment diff --git a/doc/assistant/pairing_walkthrough/pairing.png b/doc/assistant/local_pairing_walkthrough/pairing.png similarity index 100% rename from doc/assistant/pairing_walkthrough/pairing.png rename to doc/assistant/local_pairing_walkthrough/pairing.png diff --git a/doc/assistant/pairing_walkthrough/pairrequest.png b/doc/assistant/local_pairing_walkthrough/pairrequest.png similarity index 100% rename from doc/assistant/pairing_walkthrough/pairrequest.png rename to doc/assistant/local_pairing_walkthrough/pairrequest.png diff --git a/doc/assistant/pairing_walkthrough/secret.png b/doc/assistant/local_pairing_walkthrough/secret.png similarity index 100% rename from doc/assistant/pairing_walkthrough/secret.png rename to doc/assistant/local_pairing_walkthrough/secret.png diff --git a/doc/assistant/pairing_walkthrough/secretempty.png b/doc/assistant/local_pairing_walkthrough/secretempty.png similarity index 100% rename from doc/assistant/pairing_walkthrough/secretempty.png rename to doc/assistant/local_pairing_walkthrough/secretempty.png diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn index bdbf65e299..4965601458 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 0000000000..4adfa0c911 --- /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 a748ebdce7..38544d1110 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 c28b60a2b2..8bbd57b5d2 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 c8486dd6d9..6e400ae0f3 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 7be2a27de3..7014da24e6 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 0000000000..5aacc6e06d --- /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.