Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / templates / discussion.mdwn

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 94b14753c41a9acf2d5147e995ecc52478693035..220d3645571befa3e353c3c869723f4bdf6b0901 100644 (file)
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -1,3 +1,8 @@
 This confuses me enormously. Perhaps because I am new to ikiwiki, to perl, to Linux, etc.
 
 note and popups are templates? But they're not in the templates directory, and in my readings here, templates are supposed to be in the ../templates directory. 
 This confuses me enormously. Perhaps because I am new to ikiwiki, to perl, to Linux, etc.
 
 note and popups are templates? But they're not in the templates directory, and in my readings here, templates are supposed to be in the ../templates directory. 

+
+> Ikiwiki has an basewiki underlay that provides wiki files not included in
+> your personal wiki sources. The note and popup template pages are
+> installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
+> --[[Joey]]