summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-25 13:07:30 -0400
committerJoey Hess <joey@kitenet.net>2010-07-25 13:07:30 -0400
commit170e930f9d29039a4f8d385ec3bd9850c1cf95fa (patch)
tree96b09288346051473dc99ed2cb3258f85a340f5a
parentcba6935f55f95b99a177d2cbe9130d6d589e10a8 (diff)
parent2860a34dc42dd9ed28f50833a8da124b94d8596a (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/index.mdwn31
1 files changed, 3 insertions, 28 deletions
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..5800497b8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1,3 @@
-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]]
-
-## using ikiwiki
-
-[[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]].
-
-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 ]].
-
-## 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.
-
-Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
+**Hello World!!** <br>
+#HELLO
+##WORlD