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

Conflicts:
	doc/sandbox.mdwn

diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn
new file mode 100644 (file)
index 0000000..7ae6166
--- /dev/null
+++ b/doc/sandbox/Post.mdwn
@@ -0,0 +1,5 @@
+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]].

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 1c5ad826092ee615891e6786df9dab03e375cdb6..b71263dae42580f7cf8f32fa6e87d131d0fe47f3 100644 (file)
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -242,3 +242,6 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 
 > That is not entirely clear to me from the documentation. It doesn't
 > say the path has to exist, but doesn't say it cannot either. --[[Joey]]
+
+I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
+" on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)