summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-27 17:30:44 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-27 17:30:44 -0400
commitf8693facabdaa81cbebab7141151d306615fd6a5 (patch)
treefafc87f081623ac57d2619efd409a150d73a2438
parent45dbfbd02f20c211f70061a93d382ee333ef27ad (diff)
doc update
-rw-r--r--debian/changelog2
-rw-r--r--doc/backends.mdwn9
2 files changed, 5 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index e9bc896bf..e995009db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
git-annex (0.20110326) UNRELEASED; urgency=low
* annex.diskreserve can be given in arbitrary units (ie "0.5 gigabytes")
+ * Generalized remotes handling, laying groundwork for remotes that are
+ not regular git remotes.
-- Joey Hess <joeyh@debian.org> Sat, 26 Mar 2011 14:36:16 -0400
diff --git a/doc/backends.mdwn b/doc/backends.mdwn
index 5d02ad3a1..22164850a 100644
--- a/doc/backends.mdwn
+++ b/doc/backends.mdwn
@@ -9,16 +9,13 @@ to retrieve the file's content (its value).
Multiple pluggable backends are supported, and a single repository
can use different backends for different files.
-* `WORM` ("Write Once, Read Many") This backend stores the file's content
- only in `.git/annex/objects/`, and assumes that any file with the same
- basename, size, and modification time has the same content. So with
+* `WORM` ("Write Once, Read Many") This backend assumes that any file with
+ the same basename, size, and modification time has the same content. So with
this backend, files can be moved around, but should never be added to
or changed. This is the default, and the least expensive backend.
-* `SHA1` -- This backend stores the file's content in
- `.git/annex/objects/`, with a name based on its sha1 checksum. This backend
+* `SHA1` -- This backend uses a key based on a sha1 checksum. This backend
allows modifications of files to be tracked. Its need to generate checksums
can make it slower for large files.
- for use.
* `SHA512`, `SHA384`, `SHA256`, `SHA224` -- Like SHA1, but larger
checksums. Mostly useful for the very paranoid, or anyone who is
researching checksum collisions and wants to annex their colliding data. ;)