Merge branch 'master' into sipb

[ikiwiki.git] / doc / todo / support_linking_to_cgit.mdwn

diff --git a/doc/todo/support_linking_to_cgit.mdwn b/doc/todo/support_linking_to_cgit.mdwn
index 5a9fad74434fc8a36f36d1be8c91d4c32a04be82..ae7d23ce9058e20ad5495a414fbf75d7f913eed0 100644 (file)
--- a/doc/todo/support_linking_to_cgit.mdwn
+++ b/doc/todo/support_linking_to_cgit.mdwn
@@ -32,10 +32,13 @@ the substitution of `\[[file]]` in `diffurl` and `historyurl`?
 >>>> something, analogous to `%s` vs. `%S` in [[shortcuts]]; but
 >>>> gitweb and cgit are both OK with `/` not being escaped, whereas
 >>>> only gitweb allows it to be escaped as `%2F`, so I think your
->>>> solution is fine.
+>>>> solution is fine. Also, it would need a much better name than
+>>>> \[[file_less_escaped]], and I can't think of one.
 >>>>
 >>>> I don't have commit access to ikiwiki.info, but if I did,
->>>> [[I'd merge this|/users/smcv/approved]]. --[[smcv]]
+>>>> [[I'd merge this|/users/smcv/ready]]. --[[smcv]]
+
+>>>>> [[merged|done]] --[[Joey]]
 
 [[wishlist]]