Merge branch 'master' of ssh://git-annex.branchable.com

12 files changed, 129 insertions, 0 deletions

diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment
new file mode 100644
index 000000000..de92a09ee
--- /dev/null
+++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_14_fd30c9f9c3713728fb910b310397ba32._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="ztzg"
+ subject="Build 5.20150107-g0e8cf92 seems to work"
+ date="2015-01-12T17:53:07Z"
+ content="""
+Hi Joey, everybody,
+
+I was successful in syncing a repository (twice, and including contents) using version 5.20150107-g0e8cf92.
+The environment is: Nexus 7 (2013), Android 5.0.1, not rooted.
+
+Note, however, that this version spews a lot of bionic warnings (I'm using
+git-annex from the terminal):
+
+![Warnings](http://dd.crosstwine.com/tmp/git-annex-bionic-warnings.png)
+
+Probably hamless, but I thought I'd mention them.
+"""]]
diff --git a/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment
new file mode 100644
index 000000000..c86607ef8
--- /dev/null
+++ b/doc/bugs/__91__Android__93___5.0_needs_PIE_executables___40__git_annex_does_not_work_on_android_5.0__41__/comment_15_82446751b835e95832d4aefd7805cd1f._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="ztzg"
+ subject="comment 15"
+ date="2015-01-12T17:56:20Z"
+ content="""
+Oh, and many thanks!
+"""]]
diff --git a/doc/forum/OSX_Finder_extension.mdwn b/doc/forum/OSX_Finder_extension.mdwn
new file mode 100644
index 000000000..2b0e6c374
--- /dev/null
+++ b/doc/forum/OSX_Finder_extension.mdwn
@@ -0,0 +1,5 @@
+OSX 10.10 / Yosemite introduces the [Finder Sync extension][] which allows any app / extension to display informational badges in Finder. This could be used to indicate the sync status (there are some stories which claim the extensions got added because Dropbox used an undocumented API previously). I had a quick look and it would not be too difficult to implement a simple extension which reads the metadata from the `.git/annex` directory and shows a sync / transfer status icon.
+
+Just wanted to throw the idea out there, I might even start building it.
+
+[Finder Sync Extension]: https://developer.apple.com/library/prerelease/ios/documentation/General/Conceptual/ExtensibilityPG/Finder.html
diff --git a/doc/forum/Sync_files_from_remote_to_remote.mdwn b/doc/forum/Sync_files_from_remote_to_remote.mdwn
new file mode 100644
index 000000000..a723c33f3
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote.mdwn
@@ -0,0 +1,5 @@
+Not sure if this use case is supported, but I have the following setup - I use git-annex to store my Lightroom catalog and photos. My local machine does not contain all files, `.mov` files for example are excluded via the preferred content mechanism. The full backup is on a remote server using ssh.
+
+Now I want to create another copy of the data (encrypted) from my local machine to a USB stick or similar. I found that the locally excluded files are not synced. In order to copy all the data I first need to change the preferred content config, execute `git-annex get` to fetch the data, then copy via `git-annex sync myusbremote --content`, then change the local preferred content pattern, then run `git annex drop --auto` to delete the local unwanted content again.
+
+I was wondering if there's a way to sync from one remote to another, without storing any data locallly ? Something like `git-annex sync --from ... --to ...`.
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment
new file mode 100644
index 000000000..66ee6ce6a
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_1_c5247657a5b3cd68fd55112efe97ef99._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574"
+ nickname="Mica Semrick"
+ subject="assistant or cron"
+ date="2015-01-11T04:00:04Z"
+ content="""
+I'd either (1) run the assistant on your server or (2) write a simple cron script that runs git-annex sync --content on the server.
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment
new file mode 100644
index 000000000..4a0038f9d
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_2_634e399d21271f26f7f77c15c5fb132b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Jan"
+ subject="comment 2"
+ date="2015-01-11T08:54:52Z"
+ content="""
+this would work, but the server is on a remote machine and the USB drive I want to sync to is connected to my local machine.
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment
new file mode 100644
index 000000000..73c9cc0bc
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_3_b89701582b40e2c337a1a49733877210._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw"
+ nickname="Remi"
+ subject="May be use a prefered content expression about what is in the usb stick"
+ date="2015-01-11T09:14:47Z"
+ content="""
+Is there a full git repos on the usb stick? if yes You could add a remote on it and run `git annex --content` from there.
+
+You could also try to change the preferred content of your local machine to include something like \"--not --in=usb\". With this you local repos will download file not in the usb stick, copy it to the usb stick and then remove it from the local repos. (I didn't check exactly the syntax of the preferred content, so my expression could be incorrect, but I hope you get the idea)
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment
new file mode 100644
index 000000000..ad730a3ea
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_4_b3ad93e032c3c9d2312970711540bf92._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Jan"
+ subject="comment 4"
+ date="2015-01-13T09:35:10Z"
+ content="""
+Thanks for your answers. But I want to encrypt the content, so initialising a repo on the stick is not a possibility if I understand it correctly. And wouldn't `--not --in=usb` exclude a lot of content I actually want ? (Haven't tried it yet)
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment
new file mode 100644
index 000000000..4ea668070
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_5_bdf293d30692311983d0586231535bd4._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnm19dBCRphmtjXfopm_NpvnRwz-qIJ2Tw"
+ nickname="Remi"
+ subject="comment 5"
+ date="2015-01-13T12:45:47Z"
+ content="""
+Well my idea wasn't to have only this in the preferred content. You
+can use \"or\" expression.
+
+That said, I've just check the manual, and it seem that there is no --in for
+preferred content... But you could add your usb repos say to the
+archival group (git annex group usb archival), Then use something like
+like `\"include=* and ( exclude=*.mov or not inallgroup=archival )\"`
+(this is untested, but I hope you get the idea).
+
+With such a preferred content, you local repository should get (and
+keep) the .mov not in usb, and should drop them when they are send
+there.
+
+"""]]
diff --git a/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment b/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment
new file mode 100644
index 000000000..d0626d4c7
--- /dev/null
+++ b/doc/forum/using_git-annex_with_lightroom/comment_2_4dc4f1ea91c72418843a682fab1854d2._comment
@@ -0,0 +1,28 @@
+[[!comment format=mdwn
+ username="Jan"
+ subject="comment 2"
+ date="2015-01-10T10:37:11Z"
+ content="""
+I had the same problem an got Lightroom to work nicely with the following configuration.
+
+Place catalog and photo data in the same directory tree, for example:
+
+
+    /Lightroom/2015/2015-01-10/IMG_4432.JPG
+    /Lightroom/2015/2015-01-10/IMG_4433.JPG
+    ...
+    /Lightroom/Catalog/Lightroom 5 Catalog.lrcat
+    /Lightroom/Catalog/Lightroom 5 Catalog Previews.lrdata
+    /Lightroom/Catalog/Backups
+
+
+Now the image data and Lightroom metadata (= catalog) can be archived at the same time. In order to prevent temporary files and previews to get annexed use the following `.gitignore`:
+
+
+    */*.lrdata
+    Temporary Folder*/
+    */Temporary Import Data*/
+    *.lock
+
+The downside is that previews will have to get regenerated on other machines which pull this data, but I don't use it to share my Lightroom config across computers but as an archival tool.
+"""]]
diff --git a/doc/install/NixOS.mdwn b/doc/install/NixOS.mdwn
index 115f9fa53..e9730b285 100644
--- a/doc/install/NixOS.mdwn
+++ b/doc/install/NixOS.mdwn
@@ -2,5 +2,9 @@ Users of the [Nix package manager](http://nixos.org/) can install it by running:
 
     nix-env -i git-annex
 
+When including it in a NixOS configuration.nix file, the name of the reference to the package is
+
+    haskellPackages.gitAnnex
+
 The build status of the package within Nix can be seen on the [Hydra Build
 Farm](http://hydra.nixos.org/job/nixpkgs/trunk/gitAndTools.gitAnnex).
diff --git a/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment b/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment
new file mode 100644
index 000000000..2c68f7e2e
--- /dev/null
+++ b/doc/tips/Synology_NAS_and_git_annex/comment_4_d8e4b08ceedece8a45d4146ff5d3a995._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="eeerky"
+ subject="shared keys?"
+ date="2015-01-13T15:24:25Z"
+ content="""
+I'm not sure if I'm misreading this walkthrough, but does prefixing your key in authorize_keys file mean that the specific key pair can only be used in conjunction with git annex?
+
+In other words, if I wish to have one key pair between my laptop and server, could I use that one key pair for both git-annex and simple shell access? 
+
+What I'm seeing now is that the path to my **git-annex-shell** script is correct, but my server goes into high cpu and doesn't let me login when I try sshing into it.
+"""]]