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

3 files changed, 66 insertions, 0 deletions

diff --git a/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment b/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment
new file mode 100644
index 000000000..527ac9ce8
--- /dev/null
+++ b/doc/assistant/share_with_a_friend_walkthrough/comment_1_c87889721e3a7e52ac1ed3752fa7db46._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl6RDLuI2b2fHkTRseVQGUNjcQ2qUrOaE0"
+ nickname="Фёдор"
+ subject="comment 1"
+ date="2014-05-25T15:10:34Z"
+ content="""
+Do we need a cloud repository just to bypass NAT? I understand it can't share files within Jabber, but it just looks unpolished. Maybe some punching techniques might be handy, pwnat for example.
+"""]]
diff --git a/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_/comment_2_f8e97dded9ba6d2305de1278025924fe._comment b/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_/comment_2_f8e97dded9ba6d2305de1278025924fe._comment
new file mode 100644
index 000000000..b404cc381
--- /dev/null
+++ b/doc/bugs/Commiting_Files_Containing_Non_Ascii_Char_on_OS_X_/comment_2_f8e97dded9ba6d2305de1278025924fe._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
+ nickname="Hamza"
+ subject="comment 2"
+ date="2014-05-25T15:16:33Z"
+ content="""
+I file name I remember messing is the following,
+
+    George's Café
+
+I experience this problem with any char that is not ascii. As for my locale,
+
+LANG=\"en_US.UTF-8\"
+LC_COLLATE=\"en_US.UTF-8\"
+LC_CTYPE=\"en_US.UTF-8\"
+LC_MESSAGES=\"en_US.UTF-8\"
+LC_MONETARY=\"en_US.UTF-8\"
+LC_NUMERIC=\"en_US.UTF-8\"
+LC_TIME=\"en_US.UTF-8\"
+LC_ALL=\"en_US.UTF-8\"
+
+There no errors other than the behaviour I've described.
+"""]]
diff --git a/doc/bugs/Creating_a_remote_located_in___34____126____47__wherever__34___works_incorrectly.mdwn b/doc/bugs/Creating_a_remote_located_in___34____126____47__wherever__34___works_incorrectly.mdwn
new file mode 100644
index 000000000..f3ee4ab2d
--- /dev/null
+++ b/doc/bugs/Creating_a_remote_located_in___34____126____47__wherever__34___works_incorrectly.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+
+When creating a new remote with the webapp (on Windows) and setting the remote repository directory as "~/wherever", everything seems to be going well up until pressing the button to create an unencrypted repository. There is no output from either the terminal or error messages displayed in the browser.
+
+On the remote server, it turns out that it is creating a directory named ~ within $HOME so that there is a $HOME/~/wherever directory.
+
+Omitting the leading ~/ correctly creates $HOME/wherever and the setup proceeds as it should.
+
+### What steps will reproduce the problem?
+
+Try to create a remote repository with directory "~/wherever".
+
+### What version of git-annex are you using? On what operating system?
+
+OS: Windows 7
+
+Output of git annex version:
+
+git-annex version: 5.20140517-gee56d21
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV DNS Feed
+s Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SH
+A256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar ho
+ok external
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]