From d35cd6ff262bc7013e5bb8fe63e8251c0e4ba8b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Nov 2011 12:16:02 -0400 Subject: wiki updates --- doc/distributed_version_control.mdwn | 8 +++++++ doc/meta.mdwn | 5 ++++ doc/special_remotes/web.mdwn | 2 +- doc/tips/using_the_web.mdwn | 32 ------------------------- doc/tips/using_the_web_as_a_special_remote.mdwn | 32 +++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 doc/meta.mdwn delete mode 100644 doc/tips/using_the_web.mdwn create mode 100644 doc/tips/using_the_web_as_a_special_remote.mdwn diff --git a/doc/distributed_version_control.mdwn b/doc/distributed_version_control.mdwn index f9cdb7e99..738b5adc2 100644 --- a/doc/distributed_version_control.mdwn +++ b/doc/distributed_version_control.mdwn @@ -11,3 +11,11 @@ Each git-annex repository is responsible for storing some of the content, and can copy it to or from other repositories. [[Location_tracking]] information is committed to git, to let repositories inform other repositories what file contents they have available. + +-- + +The [[tutorial]] walks you through creating a distributed set of git-annex +repositories with no central repository. + +Prefer a central repository like GitHub? See the +[[tips/centralized_git_repository_tutorial]]. diff --git a/doc/meta.mdwn b/doc/meta.mdwn new file mode 100644 index 000000000..f78eaf981 --- /dev/null +++ b/doc/meta.mdwn @@ -0,0 +1,5 @@ +This wiki contains [[!pagecount pages="pages(*)"]] + +Broken links: + +[[!brokenlinks ]] diff --git a/doc/special_remotes/web.mdwn b/doc/special_remotes/web.mdwn index a969fb071..cd20a93bb 100644 --- a/doc/special_remotes/web.mdwn +++ b/doc/special_remotes/web.mdwn @@ -1,5 +1,5 @@ git-annex can use the WWW as a special remote, downloading urls to files. -See [[walkthrough/using_the_web]] for usage examples. +See [[tips/using_the_web_as_a_special_remote]] for usage examples. ## notes diff --git a/doc/tips/using_the_web.mdwn b/doc/tips/using_the_web.mdwn deleted file mode 100644 index 8009927a4..000000000 --- a/doc/tips/using_the_web.mdwn +++ /dev/null @@ -1,32 +0,0 @@ -The web can be used as a [[special_remote|special_remotes]] too. - - # git annex addurl http://example.com/video.mpeg - addurl example.com_video.mpeg (downloading http://example.com/video.mpeg) - ########################################################## 100.0% - ok - -Now the file is downloaded, and has been added to the annex like any other -file. So it can be renamed, copied to other repositories, and so on. - -Note that git-annex assumes that, if the web site does not 404, the file is -still present on the web, and this counts as one [[copy|copies]] of the -file. So it will let you remove your last copy, trusting it can be -downloaded again: - - # git annex drop example.com_video.mpeg - drop example.com_video.mpeg (checking http://example.com/video.mpeg) ok - -If you don't [[trust]] the web to this degree, just let git-annex know: - - # git annex untrust web - untrust web ok - -With the result that it will hang onto files: - - # git annex drop example.com_video.mpeg - drop example.com_video.mpeg (unsafe) - Could only verify the existence of 0 out of 1 necessary copies - Also these untrusted repositories may contain the file: - 00000000-0000-0000-0000-000000000001 -- web - (Use --force to override this check, or adjust annex.numcopies.) - failed diff --git a/doc/tips/using_the_web_as_a_special_remote.mdwn b/doc/tips/using_the_web_as_a_special_remote.mdwn new file mode 100644 index 000000000..8009927a4 --- /dev/null +++ b/doc/tips/using_the_web_as_a_special_remote.mdwn @@ -0,0 +1,32 @@ +The web can be used as a [[special_remote|special_remotes]] too. + + # git annex addurl http://example.com/video.mpeg + addurl example.com_video.mpeg (downloading http://example.com/video.mpeg) + ########################################################## 100.0% + ok + +Now the file is downloaded, and has been added to the annex like any other +file. So it can be renamed, copied to other repositories, and so on. + +Note that git-annex assumes that, if the web site does not 404, the file is +still present on the web, and this counts as one [[copy|copies]] of the +file. So it will let you remove your last copy, trusting it can be +downloaded again: + + # git annex drop example.com_video.mpeg + drop example.com_video.mpeg (checking http://example.com/video.mpeg) ok + +If you don't [[trust]] the web to this degree, just let git-annex know: + + # git annex untrust web + untrust web ok + +With the result that it will hang onto files: + + # git annex drop example.com_video.mpeg + drop example.com_video.mpeg (unsafe) + Could only verify the existence of 0 out of 1 necessary copies + Also these untrusted repositories may contain the file: + 00000000-0000-0000-0000-000000000001 -- web + (Use --force to override this check, or adjust annex.numcopies.) + failed -- cgit v1.2.3