Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 334cbfa652a199ea020b6ffbf2c645c5168b6646..89802c604c0803af0d78e4db7254a97751ff7fc8 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -2,7 +2,8 @@ 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
 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]].
+[[blogging|blog]] and [[podcasting|podcast]], as well as a large
+array of [[plugins]].

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


@@ -10,10 +11,11 @@ There are many other [[features]], including support for
 
 [[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]]. [Deutsch Englisch Übersetzung](http://www.profischnell.com) [Übersetzung Deutsch Englisch](http://www.profischnell.com/uebersetzung/uebersetzung-deutsch-englisch.html) [Übersetzungsdienst](http://www.profi-fachuebersetzung.de)
+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 ]].


@@ -21,7 +23,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.