summaryrefslogtreecommitdiff
path: root/doc/internals.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-28 19:08:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-28 19:08:12 -0400
commit58af57493418d80eb9fb3c4719f20442725aa7f8 (patch)
treea8b32b84beaf9914671ebe491d81d44df0c5d7a2 /doc/internals.mdwn
parentcaef7c82213e00695679bd9c934a4edef0a04eaa (diff)
generalize special remote configuration storage
Diffstat (limited to 'doc/internals.mdwn')
-rw-r--r--doc/internals.mdwn14
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/internals.mdwn b/doc/internals.mdwn
index 55b1045a1..629609503 100644
--- a/doc/internals.mdwn
+++ b/doc/internals.mdwn
@@ -30,16 +30,14 @@ space and then the description through to the end of the line. Example:
e605dca6-446a-11e0-8b2a-002170d25c55 laptop
26339d22-446b-11e0-9101-002170d25c55 usb disk
-## `git-annex/s3.log`
+## `git-annex/remotes.log`
-Associates the UUIDs of Amazon S3 buckets with a bucket nickname and connection
-information. Example:
+Holds persistent configuration settings for [[special_remotes]] such as
+Amazon S3.
- be72acb8-5901-11e0-b600-002170d25c55 mybucket s3.amazonaws.com 80
-
-Note that the actual bucket name used on S3 in the above example
-is "mybucket-be72acb8-5901-11e0-b600-002170d25c55". The UUID is included
-in the bucket name to ensure it is globally unique.
+The file format is one line per remote, starting with the uuid of the
+remote, followed by a space, the name of the remote, a space, and then
+a series of key=value pairs, each separated by whitespace.
## `.git-annex/trust.log`