summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-14 04:05:08 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-14 04:05:08 +0000
commit96125d8da512d992012560a1115eb3a8115bafbe (patch)
tree8290149ed4e09f4d74b14ccb618348b80e32b73b /doc
parent663a87442788d2a5db38cf2f3056383e0915a4d7 (diff)
* Allow multiple tag settings to appear in a single page.
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/problem_adding_tag_from_template.mdwn3
-rw-r--r--doc/plugins/htmlscrubber.mdwn2
-rw-r--r--doc/plugins/inline.mdwn1
-rw-r--r--doc/plugins/mdwn.mdwn2
-rw-r--r--doc/plugins/passwordauth.mdwn1
-rw-r--r--doc/plugins/template.mdwn9
6 files changed, 10 insertions, 8 deletions
diff --git a/doc/bugs/problem_adding_tag_from_template.mdwn b/doc/bugs/problem_adding_tag_from_template.mdwn
index bc697e487..0d1cf45a8 100644
--- a/doc/bugs/problem_adding_tag_from_template.mdwn
+++ b/doc/bugs/problem_adding_tag_from_template.mdwn
@@ -5,3 +5,6 @@ page that used `core=1` in the template (such as [[plugins/mdwn]]), the
`type/core` tag disappeared, and the template did not supply
it. --[[JoshTriplett]]
+Problem was that setting a tag cleared all earlier tags. [[bugs/done]], and
+I like the idea of the autotagging..
+--[[Joey]]
diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
index 4fa11d04e..8e37a5bd5 100644
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@@ -1,5 +1,5 @@
[[template id=plugin name=htmlscrubber core=1 author="[[Joey]]"]]
-[[tag type/html type/core]]
+[[tag type/html]]
This plugin is enabled by default. It sanitizes the html on pages it renders
to avoid XSS attacks and the like.
diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index 6baf6ba9b..a607474df 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,5 +1,4 @@
[[template id=plugin name=inline core=1 author="[[Joey]]"]]
-[[tag type/core]]
This is a [[PreProcessorDirective]] that allows including one wiki page
inside another. For example:
diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index 277c4f3ec..c4de0cff9 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -1,5 +1,5 @@
[[template id=plugin name=mdwn core=1 author="[[Joey]]"]]
-[[tag type/format type/core]]
+[[tag type/format]]
This plugin lets ikwiki convert files with names ending in ".mdwn" to html.
It uses the [[markdown]] minimal markup language.
diff --git a/doc/plugins/passwordauth.mdwn b/doc/plugins/passwordauth.mdwn
index 3d6782dba..2ee06b7ad 100644
--- a/doc/plugins/passwordauth.mdwn
+++ b/doc/plugins/passwordauth.mdwn
@@ -1,6 +1,5 @@
[[template id=plugin name=passwordauth core=1 author="[[Joey]]"]]
[[tag type/auth]]
-[[tag type/core]]
This plugin lets ikiwiki prompt for a user name and password when logging
into the wiki. It also handles registering users, mailing passwords, and
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index b6083d225..98188d7dc 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -38,10 +38,6 @@ few things:
* To use one block of text if a variable is set and a second if it's not,
use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template.
-
Here's a sample template:
<span class="infobox">
@@ -57,3 +53,8 @@ Here's a sample template:
<TMPL_VAR notes>
</TMPL_IF>
</span>
+
+The filled out template will be formatted the same as the rest of the page
+that contains it, so you can include WikiLinks and all other forms of wiki
+markup in the template. Note though that such WikiLinks will not show up as
+backlinks to the page that uses the template.