| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2148,28 +2148,49 @@ |
| 2149 | 2149 | /** The default Content-Type header. */ |
| 2150 | 2150 | $wgMimeType = 'text/html'; |
| 2151 | 2151 | |
| 2152 | | -/** The content type used in script tags. */ |
| | 2152 | +/** |
| | 2153 | + * The content type used in script tags. This is mostly going to be ignored if |
| | 2154 | + * $wgHtml5 is true, at least for actual HTML output, since HTML5 doesn't |
| | 2155 | + * require a MIME type for JavaScript or CSS (those are the default script and |
| | 2156 | + * style languages). |
| | 2157 | + */ |
| 2153 | 2158 | $wgJsMimeType = 'text/javascript'; |
| 2154 | 2159 | |
| 2155 | | -/** The HTML document type. */ |
| | 2160 | +/** |
| | 2161 | + * The HTML document type. Ignored if $wgHtml5 is true, since <!DOCTYPE html> |
| | 2162 | + * doesn't actually have a doctype part to put this variable's contents in. |
| | 2163 | + */ |
| 2156 | 2164 | $wgDocType = '-//W3C//DTD XHTML 1.0 Transitional//EN'; |
| 2157 | 2165 | |
| 2158 | | -/** The URL of the document type declaration. */ |
| | 2166 | +/** |
| | 2167 | + * The URL of the document type declaration. Ignored if $wgHtml5 is true, |
| | 2168 | + * since HTML5 has no DTD, and <!DOCTYPE html> doesn't actually have a DTD part |
| | 2169 | + * to put this variable's contents in. |
| | 2170 | + */ |
| 2159 | 2171 | $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'; |
| 2160 | 2172 | |
| 2161 | | -/** The default xmlns attribute. */ |
| | 2173 | +/** |
| | 2174 | + * The default xmlns attribute. Ignored if $wgHtml5 is true (or it's supposed |
| | 2175 | + * to be), since we don't currently support XHTML5, and in HTML5 (i.e., served |
| | 2176 | + * as text/html) the attribute has no effect, so why bother? |
| | 2177 | + */ |
| 2162 | 2178 | $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; |
| 2163 | 2179 | |
| 2164 | 2180 | /** |
| 2165 | 2181 | * Should we output an HTML5 doctype? If false, use XHTML 1.0 Transitional |
| 2166 | 2182 | * instead, and disable HTML5 features. This may eventually be removed and set |
| 2167 | | - * to always true. |
| | 2183 | + * to always true. If it's true, a number of other settings will be irrelevant |
| | 2184 | + * and have no effect. |
| 2168 | 2185 | */ |
| 2169 | 2186 | $wgHtml5 = true; |
| 2170 | 2187 | |
| 2171 | 2188 | /** |
| 2172 | 2189 | * Defines the value of the version attribute in the <html> tag, if any. |
| 2173 | | - * Will be initialized later if not set explicitly. |
| | 2190 | + * This is ignored if $wgHtml5 is false. If $wgAllowRdfaAttributes and |
| | 2191 | + * $wgHtml5 are both true, and this evaluates to boolean false (like if it's |
| | 2192 | + * left at the default null value), it will be auto-initialized to the correct |
| | 2193 | + * value for RDFa+HTML5. As such, you should have no reason to ever actually |
| | 2194 | + * set this to anything. |
| 2174 | 2195 | */ |
| 2175 | 2196 | $wgHtml5Version = null; |
| 2176 | 2197 | |
| — | — | @@ -2209,6 +2230,9 @@ |
| 2210 | 2231 | * $wgXhtmlNamespaces['svg'] = 'http://www.w3.org/2000/svg'; |
| 2211 | 2232 | * Normally we wouldn't have to define this in the root <html> |
| 2212 | 2233 | * element, but IE needs it there in some circumstances. |
| | 2234 | + * |
| | 2235 | + * This is ignored if $wgHtml5 is true, for the same reason as |
| | 2236 | + * $wgXhtmlDefaultNamespace. |
| 2213 | 2237 | */ |
| 2214 | 2238 | $wgXhtmlNamespaces = array(); |
| 2215 | 2239 | |