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

3 files changed, 21 insertions, 1 deletions

diff --git a/doc/bugs/git-annex-shell_doesn__39__t_honour_Rsync__39__s_bwlimit_option/comment_1_8cda861c11ef2fff3442e5a0df741939._comment b/doc/bugs/git-annex-shell_doesn__39__t_honour_Rsync__39__s_bwlimit_option/comment_1_8cda861c11ef2fff3442e5a0df741939._comment
new file mode 100644
index 000000000..8c82c7e36
--- /dev/null
+++ b/doc/bugs/git-annex-shell_doesn__39__t_honour_Rsync__39__s_bwlimit_option/comment_1_8cda861c11ef2fff3442e5a0df741939._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-03-09T06:13:17Z"
+ content="""
+git-annex-shell cannot pass arbitrary rsync parameters through as specified by the client, because this would be a security hole (eg, allows overwriting or exposing arbitrary files). I'd have to pick out and whitelist safe parameters to make that work. 
+
+I'm also not sure if rsync --server does anything with --bwlimit, it's more of a client side option. When rsync is connecting to a rsync:// server, it can't tell the server to run with --bwlimit, AFAIK.
+
+Also, the bwlimit option works by stalling the connection occasionally, it's hardly very good and you'll sometime see it ramp back to full speed in between stalls.
+"""]]
diff --git a/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment b/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment
new file mode 100644
index 000000000..66822d759
--- /dev/null
+++ b/doc/bugs/webapp_hang/comment_1_08aa908a64d0fe2d50438d01545c3f01._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://gdr.name/"
+ nickname="gdr.name"
+ subject="Not only Chrome"
+ date="2013-03-09T10:55:57Z"
+ content="""
+It happened to me numerous times with Opera. I was never able to repeat it hence no bug report.
+"""]]
diff --git a/doc/design/assistant/blog/day_208__bugfixes.mdwn b/doc/design/assistant/blog/day_208__bugfixes.mdwn
index b366ac7a6..41874b918 100644
--- a/doc/design/assistant/blog/day_208__bugfixes.mdwn
+++ b/doc/design/assistant/blog/day_208__bugfixes.mdwn
@@ -1,6 +1,6 @@
 Fixed the last XMPP bug I know of. Turns out it was not specific to XMPP at
 all; the assistant could forget to sync with any repository on startup
-under certian conditions.
+under certain conditions.
 
 Also fixed bugs in `git annex add` and in the glob matching, and some more.