Merge branch 'master' of ssh://git-annex.branchable.com

4 files changed, 58 insertions, 5 deletions

diff --git a/doc/forum/ignore_changes_made_by_a_remote.mdwn b/doc/forum/ignore_changes_made_by_a_remote.mdwn
new file mode 100644
index 000000000..3659774b4
--- /dev/null
+++ b/doc/forum/ignore_changes_made_by_a_remote.mdwn
@@ -0,0 +1,8 @@
+Hi,
+
+I have two repo one in direct (on windows) and one in indirect mode. From time to time the files in the direct repo are replaced by empty files however running git annex fsck always solves it.
+The problem is that today I did run git annex sync before running git annex fsck and git annex has then created two -variants for each of my files one empty and one with the content.
+I guess the easier for me is to just scrap that repo and make a new one however how do I prevent the changes to propagate now? I guess that if I now run git annex sync on my other repo all those small files are going to have linked created for them there as well.
+
+I hope this is clear,
+Thanks in advance.
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 9829fc687..b90d2408b 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -33,9 +33,9 @@ If it doesn't, the repository wants to drop its content
 To check at the command line which files are matched by preferred content
 settings, you can use the --want-get and --want-drop options.
 
-For example, "git annex find --want-get --not --in ." will find all the
-files that "git annex get --auto" will want to get, and "git annex find
---want-drop --in ." will find all the files that "git annex drop --auto"
+For example, `git annex find --want-get --not --in here` will find all the
+files that `git annex get --auto` will want to get, and `git annex find
+--want-drop --in here` will find all the files that `git annex drop --auto`
 will want to drop.
 
 The expressions are very similar to the matching options documented
diff --git a/doc/tips/file_manager_integration.mdwn b/doc/tips/file_manager_integration.mdwn
index 73705d7fb..8dd7fd062 100644
--- a/doc/tips/file_manager_integration.mdwn
+++ b/doc/tips/file_manager_integration.mdwn
@@ -1,7 +1,9 @@
 Integrating git-annex and your file manager provides an easy way to select
 annexed files to get or drop.
 
-## nautilus
+[[!toc]]
+
+## GNOME (nautilus)
 
 Recent git-annex comes with built-in nautilus integration. Just pick the
 action from the menu.
@@ -37,6 +39,49 @@ Create a file `~/.kde4/share/kde4/services/ServiceMenus/git-annex.desktop` with
         Icon=git-annex
         Exec=git-annex drop --notify-start --notify-finish %U
 
+## XFCE (Thunar)
+
+XFCE uses the Thunar file manager, which can also be easily configured to allow for custom actions. Just go to the "Configure custom actions..." item in the "Edit" menu, and create a custom action for get and drop with the following commands:
+
+    git-annex drop --notify-start --notify-finish %F
+
+for drop, and for get:
+
+    git-annex drop --notify-start --notify-finish %F
+
+This gives me the resulting config on disk, in `.config/Thunar/uca.xml`:
+
+    <action>
+        <icon>git-annex</icon>
+        <name>git-annex get</name>
+        <unique-id>1396278104182858-3</unique-id>
+        <command>git-annex get --notify-start --notify-finish %F</command>
+        <description>get the files from a remote git annex repository</description>
+        <patterns>*</patterns>
+        <directories/>
+        <audio-files/>
+        <image-files/>
+        <other-files/>
+        <text-files/>
+        <video-files/>
+    </action>
+    <action>
+        <icon>git-annex</icon>
+        <name>git-annex drop</name>
+        <unique-id>1396278093174843-2</unique-id>
+        <command>git-annex drop --notify-start --notify-finish %F</command>
+        <description>drop the files from the local repository</description>
+        <patterns>*</patterns>
+        <directories/>
+        <audio-files/>
+        <image-files/>
+        <other-files/>
+        <text-files/>
+        <video-files/>
+    </action>
+
+The complete instructions on how to setup actions is [in the XFCE documentation](http://docs.xfce.org/xfce/thunar/custom-actions).
+
 ## your file manager here
 
 Edit this page and add instructions!
diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 79552298b..62224c3be 100644
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -1,4 +1,4 @@
-This is git-annex's todo list. Link items to [[todo/done]] when done.
+This is git-annex's todo list. Link items to [[todo/done]] when done. A more complete [[design/roadmap/]] is also available.
 
 [[!inline pages="./todo/* and !./todo/done and !link(done) 
 and !*/Discussion" actions=yes postform=yes show=0 archive=yes]]