diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:28:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 15:28:10 +0200 |
| commit | 395db449b8c952f628a01cfd16787f1066f7bb7d (patch) | |
| tree | 39a6c839b2e03ec519ec5afb03bf4d76cbd36d4d /templates | |
| parent | 7fb1c12eb8ab54df0085bac0262ba73d5a858194 (diff) | |
| parent | 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 (diff) | |
Merge branch 'master' into master-noneditmaster-nonedit
Conflicts (manually resolved: text adjustments adopted, newly added files suppressed):
ikiwiki.mdwn
ikiwiki/directive.mdwn
ikiwiki/formatting.mdwn
ikiwiki/markdown.mdwn
ikiwiki/openid.mdwn
ikiwiki/pagespec.mdwn
ikiwiki/pagespec/attachment.mdwn
ikiwiki/subpage.mdwn
ikiwiki/wikilink.mdwn
index.mdwn
templates.mdwn
wikiicons/openidlogin-bg.gif
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/note.mdwn | 2 | ||||
| -rw-r--r-- | templates/popup.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/note.mdwn b/templates/note.mdwn index 4cc323c..9ef5ad9 100644 --- a/templates/note.mdwn +++ b/templates/note.mdwn @@ -1,7 +1,7 @@ <div class="notebox"> <TMPL_VAR text> </div> -<TMPL_UNLESS NAME="text"> +<TMPL_UNLESS text> Use this template to insert a note into a page. The note will be styled to float to the right of other text on the page. This template has one parameter: diff --git a/templates/popup.mdwn b/templates/popup.mdwn index b355daa..92455eb 100644 --- a/templates/popup.mdwn +++ b/templates/popup.mdwn @@ -1,4 +1,4 @@ -<TMPL_UNLESS NAME="mouseover"> +<TMPL_UNLESS mouseover> Use this template to create a popup window that is displayed when the mouse is over part of the page. This template has two parameters: <ul> |