Merge branch 'main' into mbj-es-validation-typo

Author: selfissued

openid-federation-1_0.xml

@@ -5728,15 +5728,33 @@ Host: trust-anchor.example.com
 	      REQUIRED.
 	      Error codes in the IANA "OAuth Extensions Error Registry"
 	      <xref target="IANA.OAuth.Parameters"/> MAY be used.
+	      In particular, these existing error codes are used by this specification:
+	      <list style="hanging">
+		<t hangText="invalid_request">
+		  <vspace/>
+		  The request is incomplete or does
+		  not comply with current specifications.
+		  The HTTP response status code SHOULD be 400 (Bad Request).
+		</t>
+		<t hangText="server_error">
+		  <vspace/>
+		  The server encountered an unexpected
+		  condition that prevented it from fulfilling the request.
+		  The HTTP response status code SHOULD be one in the 5xx range,
+		  like 500 (Internal Server Error).
+		</t>
+		<t hangText="temporarily_unavailable">
+		  <vspace/>
+		  The server hosting the federation endpoint
+		  is currently unable to handle
+		  the request due to temporary overloading or maintenance.
+		  The HTTP response status code SHOULD be 503 (Service Unavailable).
+		</t>
+	      </list>
+
 	      This specification also defines the following error codes:
 
               <list style="hanging">
-                <t hangText="invalid_request">
-                  <vspace/>
-                  The request is incomplete or does
-                  not comply with current specifications.
-                  The HTTP response status code SHOULD be 400 (Bad Request).
-                </t>
                 <t hangText="invalid_client">
                   <vspace/>
                   The Client cannot be authorized or is not
@@ -5773,20 +5791,6 @@ Host: trust-anchor.example.com
                   The requested Entity Identifier cannot be found.
                   The HTTP response status code SHOULD be 404 (Not Found).
                 </t>
-                <t hangText="server_error">
-                  <vspace/>
-                  The server encountered an unexpected
-                  condition that prevented it from fulfilling the request.
-                  The HTTP response status code SHOULD be one in the 5xx range,
-                  like 500 (Internal Server Error).
-                </t>
-                <t hangText="temporarily_unavailable">
-                  <vspace/>
-                  The server hosting the federation endpoint
-                  is currently unable to handle
-                  the request due to temporary overloading or maintenance.
-                  The HTTP response status code SHOULD be 503 (Service Unavailable).
-                </t>
                 <t hangText="unsupported_parameter">
                   <vspace/>
                   The server does not support the requested parameter.
@@ -8929,17 +8933,6 @@ HTTP/1.1 302 Found
 
           <t>
             <?rfc subcompact="yes"?>
-            <list style="symbols">
-              <t>Name: invalid_request</t>
-              <t>Usage Location: authorization endpoint</t>
-              <t>Protocol Extension: OpenID Federation</t>
-              <t>
-                Change Controller: OpenID Foundation Artifact Binding Working Group - openid-specs-ab@lists.openid.net
-              </t>
-              <t>Reference: <xref target="error_response"/> of this specification</t>
-            </list>
-          </t>
-          <t>
             <list style="symbols">
               <t>Name: invalid_client</t>
               <t>Usage Location: authorization endpoint</t>
@@ -9016,28 +9009,6 @@ HTTP/1.1 302 Found
               <t>Reference: <xref target="error_response"/> of this specification</t>
             </list>
           </t>
-          <t>
-            <list style="symbols">
-              <t>Name: server_error</t>
-              <t>Usage Location: authorization endpoint</t>
-              <t>Protocol Extension: OpenID Federation</t>
-              <t>
-                Change Controller: OpenID Foundation Artifact Binding Working Group - openid-specs-ab@lists.openid.net
-              </t>
-              <t>Reference: <xref target="error_response"/> of this specification</t>
-            </list>
-          </t>
-          <t>
-            <list style="symbols">
-              <t>Name: temporarily_unavailable</t>
-              <t>Usage Location: authorization endpoint</t>
-              <t>Protocol Extension: OpenID Federation</t>
-              <t>
-                Change Controller: OpenID Foundation Artifact Binding Working Group - openid-specs-ab@lists.openid.net
-              </t>
-              <t>Reference: <xref target="error_response"/> of this specification</t>
-            </list>
-          </t>
           <t>
             <list style="symbols">
               <t>Name: unsupported_parameter</t>
@@ -11685,6 +11656,10 @@ Host: op.umu.se
 	<list style="symbols">
 	  <t>
 	    Fixed #330: Corrected typo in Entity Statement Validation text.
+    </t>
+	  <t>
+	    Reference, rather than define, the existing error values
+	    invalid_request, server_error, and temporarily_unavailable.
 	  </t>
 	</list>
       </t>