Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 77229e163e569eec77404739cd126d66ec5da44d..220d3645571befa3e353c3c869723f4bdf6b0901 100644 (file)
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -1,9 +1,8 @@
-I was wondering what the best way to customise the templates is.
+This confuses me enormously. Perhaps because I am new to ikiwiki, to perl, to Linux, etc.

 
 

-Would it be best to copy them all into the wiki under version control or have them seperate?
+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. 

 
 

-Thanks
-
-john
-
-> Either way would work ok. From a security standpoint, keeping the templates under version control isn't entirely safe, if you have anonymous untrusted svn committers. Web commits won't be able to touch them though, so that's ok. --[[Joey]]
\ No newline at end of file
+> 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]]