diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
commit | 041923a89ece8b1ed195cb7b528843c15770ea6f (patch) | |
tree | d85f7c488c05d8d6983ec1b65b2e427c59cc3acf /templates/atompage.tmpl | |
parent | e12627e0a4c73d4d47ac2f10750defe22b41580e (diff) | |
parent | 861dea7f1c720ff889ff11ef7b7e925a3c209c5d (diff) |
Merge branch 'master' into autoconfig
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
Diffstat (limited to 'templates/atompage.tmpl')
-rw-r--r-- | templates/atompage.tmpl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index e834d7693..dcb89ab5c 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -12,22 +12,18 @@ </TMPL_IF> </author> <TMPL_IF NAME="COPYRIGHT"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> + <rights type="html" xml:lang="en"> <TMPL_IF NAME="LICENSE"> <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <TMPL_ELSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> - </div> </rights> <TMPL_ELSE> <TMPL_IF NAME="LICENSE"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR LICENSE> - </div> + <rights type="html"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> |