Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/bugs/WEBDAV_443.mdwn

doc/bugs/WEBDAV_443.mdwn

@@ -26,67 +26,7 @@ Archlinux 64: https://aur.archlinux.org/packages/git-annex/
 
 1. Try my password a couple of time. It works with Chrome, Firefox or cadaver
 2. I am using a zsh shell and try exporting both env. variables
-2. git-annex test has errors ...
- 
-----------------------------------------------------------------------
-First, some automated quick checks of properties ...
-----------------------------------------------------------------------
-prop_idempotent_deencode_git
-+++ OK, passed 100 tests.
-prop_idempotent_deencode
-+++ OK, passed 100 tests.
-prop_idempotent_fileKey
-+++ OK, passed 100 tests.
-prop_idempotent_key_encode
-+++ OK, passed 100 tests.
-prop_idempotent_shellEscape
-+++ OK, passed 100 tests.
-prop_idempotent_shellEscape_multiword
-+++ OK, passed 100 tests.
-prop_idempotent_configEscape
-+++ OK, passed 100 tests.
-prop_parse_show_Config
-+++ OK, passed 100 tests.
-prop_parentDir_basics
-+++ OK, passed 100 tests.
-prop_relPathDirToFile_basics
-+++ OK, passed 100 tests.
-prop_relPathDirToFile_regressionTest
-+++ OK, passed 1 tests.
-prop_cost_sane
-+++ OK, passed 1 tests.
-prop_hmacWithCipher_sane
-+++ OK, passed 1 tests.
-prop_TimeStamp_sane
-+++ OK, passed 1 tests.
-prop_addLog_sane
-+++ OK, passed 1 tests.
-prop_verifiable_sane
-+++ OK, passed 100 tests.
-prop_segment_regressionTest
-+++ OK, passed 1 tests.
-prop_read_write_transferinfo
-+++ OK, passed 100 tests.
-prop_read_show_inodecache
-+++ OK, passed 100 tests.
-prop_parse_show_log
-+++ OK, passed 100 tests.
-prop_read_show_TrustLevel
-+++ OK, passed 1 tests.
-prop_parse_show_TrustLog
-+++ OK, passed 1 tests.
-----------------------------------------------------------------------
-Now, some broader checks ...
-  (Do not be alarmed by odd output here; it's normal.
-   wait for the last line to see how it went.)
-----------------------------------------------------------------------
-init
-Cases: 1  Tried: 1  Errors: 0  Failures: 0
-----------------------------------------------------------------------
-add
-### Error in:   git-annex add:0           
-apple: openFile: does not exist (No such file or directory)
-Cases: 3  Tried: 1  Errors: 1  Failures: 0warning: remote HEAD refers to nonexistent ref, unable to checkout.
+3. git-annex test has errors
 
 ### Error in:   git-annex add:1           
 sha1foodup: openFile: does not exist (No such file or directory)
@@ -363,4 +303,4 @@ Some tests failed!
 > (The test suite output suggests to me that it was run on a system
 > that does not support symlinks, and may be broken in some other way
 > as well, but is not relevant to this bug report.)
- > --[[Joey]] 
+> --[[Joey]] 

doc/bugs/WEBDAV_443/comment_1_c6572ca1eaaf89b01c0ed99a4058412f._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-03-16T15:35:05Z"
+ content="""
+The i386 standalone build for 4.20130314, which is IIRC repackaged by Arch linux, was made using a known broken webdav library. I've since updated that build to use a new version of webdav. Since it only affected that one build, I do not plan to do a full re-release with a new version number.
+
+Probably Arch needs to update their package.
+"""]]

doc/bugs/WEBDAV_443/comment_2_a357969cde382a91e13920ee1e9f711c._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://pradermecker.myopenid.com/"
+ ip="81.244.205.197"
+ subject="Thanks"
+ date="2013-03-16T15:46:45Z"
+ content="""
+Thanks for your quick comment ! I was about to get crazy trying my password again and again ;-)
+"""]]

doc/bugs/assistant_-_GTalk_collision/comment_2_91dff34c629a3b3a97a2313ff077e4ae._comment

@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-03-16T15:39:14Z"
+ content="""
+Thanks for the link, that perhaps explains the continuing oddities I've seen with google talk and presence information sometimes not being sent.
+
+It's not clear to me if git-annex could use this extension at all. It seems to say that if I use it, my regular presence messages won't be sent. Which is a problem, since git-annex uses extended content in presence messages to indicate that they're coming from a git-annex client, which is important to make xmpp pairing work. (It's also used to send push notifications, but that's not essential.)
+
+Also, of course, I'm reluctant to implement a non-standard extension that may change at any time, especially when it's attached to a service that currently has the FSF unhappy <http://www.fsf.org/blogs/sysadmin/google-backslides-on-federated-instant-messaging-on-purpose>.
+
+Perhaps the real solution is to make the assistant encourage use of some other XMPP server.
+"""]]