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

7 files changed, 145 insertions, 0 deletions

diff --git a/doc/bugs/Interrupted_command_broke_encfs_repository/comment_2_fc57759cfcec0c454ab80ef8e324aa91._comment b/doc/bugs/Interrupted_command_broke_encfs_repository/comment_2_fc57759cfcec0c454ab80ef8e324aa91._comment
new file mode 100644
index 000000000..2f1b0e43d
--- /dev/null
+++ b/doc/bugs/Interrupted_command_broke_encfs_repository/comment_2_fc57759cfcec0c454ab80ef8e324aa91._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="konubinix"
+ subject="Thank you for your answer"
+ date="2015-07-08T19:33:35Z"
+ content="""
+The filesystem I use is ext4. I don't think the ext4 module of the linux kernel
+present on my version of Android would be much different of the one on my
+computer.
+
+Therefore I guess I shall investigate in encfs. It is a pity there is no
+alternative allowing to keep a directory encrypted without requiring
+administrative privileges.
+
+Thank you again.
+"""]]
diff --git a/doc/design/assistant/webapp/comment_5_2bdb436f35c659316193b89ee6e52fcb._comment b/doc/design/assistant/webapp/comment_5_2bdb436f35c659316193b89ee6e52fcb._comment
new file mode 100644
index 000000000..b1592af20
--- /dev/null
+++ b/doc/design/assistant/webapp/comment_5_2bdb436f35c659316193b89ee6e52fcb._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="dirk.schmidt@045f26624b94d351628bbb315f94150d627fb18b"
+ nickname="dirk.schmidt"
+ subject="Webapp don open"
+ date="2015-07-08T12:49:01Z"
+ content="""
+Hey there,
+i am using Ubuntu 14.04 
+I have disabled all my repositories and now i cannot open the webapp any more.
+Any suggestions ?
+"""]]
diff --git a/doc/forum/MD5_and_MD5E_backends_no_longer_available__63__.mdwn b/doc/forum/MD5_and_MD5E_backends_no_longer_available__63__.mdwn
new file mode 100644
index 000000000..9927743d4
--- /dev/null
+++ b/doc/forum/MD5_and_MD5E_backends_no_longer_available__63__.mdwn
@@ -0,0 +1,5 @@
+I set the backend to MD5E with git config, but when I try to import files I get this error:
+
+    git-annex: unknown backend MD5E
+
+MD5 doesn't work either. Have these been removed as backend options? They are listed [here](http://git-annex.branchable.com/backends/).
diff --git a/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_2_3ec8af32b8148d31aaa3ba781b4dcf89._comment b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_2_3ec8af32b8148d31aaa3ba781b4dcf89._comment
new file mode 100644
index 000000000..c16f7e377
--- /dev/null
+++ b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_2_3ec8af32b8148d31aaa3ba781b4dcf89._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="acous"
+ subject="comment 2"
+ date="2015-07-07T22:25:40Z"
+ content="""
+Thanks, that did the trick. Am I right to assume that git-remote-gcrypt is not compatible with windows? I have cygwin set up which I could try to install it into, but I expect git-annex-assistant only has access to stuff available from the standard command prompt.
+"""]]
diff --git a/doc/forum/Use_password_protected_gpg_keypair_without_password_prompt__63__.mdwn b/doc/forum/Use_password_protected_gpg_keypair_without_password_prompt__63__.mdwn
new file mode 100644
index 000000000..1ef6345bb
--- /dev/null
+++ b/doc/forum/Use_password_protected_gpg_keypair_without_password_prompt__63__.mdwn
@@ -0,0 +1,7 @@
+Hi.
+
+I couldn't find a way to pass the passphrase, required to open the gpg keypair for an encrypted special remote, to "git annex sync --content".
+I need this for my backup script. Is it possible to use an environment variable or a passphrase file?
+
+Best regards,
+sfowijowa
diff --git a/doc/install/fromsource/comment_49_c8370525547b435d963a2c1192a21124._comment b/doc/install/fromsource/comment_49_c8370525547b435d963a2c1192a21124._comment
new file mode 100644
index 000000000..c0561861e
--- /dev/null
+++ b/doc/install/fromsource/comment_49_c8370525547b435d963a2c1192a21124._comment
@@ -0,0 +1,93 @@
+[[!comment format=mdwn
+ username="dave@2ab82f485adf7e2ce787066e35f5f9789bff430b"
+ nickname="dave"
+ subject="apt-get build-dep fails"
+ date="2015-07-09T00:07:32Z"
+ content="""
+    hobbes@namagiri:~/src$ sudo apt-get build-dep git-annex
+    Reading package lists... Done
+    Building dependency tree       
+    Reading state information... Done
+    E: Build-Depends dependency for git-annex cannot be satisfied because the package libghc-hamlet-dev cannot be found
+
+Hmm, deprecated in favor of libghc-shakespear-dev, according to http://hackage.haskell.org/package/hamlet ...
+
+    hobbes@namagiri:~/src/apt-get-source-git-annex$ grep -iR build-depends.*hamlet|tr , \\n
+    git-annex_5.20141125.dsc:Build-Depends: debhelper (>= 9)
+     ghc (>= 7.4)
+     cabal-install
+     libghc-mtl-dev (>= 2.1.1)
+     libghc-missingh-dev
+     libghc-data-default-dev
+     libghc-hslogger-dev
+     libghc-pcre-light-dev
+     libghc-sha-dev
+     libghc-cryptohash-dev
+     libghc-dataenc-dev
+     libghc-utf8-string-dev
+     libghc-hs3-dev (>= 0.5.6)
+     libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc]
+     libghc-quickcheck2-dev
+     libghc-monad-control-dev (>= 0.3)
+     libghc-exceptions-dev (>= 0.6)
+     libghc-transformers-dev
+     libghc-unix-compat-dev
+     libghc-dlist-dev
+     libghc-uuid-dev
+     libghc-json-dev
+     libghc-aeson-dev
+     libghc-ifelse-dev
+     libghc-bloomfilter-dev
+     libghc-edit-distance-dev
+     libghc-hinotify-dev [linux-any]
+     libghc-stm-dev (>= 2.3)
+     libghc-dbus-dev (>= 0.10.3) [linux-any]
+     libghc-fdo-notify-dev (>= 0.3) [linux-any]
+     libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc]
+     libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc]
+     libghc-securemem-dev
+     libghc-byteable-dev
+     libghc-dns-dev
+     libghc-case-insensitive-dev
+     libghc-http-types-dev
+     libghc-http-conduit-dev
+     libghc-blaze-builder-dev
+     libghc-crypto-api-dev
+     libghc-network-multicast-dev
+     libghc-network-info-dev [linux-any kfreebsd-any]
+     libghc-safesemaphore-dev
+     libghc-network-protocol-xmpp-dev (>= 0.4.3-1+b1)
+     libghc-gnutls-dev (>= 0.1.4)
+     libghc-xml-types-dev
+     libghc-async-dev
+     libghc-feed-dev (>= 0.3.9.2)
+     libghc-regex-tdfa-dev [!mipsel !s390]
+     libghc-regex-compat-dev [mipsel s390]
+     libghc-tasty-dev (>= 0.7) [!sparc]
+     libghc-tasty-hunit-dev [!sparc]
+     libghc-tasty-quickcheck-dev [!sparc]
+     libghc-tasty-rerun-dev [!sparc]
+     libghc-optparse-applicative-dev [!sparc]
+     lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any]
+     ikiwiki
+     perlmagick
+     git (>= 1:2.0)
+     rsync
+     wget
+     curl
+     openssh-client
+     git-remote-gcrypt (>= 0.20130908-6)
+     llvm-3.4 [armel armhf]
+    
+I think that's the bug, right there: *git-annex_5.20141125.dsc*.
+
+I hope this helps.
+"""]]
diff --git a/doc/tips/Repositories_with_large_number_of_files/comment_1_fac49a6d3f6a18c9925c34521221307d._comment b/doc/tips/Repositories_with_large_number_of_files/comment_1_fac49a6d3f6a18c9925c34521221307d._comment
new file mode 100644
index 000000000..42550a064
--- /dev/null
+++ b/doc/tips/Repositories_with_large_number_of_files/comment_1_fac49a6d3f6a18c9925c34521221307d._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="ghen1"
+ subject="comment 1"
+ date="2015-07-08T04:08:28Z"
+ content="""
+This is some excellent information. Thank you.
+"""]]