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

3 files changed, 21 insertions, 3 deletions

diff --git a/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_6_8da2a73381309ecef4b2796d8f2bb0bb._comment b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_6_8da2a73381309ecef4b2796d8f2bb0bb._comment
new file mode 100644
index 000000000..8532afaf7
--- /dev/null
+++ b/doc/bugs/unused_fails_due_to_commitBuffer_containing_an_invalid_argument/comment_6_8da2a73381309ecef4b2796d8f2bb0bb._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo"
+ nickname="donkeyicydragon"
+ subject="Your changes to git annex worked"
+ date="2014-03-19T21:27:39Z"
+ content="""
+Thanks a lot.
+
+BTW, will you start a new funding round?
+"""]]
diff --git a/doc/devblog/day_137-138__bug_triage_and_too_much_windows.mdwn b/doc/devblog/day_137-138__bug_triage_and_too_much_windows.mdwn
index feff2ba8a..28b197356 100644
--- a/doc/devblog/day_137-138__bug_triage_and_too_much_windows.mdwn
+++ b/doc/devblog/day_137-138__bug_triage_and_too_much_windows.mdwn
@@ -1,6 +1,6 @@
 Yesterday, worked on cleaning up the todo list. Fixed Windows slash problem
 with rsync remotes. Today, more Windows work; it turns out to have been
-quite buggy in its handling of non-ascii characters in filenames. Encoding
+quite buggy in its handling of non-ASCII characters in filenames. Encoding
 stuff is never easy for me, but I eventually managed to find a way to fix
 that, although I think there are other filename encoding problems lurking
 in git-annex on Windows still to be dealt with.
@@ -11,5 +11,5 @@ field was last set. That was already beeing tracked, internally (to make
 union merging work), so I was able to quite cheaply expose it as
 "$field-lastchanged" metadata that can be used like any other metadata.
 
-I've been thinking about how to implement [[required_content]] expressions,
-and think I have a reasonably good handle on it.
+I've been thinking about how to implement [[todo/required_content]]
+expressions, and think I have a reasonably good handle on it.
diff --git a/doc/todo/wishlist:_metadata_metadata_view/comment_3_797e6578c60d8e2ed1f61a8d6403575f._comment b/doc/todo/wishlist:_metadata_metadata_view/comment_3_797e6578c60d8e2ed1f61a8d6403575f._comment
new file mode 100644
index 000000000..aff5afbcf
--- /dev/null
+++ b/doc/todo/wishlist:_metadata_metadata_view/comment_3_797e6578c60d8e2ed1f61a8d6403575f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.102"
+ subject="comment 3"
+ date="2014-03-19T23:14:24Z"
+ content="""
+I added a toplevel \"lastchanged\" that applies to all the fields. (Also when the last change was unsetting a field, the toplevel lastchanged will show the time of that which is otherwise not visible by collecting the lastchanged-* fields).
+"""]]