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

8 files changed, 79 insertions, 0 deletions

diff --git a/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_12_a77477951576fc657d693811f11f9975._comment b/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_12_a77477951576fc657d693811f11f9975._comment
new file mode 100644
index 000000000..23b523bbe
--- /dev/null
+++ b/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_12_a77477951576fc657d693811f11f9975._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.176"
+ subject="comment 12"
+ date="2014-05-28T22:31:21Z"
+ content="""
+The evilspliced data for eg, bootstrap.js omits that last byte. So presumably we overflow one byte and find a null (if we're lucky..).
+
+I checked the -ddump-splices output, and it omits that last newline!
+
+<pre>
+              \});\
+              \\
+              \})( jQuery );\"#),
+</pre>
+
+Indeed, ghc omits any number of trailing newlines in this display.
+
+This is probably only recently a problem because of the wacky use of a unsafe bytestring + length that file-embed has started to do. Before, the newline was not included, but that's still valid JS.
+
+So, one fix would be to have the EvilSplicer rewrite the unsafePackAddressLen back to a regular bytestring construction. But this would need some tricky parsing (need to find the end of the string to remove the # from it). Alternatively, could remove trailing newlines from all the static js and css files. (Luckily none of the other static files end in a newline, and ghc is careful to preserve ending NULs etc).
+
+For now, I've removed the trailing newlines from the files.
+"""]]
diff --git a/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_13_c3ef67bded8ed3c511a8ea85b8bd81a5._comment b/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_13_c3ef67bded8ed3c511a8ea85b8bd81a5._comment
new file mode 100644
index 000000000..dc8b24ba1
--- /dev/null
+++ b/doc/bugs/Bootstrap3_icons_missing_on_Android/comment_13_c3ef67bded8ed3c511a8ea85b8bd81a5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc"
+ nickname="Sören"
+ subject="comment 13"
+ date="2014-05-29T16:48:18Z"
+ content="""
+Works fine now (tested on android 4.4).
+"""]]
diff --git a/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name/comment_1_6b289221a65a750444b1b5850df3386c._comment b/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name/comment_1_6b289221a65a750444b1b5850df3386c._comment
new file mode 100644
index 000000000..db335239b
--- /dev/null
+++ b/doc/bugs/EvilLinker_needs_to_escape_spaces_in_user_name/comment_1_6b289221a65a750444b1b5850df3386c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.176"
+ subject="comment 1"
+ date="2014-05-28T22:29:05Z"
+ content="""
+Unfortunately, this is fairly intractable. It would be more productive to fix the [ghc bug](https://ghc.haskell.org/trac/ghc/ticket/8596) that the EvilLinker works around.
+
+Recommend building in a different directory in the meantime.
+"""]]
diff --git a/doc/bugs/forget_corrupts_non-ascii_chars/comment_3_6310ae21036582688881f1890a5c4643._comment b/doc/bugs/forget_corrupts_non-ascii_chars/comment_3_6310ae21036582688881f1890a5c4643._comment
new file mode 100644
index 000000000..de949dc30
--- /dev/null
+++ b/doc/bugs/forget_corrupts_non-ascii_chars/comment_3_6310ae21036582688881f1890a5c4643._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="72.0.72.144"
+ subject="comment 3"
+ date="2014-05-29T16:09:38Z"
+ content="""
+awesome, thanks!
+"""]]
diff --git a/doc/bugs/problem_to_addurl_--file_with_ftp/comment_4_7dae1d911b7cd645903c59940a331185._comment b/doc/bugs/problem_to_addurl_--file_with_ftp/comment_4_7dae1d911b7cd645903c59940a331185._comment
new file mode 100644
index 000000000..d07ea6c8e
--- /dev/null
+++ b/doc/bugs/problem_to_addurl_--file_with_ftp/comment_4_7dae1d911b7cd645903c59940a331185._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Balan"
+ ip="122.174.28.235"
+ subject="Buy Fruits Online | Fruits Online Chennai"
+ date="2014-05-29T07:23:20Z"
+ content="""
+Welcome to FreshOFruits, Buy Fruits and Vegetables & Grocery Online from Freshofruits in Chennai, India. Fruits Subscription Gift Basket Vegetables Online Grocery Shopping Chennai. The home of carefully selected fresh produce, available for free delivery direct to your doorstep.
+http://www.freshofruits.com
+"""]]
diff --git a/doc/bugs/problem_to_addurl_--file_with_ftp/comment_5_545a1116db30419c11c886c2e500dbde._comment b/doc/bugs/problem_to_addurl_--file_with_ftp/comment_5_545a1116db30419c11c886c2e500dbde._comment
new file mode 100644
index 000000000..a7b023d9f
--- /dev/null
+++ b/doc/bugs/problem_to_addurl_--file_with_ftp/comment_5_545a1116db30419c11c886c2e500dbde._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="Balan"
+ ip="122.174.28.235"
+ subject="http://freshofruits.com"
+ date="2014-05-29T07:25:15Z"
+ content="""
+FRESHOFRUITS.COM is the online retail venture in chennai and today it is one of the foremost retail destination for quality and fresh fruits from across the world. With the growing preference of the urban consumers, there are very few companies today understand the needs of modern consumers and address them.
+"""]]
diff --git a/doc/forum/How_to_debug_failing_sync.mdwn b/doc/forum/How_to_debug_failing_sync.mdwn
new file mode 100644
index 000000000..ad18aeb55
--- /dev/null
+++ b/doc/forum/How_to_debug_failing_sync.mdwn
@@ -0,0 +1,5 @@
+I've got a remote I setup while connected to my home network that is no longer syncing when I'm on the same network. I'm not sure how to debug the problem. Any tips?
+
+I will say that when I edit the repository in the assistant, the url it gives for the "git repository location at" field looks incorrect. It's got an extra "git-annex-" prepended to the hostname. I'm not sure how to alter that.
+
+I'm using version 5.20140517~bpo70+1, from the wheezy backports.
diff --git a/doc/forum/ssh_vs_cifs__47__webdav.mdwn b/doc/forum/ssh_vs_cifs__47__webdav.mdwn
new file mode 100644
index 000000000..62bb9d3d9
--- /dev/null
+++ b/doc/forum/ssh_vs_cifs__47__webdav.mdwn
@@ -0,0 +1,7 @@
+Hello,
+
+I'm new to git-annex and I would like to know which is the best method to deploy it for my case. I would like to have a central repo in my Synology NAS but with files to be able to browse files (not a bare repo). This repo will not have remotes configured. The mobile clients will use the central repo to exchange files. I thinks that this setup is totally valid x-D. Now my question is more related to how to share the repo in the Synology NAS. I am considering to use cifs/webdav for LAN/WAN access to the repo or SSH for LAN/WAN access. Which is the recommended setup? Which is the most optimum setup in terms of bandwidth or cpu usage (the CPU of my synology NAS is ARM). Thanks in advance and for this great piece of software!
+
+Best regards,
+
+Christian