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

doc/git-annex-unlock/comment_10_1f5ca7ccd35e9b102bf24b3f14deeee1._comment

@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="kyle"
+ avatar="http://cdn.libravatar.org/avatar/7d6e85cde1422ad60607c87fa87c63f3"
+ subject="re: Are my unlocked, annexed files still safe?"
+ date="2021-04-21T16:32:42Z"
+ content="""
+@pat:
+> Basically, unlock gives me an editable copy of the file - but I always
+> have the original version, and can revert or check it out if I need
+> to. Is that correct?
+
+Yes, it's a copy as long as you don't set `annex.thin=true` (as you
+mention).  Just as with locked files, though, you may not be able to
+get the content back from an earlier version if you've dropped unused
+content.
+
+"""]]

doc/git-annex-unlock/comment_11_26ad80a6ad142e7dac6c8af955a4413f._comment

@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="kyle"
+ avatar="http://cdn.libravatar.org/avatar/7d6e85cde1422ad60607c87fa87c63f3"
+ subject="re: clarifying unlocked files"
+ date="2021-04-21T16:34:50Z"
+ content="""
+@Ilya_Shlyakhter:
+> Does the locked/unlocked state apply to one particular path within the
+> repo, or to a particular key?
+
+A particular path.
+
+> Can the same key be used by both a locked and an unlocked file?
+
+Yes.
+
+"""]]

doc/git-annex.mdwn

@@ -1187,7 +1187,7 @@ repository, using [[git-annex-config]]. See its man page for a list.)
   And when multiple files in the work tree have the same content, only
   one of them gets hard linked to the annex.
 
-* `annex.supportunlocked'
+* `annex.supportunlocked`
 
   By default git-annex supports unlocked files as well as locked files,
   so this defaults to true. If set to false, git-annex will only support