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

5 files changed, 47 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_6_51f35f069c95a5ea7bd4dbab47b5702b._comment b/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_6_51f35f069c95a5ea7bd4dbab47b5702b._comment
new file mode 100644
index 000000000..478cb5a37
--- /dev/null
+++ b/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_6_51f35f069c95a5ea7bd4dbab47b5702b._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://schnouki.net/"
+ nickname="Schnouki"
+ subject="comment 6"
+ date="2014-03-07T08:52:12Z"
+ content="""
+Agreed, the dbus and accept messages are probably unrelated. I just commented here because it's the same bug I'm encountering.
+
+The dbus message only appears once in the log (shortly after startup). The accept messages appears every second.
+"""]]
diff --git a/doc/forum/Auto_sync_with_music_player/comment_2_a15e3f298c3d3faa5b3295355f9bb794._comment b/doc/forum/Auto_sync_with_music_player/comment_2_a15e3f298c3d3faa5b3295355f9bb794._comment
new file mode 100644
index 000000000..fc0d06968
--- /dev/null
+++ b/doc/forum/Auto_sync_with_music_player/comment_2_a15e3f298c3d3faa5b3295355f9bb794._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="EvanDeaubl"
+ ip="67.128.198.190"
+ subject="Workaround using external app"
+ date="2014-03-07T14:57:39Z"
+ content="""
+A workaround for this is using an external app that pings the media scanner to rescan. It's an extra step to remember, but I haven't found it too much of a burden.
+
+I use this one: <https://play.google.com/store/apps/details?id=com.addz.mediascanner>, but there are at least a dozen to choose from.
+
+"""]]
diff --git a/doc/forum/Feature_Request:_Sync_Now_Button_in_Webapp/comment_2_196552002d70390e8b52b4af61dca903._comment b/doc/forum/Feature_Request:_Sync_Now_Button_in_Webapp/comment_2_196552002d70390e8b52b4af61dca903._comment
new file mode 100644
index 000000000..41e05bf6e
--- /dev/null
+++ b/doc/forum/Feature_Request:_Sync_Now_Button_in_Webapp/comment_2_196552002d70390e8b52b4af61dca903._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.146"
+ subject="comment 2"
+ date="2014-03-06T22:12:27Z"
+ content="""
+I've added a \"Sync now\" to the menu for each remote. So can be used to sync with an individual remote, or if picked from the menu for the local repository, it causes it to try to sync with every one if its remotes at once.
+"""]]
diff --git a/doc/forum/Mac_OS_X_Build_doesn__39__t_include_webapp.mdwn b/doc/forum/Mac_OS_X_Build_doesn__39__t_include_webapp.mdwn
new file mode 100644
index 000000000..f5962b81b
--- /dev/null
+++ b/doc/forum/Mac_OS_X_Build_doesn__39__t_include_webapp.mdwn
@@ -0,0 +1,10 @@
+Latest build for Mac OS X (both autobuild and release versions) does not contain webapp.
+
+git annex version for OS X,
+
+    git-annex version: 5.20140306-g309a73c
+    build flags: Assistant Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN2 56 SKEIN512 WORM URL                                                                                                
+    remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+
+whereas on my Linux box build flags include webapp. On os x when I run git annex webapp it does nothing, just prints the help info.
diff --git a/doc/todo/custom_f-droid_repo/comment_3_5a79abb8b1dd12426e111e733fa6493b._comment b/doc/todo/custom_f-droid_repo/comment_3_5a79abb8b1dd12426e111e733fa6493b._comment
new file mode 100644
index 000000000..dda348874
--- /dev/null
+++ b/doc/todo/custom_f-droid_repo/comment_3_5a79abb8b1dd12426e111e733fa6493b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0"
+ nickname="Tobias"
+ subject="comment 3"
+ date="2014-03-06T22:49:22Z"
+ content="""
+F-droid compiles all the binaries themselves internally.
+"""]]