summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/install.mdwn4
-rw-r--r--doc/markdown/discussion.mdwn1
-rw-r--r--doc/plugins/orphans.mdwn4
-rw-r--r--doc/sandbox/foo.wiki2
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! :-)