diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index c4ec45736524cd..eff9fd5dc185c3 100755
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -10,7 +10,7 @@
   <style type="text/css">
     .none { background-color: #FFCCCC }
     .partial { background-color: #FFE0B0 }
-    .svn  { background-color: #FFFF99 }
+    .unreleased { background-color: #FFFF99 }
     .full { background-color: #CCFF99 }
     .na { background-color: #DDDDDD }
     .open * { color: #AAAAAA }
@@ -2645,7 +2645,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
     <td><a href="https://wg21.link/cwg434">434</a></td>
     <td>NAD</td>
     <td>Unclear suppression of standard conversions while binding reference to lvalue</td>
-    <td class="svn" align="center">Superseded by <a href="#2352">2352</a></td>
+    <td class="unreleased" align="center">Superseded by <a href="#2352">2352</a></td>
   </tr>
   <tr id="435">
     <td><a href="https://wg21.link/cwg435">435</a></td>
@@ -9421,7 +9421,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
     <td><a href="https://wg21.link/cwg1601">1601</a></td>
     <td>C++14</td>
     <td>Promotion of enumeration with fixed underlying type</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="unreleased" align="center">Clang 10</td>
   </tr>
   <tr class="open" id="1602">
     <td><a href="https://wg21.link/cwg1602">1602</a></td>
@@ -13927,7 +13927,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
     <td><a href="https://wg21.link/cwg2352">2352</a></td>
     <td>DR</td>
     <td>Similar types and reference binding</td>
-    <td class="svn" align="center">SVN</td>
+    <td class="unreleased" align="center">Clang 10</td>
   </tr>
   <tr id="2353">
     <td><a href="https://wg21.link/cwg2353">2353</a></td>
diff --git a/clang/www/cxx_status.html b/clang/www/cxx_status.html
index 6b181e7f8dbbf7..50a9d000699cdb 100755
--- a/clang/www/cxx_status.html
+++ b/clang/www/cxx_status.html
@@ -8,7 +8,7 @@
   <style type="text/css">
     .none { background-color: #FFCCCC }
     .partial { background-color: #FFE0B0 }
-    .svn  { background-color: #FFFF99 }
+    .unreleased { background-color: #FFFF99 }
     .full { background-color: #CCFF99 }
     .na { background-color: #DDDDDD }
     :target { background-color: #FFFFBB; outline: #DDDD55 solid thin; }
@@ -26,13 +26,13 @@
 <!--*************************************************************************-->
 <h1>C++ Support in Clang</h1>
 <!--*************************************************************************-->
-<p>Last updated: $Date$</p>
 
-<p>Clang fully implements all published ISO C++ standards (<a
-href="#cxx98">C++98 / C++03</a>, <a
-href="#cxx11">C++11</a>, and <a
-href="#cxx14">C++14</a>), and most of the upcoming <a
-href="#cxx17">C++17</a> standard.
+<p>Clang fully implements all published ISO C++ standards
+(<a href="#cxx98">C++98 / C++03</a>,
+<a href="#cxx11">C++11</a>,
+<a href="#cxx14">C++14</a>, and
+<a href="#cxx17">C++17</a>), and some of the upcoming <a
+href="#cxx20">C++20</a> standard.
 
 <p>The Clang community is continually striving to improve C++ standards
 compliance between releases by submitting and tracking <a
@@ -580,16 +580,6 @@ <h2 id="cxx17">C++17 implementation status</h2>
       <td><a href="https://wg21.link/n4086">N4086</a></td>
       <td class="full" align="center">Clang 3.5</td>
     </tr>
-    <!--
-    <tr>
-      <td rowspan="2">Terse range-based for loops (removed from C++17)</td>
-      <td rowspan="2"><a href="https://wg21.link/n3994">N3994</a></td>
-      <td class="none" align="center">Clang 3.5: Yes</td>
-    </tr>
-    <tr>
-      <td class="svn" align="center">SVN: No</td>
-    </tr>
-    -->
     <tr>
       <td><tt>typename</tt> in a template template parameter</td>
       <td><a href="https://wg21.link/n4051">N4051</a></td>
@@ -871,7 +861,7 @@ <h2 id="cxx20">C++2a implementation status</h2>
     <tr>
       <td>Designated initializers</td>
       <td><a href="https://wg21.link/p0329r4">P0329R4</a></td>
-      <td class="svn" align="center">SVN</td>
+      <td class="unreleased" align="center">Clang 10</td>
     </tr>
     <tr>
       <td><i>template-parameter-list</i> for generic lambdas</td>
@@ -926,7 +916,7 @@ <h2 id="cxx20">C++2a implementation status</h2>
     <tr>
       <td rowspan="8">Consistent comparison (<tt>operator&lt;=&gt;</tt>)</td>
       <td><a href="https://wg21.link/p0515r3">P0515R3</a></td>
-      <td rowspan="8" class="svn" align="center">SVN</td>
+      <td rowspan="8" class="unreleased" align="center">Clang 10</td>
     </tr>
       <tr> <!-- from Jacksonville -->
         <td><a href="https://wg21.link/p0905r1">P0905R1</a></td>
@@ -1017,7 +1007,7 @@ <h2 id="cxx20">C++2a implementation status</h2>
       </tr>
       <tr> <!-- from Cologne -->
         <td><a href="https://wg21.link/p1331r2">P1331R2</a></td>
-        <td rowspan="3" class="svn" align="center">SVN</td>
+        <td rowspan="3" class="unreleased" align="center">Clang 10</td>
       </tr>
       <tr>
         <td><a href="https://wg21.link/p1668r1">P1668R1</a></td>
@@ -1128,7 +1118,7 @@ <h2 id="cxx20">C++2a implementation status</h2>
     <tr>
       <td>Deprecate some problematic uses of <tt>volatile</tt></td>
       <td><a href="https://wg21.link/p1152r4">P1152R4</a></td>
-      <td class="svn" align="center">SVN</td>
+      <td class="unreleased" align="center">Clang 10</td>
     </tr>
     <tr>
       <td><tt>[[nodiscard("with reason")]]</tt></td>
@@ -1158,7 +1148,7 @@ <h2 id="cxx20">C++2a implementation status</h2>
     <tr>
       <td><tt>constinit</tt></td>
       <td><a href="https://wg21.link/p1143r2">P1143R2</a></td>
-      <td class="svn" align="center">SVN</td>
+      <td class="unreleased" align="center">Clang 10</td>
     </tr>
 </table>
 
@@ -1232,8 +1222,8 @@ <h2 id="ts">Technical specifications and standing documents</h2>
       </td>
     </tr>
     <tr>
-      <td class="svn" align="center">
-        SVN (<a href="https://wg21.link/p1902r1">P1902R1</a>)</a>
+      <td class="unreleased" align="center">
+        Clang 10 (<a href="https://wg21.link/p1902r1">P1902R1</a>)</a>
       </td>
     </tr>
     <!-- No compiler support is known to be needed for:
diff --git a/clang/www/make_cxx_dr_status b/clang/www/make_cxx_dr_status
index fd5eb7fbabb4c7..f2b3122f63b45f 100755
--- a/clang/www/make_cxx_dr_status
+++ b/clang/www/make_cxx_dr_status
@@ -61,7 +61,7 @@ print >> out_file, '''\
   <style type="text/css">
     .none { background-color: #FFCCCC }
     .partial { background-color: #FFE0B0 }
-    .svn  { background-color: #FFFF99 }
+    .unreleased { background-color: #FFFF99 }
     .full { background-color: #CCFF99 }
     .na { background-color: #DDDDDD }
     .open * { color: #AAAAAA }
@@ -93,6 +93,8 @@ print >> out_file, '''\
     <th>Available in Clang?</th>
   </tr>'''
 
+latest_release = 9
+
 def availability(issue):
   status = status_map.get(issue, 'unknown')
   avail_suffix = ''
@@ -108,12 +110,12 @@ def availability(issue):
   if status == 'unknown':
     avail = 'Unknown'
     avail_style = ' class="none"'
-  elif status == '10':
-    avail = 'SVN'
-    avail_style = ' class="svn"'
   elif re.match('^[0-9]+\.?[0-9]*', status):
     avail = 'Clang %s' % status
-    avail_style = ' class="full"'
+    if float(status) > latest_release:
+      avail_style = ' class="unreleased"'
+    else:
+      avail_style = ' class="full"'
   elif status == 'yes':
     avail = 'Yes'
     avail_style = ' class="full"'