committing changes for conflict test

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

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 8c08b70b97c63923dd4505ca254a13d7069945ba..6f5b638f5bb5ebb8d7d3a67dd18363f4c9529fc5 100644 (file)
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -1,12 +1,24 @@
+[[WhyIkiWiki]]?
+

 Currently implemented:
 
 * [[Subversion]]
 
 Currently implemented:
 
 * [[Subversion]]
 

-  Rather than implement its own system for storing page histories etc, ikiwiki      simply uses subversion. (Supporting other revision control systems is also possible, ikiwiki only needs $FOO add, $FOO commit, and $FOO log).
+  Rather than implement its own system for storing page histories etc,
+  ikiwiki simply uses subversion. (Supporting other revision control
+  systems is also possible, ikiwiki only needs $FOO add, $FOO commit, and
+  $FOO log).
+
+  Instead of editing pages in a stupid web form, you can use vim and commit
+  changes via svn. Or work disconnected using svk and push your changes out
+  when you come online. Deal with edit conflicts with others in a sane
+  environment. Take advantage of subversion's smart merges.

 
 

-  Instead of editing pages in a stupid web form, you can use vim and commit changes via svn. Or work disconnected using svk and push your changes out when you come online. Deal with edit conflicts with others in a sane environment. Take advantage of subversion's smart merges.
+  ikiwiki can be run from a [[post-commit]] hook to update your wiki
+  immediately whenever you commit.

 
 

- ikiwiki can be run from a [[post-commit]] hook to update your wiki immediately whenever you commit.
+  Note that ikiwiki does not require subversion to function. If you want to
+  run a simple wiki without page history, it can do that too.

 
 * [[MarkDown]]
 
 
 * [[MarkDown]]
 


@@ -42,11 +54,25 @@ Currently implemented:
 
 * [[PageHistory]]
 
 
 * [[PageHistory]]
 

-  Well, sorta. Rather than implementing YA history browser, it can link to [[ViewCVS]] or the link to browse the history of a wiki page.
+  Well, sorta. Rather than implementing YA history browser, it can link to
+  [[ViewCVS]] or the link to browse the history of a wiki page.
+
+* [[RecentChanges]], editing pages in a web browser
+
+  Nearly the definition of a wiki, although perhaps ikiwiki challenges how
+  much of that web gunk a wiki really needs. These features are optional
+  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.

 
 

-* [[RecentChanges]], editng pages in a web browser
+* Discussion pages

 
 

-  Nearly the definition of a wiki, although perhaps ikiwiki challenges how much of that web gunk a wiki really needs. These features are optional and can be enabled by enabling [[CGI]].
+  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.

 
 ----
 
 
 ----