Jonathan provides new wording for 4304

Author: jwakely

xml/issue4304.xml

@@ -91,29 +91,11 @@ This wording is relative to <paper num="N5014"/>.
 
 <ol>
 
-<li><p>Modify <sref ref="[optional.optional.ref.general]"/>, header <tt>&lt;iterator&gt;</tt> synopsis, as indicated:</p>
-
-<blockquote>
-<pre>
-namespace std {
-  template&lt;class T&gt;
-  class optional&lt;T&amp;&gt; {
-    [&hellip;]
-    constexpr T&amp; value() const; // freestanding-deleted
-    template&lt;class U = remove_cv_t&lt;T&gt;&gt;
-      constexpr <ins>decay_t</ins><del>remove_cv_t</del>&lt;T&gt; value_or(U&amp;&amp; u) const;
-    [&hellip;]
-  };
-}
-</pre>
-</blockquote>
-</li>
-
 <li><p>Modify <sref ref="[optional.ref.observe]"/> as indicated:</p>
 
 <blockquote>
 <pre>
-template&lt;class U = remove_cv_t&lt;T&gt;&gt; constexpr <ins>decay_t</ins><del>remove_cv_t</del>&lt;T&gt; value_or(U&amp;&amp; u) const;
+template&lt;class U = remove_cv_t&lt;T&gt;&gt; constexpr remove_cv_t&lt;T&gt; value_or(U&amp;&amp; u) const;
 </pre>
 <blockquote>
 <p>
@@ -132,6 +114,18 @@ template&lt;class U = remove_cv_t&lt;T&gt;&gt; constexpr <ins>decay_t</ins><del>
 <blockquote><pre>
 return has_value() ? *<i>val</i> : static_cast&lt;X&gt;(std::forward&lt;U&gt;(u));
 </pre></blockquote>
+<p>
+<ins>
+-?- <i>Remarks</i>:
+The return type is unspecified if `T` is an array type or a non-object type.
+[<i>Note ?</i>: For example,
+<code>decay_t&lt;T&gt;</code> or
+<code>conditional_t&lt;is_object_v&lt;T&gt; &amp;&amp; !is_array_v&lt;T&gt;,
+remove_cvref_t&lt;T&gt;, void&gt;</code>
+could be used to avoid the declaration being ill-formed.
+<i>&mdash; end note</i>]
+</ins>
+</p>
 </blockquote>
 </blockquote>
 </li>