diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-13 23:23:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-13 23:23:23 -0400 |
| commit | 89f7aae6d72bd9ea2719fc39c3d0f8d012cd9d96 (patch) | |
| tree | e74810090dfac613bddc2fe3dc0a87012e7a281b /doc | |
| parent | 0f6b2665841fd8b074ed3827162fb51594c4f6b1 (diff) | |
| parent | f10780dc9f3159a183ed49d155c41c170e0dcfbe (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
3 files changed, 23 insertions, 1 deletions
diff --git a/doc/bugs/immediately_drops_files/comment_5_7c9f660b6bcec31827a44a650e9d4622._comment b/doc/bugs/immediately_drops_files/comment_5_7c9f660b6bcec31827a44a650e9d4622._comment new file mode 100644 index 000000000..bb2569893 --- /dev/null +++ b/doc/bugs/immediately_drops_files/comment_5_7c9f660b6bcec31827a44a650e9d4622._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ" + nickname="Walter" + subject="comment 5" + date="2013-09-13T21:58:30Z" + content=""" +I had checked in the webapps, and they were all set to manual. + +Looking in `git annex vicfg`, the groups are set to manual, and the content is set to standard. +"""]] diff --git a/doc/devblog/day_9__Friday_the_13th/comment_1_07195b4ec399ba1be6c8bdb3ae0fa50b._comment b/doc/devblog/day_9__Friday_the_13th/comment_1_07195b4ec399ba1be6c8bdb3ae0fa50b._comment new file mode 100644 index 000000000..aff4dc264 --- /dev/null +++ b/doc/devblog/day_9__Friday_the_13th/comment_1_07195b4ec399ba1be6c8bdb3ae0fa50b._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://nullroute.eu.org/~grawity/" + nickname="Mantas" + subject="comment 1" + date="2013-09-13T22:05:37Z" + content=""" +Windows *does* have something very much like symlinks – they're called *symlinks* (\"symbolic links\") and they are meant to [\"function just like UNIX links\"][1] as the official docs say. + +But on the other hand, yes – `isSymlink` makes less sense on Windows, because symlinks are just a type of reparse points, and there may be several other types (e.g. directory junctions should also be treated like symlinks, but mount points shouldn't...) + +[1]: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365680(v=vs.85).aspx +"""]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index c845e2758..3ce7b37f7 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -310,7 +310,7 @@ subdirectories). All special remotes support encryption. You can either specify `encryption=none` to disable encryption, or specify `encryption=hybrid keyid=$keyid ...` to specify a gpg key id (or an email - address accociated with a key. + address associated with a key.) There are actually three schemes that can be used for management of the encryption keys. When using the encryption=hybrid scheme, additional |