summaryrefslogtreecommitdiff
path: root/doc/features.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/features.mdwn')
-rw-r--r--doc/features.mdwn3
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 5765552f0..b58392fd5 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -97,9 +97,6 @@ Some of ikiwiki's features:
shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn.
- For all the gory details of how ikiwiki handles this behind the scenes,
- see [[commit-internals]].
-
* page locking
Wiki admins can lock pages so that only other admins can edit them.