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

4 files changed, 28 insertions, 1 deletions

diff --git a/doc/bugs/android_cannot_get_from_5.20131221/comment_3_4ba8208822c7f66e23037564b3501391._comment b/doc/bugs/android_cannot_get_from_5.20131221/comment_3_4ba8208822c7f66e23037564b3501391._comment
new file mode 100644
index 000000000..dbb94a50d
--- /dev/null
+++ b/doc/bugs/android_cannot_get_from_5.20131221/comment_3_4ba8208822c7f66e23037564b3501391._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl99Gxq3NPNvwZHp3PDufaknQH4rZb_KKY"
+ nickname="Florian"
+ subject="comment 3"
+ date="2013-12-26T00:15:56Z"
+ content="""
+I can still confirm the bug for the current version (5.20131224-g692aa01). I see this problem on all my machines.
+"""]]
diff --git a/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01.mdwn b/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01.mdwn
new file mode 100644
index 000000000..b13cab9bf
--- /dev/null
+++ b/doc/forum/No_output_from_git-annex_status_v5.20131224-g692aa01.mdwn
@@ -0,0 +1,16 @@
+I'm running version 5.20131224-g692aa01 standalone tarball on linux x86_64 (Linux Mint 15). When I run `git-annex status` in the terminal I get no output. 
+
+I've tried:
+
+* system linked (`ln -s`) the `git-annex`, `git-annex-shell`, and `git-annex-webapp` to `~/bin/` which is on my PATH
+* run the `runshell` program from the terminal 
+
+Other things to consider:
+
+* I've just upgraded the repo from version 3 to version 5
+* Repo was created using git-annex version 3 
+* I don't use assistant or the webapp
+* Only used from my terminal
+* Repo is in indirect mode
+
+What do I need to do to see the results of `git-annex status`? in my terminal?
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 84fe85eed..4af533bc5 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -107,7 +107,7 @@ subdirectories).
   To force checking the remote for every file when copying --from the
   repository, specify `--force`.
 
-* `status` [path ...]`
+* `status [path ...]`
 
   Similar to `git status --short`, displays the status of the files in the
   working tree. Shows files that are not checked into git, files that
diff --git a/doc/todo/wishlist:_allow_custom_S3_url_in_webapp.mdwn b/doc/todo/wishlist:_allow_custom_S3_url_in_webapp.mdwn
new file mode 100644
index 000000000..2d291608b
--- /dev/null
+++ b/doc/todo/wishlist:_allow_custom_S3_url_in_webapp.mdwn
@@ -0,0 +1,3 @@
+It is now relatively easy to build your own S3-compatible storage system with software such as Ceph radosgw or Openstack Swift.
+
+So a way for users to specify their own S3 url would come pretty handy in the webapp's "add S3 remote" page.