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

5 files changed, 34 insertions, 0 deletions

diff --git a/doc/design/assistant/blog/day_185__android_liftoff/comment_1_b7d28010a72619a7e9a5ad4f2a0d6c07._comment b/doc/design/assistant/blog/day_185__android_liftoff/comment_1_b7d28010a72619a7e9a5ad4f2a0d6c07._comment
new file mode 100644
index 000000000..c0d336b11
--- /dev/null
+++ b/doc/design/assistant/blog/day_185__android_liftoff/comment_1_b7d28010a72619a7e9a5ad4f2a0d6c07._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://mlinden.myopenid.com/"
+ ip="2001:470:d1c3:0:5c01:5562:e242:37b9"
+ subject=""Build native GNU/Linux applications: the easy way""
+ date="2013-02-10T22:02:19Z"
+ content="""
+Maybe this helps:
+[[http://forum.xda-developers.com/showthread.php?t=1444792]]
+"""]]
diff --git a/doc/design/assistant/blog/day_185__android_liftoff/comment_2_ddeb24e86fafb7dae93142cc02767aad._comment b/doc/design/assistant/blog/day_185__android_liftoff/comment_2_ddeb24e86fafb7dae93142cc02767aad._comment
new file mode 100644
index 000000000..ed0c3dc31
--- /dev/null
+++ b/doc/design/assistant/blog/day_185__android_liftoff/comment_2_ddeb24e86fafb7dae93142cc02767aad._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbBRfl5F8gKRr1ko8Ai6FbEZStXXNF1S4"
+ nickname="Áron"
+ subject="another android git app"
+ date="2013-02-11T08:20:42Z"
+ content="""
+https://play.google.com/store/apps/details?id=com.madgag.agit&hl=en
+
+I used it and its decent and certainly runs git as a backend (although I havent seen its internals)
+"""]]
diff --git a/doc/forum/Does_Jabber_syncing_work_when_the_buddy_is_offline__63__.mdwn b/doc/forum/Does_Jabber_syncing_work_when_the_buddy_is_offline__63__.mdwn
new file mode 100644
index 000000000..d5a3d3a92
--- /dev/null
+++ b/doc/forum/Does_Jabber_syncing_work_when_the_buddy_is_offline__63__.mdwn
@@ -0,0 +1 @@
+Do both friends need to be online in order for Jabber syncing to work? Or will the pushed changes be stored on the Jabber server, so that when the remote machine does come online it can pull them even if the original machine is now offline?
diff --git a/doc/forum/Feature_request:_webapp_support_for_centralized_bare_repos.mdwn b/doc/forum/Feature_request:_webapp_support_for_centralized_bare_repos.mdwn
new file mode 100644
index 000000000..2fdab28a7
--- /dev/null
+++ b/doc/forum/Feature_request:_webapp_support_for_centralized_bare_repos.mdwn
@@ -0,0 +1 @@
+I would like it if the webapp could support setting up [bare remotes](http://git-annex.branchable.com/tips/centralized_git_repository_tutorial/) to assist with syncing between two machines that are never online at the same time.
diff --git a/doc/forum/Make_whereis_output_more_compact.mdwn b/doc/forum/Make_whereis_output_more_compact.mdwn
new file mode 100644
index 000000000..5503e716f
--- /dev/null
+++ b/doc/forum/Make_whereis_output_more_compact.mdwn
@@ -0,0 +1,13 @@
+Hi there,
+
+first of all, great job done on annex! I think I finally found what I was looking for to organize all my data.
+
+My question: when I do git annex whereis Music, I get a detailed list of every single song and its remote locations. I have tens of thousands of songs, so just typing git annex whereis Music gives me way too much information. 
+Here is my proposition: in my case, every file of the Music folder resides in the same remote. So, wouldn't it be better to show just one line of output telling me that Music is on remote bla and blub, and then I know that all files in Music are in remotes bla and blub?
+
+Is that possible now already or would that be a feature request? What do you think?
+
+Cheers,
+Moritz.
+
+PS: I know that I can specify filters, e.g. git annex whereis --in bla --and --not --in blub. That is great!