diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:37:40 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:37:40 +0200 |
commit | 36b34c055cc7db0ef454726f1ba477b949cd8f02 (patch) | |
tree | aec3d95ce34ba1d76ebcfb2bd19c4d6d7981b043 /templates/note.mdwn | |
parent | 8321feea467909190764dde311e1918adb729b33 (diff) | |
parent | 0b4f0016a186a6054bb1731c14ba35d5368f5694 (diff) |
Merge branch 'clean-da' into allinone-nonedit-da
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/note.mdwn')
-rw-r--r-- | templates/note.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/note.mdwn b/templates/note.mdwn index 3a5b87a..2c6c9e0 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> Brug denne skabelon til at indsætte en note på en side. Noten vil blive udsmykket til at flyde til højre for den øvrige tekst på siden. Denne skabelon har et parameter: |