web commit by JoshTriplett: Escape code with ``

[git.ikiwiki.info.git] / doc / features.mdwn

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 05aeebfc9cf93ef15244af1445422c62b6f0e7c5..551edf81106a315b913e83dfa71d2a6de964cef1 100644 (file)
--- 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
 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
 
 ikiwiki also supports files of any other type, including plain text,
 images, etc. These are not converted to wiki pages, they are just copied


@@ -67,9 +68,9 @@ you would care to syndicate.
 ## Valid html and [[css]]
 
 ikiwiki aims to produce 
 ## Valid html and [[css]]
 
 ikiwiki aims to produce 

-[valid XHTML 1.0](http://validator.w3.org/check?url=referer).
-ikiwiki generates html using [[templates]], and uses [[css]], so you can 
-change the look and layout of all pages in any way you would like.
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki
+generates html using [[templates|wikitemplates]], and uses [[css]], so you
+can change the look and layout of all pages in any way you would like.

 
 ## [[Plugins]]
 
 
 ## [[Plugins]]
 


@@ -128,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


@@ -141,14 +142,17 @@ 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 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]]
 
 Well, sorta. Rather than implementing YA history browser, it can link to
 
 ### [[PageHistory]]
 
 Well, sorta. Rather than implementing YA history browser, it can link to

-[[ViewCVS]] or the like to browse the history of a wiki page.
+[[ViewVC]] or the like to browse the history of a wiki page.

 
 ### Full text search
 
 
 ### Full text search