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

4 files changed, 53 insertions, 0 deletions

diff --git a/doc/bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo/comment_1_0b4dcedc58e5071733e1239490aed2ea._comment b/doc/bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo/comment_1_0b4dcedc58e5071733e1239490aed2ea._comment
new file mode 100644
index 000000000..34d8d94b1
--- /dev/null
+++ b/doc/bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo/comment_1_0b4dcedc58e5071733e1239490aed2ea._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
+ nickname="Jimmy"
+ subject="Updated version 4.20131105-g136b030 seems to work"
+ date="2013-11-07T20:28:55Z"
+ content="""
+I've updated to the latest version as of 12 hours ago and I was able to create a USB repo on two computers.  4.20131105-g136b030 showing on the web app but 20131106 on the command line.
+
+Is there an easy way of checking the repo is correctly encrypted?  I didn't see anything about encrypting (now the previous error has disappeared) when creating the repo - is this what I should expect?
+"""]]
diff --git a/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_2_452a3c524974832f0742efb00df4d576._comment b/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_2_452a3c524974832f0742efb00df4d576._comment
new file mode 100644
index 000000000..6b3ca2a0b
--- /dev/null
+++ b/doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_2_452a3c524974832f0742efb00df4d576._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
+ nickname="Jimmy"
+ subject="Still fails with git-annex version 4.20131105-g136b030"
+ date="2013-11-07T20:32:09Z"
+ content="""
+Updating seems to have fixed my other problem with creating a USB repo but still fails when trying to create an encrypted S3 repo.
+
+    (encryption setup) dyld: Library not loaded: @rpath/libz.1.2.8.dylib
+      Referenced from: /Applications/git-annex.app/Contents/MacOS/bundle/gpg
+      Reason: image not found
+    08/Nov/2013:07:30:11 +1100 [Error#yesod-core] user error (gpg [\"--batch\",\"--no-tty\",\"--use-agent\",\"--quiet\",\"--trust-model\",\"always\",\"--gen-random\",\"--armor\",\"1\",\"512\"] exited 5) @(yesod-core-1.2.4.5:Yesod.Core.Class.Yesod ./Yesod/Core/Class/Yesod.hs:485:5)
+"""]]
diff --git a/doc/forum/Effectively_replicating_backup_files/comment_2_472ab9c973b475f7f3ce7e3934f94281._comment b/doc/forum/Effectively_replicating_backup_files/comment_2_472ab9c973b475f7f3ce7e3934f94281._comment
new file mode 100644
index 000000000..668416c04
--- /dev/null
+++ b/doc/forum/Effectively_replicating_backup_files/comment_2_472ab9c973b475f7f3ce7e3934f94281._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
+ nickname="Aaron"
+ subject="comment 2"
+ date="2013-11-07T19:46:32Z"
+ content="""
+Thanks Joey!
+
+> gitrepo= is the location of the repository you are setting up with gcrypt, not your existing git-annex repository.
+
+Great, thanks. If I set these up outside of the WebApp, what is the best way to link them up to my main repositories?
+
+> numcopies configures the lower bound of the number of copies, not the upper bound. There's no \"small backup\" type, 
+> you must mean either small archive, or incremental backup. Either type of repository is going to want to have files 
+> that have not previously been archived, or backed up.
+
+Yes, I meant incremental backup. Thanks, understood. The page on preferred content ( http://git-annex.branchable.com/preferred_content/ ) made things a bit clearer. I didn't realise that the incremental backups etc want a copy even if it isn't necessary to satisfy numcopies. Does that mean that once it is on one backup drive, it will not be sent to the other unless I increase numcopies?
+
+"""]]
diff --git a/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment b/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment
new file mode 100644
index 000000000..dbf2178f5
--- /dev/null
+++ b/doc/forum/assistant_created_encrypted__backup_remote:_Howto_restore__63__/comment_2_173da510b45f0320ae8aa2df9f14ae7b._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="Frank"
+ ip="31.19.114.93"
+ subject="Comment 2"
+ date="2013-11-07T19:45:16Z"
+ content="""
+Thank you very much for the explanation! Have fun!
+
+
+
+"""]]