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

5 files changed, 23 insertions, 1 deletions

diff --git a/doc/design/assistant/blog/day_307__buuuugs.mdwn b/doc/design/assistant/blog/day_307__buuuugs.mdwn
index bf5aa20a3..9cc4cae58 100644
--- a/doc/design/assistant/blog/day_307__buuuugs.mdwn
+++ b/doc/design/assistant/blog/day_307__buuuugs.mdwn
@@ -24,7 +24,7 @@ local paired with or is being used as a ssh server, but I don't yet
 understand what. I have spent hours today trying various scenarios to break
 git-annex and get this problem to happen.
 
-I certianly can improve the webapp's behavior when a repository's UUID is
+I certainly can improve the webapp's behavior when a repository's UUID is
 not known. The easiest fix would be to simply not display such
 repositories. Or there could be a UI to try to get the UUID.
 But I'm more interested in fixing the core problem than putting
diff --git a/doc/design/assistant/blog/day_308__ssh-agent/comment_1_5f0fc810cf1e1cd9b3ddba3cd19bb19d._comment b/doc/design/assistant/blog/day_308__ssh-agent/comment_1_5f0fc810cf1e1cd9b3ddba3cd19bb19d._comment
new file mode 100644
index 000000000..a40921ef6
--- /dev/null
+++ b/doc/design/assistant/blog/day_308__ssh-agent/comment_1_5f0fc810cf1e1cd9b3ddba3cd19bb19d._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~mikapflueger"
+ nickname="mikapflueger"
+ subject="Thank you so much!"
+ date="2013-08-01T01:13:51Z"
+ content="""
+This behaviour of ssh has bugged me for years now (I even think it is an information leak – ssh offers basically all my public ssh keys to every server I try to connect to, even though that public key might be confidential). Although it had nothing to do with git-annex, you helped me a _lot_ by pointing me towards IdentitiesOnly. Really a nice setting!
+
+Cheers,
+
+Mika
+"""]]
diff --git a/doc/tips/downloading_podcasts/comment_7_ceb16498b7aadbf04a27acd5d6561d46._comment b/doc/tips/downloading_podcasts/comment_7_ceb16498b7aadbf04a27acd5d6561d46._comment
new file mode 100644
index 000000000..ac2c89a36
--- /dev/null
+++ b/doc/tips/downloading_podcasts/comment_7_ceb16498b7aadbf04a27acd5d6561d46._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="ckeen"
+ ip="78.108.63.46"
+ subject="--force reload all URLs"
+ date="2013-08-01T09:47:34Z"
+ content="""
+Is it intentionally saving URLs with a prefixed 2_? I have sorted out all missing URLs and renamed it, so no harm done, but it has been a bit of a hassle to get there.
+"""]]
diff --git a/doc/todo/faster_gnupg_cipher.mdwn b/doc/todo/faster_gnupg_cipher.mdwn
new file mode 100644
index 000000000..a1cfd428d
--- /dev/null
+++ b/doc/todo/faster_gnupg_cipher.mdwn
@@ -0,0 +1 @@
+Apparently newer gnupg has support for hardware-accelerated AES-NI. It would be good to have an option to use that. I also wonder if using the same symmetric key for many files presents a security issues (and whether using GPG keys directly would be more secure).
diff --git a/doc/todo/faster_rsync_remotes.mdwn b/doc/todo/faster_rsync_remotes.mdwn
new file mode 100644
index 000000000..5ece25008
--- /dev/null
+++ b/doc/todo/faster_rsync_remotes.mdwn
@@ -0,0 +1 @@
+Using an rsync remote is currently very slow when there are a lot of files, since rsync appears to be called for each file copied.  It would be awesome if each call to rsync was amortized to copy many files; rsync is very good at copying many small files quickly.