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

2 files changed, 18 insertions, 0 deletions

diff --git a/doc/forum/Problem_with_corrupt_SQLite_DB/comment_2_98020b857e5b52ebbbaaeba1313f2697._comment b/doc/forum/Problem_with_corrupt_SQLite_DB/comment_2_98020b857e5b52ebbbaaeba1313f2697._comment
new file mode 100644
index 000000000..d85b6a16e
--- /dev/null
+++ b/doc/forum/Problem_with_corrupt_SQLite_DB/comment_2_98020b857e5b52ebbbaaeba1313f2697._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="gernot"
+ subject="comment 2"
+ date="2016-06-02T18:33:59Z"
+ content="""
+Perfect, thank you!
+"""]]
diff --git a/doc/tips/Git_annex_and_Calibre/comment_3_ee1372977919229d17d216cfc3fb0f61._comment b/doc/tips/Git_annex_and_Calibre/comment_3_ee1372977919229d17d216cfc3fb0f61._comment
new file mode 100644
index 000000000..998280d29
--- /dev/null
+++ b/doc/tips/Git_annex_and_Calibre/comment_3_ee1372977919229d17d216cfc3fb0f61._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="Dilyin"
+ subject="comment 3"
+ date="2016-06-02T18:10:33Z"
+ content="""
+Actually you do want to exclude \"cover.jpg\" from being annexed because it will allow you to view the covers of all your books without getting them.
+Keeping metadata.opf out of annex is not that important because you cannot safely edit the metadata without getting the books first.
+
+It would be great to teach Calibre to see broken symlinks as normal zero length files and work with them accordingly.
+And we do need a Calibre plugin with buttons \"annex get\" and \"annex unlock\".
+"""]]