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

4 files changed, 86 insertions, 3 deletions

diff --git a/doc/bugs/Auto_update_not_updating_to_newest_version/comment_5_ab1ee005dbd54e560ea6e3c716cc8f1b._comment b/doc/bugs/Auto_update_not_updating_to_newest_version/comment_5_ab1ee005dbd54e560ea6e3c716cc8f1b._comment
new file mode 100644
index 000000000..b05a0b1e2
--- /dev/null
+++ b/doc/bugs/Auto_update_not_updating_to_newest_version/comment_5_ab1ee005dbd54e560ea6e3c716cc8f1b._comment
@@ -0,0 +1,70 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo"
+ nickname="Dirk"
+ subject="Still problems"
+ date="2014-02-14T11:30:10Z"
+ content="""
+There seem to be still problems here.
+
+I removed all my old configurations and repositories and reinstalled the newest version from the site. After starting I get a message about an update being available. I update and end up with the same version.
+
+[[!format sh \"\"\"
+[2014-02-14 12:22:10 CET] main: starting assistant version 5.20140209-g3a61dbe
+(scanning...) [2014-02-14 12:22:10 CET] Watcher: Performing startup scan
+(started...) [2014-02-14 12:22:10 CET] Upgrader: An upgrade of git-annex is available.  (version 5.20140210)
+--2014-02-14 12:23:24--  https://downloads.kitenet.net/git-annex/OSX/current/10.9_Mavericks/git-annex.dmg
+Resolving downloads.kitenet.net... 80.68.85.49, 2001:41c8:125:49::10
+Connecting to downloads.kitenet.net|80.68.85.49|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 29053083 (28M) [application/x-apple-diskimage]
+Saving to: ‘/Users/kraft/Desktop/annex/.git/annex/tmp/SHA256E-s29053083--ee629137b511da8b874cdac78ece54b344b2b2a1763e4bf806949c9868117b13.dmg’
+
+     0K .......... .......... .......... .......... ..........  0% 2.46M 11s
+    50K .......... .......... .......... .......... ..........  0% 1.69M 14s
+   100K .......... .......... .......... .......... ..........  0% 4.39M 11s
+   150K .......... .......... .......... .......... ..........  0% 2.28M 11s
+   200K .......... .......... .......... .......... ..........  0% 7.15M 10s
+   250K .......... .......... .......... .......... ..........  1% 2.30M 10s
+   300K .......... .......... .......... .......... ..........  1% 15.5M 9s
+
+ 28300K .......... .......... .......... .......... .......... 99% 11.0M 0s
+ 28350K .......... .......... ..                              100% 16.8M=2.8s
+
+2014-02-14 12:23:28 (9.96 MB/s) - ‘/Users/kraft/Desktop/annex/.git/annex/tmp/SHA256E-s29053083--ee629137b511da8b874cdac78ece54b344b2b2a1763e4bf806949c9868117b13.dmg’ saved [29053083/29053083]
+
+[2014-02-14 12:23:28 CET] main: Downloaded git-annex.. upgrade)
+Checksumming Protective Master Boot Record (MBR : 0)…
+Protective Master Boot Record (MBR :: verified   CRC32 $BFC39E6D
+Checksumming GPT Header (Primary GPT Header : 1)…
+ GPT Header (Primary GPT Header : 1): verified   CRC32 $3488C834
+Checksumming GPT Partition Data (Primary GPT Table : 2)…
+GPT Partition Data (Primary GPT Tabl: verified   CRC32 $CABDFFA1
+Checksumming  (Apple_Free : 3)…
+                    (Apple_Free : 3): verified   CRC32 $00000000
+Checksumming disk image (Apple_HFS : 4)…
+          disk image (Apple_HFS : 4): verified   CRC32 $0CFF6F1A
+Checksumming  (Apple_Free : 5)…
+                    (Apple_Free : 5): verified   CRC32 $00000000
+Checksumming GPT Partition Data (Backup GPT Table : 6)…
+GPT Partition Data (Backup GPT Table: verified   CRC32 $CABDFFA1
+Checksumming GPT Header (Backup GPT Header : 7)…
+  GPT Header (Backup GPT Header : 7): verified   CRC32 $4EC691C4
+verified   CRC32 $A78EB9FA
+/dev/disk4          	GUID_partition_scheme          	
+/dev/disk4s1        	Apple_HFS                      	/Applications/git-annex.upgrade.0
+\"disk4\" unmounted.
+\"disk4\" ejected.
+git-annex version: 5.20140209-g3a61dbe
+build flags: Assistant Webapp Pairing S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+[2014-02-14 12:23:45 CET] main: Upgrading git-annex
+[2014-02-14 12:23:45 CET] main: starting assistant version 5.20140209-g3a61dbe
+[2014-02-14 12:23:45 CET] UpgradeWatcher: Finished upgrading git-annex to version 5.20140209-g3a61dbe 
+(scanning...) [2014-02-14 12:23:45 CET] Watcher: Performing startup scan
+(started...)
+\"\"\"]]
+"""]]
diff --git a/doc/bugs/Creating_a_box.com_repository_fails.mdwn b/doc/bugs/Creating_a_box.com_repository_fails.mdwn
index b59bf5475..75d59c9bc 100644
--- a/doc/bugs/Creating_a_box.com_repository_fails.mdwn
+++ b/doc/bugs/Creating_a_box.com_repository_fails.mdwn
@@ -35,6 +35,3 @@ ubuntu 13.10 (saucy), i686
 > Seems that [DAV-0.6 is badly broken](http://bugs.debian.org/737902).
 > I have adjusted the cabal file to refuse to build with that broken
 > version.
-> 
-> [[done]]; this was fixed in version 5.20140210 after fixing DAV.
-> --[[Joey]]
diff --git a/doc/bugs/Creating_a_box.com_repository_fails/comment_5_93981afe8162f64ebb9d8c2c6a7ef91e._comment b/doc/bugs/Creating_a_box.com_repository_fails/comment_5_93981afe8162f64ebb9d8c2c6a7ef91e._comment
new file mode 100644
index 000000000..bcff92ac9
--- /dev/null
+++ b/doc/bugs/Creating_a_box.com_repository_fails/comment_5_93981afe8162f64ebb9d8c2c6a7ef91e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8"
+ nickname="Jon Ander"
+ subject="Not fixed"
+ date="2014-02-14T09:03:29Z"
+ content="""
+This bug has been marked as fixed but I'm still experiencing it in 5.20140210
+"""]]
diff --git a/doc/bugs/problems_with_android_and_gpg/comment_1_526d8805cb1ae896e8b1920ac2aecc17._comment b/doc/bugs/problems_with_android_and_gpg/comment_1_526d8805cb1ae896e8b1920ac2aecc17._comment
new file mode 100644
index 000000000..308d7ed8d
--- /dev/null
+++ b/doc/bugs/problems_with_android_and_gpg/comment_1_526d8805cb1ae896e8b1920ac2aecc17._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://openid.stackexchange.com/user/3f8a1927-744c-4409-8425-48fb3c86672f"
+ nickname="kim"
+ subject="comment 1"
+ date="2014-02-14T19:16:02Z"
+ content="""
+I am experiencing the exaxact same issue on android 4.3 with the current git-annex version (5.20140211)
+"""]]