merge

diff --cc doc/cgi/discussion.mdwn
index eee63faed61e4c824dbd64564e4cf8c48e0127fd,bf7d6c2f1908529a7eeb05ddd6c2efb22cf9d3cd..2b487db13a02ed6fb7c56477313eaa0af074f812
--- 1/doc/cgi/discussion.mdwn
--- 2/doc/cgi/discussion.mdwn
+++ b/doc/cgi/discussion.mdwn
@@@ -6,10 -6,4 +6,10 @@@ I have a working ikiwiki configuration 
  CGI seems to be working at least partly - the History and Recent Changes pages both work. However, if I attempt to edit or create a page, I get this error:
      Error: Failed to load plugin IkiWiki::Plugin::mdwn: Can't locate IkiWiki/Plugin/mdwn.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.8.8 /usr/local/share/perl/5.8.8 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.8 /usr/share/perl/5.8 /usr/local/lib/site_perl .) at (eval 6) line 2. BEGIN failed--compilation aborted at (eval 6) line 2. 
  
- Since ikiwiki builds, it has to be finding Markdown at build time, right? What am I doing wrong here? I would appreciate a point in the right direction. Thanks.
+ Since ikiwiki builds, it has to be finding Markdown at build time, right? What am I doing wrong here? I would appreciate a point in the right direction. Thanks. --mrled
 +
- > Ikiwiki is failing to find `IkiWiki/Plugin/mdwn.pm` which is a plugin included in ikiwiki itsel.
++> Ikiwiki is failing to find `IkiWiki/Plugin/mdwn.pm` which is a plugin included in ikiwiki itself.
 +> So, that file must not have been installed in any of the directories in the @INC search path listed.
 +> Either fix the installation so ikiwiki's perl modules are installed in one of the standard locations,
 +> or you could use the `libdir` setting in the setup file to point ikiwiki
 +> at the directory the perl modules are installed. --[[Joey]]