diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-10 04:11:58 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-10 04:11:58 +0000 |
| commit | cade16fbb6df5b1374f28a393ef9bf2b715c143b (patch) | |
| tree | 868cc0587c9c1b3469f8d52766b1e6c94e66e78a /doc | |
| parent | 3ed1116c11eb5fb13d1f011535f7f0f4c8961c83 (diff) | |
| download | ikiwiki-cade16fbb6df5b1374f28a393ef9bf2b715c143b.tar ikiwiki-cade16fbb6df5b1374f28a393ef9bf2b715c143b.tar.gz | |
* Improve markdown loading. First, try to load it as a properl perl module,
in case it was installed as one. Then fall back to trying
/usr/bin/markdown.
* Document in install page how to install markdown, since it has no
installation procedure in the upstream tarball.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install.mdwn | 4 | ||||
| -rw-r--r-- | doc/markdown/discussion.mdwn | 1 | ||||
| -rw-r--r-- | doc/plugins/orphans.mdwn | 4 | ||||
| -rw-r--r-- | doc/sandbox/foo.wiki | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/doc/install.mdwn b/doc/install.mdwn index d2b6b8833..49153c0d0 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -6,6 +6,10 @@ installed, and also uses the following perl modules if available: `HTML::Template` `Mail::SendMail` `Time::Duration` `Date::Parse`, `HTML::Scrubber`, `RPC::XML`, `XML::Simple`, `XML::Feed` +If you're installing MarkDown by hand, note that it should be installed as +`Markdown.pm` somewhere in perl's module search path, or alternately as +`/usr/bin/markdown`. Ikiwiki will find it under either name. + If you want to install from the tarball, you should make sure that the required perl modules are installed, then run: diff --git a/doc/markdown/discussion.mdwn b/doc/markdown/discussion.mdwn deleted file mode 100644 index dd63f1704..000000000 --- a/doc/markdown/discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -in order to install Markdown, I had to copy the Markdown.pl file to /usr/bin/markdown
\ No newline at end of file diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn index 2c4e52a3f..4591ebf59 100644 --- a/doc/plugins/orphans.mdwn +++ b/doc/plugins/orphans.mdwn @@ -1,5 +1,5 @@ -This plugin generates a list of possibly orphaned pages -- pages that no other page -links to. +This plugin generates a list of possibly orphaned pages -- pages that no +other page links to. The optional parameter "pages" can be a [[PageSpec]] specifying the pages to check for orphans, default is search them all. diff --git a/doc/sandbox/foo.wiki b/doc/sandbox/foo.wiki index 7e58da046..e06baad61 100644 --- a/doc/sandbox/foo.wiki +++ b/doc/sandbox/foo.wiki @@ -1 +1 @@ -Look ma, this page uses '''wiki''' markup, not MarkDown! :-)
\ No newline at end of file +Look ma, this page uses '''wiki''' markup, not MarkDown! :-) |