add news item for git-annex 3.20111122

2 files changed, 22 insertions, 30 deletions

diff --git a/doc/news/version_3.20111011.mdwn b/doc/news/version_3.20111011.mdwn
deleted file mode 100644
index 0346cbca8..000000000
--- a/doc/news/version_3.20111011.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-git-annex 3.20111011 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * This version of git-annex only works with git 1.7.7 and newer.
-     The breakage with old versions is subtle, and affects the
-     annex.numcopies settings in .gitattributes, so be sure to upgrade git
-     to 1.7.7. (Debian package now depends on that version.)
-   * Don't pass absolute paths to git show-attr, as it started following
-     symlinks when that's done in 1.7.7. Instead, use relative paths,
-     which show-attr only handles 100% correctly in 1.7.7. Closes: #[645046](http://bugs.debian.org/645046)
-   * Fix referring to remotes by uuid.
-   * New or changed repository descriptions in uuid.log now have a timestamp,
-     which is used to ensure the newest description is used when the uuid.log
-     has been merged.
-   * Note that older versions of git-annex will display the timestamp as part
-     of the repository description, which is ugly but otherwise harmless.
-   * Add timestamps to trust.log and remote.log too.
-   * git-annex-shell: Added the --uuid option.
-   * git-annex now asks git-annex-shell to verify that it's operating in
-     the expected repository.
-   * Note that this git-annex will not interoperate with remotes using
-     older versions of git-annex-shell.
-   * Now supports git's insteadOf configuration, to modify the url
-     used to access a remote. Note that pushInsteadOf is not used;
-     that and pushurl are reserved for actual git pushes. Closes: #[644278](http://bugs.debian.org/644278)
-   * status: List all known repositories.
-   * When displaying a list of repositories, show git remote names
-     in addition to their descriptions.
-   * Add locking to avoid races when changing the git-annex branch.
-   * Various speed improvements gained by using ByteStrings.
-   * Contain the zombie hordes."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20111122.mdwn b/doc/news/version_3.20111122.mdwn
new file mode 100644
index 000000000..193394de9
--- /dev/null
+++ b/doc/news/version_3.20111122.mdwn
@@ -0,0 +1,22 @@
+git-annex 3.20111122 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * merge: Improve commit messages to mention what was merged.
+   * Avoid doing auto-merging in commands that don't need fully current
+     information from the git-annex branch. In particular, git annex add
+     no longer needs to auto-merge.
+   * init: When run in an already initalized repository, and without
+     a description specified, don't delete the old description.
+   * Optimised union merging; now only runs git cat-file once, and runs
+     in constant space.
+   * status: Now displays trusted, untrusted, and semitrusted repositories
+     separately.
+   * status: Include all special remotes in the list of repositories.
+   * status: Fix --json mode.
+   * status: --fast is back
+   * Fix support for insteadOf url remapping. Closes: #[644278](http://bugs.debian.org/644278)
+   * When not run in a git repository, git-annex can still display a usage
+     message, and "git annex version" even works.
+   * migrate: Don't fall over a stale temp file.
+   * Avoid excessive escaping for rsync special remotes that are not accessed
+     over ssh.
+   * find: Support --print0"""]]
\ No newline at end of file