The git-annex-backend attribute has been renamed to annex.backend.

5 files changed, 9 insertions, 8 deletions

diff --git a/Backend.hs b/Backend.hs
index 8e17f253f..8142e4707 100644
--- a/Backend.hs
+++ b/Backend.hs
@@ -151,7 +151,7 @@ chooseBackends :: [FilePath] -> Annex [(FilePath, Maybe Backend)]
 chooseBackends fs = do
 	g <- Annex.gitRepo
 	bs <- Annex.supportedBackends
-	pairs <- liftIO $ Git.checkAttr g "git-annex-backend" fs
+	pairs <- liftIO $ Git.checkAttr g "annex.backend" fs
 	return $ map (\(f,b) -> (f, maybeLookupBackendName bs b)) pairs
 
 {- Returns the backend to use for a key. -}
diff --git a/debian/changelog b/debian/changelog
index 767583844..fcd768bf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ git-annex (0.10) UNRELEASED; urgency=low
   * fsck: Fix warning about not enough copies of a file, when locations
     are known, but are not available in currently configured remotes.
   * precommit: Optimise to avoid calling git-check-attr more than once.
+  * The git-annex-backend attribute has been renamed to annex.backend.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 28 Nov 2010 14:19:15 -0400
 
diff --git a/doc/backends.mdwn b/doc/backends.mdwn
index be4eac723..3e605e4b1 100644
--- a/doc/backends.mdwn
+++ b/doc/backends.mdwn
@@ -26,12 +26,12 @@ git-annex should use. The first one listed will be used by default when
 new files are added.
 
 For finer control of what backend is used when adding different types of
-files, the `.gitattributes` file can be used. The `git-annex-backend`
+files, the `.gitattributes` file can be used. The `annex.backend`
 attribute can be set to the name of the backend to use for matching files.
 
 For example, to use the SHA1 backend for sound files, which tend to be
 smallish and might be modified over time, you could set in
 `.gitattributes`:
 
-	*.mp3 git-annex-backend=SHA1
-	*.ogg git-annex-backend=SHA1
+	*.mp3 annex.backend=SHA1
+	*.ogg annex.backend=SHA1
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index a2af9d990..64ca6a549 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -268,12 +268,12 @@ Here are all the supported configuration settings.
 
 The backend used when adding a new file to the annex can be configured
 on a per-file-type basis via `.gitattributes` files. In the file,
-the `git-annex-backend` attribute can be set to the name of the backend to
+the `annex.backend` attribute can be set to the name of the backend to
 use. For example, this here's how to use the WORM backend by default,
 but the SHA1 backend for ogg files:
 
-	* git-annex-backend=WORM
-	*.ogg git-annex-backend=SHA1
+	* annex.backend=WORM
+	*.ogg annex.backend=SHA1
 
 The numcopies setting can also be configured on a per-file-type basis via
 the `annex.numcopies` attribute in `.gitattributes` files.
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
index 6a1c688b3..2aa2478b3 100644
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -275,7 +275,7 @@ files when they're added to the annex, and this can slow things down
 significantly for really big files. To make SHA1 the detault, just
 add something like this to `.gitattributes`:
 
-	* git-annex-backend=SHA1
+	* annex.backend=SHA1
 
 ## unused data