summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2008-09-05 14:01:12 -0400
committerJoey Hess <joey@kitenet.net>2008-09-05 14:01:12 -0400
commitdd349d69ea2361360b4534d9c77806345ff490ad (patch)
tree5858da519b35151b5b04bc005550608d5b0bcb2c /doc
parente79e3143509d3f4c0273e8eed5956d264cbc56e2 (diff)
parent0f67e7d96953535e98d9ec26c30a25b8aaad782c (diff)
Merge branch 'master' of file:///srv/git/ikiwiki.info
Conflicts: doc/todo/page_edit_disable.mdwn
Diffstat (limited to 'doc')
-rw-r--r--doc/plugins/editpage.mdwn5
-rw-r--r--doc/todo/page_edit_disable.mdwn2
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/plugins/editpage.mdwn b/doc/plugins/editpage.mdwn
new file mode 100644
index 000000000..b830e51aa
--- /dev/null
+++ b/doc/plugins/editpage.mdwn
@@ -0,0 +1,5 @@
+[[!template id=plugin name=editpage core=1 author="[[Joey]]"]]
+
+This plugin allows editing wiki pages in the web interface. It's enabled by
+default if [[cgi]] is enabled; disable it if you want cgi for other things
+while not allowing page edits.
diff --git a/doc/todo/page_edit_disable.mdwn b/doc/todo/page_edit_disable.mdwn
index ee7c58d4e..c5b666656 100644
--- a/doc/todo/page_edit_disable.mdwn
+++ b/doc/todo/page_edit_disable.mdwn
@@ -47,3 +47,5 @@ by Cron. I haven't decided how to do it yet. --[[Paweł|ptecza]]
>> - wanting cgiurl so that our recentchanges page displays links,
>> but not wanting to enable editing of pages (since we're also
>> rsync'ing the html pages to mirrors) --[[Jamie]]
+
+editpage plugin implemented, [[done]] --[[Joey]]