P2246R1 Character encoding of diagnostic text

Author: jensmaurer

source/declarations.tex

@@ -232,11 +232,8 @@
 If the value of the expression when
 so converted is \tcode{true}, the declaration has no
 effect. Otherwise, the program is ill-formed, and the resulting
-diagnostic message\iref{intro.compliance} shall include the text of
-the \grammarterm{string-literal}, if one is supplied,
-except that characters not in the basic
-source character set\iref{lex.charset} are not required to appear in
-the diagnostic message.
+diagnostic message\iref{intro.compliance} should include the text of
+the \grammarterm{string-literal}, if one is supplied.
 \begin{example}
 \begin{codeblock}
 static_assert(sizeof(int) == sizeof(void*), "wrong pointer size");

source/preprocessor.tex

@@ -1607,7 +1607,7 @@
 \terminal{\# error} \opt{pp-tokens} new-line
 \end{ncsimplebnf}
 causes the implementation to produce
-a diagnostic message that includes the specified sequence of preprocessing tokens,
+a diagnostic message that should include the specified sequence of preprocessing tokens,
 and renders the program ill-formed.
 
 \rSec1[cpp.pragma]{Pragma directive}%