From cae559f677c915519770e20888186cd6ad186931 Mon Sep 17 00:00:00 2001
From: "http://velmont.no/" <http://velmont.no/@web>
Date: Tue, 4 Aug 2009 08:18:06 -0400
Subject:

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 93526c42c..d8d90e508 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+Ikiwiki is a **wiki compiler** written in Perl. 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
-- 
cgit v1.2.3


From e3c944ae00f7250bdff9e8d2bf07a55b1d72a0e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 4 Aug 2009 13:33:27 -0400
Subject: Revert "written in perl"

This reverts commit cae559f677c915519770e20888186cd6ad186931.

Ikiwiki's implementation language is not so important as to appear in the
first, key sentence of its website. The language is already documented
elsewhere, as in the install page.
---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index d8d90e508..93526c42c 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,4 +1,4 @@
-Ikiwiki is a **wiki compiler** written in Perl. It converts wiki pages into HTML pages
+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
-- 
cgit v1.2.3


From 027d28a6a1795b5b1b81aa381793f225682cc0e5 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Fri, 16 Oct 2009 11:28:06 +0200
Subject: Link to the forum from the top-level page.

---
 doc/index.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 93526c42c..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -20,6 +20,7 @@ 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.
 
-- 
cgit v1.2.3


From 797ef6f61aced20d0553f748bbe3d04fd9305df9 Mon Sep 17 00:00:00 2001
From: diannetyron <diannetyron@web>
Date: Thu, 12 Nov 2009 00:12:10 -0500
Subject:

---
 doc/index.mdwn | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..8b1378917 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1 @@
-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]].
-- 
cgit v1.2.3


From 5d040714649e905927cc0ed71edca0875a4e49d8 Mon Sep 17 00:00:00 2001
From: diannetyron <diannetyron@web>
Date: Thu, 12 Nov 2009 00:19:28 -0500
Subject:

---
 doc/index.mdwn | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 8b1378917..fa5ad37ae 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,28 @@
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages of [custom essay](http://www.superiorpapers.com/) 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]].
-- 
cgit v1.2.3


From 91f364d02baae11e2d4d7aaa433ac7574f1fba8e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Nov 2009 00:24:33 -0500
Subject: Revert spam

---
 doc/index.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index fa5ad37ae..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,5 +1,5 @@
 Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages of [custom essay](http://www.superiorpapers.com/) and history in a
+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]].
-- 
cgit v1.2.3


From f2b8f358652e76e4047f4e304870e25cac51b681 Mon Sep 17 00:00:00 2001
From: parade <parade@web>
Date: Thu, 14 Jan 2010 14:25:56 +0000
Subject:

---
 doc/index.mdwn | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..13e7564ea 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1 @@
-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]].
+o
-- 
cgit v1.2.3


From b3036541674cc90b1c48203244dd711e399ce9d7 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 14 Jan 2010 16:29:09 +0100
Subject: Restore page.

This reverts commit f2b8f358652e76e4047f4e304870e25cac51b681.
---
 doc/index.mdwn | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 13e7564ea..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,28 @@
-o
+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]].
-- 
cgit v1.2.3


From cb4833742739ebaa2e875b97ae0035285f5b27b6 Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:15:41 +0000
Subject:

---
 doc/index.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..b1ef36b2e 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,6 +19,8 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
+[jup](http://www.google.de)
+
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
@@ -26,3 +28,5 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
+
+
-- 
cgit v1.2.3


From dd438d3a62615908adfe92868b95151b8c60506a Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:19:22 +0000
Subject:

---
 doc/index.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b1ef36b2e..88eafa114 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
-[jup](http://www.google.de)
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 070026f12a1e75d4f86ec224abf01fe566f739c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Mar 2010 12:37:12 -0500
Subject: Revert spammer's whitespace changes

(PS, you're banned.)
---
 doc/index.mdwn | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 88eafa114..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ 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]]
@@ -27,5 +26,3 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-
-
-- 
cgit v1.2.3


From 195943e588b8c7b6a3a43d10404d2d40a503c1d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 16:07:32 -0400
Subject: slightly more consistent capitalisation of ikiwiki

For a while, I was avoiding capitalizing ikiwiki at the beginning of a
sentence. I now think that's a bad idea (unless explicitly referring to
the `ikiwiki` command). Still, I don't go all the way and always cap it,
as a proper noun. That would make the logo look bad. ;)

I also tend to avoid capping it as IkiWiki, except when referring to the
perl internals, which do use that capitalization. (Too late to change
that.) However, it's also reasonable to do so in a WikiLink, as a nod to
historical camelcase wikis.
---
 debian/control                     |  6 +++---
 doc/download.mdwn                  |  2 +-
 doc/features.mdwn                  | 12 ++++++------
 doc/forum/speeding_up_ikiwiki.mdwn |  2 +-
 doc/index.mdwn                     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/debian/control b/debian/control
index 24c2c96a5..d7ce9a178 100644
--- a/debian/control
+++ b/debian/control
@@ -42,17 +42,17 @@ Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler
- ikiwiki converts a directory full of wiki pages into HTML pages suitable
+ Ikiwiki converts a directory full of 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 or Git.
  .
- ikiwiki implements all of the other standard features of a wiki, including
+ Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  page, BackLinks, search, Discussion pages, tags, smart merging and conflict
  resolution, and page locking.
  .
- ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
+ Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  ikiwiki provides a plugin system which allows many other features to be
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 45d0d7870..92c8a4f75 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -35,7 +35,7 @@ own RPM.
 
 ## BSD ports
 
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
 by running `sudo port install ikiwiki`.
 
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef..ab521213d 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -13,7 +13,7 @@ Instead of editing pages in a stupid web form, you can use vim and commit
 changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
 [[Revision_Control_Systems|rcs]].
 
-ikiwiki can be run from a [[post-commit]] hook to update your wiki
+Ikiwiki can be run from a [[post-commit]] hook to update your wiki
 immediately whenever you commit a change using the RCS.
 
 It's even possible to securely let
@@ -25,7 +25,7 @@ run a simple wiki without page history, it can do that too.
 
 ## A wiki compiler
 
-ikiwiki is a wiki compiler; it builds a static website for your wiki, and
+Ikiwiki is a wiki compiler; it builds a static website for your wiki, and
 updates it as pages are edited. It is fast and smart about updating a wiki,
 it only builds pages that have changed (and tracks things like creation of
 new pages and links that can indirectly cause a page to need a rebuild)
@@ -45,7 +45,7 @@ easily be added by [[plugins]]. For example it also supports traditional
 [[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]]
 or [[Textile|plugins/textile]].
 
-ikiwiki also supports files of any other type, including plain text,
+Ikiwiki also supports files of any other type, including plain text,
 images, etc. These are not converted to wiki pages, they are just copied
 unchanged by ikiwiki as it builds your wiki. So you can check in an image,
 program, or other special file and link to it from your wiki pages.
@@ -70,8 +70,8 @@ you would care to syndicate.
 
 ## Valid html and [[css]]
 
-ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki
+Ikiwiki aims to produce 
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
 generates html using [[templates|wikitemplates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
@@ -163,7 +163,7 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 
 ### Full text search
 
-ikiwiki can use the xapian search engine to add powerful
+Ikiwiki can use the xapian search engine to add powerful
 full text [[plugins/search]] capabilities to your wiki.
 
 ### Translation via po files
diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn
index 2c2ac240e..799186cf8 100644
--- a/doc/forum/speeding_up_ikiwiki.mdwn
+++ b/doc/forum/speeding_up_ikiwiki.mdwn
@@ -56,7 +56,7 @@ number is still too large to really visualize: the graphviz PNG and PDF output
 engines segfault for me, the PS one works but I can't get any PS software to
 render it without exploding.
 
-Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
+Now, the relations in the links hash are not the same thing as Ikiwiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
 
 Once I've figured out that I might be able to optimize some pagespecs. I
 understand pagespecs are essentially translated into sequential perl code. I
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,5 +24,5 @@ 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,
+Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-- 
cgit v1.2.3


From f48500b47e73f0acebee7e46c19f040a8d26485b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:36:31 +0000
Subject:

---
 doc/index.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..b047a97dd 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,8 +1,4 @@
-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]].
+<p>test</p>
 
 [[!template id=links]]
 
-- 
cgit v1.2.3


From dc68dfed39e13b559b0590fa8e5d178f1079db7b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:38:19 +0000
Subject:

---
 doc/index.mdwn | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b047a97dd..58d93dbd6 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,24 +1 @@
 <p>test</p>
-
-[[!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]].
-- 
cgit v1.2.3


From b374530addca21bbd4cdbca5d9c4df408fc84a4f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:42:37 +0000
Subject:

---
 doc/index.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 58d93dbd6..82c11b58e 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,3 @@
-<p>test</p>
+"*Hello World!!"
+1. "a.HELLO"
+2. "b.WORlD"
-- 
cgit v1.2.3


From 2860a34dc42dd9ed28f50833a8da124b94d8596a Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlYXeKSEBoSCzES7o5VYiSratG5RfNucL0"
 <@web>
Date: Sun, 25 Jul 2010 16:53:17 +0000
Subject:

---
 doc/index.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 82c11b58e..5800497b8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,3 @@
-"*Hello World!!"
-1. "a.HELLO"
-2. "b.WORlD"
+**Hello World!!** <br>
+#HELLO
+##WORlD
-- 
cgit v1.2.3


From 80903dff493738bc66fd14b7f7ec52174af7311c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Jul 2010 13:09:12 -0400
Subject: Revert refactment

---
 doc/index.mdwn | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'doc/index.mdwn')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 5800497b8..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,28 @@
-**Hello World!!** <br>
-#HELLO
-##WORlD
+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]].
-- 
cgit v1.2.3