summaryrefslogtreecommitdiff
path: root/doc/design/encryption.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-05-13 14:55:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-05-13 14:55:27 -0400
commit1fdc6b3aadc336a3a4ed2e35db9ad6797fd3b4d5 (patch)
tree3ff228cc8f560c1ca67add0a8e5e3031fd393449 /doc/design/encryption.mdwn
parentf7174d09b60992ba0bf106956f83b35bac038b16 (diff)
update
Diffstat (limited to 'doc/design/encryption.mdwn')
-rw-r--r--doc/design/encryption.mdwn7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/design/encryption.mdwn b/doc/design/encryption.mdwn
index bcd6a11bc..2b9769aa7 100644
--- a/doc/design/encryption.mdwn
+++ b/doc/design/encryption.mdwn
@@ -1,5 +1,6 @@
-This was the design doc for [[encryption]] and is preserved for
-the curious.
+This was the design doc for [[/encryption]] and is preserved for
+the curious. For an example of using git-annex with an encrypted S3 remote,
+see [[using_Amazon_S3]].
[[!toc]]
@@ -32,7 +33,7 @@ Allowing multiple ciphers to be used within a single remote would add a lot
of complexity, so is not planned to be supported.
Instead, if you want a new cipher, create a new S3 bucket, or whatever.
There does not seem to be much benefit to using the same cipher for
-two different enrypted remotes.
+two different encrypted remotes.
So, the encrypted cipher could just be stored with the rest of a remote's
configuration in `.git-annex/remotes.log` (see [[internals]]). When `git