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

diff --git a/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment b/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment
new file mode 100644 (file)
index 0000000..6045a4a
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__/comment_1_037f858c4d0bcbb708c3efd264379500._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
+ nickname="Dário"
+ subject="comment 1"
+ date="2010-07-15T15:37:31Z"
+ content="""
+multimarkdown-git is a package build that fetches the git version of multimarkdown.
+It should install Text::Markdown I believe.
+I tried to install it by hand on the cpan command line but it didn't work either:
+perl -MCPAN -e shell 
+install Text::MultiMarkdown
+
+says couldn't run make file or something.
+"""]]

diff --git a/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment b/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment
new file mode 100644 (file)
index 0000000..804b71c
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__/comment_2_b7d512a535490dabf8d6ce55439741c7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 2"
+ date="2010-07-16T19:44:55Z"
+ content="""
+All I can tell you is that, if multimarkdown is correctly installed (ie, if `perl -e 'use Text::MultiMarkdown'` runs successfully), ikiwiki can use it. 
+"""]]

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index d38b1208b5a1cf2449410c9e515094b34cd66262..6e5dcfb3fa96e90025e2637258676b492ab8005f 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -54,6 +54,7 @@ Projects & Organizations
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 * [Apua IT](http://apua.se/)
+* [PDFpirate Community](http://community.pdfpirate.org/)
 
 Personal sites and blogs
 ========================
@@ -150,6 +151,7 @@ Personal sites and blogs
 * [Mukund](https://www.mukund.org/)
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
+* [Thomas Kane](http://planetkane.org/)
 
 Please feel free to add your own ikiwiki site!
 

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 9eb12e81915a271d3675640dd691ede3e3bb080f..bfb6a439adc7b71096b4641f077a116648cba10f 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -29,7 +29,7 @@ pages in the wiki.
 
 The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
-page, which can be filled as out the page is edited.
+page, which can be filled out as the page is edited.
 """]]
 
 [[!if test="(enabled(template) or enabled(edittemplate))
@@ -56,7 +56,7 @@ html out of ikiwiki and in the templates.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.
 * `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
 * `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
+* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)
 * `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
 * `aggregatepost.tmpl` - Used by the aggregate plugin to create
   a page for a post.