Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 511ae12aab08ca56992e1df29ac6233a73c99a6b..93526c42ce5ced330645b4096e81185c025ba063 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,35 +1,27 @@
-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 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]].

 
 

-* [[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]].
+[[!template id=links]]

 
 

-* Ikiwiki has a nice set of wiki [[features]] which can be expanded by
-  a large array of [[plugins]].
+## using ikiwiki

 
 

-[[template id=note text="""
-[[ikiwiki_logo|logo/ikiwiki.png]]  
-[[Version_2.0|news/ikiwiki_version_2.0]] is now available.  
-If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
-Thanks! --[[Joey]]
-"""]]
+[[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]].

 
 

-* [[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.
-
-* This wiki is used for tracking ikiwiki's [[TODO]] items, [[bugs]],
-  [[patches]], and its general [[RoadMap]].
+All wikis are supposed to have a [[SandBox]], so this one does too.

 
 

-* Feel free to post your questions and thoughts about ikiwiki to
-  [[Discussion]], or [[contact]] the developers.
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].

 
 

-* [[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.
+## developer resources

 
 

-All wikis are supposed to have a [[SandBox]], so this one does too.
+The [[RoadMap]] describes where the project is going.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.

 
 

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