From f56a070c2bb2a82b73024354c8a720fa0f89789c Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Fri, 23 Jun 2017 12:41:05 -0400
Subject: [PATCH 1/2] Remove landmark roles

* With better browser support, these roles aren't needed now.
* Most newer browsers imply them via HTML5 semantics. See: http://html5doctor.com/on-html-belts-and-aria-braces/

Fixes #1132
---
 404.php      | 2 +-
 archive.php  | 2 +-
 comments.php | 4 ++--
 footer.php   | 2 +-
 header.php   | 4 ++--
 index.php    | 2 +-
 page.php     | 2 +-
 search.php   | 2 +-
 sidebar.php  | 2 +-
 single.php   | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/404.php b/404.php
index 4e6debe8..ad0ba01b 100644
--- a/404.php
+++ b/404.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 			<section class="error-404 not-found">
 				<header class="page-header">
diff --git a/archive.php b/archive.php
index 97ae7a0b..d5de83de 100644
--- a/archive.php
+++ b/archive.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 		<?php
 		if ( have_posts() ) : ?>
diff --git a/comments.php b/comments.php
index aef17fe5..3e2d27c9 100644
--- a/comments.php
+++ b/comments.php
@@ -46,7 +46,7 @@ if ( post_password_required() ) {
 		</h2><!-- .comments-title -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-		<nav id="comment-nav-above" class="navigation comment-navigation" role="navigation">
+		<nav id="comment-nav-above" class="navigation comment-navigation">
 			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', '_s' ); ?></h2>
 			<div class="nav-links">
 
@@ -67,7 +67,7 @@ if ( post_password_required() ) {
 		</ol><!-- .comment-list -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-		<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
+		<nav id="comment-nav-below" class="navigation comment-navigation">
 			<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', '_s' ); ?></h2>
 			<div class="nav-links">
 
diff --git a/footer.php b/footer.php
index fb050920..5f406bcb 100644
--- a/footer.php
+++ b/footer.php
@@ -13,7 +13,7 @@
 
 	</div><!-- #content -->
 
-	<footer id="colophon" class="site-footer" role="contentinfo">
+	<footer id="colophon" class="site-footer">
 		<div class="site-info">
 			<a href="<?php echo esc_url( __( 'https://wordpress.org/', '_s' ) ); ?>"><?php
 				/* translators: %s: CMS name, i.e. WordPress. */
diff --git a/header.php b/header.php
index d6d88322..da215447 100644
--- a/header.php
+++ b/header.php
@@ -23,7 +23,7 @@
 <div id="page" class="site">
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', '_s' ); ?></a>
 
-	<header id="masthead" class="site-header" role="banner">
+	<header id="masthead" class="site-header">
 		<div class="site-branding">
 			<?php
 			if ( is_front_page() && is_home() ) : ?>
@@ -40,7 +40,7 @@
 			endif; ?>
 		</div><!-- .site-branding -->
 
-		<nav id="site-navigation" class="main-navigation" role="navigation">
+		<nav id="site-navigation" class="main-navigation">
 			<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', '_s' ); ?></button>
 			<?php
 				wp_nav_menu( array(
diff --git a/index.php b/index.php
index 82e95663..c9d96f7a 100644
--- a/index.php
+++ b/index.php
@@ -15,7 +15,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 		<?php
 		if ( have_posts() ) :
diff --git a/page.php b/page.php
index ea755b23..f41e4455 100644
--- a/page.php
+++ b/page.php
@@ -15,7 +15,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 			<?php
 			while ( have_posts() ) : the_post();
diff --git a/search.php b/search.php
index 4ab5676c..9f6b79df 100644
--- a/search.php
+++ b/search.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 	<section id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 		<?php
 		if ( have_posts() ) : ?>
diff --git a/sidebar.php b/sidebar.php
index 8a197581..895a3d1d 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -12,6 +12,6 @@ if ( ! is_active_sidebar( 'sidebar-1' ) ) {
 }
 ?>
 
-<aside id="secondary" class="widget-area" role="complementary">
+<aside id="secondary" class="widget-area">
 	<?php dynamic_sidebar( 'sidebar-1' ); ?>
 </aside><!-- #secondary -->
diff --git a/single.php b/single.php
index 1d85e981..4f058f73 100644
--- a/single.php
+++ b/single.php
@@ -10,7 +10,7 @@
 get_header(); ?>
 
 	<div id="primary" class="content-area">
-		<main id="main" class="site-main" role="main">
+		<main id="main" class="site-main">
 
 		<?php
 		while ( have_posts() ) : the_post();

From 5efec5e6b4c37be2837efb1874bb9a26f037fe73 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Fri, 23 Jun 2017 13:16:37 -0400
Subject: [PATCH 2/2] Remove call to `_s_categorized_blog()` (#1134)

* It was removed in #1131.
---
 404.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/404.php b/404.php
index 4e6debe8..682d1896 100644
--- a/404.php
+++ b/404.php
@@ -24,9 +24,6 @@ get_header(); ?>
 						get_search_form();
 
 						the_widget( 'WP_Widget_Recent_Posts' );
-
-						// Only show the widget if site has multiple categories.
-						if ( _s_categorized_blog() ) :
 					?>
 
 					<div class="widget widget_categories">
@@ -45,7 +42,6 @@ get_header(); ?>
 					</div><!-- .widget -->
 
 					<?php
-						endif;
 
 						/* translators: %1$s: smiley */
 						$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', '_s' ), convert_smilies( ':)' ) ) . '</p>';