fairly complete support for outputting html 4.01 instead of xhtml

still todo:

* the javascript inlined for toggle somehow fails to validate as html
* the doc wiki still mentions xhtml all over
* testing!

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 5d666e1be68d854e8c4e00f96c627de699521859..8ac2ad518ab25c66713f9d6c615df6ba61baab80 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -66,11 +66,11 @@ sub render_graph (\%) { #{{{
                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".
-                               encode_base64($png)."\" />";
+                               encode_base64($png)."\">";
                }
        }
 
-       return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+       return "<img src=\"".urlto($dest, $params{page})."\">\n";
 } #}}}
 
 sub graph (@) { #{{{

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index c5b08f60435b8b37ffb0b75732cfe92a8a6980ad..227c56af419540d012836cabafe87a7fd182d836 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -44,8 +44,7 @@ sub scrubber { #{{{
                        selected shape size span src start summary
                        tabindex target title type usemap valign
                        value vspace width
-               }, "/" => 1, # emit proper <hr /> XHTML
-               }],
+               }}],
        );
        return $_scrubber;
 } # }}}

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index cd5dc83acc6b1da5b990f18105070f1fba132487..32e9b3618fe3d63cce291872d1ecdda33da28e27 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -22,7 +22,7 @@ sub sanitize (@) { #{{{
        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };
-       $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
+       $pid=open2(*IN, *OUT, 'tidy -quiet -ashtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
        
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a453a49ba43321c1261ae12db846c1c3adb88c5e..7d74ed424b8ab766a2b89f9ab72c82556042680a 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -101,7 +101,7 @@ sub preprocess (@) { #{{{
                '" height="'.$im->Get("height").'"'.
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
-               ' /></a>';
+               '></a>';
 } #}}}
 
 1

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 08e1f2769b8b7ca3b526e04808cd171d7ba3a2b4..77932f60db03a0238bc9fd9689330b6953803831 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -233,7 +233,7 @@ sub preprocess_inline (@) { #{{{
                        writefile($rssp, $config{destdir},
                                genfeed("rss", $rssurl, $desc, $params{page}, @list));
                        $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
+                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl">};
                }
                if ($atom) {
                        my $atomp=atompage($params{page});
@@ -241,7 +241,7 @@ sub preprocess_inline (@) { #{{{
                        writefile($atomp, $config{destdir},
                                genfeed("atom", $atomurl, $desc, $params{page}, @list));
                        $toping{$params{page}}=1 unless $config{rebuild};
-                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+                       $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl">};
                }
        }
        

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index ca8898679216684da988bfd2fb08cd14dd04ff51..e747ac968b98397cbf0922b3c4f34c91ac5ecaa4 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -26,16 +26,19 @@ sub htmlize (@) { #{{{
                eval q{use Markdown};
                if (! $@) {
                        $markdown_sub=\&Markdown::Markdown;
+                       $Markdown::g_empty_element_suffix=">"; # HTML output
                }
                else {
                        eval q{use Text::Markdown};
                        if (! $@) {
                                $markdown_sub=\&Text::Markdown::Markdown;
+                               $Text::Markdown::g_empty_element_suffix=">"; # HTML output
                        }
                        else {
                                do "/usr/bin/markdown" ||
                                        error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!));
                                $markdown_sub=\&Markdown::Markdown;
+                               $Markdown::g_empty_element_suffix=">"; # HTML output
                        }
                }
                require Encode;

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 184146cfee5c558a23426a6b36438f8e681b41f9..731d9da76f7c18c10f5f98c22069616dd390f07d 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -57,7 +57,7 @@ sub preprocess (@) { #{{{
                if (%params) {
                        $meta{$page}.=scrub("<link href=\"".encode_entities($value)."\" ".
                                join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params).
-                               " />\n");
+                               ">\n");
                }
                else {
                        # hidden WikiLink
@@ -69,7 +69,7 @@ sub preprocess (@) { #{{{
        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;
-               $meta{$page}.=scrub("<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n");
+               $meta{$page}.=scrub("<link rel=\"bookmark\" href=\"".encode_entities($value)."\">\n");
        }
        elsif ($key eq 'date') {
                eval q{use Date::Parse};
@@ -90,19 +90,19 @@ sub preprocess (@) { #{{{
                $meta{$page}.='<link href="'.$stylesheet.
                        '" rel="'.encode_entities($rel).
                        '" title="'.encode_entities($title).
-                       "\" style=\"text/css\" />\n";
+                       "\" style=\"text/css\">\n";
        }
        elsif ($key eq 'openid') {
                if (exists $params{server}) {
                        $meta{$page}.='<link href="'.encode_entities($params{server}).
-                               "\" rel=\"openid.server\" />\n";
+                               "\" rel=\"openid.server\">\n";
                }
                $meta{$page}.='<link href="'.encode_entities($value).
-                       "\" rel=\"openid.delegate\" />\n";
+                       "\" rel=\"openid.delegate\">\n";
        }
        else {
                $meta{$page}.=scrub("<meta name=\"".encode_entities($key).
-                       "\" content=\"".encode_entities($value)."\" />\n");
+                       "\" content=\"".encode_entities($value)."\">\n");
                if ($key eq 'author') {
                        $author{$page}=$value;
                }

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index 63c93c62d9380fedbfa2954ee24ea9eac7f9c76d..b0682669e6e2a230dfe7f36cd7935850be248cf3 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -57,13 +57,13 @@ sub preprocess (@) { #{{{
                        $ret.="$choice ($choices{$choice})\n";
                }
                if ($open && exists $config{cgiurl}) {
-                       $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
-                       $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n";
-                       $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
-                       $ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
-                       $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
+                       $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\">\n";
+                       $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\">\n";
+                       $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\">\n";
+                       $ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\">\n";
+                       $ret.="<input type=\"submit\" value=\"".gettext("vote")."\">\n";
                }
-               $ret.="</p>\n<hr class=poll align=left width=\"$percent%\"/>\n";
+               $ret.="</p>\n<hr class=poll align=left width=\"$percent%\">\n";
                if ($open && exists $config{cgiurl}) {
                        $ret.="</form>\n";
                }

diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index 69b3512c27e708d1155fab842e76b46b7dbff9f5..1c972943ec027112ca2414c017d1459ae8e3d798 100644 (file)
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -152,11 +152,11 @@ sub preprocess (@) { #{{{
                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".
-                               encode_base64($png)."\" />";
+                               encode_base64($png)."\">";
                }
        }
 
-       return '<img src="'.urlto($fn, $params{destpage}).'" alt="graph" />';
+       return '<img src="'.urlto($fn, $params{destpage}).'" alt="graph">';
 } # }}}
 
 1

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 797bfc6bd526b7489e98046dd2ce752d4f85a0cd..bc62f71d6858cb302ef23549e5f63fe9152957e9 100644 (file)
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -47,7 +47,7 @@ sub format (@) { #{{{
                if ($tagname =~ /^h(\d+)$/i) {
                        my $level=$1;
                        my $anchor="index".++$anchors{$level}."h$level";
-                       $page.="$text<a name=\"$anchor\" />";
+                       $page.="$text<a name=\"$anchor\"></a>";
        
                        # Take the first header level seen as the topmost level,
                        # even if there are higher levels seen later on.

diff --git a/debian/NEWS b/debian/NEWS
index 7a5808ac0848ef9b43adcd3fcc3ea8c8addf94ac..61e66e3d0a2ee289f3947fb987cb3f429defbbfd 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,23 @@
+ikiwiki (2.4) unstable; urgency=low
+
+  Ikiwiki now outputs HTML 4.01, not XHTML 1.0. For the many reasons, see
+  http://www.hixie.ch/advocacy/xhtml and note that even if a web server is
+  set up to serve XHTML appropriately as application/xhtml+xml, mozilla
+  doesn't support that mime type.
+
+  It's possible that your wiki contains some hardcoded XHTML tags. No
+  need to worry about these too much though. Since before ikiwiki generated
+  XHTML before, but your web server almost certianly served it up as 
+  text/html, web browsers actually were processing it as HTML all along and
+  if an XHTML tag worked before, it will continue to work. Also,
+  both the htmlscrubber and htmlsanitizer modules will convert any such
+  XHTML tags to valid HTML tags.
+
+  You might want to rebuild your wiki on upgrade to this version, to switch
+  everything over to HTML 4.01 at once.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 08 Jul 2007 11:55:00 -0400
+
 ikiwiki (2.1) unstable; urgency=low
 
   Some wikis need to be rebuilt on upgrade to this version, due to changes to

diff --git a/debian/changelog b/debian/changelog
index d946f12e1cae787eb4d6c8321f62b918ec96dc88..ade01140d971e57b636200c653ba5e42c47cd03a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.4) UNRELEASED; urgency=low
+
+  * Ikiwiki now outputs HTML 4.01, not XHTML 1.0. See the NEWS file for
+    details. Closes: #432045
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 08 Jul 2007 11:51:29 -0400
+
 ikiwiki (2.3) unstable; urgency=low
 
   * Corrected a typo in an error handler in the image plugin.

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 4c8756f89670d0af8e55261bb100b33a65b782ca..28a2b89e63ae1bdae8eef0adebd4b6a51bca69cc 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-29 20:49-0400\n"
+"POT-Creation-Date: 2007-07-08 12:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -208,7 +208,7 @@ msgstr ""
 msgid "%s is locked by %s and cannot be edited"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:37
+#: ../IkiWiki/Plugin/mdwn.pm:39
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""

diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 6bc789dfb29cfe241055ac51c4c392df6a6a50a4..9eceee2e42972b9954f388689ce4b81e1ccdcd97 100644 (file)
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,5 +1,5 @@
 <p>
-<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br>
 <i>
 Posted <TMPL_VAR CTIME>
 </i>

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 9190fcc842d3ffe8bdec47935ec333ae0be8bf49..16effda06c3e1ae50106b39f69595fd31b9e2fae 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -15,10 +15,6 @@
        <TMPL_IF NAME="ENCLOSURE">
        <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>
-       <content type="xhtml" xml:lang="en">
-        <div xmlns="http://www.w3.org/1999/xhtml">
-        <TMPL_VAR CONTENT>
-        </div>
-       </content>
+       <content type="html"><![CDATA[<TMPL_VAR CONTENT>]]></content>
        </TMPL_IF>
 </entry>

diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
index 7eeede6038b64c16520dcc506c3198ffe42ecd85..c044f51b04c17d186f862f4315cedc9815f985c3 100644 (file)
--- a/templates/blogpost.tmpl
+++ b/templates/blogpost.tmpl
@@ -6,11 +6,11 @@
 <TMPL_IF NAME="ATOMURL">
 <a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
 </TMPL_IF>
-<input type="hidden" name="do" value="blog" />
-<input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
-<input type="hidden" name="subpage" value="1" />
+<input type="hidden" name="do" value="blog">
+<input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>">
+<input type="hidden" name="subpage" value="1">
 <TMPL_VAR POSTFORMTEXT>
-<input name="title" size="40" />
-<input type="submit" value="Edit" />
+<input name="title" size="40">
+<input type="submit" value="Edit">
 </div>
 </form>

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 08f160881f4a768401c73795fd82731e855df94c..d418bac6915130c6b0766d7087aae0c4a28f6c28 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<base href="<TMPL_VAR BASEURL>" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<base href="<TMPL_VAR BASEURL>">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title><TMPL_VAR FORM-TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css">
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css">
 <TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon">
 </TMPL_IF>
 </head>
 <body>
@@ -65,20 +65,20 @@ together before saving.
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
-<br />
+<br>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
-<TMPL_VAR FIELD-EDITCONTENT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br>
 <TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
-<TMPL_VAR FIELD-COMMENTS><br />
+Optional comment about this change:<br>
+<TMPL_VAR FIELD-COMMENTS><br>
 </TMPL_IF>
-<input id="_submit" name="_submit" type="submit" value="Save Page" /><input id="_submit_2" name="_submit" type="submit" value="Preview" /><input id="_submit_3" name="_submit" type="submit" value="Cancel" />
+<input id="_submit" name="_submit" type="submit" value="Save Page"><input id="_submit_2" name="_submit" type="submit" value="Preview"><input id="_submit_3" name="_submit" type="submit" value="Cancel">
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_VAR FORM-END>
 <TMPL_IF NAME="PAGE_PREVIEW">
-<hr />
+<hr>
 <div class="header">
 <span>Page preview:</span>
 </div>

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 32e2c934eac8fe8efdade8b40bbf3081293d7391..9ce3c42fde7b5975ce85761dc7fb45b0f2592cd2 100644 (file)
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<base href="<TMPL_VAR BASEURL>" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<base href="<TMPL_VAR BASEURL>">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css">
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css">
 <TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon">
 </TMPL_IF>
 </head>
 <body>

diff --git a/templates/page.tmpl b/templates/page.tmpl
index fd44a53be0a7e1e1a81d0950bfde16f79ef1a2b9..05c8af7a8dcd72e1b625a6e60d37fad82cc80a51 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon">
 </TMPL_IF>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css">
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css">
 <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
 </head>
@@ -42,7 +42,7 @@
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
 <TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+<li><TMPL_VAR DISCUSSIONLINK><br></li>
 </TMPL_IF>
 </ul>
 </div>

diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index e954503f8a0f46df58ece13f3009b81847b769f7..6e95e5b8aaf2e3848ab1bfbcb387201c17530245 100644 (file)
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<base href="<TMPL_VAR BASEURL>" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<base href="<TMPL_VAR BASEURL>">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css">
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css">
 <TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon">
 </TMPL_IF>
 </head>
 <body>
@@ -20,7 +20,7 @@
 </div>
 
 <div id="content">
-<br />
+<br>
 <table border="1" frame="border" rules="groups">
 <thead>
        <tr class="changeheader">
@@ -39,7 +39,7 @@
                <TMPL_LOOP NAME="PAGES">
                        <TMPL_IF NAME="DIFFURL">
                                <a href="<TMPL_VAR NAME="DIFFURL">">
-                               <img alt="diff" src="wikiicons/diff.png" />
+                               <img alt="diff" src="wikiicons/diff.png">
                                </a>
                                <TMPL_VAR NAME="LINK">
                        <TMPL_ELSE>
@@ -53,7 +53,7 @@
                <td class="changelog" colspan="4">
                        <TMPL_LOOP NAME="MESSAGE">
                                <TMPL_IF NAME="LINE">
-                                       <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+                                       <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br>
                                </TMPL_IF>
                        </TMPL_LOOP>
                </td>

diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl
index 7c4fdb026ce73025ce6aa5ca2d1051b5670b8e53..d449c784e24ffe6e3f1afaed5c9bc8e3d91f0a7f 100644 (file)
--- a/templates/searchform.tmpl
+++ b/templates/searchform.tmpl
@@ -1,7 +1,7 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" name="phrase" value="" size="16" />
-<input type="hidden" name="enc" value="UTF-8" />
-<input type="hidden" name="do" value="hyperestraier" />
+<input type="text" name="phrase" value="" size="16">
+<input type="hidden" name="enc" value="UTF-8">
+<input type="hidden" name="do" value="hyperestraier">
 </div>
 </form>