xhtml to html5

bethrobson · bethrobson · commit 7a07dfe34b14 · 2012-05-28T10:14:04.000-07:00
diff --git a/chapter9/lounge/about/directions.html b/chapter9/lounge/about/directions.html
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE html>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <meta charset="utf-8">
     <title>Head First Lounge Directions</title>
-    <link type="text/css" rel="stylesheet" href="../lounge.css" />
+    <link type="text/css" rel="stylesheet" href="../lounge.css">
   </head>
   <body>
     <h1>Directions</h1>
diff --git a/chapter9/lounge/beverages/elixir.html b/chapter9/lounge/beverages/elixir.html
@@ -1,38 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<!DOCTYPE>
+<html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <meta charset="utf-8">
     <title>Head First Lounge Elixirs</title>
-    <link type="text/css" rel="stylesheet" href="../lounge.css" />
+    <link type="text/css" rel="stylesheet" href="../lounge.css">
   </head>
   <body>
     <h1>Our Elixirs</h1>
 
     <h2>Green Tea Cooler</h2>
     <p class="greentea">
-      <img src="../images/green.jpg" alt="Green Tea Cooler" />
+      <img src="../images/green.jpg" alt="Green Tea Cooler">
       Chock full of vitamins and minerals, this elixir
       combines the healthful benefits of green tea with
       a twist of chamomile blossoms and ginger root.
     </p>
     <h2>Raspberry Ice Concentration</h2>
     <p class="raspberry">
-      <img src="../images/lightblue.jpg" alt="Raspberry Ice Concentration" />
+      <img src="../images/lightblue.jpg" alt="Raspberry Ice Concentration">
       Combining raspberry juice with lemon grass,
       citrus peel and rosehips, this icy drink
       will make your mind feel clear and crisp.
     </p>
     <h2>Blueberry Bliss Elixir</h2>
     <p class="blueberry">
-      <img src="../images/blue.jpg" alt="Blueberry Bliss Elixir" />
+      <img src="../images/blue.jpg" alt="Blueberry Bliss Elixir">
       Blueberries and cherry essence mixed into a base
       of elderflower herb tea will put you in a relaxed
       state of bliss in no time.
     </p>
     <h2>Cranberry Antioxidant Blast</h2>
     <p>
-      <img src="../images/red.jpg" alt="Cranberry Antioxidant Blast" />
+      <img src="../images/red.jpg" alt="Cranberry Antioxidant Blast">
       Wake up to the flavors of cranberry and hibiscus
       in this vitamin C rich elixir.
     </p>
