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

2 files changed, 20 insertions, 0 deletions

diff --git a/doc/bugs/git_annex_assistant_--autostart_failed/comment_1_746545273b53849c42ff6272324e5155._comment b/doc/bugs/git_annex_assistant_--autostart_failed/comment_1_746545273b53849c42ff6272324e5155._comment
new file mode 100644
index 000000000..7267ec1c4
--- /dev/null
+++ b/doc/bugs/git_annex_assistant_--autostart_failed/comment_1_746545273b53849c42ff6272324e5155._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-04-18T20:08:12Z"
+ content="""
+The most likely cause of this error is a bad `~/.config/git-annex/program` file. Either the file is missing, or it points to the wrong location for the git-annex command. All that --autostart does is run the program listed on that file in each repository listed in the autostart file. Note that you don't need the file when git-annex is installed in your PATH.
+
+So, how did you install git-annex?
+"""]]
diff --git a/doc/forum/Using_for_Music_repo/comment_1_3488ed85ad98f14cb17f229225ece26e._comment b/doc/forum/Using_for_Music_repo/comment_1_3488ed85ad98f14cb17f229225ece26e._comment
new file mode 100644
index 000000000..6176f755d
--- /dev/null
+++ b/doc/forum/Using_for_Music_repo/comment_1_3488ed85ad98f14cb17f229225ece26e._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-04-18T20:01:50Z"
+ content="""
+You can use [[direct_mode]] to keep all files unlocked all the time.
+
+You can use the [[assistant]] to automatically commit whatever changes are made to the directory, as well as automatically sync them to your other computers.
+"""]]