add news item for git-annex 4.20130601

2 files changed, 25 insertions, 34 deletions

diff --git a/doc/news/version_4.20130405.mdwn b/doc/news/version_4.20130405.mdwn
deleted file mode 100644
index 9c822534b..000000000
--- a/doc/news/version_4.20130405.mdwn
+++ /dev/null
@@ -1,34 +0,0 @@
-git-annex 4.20130405 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Group subcommands into sections in usage. Closes: #[703797](http://bugs.debian.org/703797)
-   * Per-command usage messages.
-   * webapp: Fix a race that sometimes caused alerts or other notifications
-     to be missed if they occurred while a page was loading.
-   * webapp: Progess bar fixes for many types of special remotes.
-   * Build debian package without using cabal, which writes to HOME.
-     Closes: #[704205](http://bugs.debian.org/704205)
-   * webapp: Run ssh server probes in a way that will work when the
-     login shell is a monstrosity that should have died 25 years ago,
-     such as csh.
-   * New annex.largefiles setting, which configures which files
-     `git annex add` and the assistant add to the annex.
-   * assistant: Check small files into git directly.
-   * Remotes can be configured to use other MAC algorithms than HMACSHA1
-     to encrypt filenames.
-     Thanks, guilhem for the patch.
-   * git-annex-shell: Passes rsync --bwlimit options on rsync.
-     Thanks, guilhem for the patch.
-   * webapp: Added UI to delete repositories. Closes: #[689847](http://bugs.debian.org/689847)
-   * Adjust built-in preferred content expressions to make most types
-     of repositories want content that is only located on untrusted, dead,
-     and unwanted repositories.
-   * drop --auto: Fix bug that prevented dropping files from untrusted
-     repositories.
-   * assistant: Fix bug that could cause direct mode files to be unstaged
-     from git.
-   * Update working tree files fully atomically.
-   * webapp: Improved transfer queue management.
-   * init: Probe whether the filesystem supports fifos, and if not,
-     disable ssh connection caching.
-   * Use lower case hash directories for storing files on crippled filesystems,
-     same as is already done for bare repositories."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.20130601.mdwn b/doc/news/version_4.20130601.mdwn
new file mode 100644
index 000000000..c4713a0f2
--- /dev/null
+++ b/doc/news/version_4.20130601.mdwn
@@ -0,0 +1,25 @@
+git-annex 4.20130601 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * XMPP: Git push over xmpp made much more robust.
+   * XMPP: Avoid redundant and unncessary pushes. Note that this breaks
+     compatibility with previous versions of git-annex, which will refuse
+     to accept any XMPP pushes from this version.
+   * XMPP: Send pings and use them to detect when contact with the server
+     is lost.
+   * hook special remote: Added combined hook program support.
+   * Android app: Avoid using hard links to app's lib directory, which
+     is sometimes on a different filesystem than the data directory.
+   * Fix bug in parsing of parens in some preferred content expressions.
+     This fixes the behavior of the manual mode group.
+   * assistant: Work around git-cat-file's not reloading the index after files
+     are staged.
+   * Improve error handling when getting uuid of http remotes to auto-ignore,
+     like with ssh remotes.
+   * content: New command line way to view and configure a repository's
+     preferred content settings.
+   * sync: Fix double merge conflict resolution handling.
+   * XMPP: Fix a file descriptor leak.
+   * Android: Added an "Open WebApp" item to the terminal's menu.
+   * Android: Work around Android devices where the `am` command doesn't work.
+   * Can now restart certain long-running git processes if they crash, and
+     continue working."""]]
\ No newline at end of file