web commit by tuomov

[ikiwiki.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index b2c810f30b209f4ce3f5048196755416bf1e5406..58d6d09cd9ef041af12e9b421375dc3d19a459be 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -129,7 +129,7 @@ and can be enabled by enabling [[CGI]].
 
 ### User registration
 
 
 ### User registration
 

-Can optionally be configured to allow only registered users to post
+Can optionally be configured to allow only registered users to edit

 pages.
 
 User registration can be done using a web form, or ikiwiki can be
 pages.
 
 User registration can be done using a web form, or ikiwiki can be


@@ -142,10 +142,12 @@ Thanks to subpages, every page can easily and automatically have a
 /Discussion subpage. By default, these links are included in the
 [[templates]] for each page.
 
 /Discussion subpage. By default, these links are included in the
 [[templates]] for each page.
 

-### Page locking
+### Edit controls

 
 

-Wiki admins can [[lock_pages|page_locking]] so that only other admins
-can edit them.
+Wiki admins can [[lock_pages|page_locking]] so that only other admins can
+edit them. Or a wiki can be set up to allow anyone to edit Discussion
+pages, but only registered users to edit other pages. These are just two
+possibilities, since page edit controls can be changed via plugins.

 
 ### [[PageHistory]]
 
 
 ### [[PageHistory]]