diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 99df9d6e..56b32da9 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -63,7 +63,7 @@
         </div> <!-- /.navbar-collapse -->
       </div> <!-- /.col-md-offset-2 -->
     </div> <!-- /.row -->
-  </div><!-- /.container-fluid -->
+  </div><!-- /.container -->
 </nav>
 {% if pagename == "index" %}
 <div class="jumbotron">
diff --git a/doc/basic-bootstrap/layout.html b/doc/basic-bootstrap/layout.html
index 4c0ebd65..3ef56978 100644
--- a/doc/basic-bootstrap/layout.html
+++ b/doc/basic-bootstrap/layout.html
@@ -8,8 +8,7 @@
     :license: BSD, see LICENSE for details.
 #}
 {%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
@@ -107,9 +106,13 @@
     {%- endfor %}
 {%- endmacro %}
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
+    <meta charset="{{ encoding }}">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content
+         must come *after* these tags -->
     {{ metatags }}
     {%- block htmltitle %}
     <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
