diff --git a/www/cxx_status.html b/www/cxx_status.html
index 077a1d6c17d4a1027ec886c28fdcf3fc828bad8e..4b50c2253295345b1aae372c509c3ef635cc7a4c 100644
--- a/www/cxx_status.html
+++ b/www/cxx_status.html
@@ -3,7 +3,7 @@
 <html>
 <head>
   <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>Clang - C++ and C++'11 Status</title>
+  <title>Clang - C++98 and C++11 Status</title>
   <link type="text/css" rel="stylesheet" href="menu.css">
   <link type="text/css" rel="stylesheet" href="content.css">
   <style type="text/css">
@@ -20,18 +20,20 @@
 <div id="content">
 
 <!--*************************************************************************-->
-<h1>C++ and C++'11 Support in Clang</h1>
+<h1>C++98 and C++11 Support in Clang</h1>
 <!--*************************************************************************-->
 <p>Last updated: $Date$</p>
 
+<h2 id="cxx98">C++98 implementation status</h2>
+
 <p>Clang currently implements all of the ISO C++ 1998 standard
   (including the defects addressed in the ISO C++ 2003 standard)
-  except for 'export' (which has been removed in C++'11)
+  except for 'export' (which has been removed in C++11)
   and is considered a production-quality C++ compiler.  The <a
    href="http://llvm.org/bugs/">LLVM bug tracker</a> contains a Clang
   C++ component that tracks known Clang C++ bugs.</p>
 
-<h2 id="cxx11">C++11 Implementation status</h2>
+<h2 id="cxx11">C++11 implementation status</h2>
 
   <p>Clang provides support for a number of features included in the new <a href="http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=50372">ISO C++ Standard, ISO/IEC 14882:2011</a>. The following table describes which C++11 features have been implemented in Clang and in which Clang versions they became available.</p>
 
@@ -43,7 +45,7 @@ with clang; other versions have not been tested.</p>
 <table width="689" border="1" cellspacing="0">
  <tr>
     <th>Language Feature</th>
-    <th>C++0x Proposal</th>
+    <th>C++11 Proposal</th>
     <th>Available in Clang?</th>
  </tr>
      <tr>
@@ -343,7 +345,7 @@ with clang; other versions have not been tested.</p>
     </tr>
 
     <tr class="separator">
-      <th align="center" colspan="3">C99 Features in C++0x</th>
+      <th align="center" colspan="3">C99 Features in C++11</th>
     </tr>
     <tr>
       <td><code>__func__</code> predefined identifier</td>