diff --git a/clang/test/CXX/drs/dr20xx.cpp b/clang/test/CXX/drs/dr20xx.cpp
index b97a9a46bc85..5819c319fd54 100644
--- a/clang/test/CXX/drs/dr20xx.cpp
+++ b/clang/test/CXX/drs/dr20xx.cpp
@@ -10,7 +10,7 @@
#define static_assert(...) _Static_assert(__VA_ARGS__)
#endif
-namespace dr2094 { // dr2094: 5.0
+namespace dr2094 { // dr2094: 5
struct A { int n; };
struct B { volatile int n; };
static_assert(__is_trivially_copyable(volatile int), "");
diff --git a/clang/test/CXX/drs/dr4xx.cpp b/clang/test/CXX/drs/dr4xx.cpp
index a55bb91be558..a30b82f24a19 100644
--- a/clang/test/CXX/drs/dr4xx.cpp
+++ b/clang/test/CXX/drs/dr4xx.cpp
@@ -1202,7 +1202,7 @@ namespace dr495 { // dr495: 3.5
long n2 = s2;
}
-namespace dr496 { // dr496: sup dr2094
+namespace dr496 { // dr496: sup 2094
struct A { int n; };
struct B { volatile int n; };
int check1[ __is_trivially_copyable(const int) ? 1 : -1];
diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index d852decb50d7..b1920364f6ec 100644
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -591,7 +591,7 @@
| 92 |
CD4 |
Should exception-specifications be part of the type system? |
- Clang 4 (C++17 onwards) |
+ Clang 4 (C++17 onwards) |
| 93 |
@@ -813,7 +813,7 @@
129 |
CD3 |
Stability of uninitialized auto variables |
- Duplicate of 616 |
+ Duplicate of 616 |
| 130 |
@@ -1480,7 +1480,7 @@ accessible?
240 |
CD3 |
Uninitialized values and undefined behavior |
- Duplicate of 616 |
+ Duplicate of 616 |
| 241 |
@@ -1594,7 +1594,7 @@ accessible?
259 |
CD1 |
Restrictions on explicit specialization and instantiation |
- Clang 4 |
+ Clang 4 |
| 260 |
@@ -1913,7 +1913,7 @@ of class templates
312 |
CD3 |
“use” of invalid pointer value not defined |
- Duplicate of 616 |
+ Duplicate of 616 |
| 313 |
@@ -2279,7 +2279,7 @@ of class templates
373 |
C++11 |
Lookup on namespace qualified name in using-directive |
- SVN |
+ Clang 5 |
| 374 |
@@ -3017,7 +3017,7 @@ of class templates
496 |
CD3 |
Is a volatile-qualified type really a POD? |
- Superseded by dr2094 |
+ Superseded by 2094 |
| 497 |
@@ -3541,7 +3541,7 @@ and POD class
583 |
CD3 |
Relational pointer comparisons against the null pointer constant |
- Clang 4 |
+ Clang 4 |
| 584 |
@@ -3613,7 +3613,7 @@ and POD class
595 |
dup |
Exception specifications in templates instantiated from class bodies |
- Duplicate of 1330 |
+ Duplicate of 1330 |
| 596 |
@@ -3739,7 +3739,7 @@ and POD class
616 |
CD3 |
Definition of “indeterminate value” |
- Clang 4 |
+ Clang 4 |
| 617 |
@@ -5839,7 +5839,7 @@ and POD class
1004 |
C++11 |
Injected-class-names as arguments for template template parameters |
- SVN |
+ Clang 5 |
| 1005 |
@@ -7093,7 +7093,7 @@ and POD class
1213 |
CD3 |
Array subscripting and xvalues |
- Clang 4 |
+ Clang 4 |
| 1214 |
@@ -7405,7 +7405,7 @@ and POD class
1265 |
CD3 |
Mixed use of the auto specifier |
- SVN |
+ Clang 5 |
| 1266 |
@@ -7585,7 +7585,7 @@ and POD class
1295 |
CD3 |
Binding a reference to an rvalue bit-field |
- Clang 4 |
+ Clang 4 |
| 1296 |
@@ -7675,7 +7675,7 @@ and POD class
1310 |
CD3 |
What is an “acceptable lookup result?” |
- SVN |
+ Clang 5 |
| 1311 |
@@ -7795,7 +7795,7 @@ and POD class
1330 |
CD3 |
Delayed instantiation of noexcept specifiers |
- Clang 4 (C++11 onwards) |
+ Clang 4 (C++11 onwards) |
| 1331 |
@@ -8143,7 +8143,7 @@ and POD class
1388 |
CD3 |
Missing non-deduced context following a function parameter pack |
- Clang 4 |
+ Clang 4 |
| 1389 |
@@ -8209,7 +8209,7 @@ and POD class
1399 |
CD3 |
Deduction with multiple function parameter packs |
- Duplicate of 1388 |
+ Duplicate of 1388 |
| 1400 |
@@ -8785,7 +8785,7 @@ and POD class
1495 |
CD3 |
Partial specialization of variadic class template |
- Clang 4 |
+ Clang 4 |
| 1496 |
@@ -8887,7 +8887,7 @@ and POD class
1512 |
CD3 |
Pointer comparison vs qualification conversions |
- Clang 4 |
+ Clang 4 |
| 1513 |
@@ -8923,7 +8923,7 @@ and POD class
1518 |
CD4 |
Explicit default constructors and copy-list-initialization |
- Clang 4 |
+ Clang 4 |
| 1519 |
@@ -9733,7 +9733,7 @@ and POD class
1653 |
CD4 |
Removing deprecated increment of bool |
- Clang 4 (C++17 onwards) |
+ Clang 4 (C++17 onwards) |
| 1654 |
@@ -9763,7 +9763,7 @@ and POD class
1658 |
C++14 |
Deleted default constructor for abstract class via destructor |
- SVN |
+ Clang 5 |
| 1659 |
@@ -11161,7 +11161,7 @@ and POD class
1891 |
CD4 |
Move constructor/assignment for closure class |
- Clang 4 |
+ Clang 4 |
| 1892 |
@@ -12379,7 +12379,7 @@ and POD class
2094 |
DR |
Trivial copy/move constructor for class with volatile member |
- Clang 5.0 |
+ Clang 5 |
| 2095 |
diff --git a/clang/www/make_cxx_dr_status b/clang/www/make_cxx_dr_status
index 8a05d41c08b5..f942db2ece9a 100755
--- a/clang/www/make_cxx_dr_status
+++ b/clang/www/make_cxx_dr_status
@@ -108,11 +108,11 @@ def availability(issue):
if status == 'unknown':
avail = 'Unknown'
avail_style = ' class="none"'
- elif status == '5':
+ elif status == '6':
avail = 'SVN'
avail_style = ' class="svn"'
- elif status == '4':
- avail = 'Clang 4'
+ elif status == '5':
+ avail = 'Clang 5'
avail_style = ' class="svn"'
elif re.match('^[0-9]+\.?[0-9]*', status):
avail = 'Clang %s' % status