X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/369cf45ace663f42960cea72f87e669ea81979cd..f48e7d2a282631dd4fbdff739c4fbe1fac9507ac:/doc/features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index cb118f27d..b2c810f30 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -39,7 +39,8 @@ provided by ikiwiki on top of regular markdown is the [[WikiLink]] and
 If you prefer to use some other markup language, ikiwiki allows others to
 easily be added by [[plugins]]. For example it also supports traditional
 [[plugins/WikiText]] formatted pages, pages written as pure
-[[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]].
+[[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]]
+or [[Textile|plugins/textile]].
 
 ikiwiki also supports files of any other type, including plain text,
 images, etc. These are not converted to wiki pages, they are just copied
@@ -129,7 +130,11 @@ and can be enabled by enabling [[CGI]].
 ### User registration
 
 Can optionally be configured to allow only registered users to post
-pages; online user registration form, etc.
+pages.
+
+User registration can be done using a web form, or ikiwiki can be
+configured to accept users authenticated with OpenID, or HTTP basic
+authentication, or other methods implemented via plugins.
 
 ### Discussion pages
 
@@ -139,7 +144,8 @@ Thanks to subpages, every page can easily and automatically have a
 
 ### Page locking
 
-Wiki admins can lock pages so that only other admins can edit them.
+Wiki admins can [[lock_pages|page_locking]] so that only other admins
+can edit them.
 
 ### [[PageHistory]]