diff --git a/source/expressions.tex b/source/expressions.tex
index c93a1bbb27..65802d7594 100644
--- a/source/expressions.tex
+++ b/source/expressions.tex
@@ -7491,7 +7491,10 @@
 \end{note}
 
 \item
-a conversion from type \cv{}~\tcode{\keyword{void}*} to a pointer-to-object type;
+a conversion
+from a prvalue \tcode{P} of type ``pointer to \cv{}~\keyword{void}''
+to a pointer-to-object type \tcode{T}
+unless \tcode{P} points to an object whose type is similar to \tcode{T};
 
 \item
 a \keyword{reinterpret_cast}\iref{expr.reinterpret.cast};
diff --git a/source/preprocessor.tex b/source/preprocessor.tex
index 828b2c9673..8e4abe23e8 100644
--- a/source/preprocessor.tex
+++ b/source/preprocessor.tex
@@ -1812,7 +1812,7 @@
 \defnxname{cpp_char8_t}                           & \tcode{202207L} \\ \rowsep
 \defnxname{cpp_concepts}                          & \tcode{202002L} \\ \rowsep
 \defnxname{cpp_conditional_explicit}              & \tcode{201806L} \\ \rowsep
-\defnxname{cpp_constexpr}                         & \tcode{202211L} \\ \rowsep
+\defnxname{cpp_constexpr}                         & \tcode{202306L} \\ \rowsep
 \defnxname{cpp_constexpr_dynamic_alloc}           & \tcode{201907L} \\ \rowsep
 \defnxname{cpp_constexpr_in_decltype}             & \tcode{201711L} \\ \rowsep
 \defnxname{cpp_consteval}                         & \tcode{202211L} \\ \rowsep