Merge branch 'master' into cvs

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b047a97dd6079f9516054ea575c38b3e302e93b3..4c22ce0e0997977ebc168a0b3e8a2856e0d69ac8 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,4 +1,8 @@
-<p>test</p>
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].

 
 [[!template id=links]]
 
 
 [[!template id=links]]
 


@@ -6,9 +10,11 @@
 
 [[Setup]] has a tutorial for setting up ikiwiki, or you can read the
 [[man_page|usage]]. There are some [[examples]] of things you can do
 
 [[Setup]] has a tutorial for setting up ikiwiki, or you can read the
 [[man_page|usage]]. There are some [[examples]] of things you can do

-with ikiwiki, and some [[tips]].
+with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
+and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
+discussions.

 
 

-All wikis are supposed to have a [[SandBox]], so this one does too.
+All wikis are supposed to have a [[sandbox]], so this one does too.

 
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].
 
 This site generally runs the latest release of ikiwiki; currently, it runs
 ikiwiki [[!version ]].


@@ -16,7 +22,6 @@ ikiwiki [[!version ]].
 ## developer resources
 
 The [[RoadMap]] describes where the project is going.
 ## developer resources
 
 The [[RoadMap]] describes where the project is going.

-The [[forum]] is open for discussions.

 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.