merge change from doc to basewiki

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index a14be5401a5d35658f85aa846f3528ecb347e3b3..22709f88d436635903a6ce80f5efab2b4113cfe6 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,20 +1,33 @@
-Welcome to the ikiwiki documentation wiki.
+[[ikiwiki_logo|logo/ikiwiki.png]]  
+ikiwiki is a **wiki compiler**. It converts wiki pages
+into html pages suitable for publishing on a website. Unlike many
+wikis, ikiwiki does not have its own ad-hoc means of storing page history,
+and instead uses a revision control system such as [[Subversion]].

 
 

-ikiwiki is a wiki compiler. It converts a directory full of wiki pages
-into html pages suitable for publishing on a website. Unlike a traditional
-wiki, ikiwiki does not have its own means of storing page history or its own
-markup language. Instead it uses [[Subversion]] and [[MarkDown]].
+* [[News]] is a blog (built using ikiwiki) of news items about ikiwiki.
+  It's the best way to find out when there's a new version to [[Download]].

 
 

-* [[News]] is a blog (built using ikiwiki) of new items about ikiwiki.
+* See [[Features]] for a list of ikiwiki's features and [[plugins]] for information about its plugins. [[RoadMap]], [[TODO]]
+  and [[bugs]] might also be of interest. 

 
 

-* See [[Features]] for a current list of ikiwiki's features. [[TODO]] and [[bugs]] might also be of interest.
+* Feel free to post your questions and thoughts about ikiwiki to [[Discussion]].

 
 

-* [[Setup]] has a tutorial for setting up ikiwki, and [[Usage]] documents the parameters and usage of the ikiwiki program.
+[[template id=note text="""
+If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
+Thanks! --[[Joey]]
+"""]]

 
 

-* [[Security]] lists potential security problems. ikiwiki is still being developed, and is being written with security as a priority, so don't expect things to stay in this list for long.
+* [[Setup]] has a tutorial for setting up ikiwiki, and [[Usage]] documents
+  the parameters and usage of the ikiwiki program. There are some
+  [[examples]] of things you can do with ikiwiki.

 
 

-Ikiwiki is _not_ yet formally released, although it's very close to being ready for a release now. If you really have to have it: `svn://svn.kitenet.net/ikiwiki/trunk`
+* [[Security]] lists potential security problems. ikiwiki is still being
+  developed, and is being written with security as a priority, so don't
+  expect things to stay in this list for long.
+
+* Developers, please document any ikiwiki patches you have in the
+  [[PatchQueue]].

 
 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.
 

-ikiwiki is developed by [[Joey]].
+ikiwiki is developed by [[Joey]] and is [[FreeSoftware]].