Merge branch 'master' into assistant

7 files changed, 28 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index a580f88bc..2c289667d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-git-annex (3.20120616) UNRELEASED; urgency=low
+git-annex (3.20120625) UNRELEASED; urgency=low
+
+  * cabal: Only try to use inotify on Linux.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Jun 2012 11:38:12 -0400
+
+git-annex (3.20120624) unstable; urgency=low
 
   * watch: New subcommand, a daemon which notices changes to
     files and automatically annexes new files, etc, so you don't
@@ -8,7 +14,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low
   * unused: Fix crash when key names contain invalid utf8.
   * sync: Avoid recent git's interactive merge.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 12 Jun 2012 11:35:59 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 24 Jun 2012 12:36:50 -0400
 
 git-annex (3.20120614) unstable; urgency=medium
 
diff --git a/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment b/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment
new file mode 100644
index 000000000..c0746a5a7
--- /dev/null
+++ b/doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__/comment_1_42aa2b61b880f4048d874210212aa63b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.14.60"
+ subject="comment 1"
+ date="2012-06-23T14:30:22Z"
+ content="""
+The logging format could be improved, but the daemon already logs to .git/annex/daemon.log. It also automatically rotates the log file.
+"""]]
diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn
index 89a05b1d6..00c68ff3a 100644
--- a/doc/git-annex-shell.mdwn
+++ b/doc/git-annex-shell.mdwn
@@ -46,7 +46,7 @@ first "/~/" or "/~user/" is expanded to the specified home directory.
 
   This runs rsync in server mode to transfer out the content of a key.
 
-* commit
+* commit directory
 
   This commits any staged changes to the git-annex branch.
   It also runs the annex-content hook.
diff --git a/doc/news/version_3.20120511.mdwn b/doc/news/version_3.20120511.mdwn
deleted file mode 100644
index 19e835522..000000000
--- a/doc/news/version_3.20120511.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-git-annex 3.20120511 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Rsync special remotes can be configured with shellescape=no
-     to avoid shell quoting that is normally done when using rsync over ssh.
-     This is known to be needed for certian rsync hosting providers
-     (specificially hidrive.strato.com) that use rsync over ssh but do not
-     pass it through the shell.
-   * dropunused: Allow specifying ranges to drop.
-   * addunused: New command, the opposite of dropunused, it relinks unused
-     content into the git repository.
-   * Fix use of several config settings: annex.ssh-options,
-     annex.rsync-options, annex.bup-split-options. (And adjust types to avoid
-     the bugs that broke several config settings.)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120522.mdwn b/doc/news/version_3.20120522.mdwn
deleted file mode 100644
index 55c45900c..000000000
--- a/doc/news/version_3.20120522.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-git-annex 3.20120522 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Pass -a to cp even when it supports --reflink=auto, to preserve
-     permissions.
-   * Clean up handling of git directory and git worktree.
-   * Add support for core.worktree, and fix support for GIT\_WORK\_TREE and
-     GIT\_DIR."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120624.mdwn b/doc/news/version_3.20120624.mdwn
new file mode 100644
index 000000000..8b619228e
--- /dev/null
+++ b/doc/news/version_3.20120624.mdwn
@@ -0,0 +1,9 @@
+git-annex 3.20120624 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * watch: New subcommand, a daemon which notices changes to
+     files and automatically annexes new files, etc, so you don't
+     need to manually run git commands when manipulating files.
+     Available on Linux, BSDs, and OSX!
+   * Enable diskfree on kfreebsd, using kqueue.
+   * unused: Fix crash when key names contain invalid utf8.
+   * sync: Avoid recent git's interactive merge."""]]
\ No newline at end of file
diff --git a/git-annex.cabal b/git-annex.cabal
index 1416a381d..b43705793 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 3.20120616
+Version: 3.20120624
 Cabal-Version: >= 1.8
 License: GPL
 Maintainer: Joey Hess <joey@kitenet.net>
@@ -47,7 +47,7 @@ Executable git-annex
     Build-Depends: hS3
     CPP-Options: -DWITH_S3
 
-  if flag(Inotify)
+  if os(linux) && flag(Inotify)
     Build-Depends: hinotify
     CPP-Options: -DWITH_INOTIFY