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

3 files changed, 558 insertions, 0 deletions

diff --git a/doc/bugs/Permission_problem_in_second_user_account_on_Android/comment_2_ef775b5fceb4caf00227978318f73470._comment b/doc/bugs/Permission_problem_in_second_user_account_on_Android/comment_2_ef775b5fceb4caf00227978318f73470._comment
new file mode 100644
index 000000000..761bca635
--- /dev/null
+++ b/doc/bugs/Permission_problem_in_second_user_account_on_Android/comment_2_ef775b5fceb4caf00227978318f73470._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://inkwell.za.net/"
+ nickname="kwill"
+ subject="Confirmation"
+ date="2014-11-11T08:01:48Z"
+ content="""
+I can confirm this occurs for me on Android 4.4 with exactly the same symptoms: primary user account can install and run Git Annex (triggers repo setup, webapp opens), secondary user account can install, but gets this error when starting Git Annex (webapp does not open). Is there any additional info I can provide to resolve this?
+"""]]
diff --git a/doc/bugs/git_annex_assistant_crashes_when_parsing_lsof_output_for_version_4.88/comment_2_d4ff043ebca6028105d6e38ee4020e7c._comment b/doc/bugs/git_annex_assistant_crashes_when_parsing_lsof_output_for_version_4.88/comment_2_d4ff043ebca6028105d6e38ee4020e7c._comment
new file mode 100644
index 000000000..9636edd19
--- /dev/null
+++ b/doc/bugs/git_annex_assistant_crashes_when_parsing_lsof_output_for_version_4.88/comment_2_d4ff043ebca6028105d6e38ee4020e7c._comment
@@ -0,0 +1,539 @@
+[[!comment format=mdwn
+ username="https://renaud.casenave.fr/"
+ subject="comment 2"
+ date="2014-11-11T04:35:57Z"
+ content="""
+Hi,
+
+Here it is:
+
+    % lsof -v
+    lsof version information:
+        revision: 4.88
+        latest revision: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+        latest FAQ: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/FAQ
+        latest man page: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_man
+        constructed: Wed Oct 29 13:53:05 PDT 2014
+        constructed by and on: builduser@anatol
+        compiler: cc
+        compiler version: 4.9.1 20140903 (prerelease) (GCC)
+        compiler flags: -DLINUXV=316002 -DGLIBCV=220 -DHASIPv6 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DHAS_STRFTIME -DLSOF_VSTR=\"3.16.2\" -O
+        loader flags: -L./lib -llsof
+        system info: Linux anatol 3.17.1-1-ARCH #1 SMP PREEMPT Wed Oct 15 15:04:35 CEST 2014 x86_64 GNU/Linux
+        Only root can list all files.
+        /dev warnings are disabled.
+        Kernel ID check is disabled.
+
+    % lsof -F0can +d ~
+    p476csh
+    fcwda n/home/raz
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    f255arn/home/raz/.xsession
+    p483cdbus-launch
+    f8arnpipe
+    p486cuim-xim
+    fcwda n/home/raz
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    f6arnpipe
+    f9awnpipe
+    f11arnpipe
+    f14awnpipe
+    p487cuim-toolbar-gtk
+    fcwda n/home/raz
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    p488cclfswm
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    p490cuim-helper-serv
+    fcwda n/home/raz
+    f2awn/home/raz/.xsession-errors
+    p491csbcl
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    f10awnpipe
+    f11arnpipe
+    f12awnpipe
+    f13arnpipe
+    f14awnpipe
+    f15arnpipe
+    f16awnpipe
+    f17arnpipe
+    f18awnpipe
+    f19arnpipe
+    f20awnpipe
+    f21arnpipe
+    p492cmozc_server
+    fcwda n/home/raz
+    f1awn/home/raz/.xsession-errors
+    f2awn/home/raz/.xsession-errors
+    f6arnpipe
+    f9awnpipe
+    p580cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f13awnpipe
+    f15arnpipe
+    f18awnpipe
+    f19arnpipe
+    f22awnpipe
+    f23arnpipe
+    f25awnpipe
+    f26arnpipe
+    p591cgit
+    f0arnpipe
+    f1awnpipe
+    p621cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f15awnpipe
+    f16arnpipe
+    f18awnpipe
+    f19arnpipe
+    f23awnpipe
+    f24arnpipe
+    f25awnpipe
+    f26arnpipe
+    p649cgit
+    f0arnpipe
+    f1awnpipe
+    p656cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f16awnpipe
+    f18arnpipe
+    f19awnpipe
+    f20arnpipe
+    f21arnpipe
+    p673cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p703cgit
+    f0arnpipe
+    f1awnpipe
+    p719cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f13awnpipe
+    f15arnpipe
+    f18awnpipe
+    f19arnpipe
+    f20awnpipe
+    f22arnpipe
+    f24awnpipe
+    f25arnpipe
+    p743cgit
+    f0arnpipe
+    f1awnpipe
+    p745cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f18awnpipe
+    f19arnpipe
+    f20awnpipe
+    f21arnpipe
+    f22arnpipe
+    p762cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p804cgit
+    f0arnpipe
+    f1awnpipe
+    p836cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f15awnpipe
+    f16arnpipe
+    f18awnpipe
+    f19arnpipe
+    f22awnpipe
+    f23arnpipe
+    f25awnpipe
+    f26arnpipe
+    p858cgit
+    f0arnpipe
+    f1awnpipe
+    p865cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p868cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p878cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f13awnpipe
+    f15arnpipe
+    f18awnpipe
+    f19arnpipe
+    f20awnpipe
+    f22arnpipe
+    f24awnpipe
+    f25arnpipe
+    p901cgit
+    f0arnpipe
+    f1awnpipe
+    p914cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f13awnpipe
+    f15arnpipe
+    f18awnpipe
+    f19arnpipe
+    f22awnpipe
+    f23arnpipe
+    f25awnpipe
+    f26arnpipe
+    p936cgit
+    f0arnpipe
+    f1awnpipe
+    p952cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f9awnpipe
+    f15arnpipe
+    f18awnpipe
+    f19arnpipe
+    f22awnpipe
+    f23arnpipe
+    f25awnpipe
+    f26arnpipe
+    p956cskype
+    fcwda n/home/raz
+    f1awnpipe
+    f2awnpipe
+    f4arnpipe
+    f5awnpipe
+    f13arnpipe
+    f14awnpipe
+    f23arnpipe
+    f24awnpipe
+    f30arnpipe
+    f31awnpipe
+    f82arnpipe
+    f87awnpipe
+    p957ctrayer
+    fcwda n/home/raz
+    f1awnpipe
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    p961cpulseaudio
+    f5arnpipe
+    f6awnpipe
+    f7arnpipe
+    f8awnpipe
+    f42arnpipe
+    p972cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p973cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p988cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f18awnpipe
+    f19arnpipe
+    f20awnpipe
+    f21arnpipe
+    f22arnpipe
+    p1008cgit
+    f0arnpipe
+    f1awnpipe
+    p1012cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p1041cgconf-helper
+    f1awnpipe
+    p1081cuim-candwin-gtk
+    fcwda n/home/raz
+    f0arnpipe
+    f1awnpipe
+    f2awn/home/raz/.xsession-errors
+    p1087cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p1088cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f18awnpipe
+    f19arnpipe
+    f21arnpipe
+    f23awnpipe
+    f25arnpipe
+    p1106cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p1114cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p1121cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p1125cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p1159cgit
+    f0arnpipe
+    f1awnpipe
+    p1204cgit
+    f0arnpipe
+    f1awnpipe
+    p1227cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f18awnpipe
+    f19arnpipe
+    f21arnpipe
+    f23awnpipe
+    f25arnpipe
+    p1244cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p1275cgit
+    f0arnpipe
+    f1awnpipe
+    p1407cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p1410cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p1474cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f9arnpipe
+    f11awnpipe
+    f17awnpipe
+    f18arnpipe
+    f19awnpipe
+    f20arnpipe
+    f21arnpipe
+    p1510cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p1515cgit
+    f0arnpipe
+    f1awnpipe
+    p1522cld-linux-x86-64
+    f4arnpipe
+    f5awnpipe
+    f11arnpipe
+    f12awnpipe
+    f17awnpipe
+    f18arnpipe
+    f19awnpipe
+    f20arnpipe
+    f21arnpipe
+    p1541cssh
+    f0arnpipe
+    f1awnpipe
+    f2awnpipe
+    p1564cgit
+    f0arnpipe
+    f1awnpipe
+    p1580cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p1583cssh
+    f2awnpipe
+    f6arnpipe
+    f7awnpipe
+    f8awnpipe
+    p1609cgit
+    f0arnpipe
+    f1awnpipe
+    f11arnpipe
+    f12awnpipe
+    p1610cgit
+    f0arnpipe
+    f1awnpipe
+    f9arnpipe
+    f11awnpipe
+    p1642cgit
+    f0arnpipe
+    f1awnpipe
+    p1678cgit
+    f0arnpipe
+    f1awnpipe
+    p1683cgit
+    f0arnpipe
+    f1awnpipe
+    p1687cgit
+    f0arnpipe
+    f1awnpipe
+    p1693cgit
+    f0arnpipe
+    f1awnpipe
+    p1694cgit
+    f0arnpipe
+    f1awnpipe
+    p1697cgit
+    f0arnpipe
+    f1awnpipe
+    p1716cxulrunner
+    fcwda n/home/raz
+    f0arnpipe
+    f10arnpipe
+    f11awnpipe
+    f12arnpipe
+    f13awnpipe
+    f14arnpipe
+    f15awnpipe
+    f19arnpipe
+    f20awnpipe
+    f28arnpipe
+    f29awnpipe
+    f49arnpipe
+    f52awnpipe
+    p1719ckonsole
+    fcwda n/home/raz
+    f0arnpipe
+    f4arnpipe
+    f6awnpipe
+    f12awnpipe
+    f16awnpipe
+    f19arnpipe
+    f20awnpipe
+    f25arnpipe
+    f26awnpipe
+    p1724cemacs
+    fcwda n/home/raz
+    p1740czsh
+    fcwda n/home/raz
+    p1748cat-spi-bus-laun
+    f5arnpipe
+    f6awnpipe
+    p1980cgpg-agent
+    f3arnpipe
+    f4awnpipe
+    p1989cssh
+    fcwda n/home/raz
+    p1996czsh
+    fcwda n/home/raz
+    p2600clsof
+    fcwda n/home/raz
+    f4awnpipe
+    f5arnpipe
+    p2601clsof
+    fcwda n/home/raz
+    f3arnpipe
+    f6awnpipe
+    zsh: exit 1     lsof -F0can +d ~
+
+Comparing with the same command using lsof-4.87, something doesn't seem quite right:
+
+    % lsof -v
+    lsof version information:
+        revision: 4.87
+        latest revision: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+        latest FAQ: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/FAQ
+        latest man page: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_man
+        constructed: Thu May 30 11:05:15 UTC 2013
+        constructed by and on: nobody@-var-lib-archbuild-extra-x86_64-tomegun
+        compiler: cc
+        compiler version: 4.8.0 20130502 (prerelease) (GCC)
+        compiler flags: -DLINUXV=38004 -DGLIBCV=217 -DHASIPv6 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DHAS_STRFTIME -DLSOF_VSTR=\"3.8.4\" -O
+        loader flags: -L./lib -llsof
+        system info: Linux -var-lib-archbuild-extra-x86_64-tomegun 3.9.2-1-ARCH #1 SMP PREEMPT Sat May 11 20:31:08 CEST 2013 x86_64 GNU/Linux
+        Only root can list all files.
+        /dev warnings are disabled.
+        Kernel ID check is disabled.
+    % lsof -F0can +d ~
+    p476csh
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    arn/home/raz/.xsession
+    p486cuim-xim
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    p487cuim-toolbar-gtk
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    p488cclfswm
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    p490cuim-helper-serv
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    p491csbcl
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    p492cmozc_server
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    awn/home/raz/.xsession-errors
+    p956cskype
+    a n/home/raz
+    p957ctrayer
+    a n/home/raz
+    p1081cuim-candwin-gtk
+    a n/home/raz
+    awn/home/raz/.xsession-errors
+    p1716cxulrunner
+    a n/home/raz
+    p1719ckonsole
+    a n/home/raz
+    p1724cemacs
+    a n/home/raz
+    p1740czsh
+    a n/home/raz
+    p1989cssh
+    a n/home/raz
+    p1996czsh
+    a n/home/raz
+    p2636cconkeror-spawn-
+    a n/home/raz
+    p2638cemacsclient
+    a n/home/raz
+    p2769clsof
+    a n/home/raz
+    p2770clsof
+    a n/home/raz
+    zsh: exit 1     lsof -F0can +d ~
+
+"""]]
diff --git a/doc/forum/Shared_Encryption_does_not_Work_as_Expected.mdwn b/doc/forum/Shared_Encryption_does_not_Work_as_Expected.mdwn
new file mode 100644
index 000000000..660006a5b
--- /dev/null
+++ b/doc/forum/Shared_Encryption_does_not_Work_as_Expected.mdwn
@@ -0,0 +1,11 @@
+I recently started to set up a share that would be synced between multiple machines.  Since I control all of them I thought it might be cool to try using the suggested "shared encryption".  This seems to have been a mistake.
+
+My project folder is now a big mess of symlinks to read-only files.  
+
+I can fix this with a "cp -RH" and get my data back and I can muddle through fixing the permissions but this leads me to two conclusions:
+
+1.  I did something wrong but I don't know what.  Should I have created the ssh remote first and the local repo second?  
+
+2.  This feature should either be hidden or the UI should be much more explicit about how to use it properly.  This cost me quite a bit of time and frustration.
+
+I really like git-annex so I would appreciate any comments or suggestions.