diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 418dd547..b8e2e075 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -109,7 +109,7 @@ credits = [
'https://raw.githubusercontent.com/apache/cordova-docs/master/LICENSE'
], [
'CSS
DOM
HTML
JavaScript',
- '2005-2013 Mozilla Developer Network and individual contributors',
+ '2005-2014 Mozilla Developer Network and individual contributors',
'CC BY-SA',
'http://creativecommons.org/licenses/by-sa/2.5/'
], [
diff --git a/lib/docs/filters/html/entries.rb b/lib/docs/filters/html/entries.rb
index e082e3bd..b2e7428d 100644
--- a/lib/docs/filters/html/entries.rb
+++ b/lib/docs/filters/html/entries.rb
@@ -1,7 +1,7 @@
module Docs
class Html
class EntriesFilter < Docs::EntriesFilter
- HTML5 = %w(content element menuitem template)
+ HTML5 = %w(content element video)
OBSOLETE = %w(frame frameset hgroup noframes)
ADDITIONAL_ENTRIES = { 'Heading_Elements' => (1..6).map { |n| ["h#{n}"] } }
@@ -14,7 +14,7 @@ module Docs
'Obsolete'
else
spec = css('.standard-table').last.try(:content)
- if (spec && spec =~ /HTML\s?5/ && spec !~ /HTML\s?4/) || HTML5.include?(slug)
+ if (spec && html5_spec?(spec)) || HTML5.include?(slug)
'HTML5'
else
'Standard'
@@ -29,6 +29,10 @@ module Docs
def additional_entries
ADDITIONAL_ENTRIES[slug] || []
end
+
+ def html5_spec?(spec)
+ (spec =~ /HTML\s?5/ || spec.include?('WHATWG HTML Living Standard')) && spec !~ /HTML\s?4/
+ end
end
end
end
diff --git a/lib/docs/filters/mdn/clean_html.rb b/lib/docs/filters/mdn/clean_html.rb
index 9c94f790..7e8058e3 100644
--- a/lib/docs/filters/mdn/clean_html.rb
+++ b/lib/docs/filters/mdn/clean_html.rb
@@ -6,9 +6,6 @@ module Docs
'.htab', # "Browser compatibility" tabs
'.breadcrumbs', # (e.g. CSS/animation)
'.Quick_links', # (e.g. CSS/animation)
- '.HTMLElmNav', # (e.g. HTML/a)
- '.htmlMinVerHeader', # (e.g. HTML/article)
- '.geckoVersionNote', # (e.g. HTML/li)
'.todo',
'.draftHeader']
diff --git a/lib/docs/scrapers/mdn/mdn.rb b/lib/docs/scrapers/mdn/mdn.rb
index d418c1d5..af9277b1 100644
--- a/lib/docs/scrapers/mdn/mdn.rb
+++ b/lib/docs/scrapers/mdn/mdn.rb
@@ -11,7 +11,7 @@ module Docs
options[:trailing_slash] = false
options[:attribution] = <<-HTML
- © 2013 Mozilla Contributors
+ © 2014 Mozilla Contributors
Licensed under the Creative Commons Attribution-ShareAlike License v2.5 or later.
HTML