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

4 files changed, 85 insertions, 0 deletions

diff --git a/doc/bugs/info_file_contains_wrong_version.mdwn b/doc/bugs/info_file_contains_wrong_version.mdwn
new file mode 100644
index 000000000..ab59f431a
--- /dev/null
+++ b/doc/bugs/info_file_contains_wrong_version.mdwn
@@ -0,0 +1,19 @@
+### Please describe the problem.
+
+The script producing the .info file along with the binary tarball seems to generate the wrong version.
+
+
+### What steps will reproduce the problem?
+
+    % curl https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz.info
+    GitAnnexDistribution {distributionUrl = "https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz",
+    distributionKey = Key {keyName = "2a01f853b08dc0f47392b50cda41d5f589f46413073fdf4ffd5b817d6638a502.tar.gz", keyBackendName = "SHA256E",
+    keySize = Just 27578790, keyMtime = Nothing}, distributionVersion = "5.20131222",
+    distributionReleasedate = 2013-12-30 18:56:44.908259 UTC, distributionUrgentUpgrade = Nothing}        
+
+
+`distributionVersion` is 5.20131222, but `git annex version` returns 5.20131230-g4aa88d8.
+
+This may look anecdotical, but at least the `git-annex-bin` package of Arch Linux uses the .info data to retrieve the version information.
+
+
diff --git a/doc/forum/Controlling_content_on_mobile_device.mdwn b/doc/forum/Controlling_content_on_mobile_device.mdwn
new file mode 100644
index 000000000..b1f145ccb
--- /dev/null
+++ b/doc/forum/Controlling_content_on_mobile_device.mdwn
@@ -0,0 +1,46 @@
+I have some questions about how to best manage content on mobile
+devices.  This is probably more of a wishlist discussion, although I
+haven't had enough experience with the assistant and preferred content
+features enough to know how much of this might already be possible.
+
+(While I did donate to both campaigns, I also didn't donate at the
+"personal git-annex assistant" level, so I also know not to expect
+personal undivided attention :) . Any tips would be appreciated.)
+
+In short, I don't think git-annex really fits with how I'd like to use
+it on my Android phone.  My current setup is as follows:
+
+- I have a large repository with various media files.  This is stored
+  on several computers, at least one of which generally has a copy of
+  everything.  I use a centralized bare repo to automatically
+  synchronize between computers with "`git annex sync origin`" using
+  cron, and manually control what is on each one using "`copy --to
+  host`", "`get`", "`drop`", etc.  It is *awesome*.
+
+What I would like for Android is:
+
+- The phone keeps in sync with the origin repository.
+
+- On the phone, I'd like to browse through and choose content to get
+  or drop.  I could use the command-line "`get`" and "`drop`" for
+  this, of course, but being able to do it through the webapp would be
+  better, as typing on a phone is no fun.
+
+- From _off_ the phone, I'd like to be able to choose which content
+  should be _on_ the phone.  For example, using the command line or
+  webapp on my desktop, I'd like to be able to choose media files that
+  should be downloaded to (or removed from) the phone.  However, I
+  don't want to have to move files between directories in the repository
+  to achieve this.
+
+- The only useful content that gets created on the phone is photos and
+  videos.  Those should get uploaded to the main server, but only the
+  most recent files should remain on the phone by default (say,
+  anything older than 2 weeks gets dropped).  Both on the phone, and
+  off the phone, I'd be able to override that using the previously
+  described features, so that certain photos remain on the phone
+  forever, or get dropped earlier.
+
+Thoughts?  I feel like git-annex is close to being able to do this.
+
+-jim
diff --git a/doc/forum/Controlling_content_on_mobile_device/comment_1_708649b7f30d8619d7b34dcb0ef46515._comment b/doc/forum/Controlling_content_on_mobile_device/comment_1_708649b7f30d8619d7b34dcb0ef46515._comment
new file mode 100644
index 000000000..c9cbc9e79
--- /dev/null
+++ b/doc/forum/Controlling_content_on_mobile_device/comment_1_708649b7f30d8619d7b34dcb0ef46515._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl_EUsflI4UOGtx0-2yrRJuGAzNyN_5UYY"
+ nickname="Chris"
+ subject="comment 1"
+ date="2014-01-03T16:33:51Z"
+ content="""
+Jim,
+
+I have nothing in terms of a solution, but wanted to say thanks for writing this up.  This describes precisely the use case I am also seeking on my Android phone.
+
+-- Chris
+"""]]
diff --git a/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_5_45ac270caca7fc09e55a80796fe2fd63._comment b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_5_45ac270caca7fc09e55a80796fe2fd63._comment
new file mode 100644
index 000000000..55c7b0cd4
--- /dev/null
+++ b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_5_45ac270caca7fc09e55a80796fe2fd63._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
+ nickname="Jan Ulrich"
+ subject="Still crashing"
+ date="2014-01-03T14:28:15Z"
+ content="""
+With the current git-annex.app from the git-annex.dmg from 2013-12-30 I still get crashes.
+"""]]