From 64dbe88ee962a4504837fcdc8c23e3d575e24638 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 3 Jul 2014 10:32:15 +0000
Subject: [PATCH] Clarify a couple of error messages.

---
 mdx/_rules/check_reqattr.xsl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mdx/_rules/check_reqattr.xsl b/mdx/_rules/check_reqattr.xsl
index 19c3bb27..6840a020 100644
--- a/mdx/_rules/check_reqattr.xsl
+++ b/mdx/_rules/check_reqattr.xsl
@@ -233,14 +233,15 @@
 				">
 				<xsl:call-template name="error">
 					<xsl:with-param name="m">
-						<xsl:text>RequestedAttribute uses OID name </xsl:text>
-						<xsl:value-of select="@Name"/>
-						<xsl:text> with SAML 1.x NameFormat: should use urn:mace name or SAML 2.0 NameFormat</xsl:text>
+						<xsl:text>RequestedAttribute</xsl:text>
 						<xsl:if test="@FriendlyName">
 							<xsl:text> (</xsl:text>
 							<xsl:value-of select="@FriendlyName"/>
 							<xsl:text>)</xsl:text>
 						</xsl:if>
+						<xsl:text> uses OID name </xsl:text>
+						<xsl:value-of select="@Name"/>
+						<xsl:text> with SAML 1.x NameFormat: should use urn:mace name or SAML 2.0 NameFormat</xsl:text>
 					</xsl:with-param>
 				</xsl:call-template>
 			</xsl:when>
@@ -289,14 +290,15 @@
 				">
 				<xsl:call-template name="error">
 					<xsl:with-param name="m">
-						<xsl:text>RequestedAttribute uses OID name </xsl:text>
-						<xsl:value-of select="@Name"/>
-						<xsl:text> with SAML 1.x NameFormat: should use urn:mace name or SAML 2.0 NameFormat</xsl:text>
+						<xsl:text>RequestedAttribute</xsl:text>
 						<xsl:if test="@FriendlyName">
 							<xsl:text> (</xsl:text>
 							<xsl:value-of select="@FriendlyName"/>
 							<xsl:text>)</xsl:text>
 						</xsl:if>
+						<xsl:text> uses OID name </xsl:text>
+						<xsl:value-of select="@Name"/>
+						<xsl:text> with SAML 1.x NameFormat: should use urn:mace name or SAML 2.0 NameFormat</xsl:text>
 					</xsl:with-param>
 				</xsl:call-template>
 			</xsl:when>