diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-11-23 15:01:23 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-11-23 15:01:23 -0500 |
| commit | 4c0c6a19b83459d0336bafecc0e6181729a7b729 (patch) | |
| tree | 14af1eaed9685f8a66fc4c2e594179232bf78ccb | |
| parent | cf6fd45a8a6379232c3c8dec652175c42a96040b (diff) | |
| parent | 2a933a07c63056df0a645c501e16a951c7308184 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:
doc/sandbox.mdwn
| -rw-r--r-- | doc/sandbox/Post.mdwn | 5 | ||||
| -rw-r--r-- | doc/setup/discussion.mdwn | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn new file mode 100644 index 000000000..7ae61669b --- /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 1c5ad8260..b71263dae 100644 --- 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/) |