summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2012-07-14 12:10:08 +0100
committerAnika Henke <anika@selfthinker.org>2012-07-14 12:10:08 +0100
commitc8839c220c49633ea45ce5d0e4be1f411f66ad6c (patch)
tree58c6fba882a0d2d550aa04872ffd6036d1819519 /inc
parent4a14c3a4f530437180e3523cc34ab4464cea7dfa (diff)
downloadrpg-c8839c220c49633ea45ce5d0e4be1f411f66ad6c.tar.gz
rpg-c8839c220c49633ea45ce5d0e4be1f411f66ad6c.tar.bz2
changed all doctypes to html5 doctype
Diffstat (limited to 'inc')
-rw-r--r--inc/actions.php8
-rw-r--r--inc/init.php3
2 files changed, 4 insertions, 7 deletions
diff --git a/inc/actions.php b/inc/actions.php
index d4bd5b20e..fc15713d8 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -568,12 +568,10 @@ function act_export($act){
$output = rawWiki($ID,$REV);
break;
case 'xhtml':
- $pre .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' . DOKU_LF;
- $pre .= ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . DOKU_LF;
- $pre .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$conf['lang'].'"' . DOKU_LF;
- $pre .= ' lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF;
+ $pre .= '<!DOCTYPE html>' . DOKU_LF;
+ $pre .= '<html lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF;
$pre .= '<head>' . DOKU_LF;
- $pre .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . DOKU_LF;
+ $pre .= ' <meta charset="utf-8" />' . DOKU_LF;
$pre .= ' <title>'.$ID.'</title>' . DOKU_LF;
// get metaheaders
diff --git a/inc/init.php b/inc/init.php
index a28050736..00ab2afe9 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -497,8 +497,7 @@ function is_ssl(){
*/
function nice_die($msg){
echo<<<EOT
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
<html>
<head><title>DokuWiki Setup Error</title></head>
<body style="font-family: Arial, sans-serif">