[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/webapp/error.jsp

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 28 11:34:26 2014
New Revision: 3197

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3197&view=rev
Log:
SIDP-615 - Grammatical error in error.jsp

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/webapp/error.jsp

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3197&r1=3196&r2=3197&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Thu Aug 28 11:34:26 2014
@@ -3,6 +3,10 @@
 
 Feature Highlights:
 https://wiki.shibboleth.net/confluence/display/SHIB2/IdPInterestingFeatures
+
+Changes in Release 2.4.2
+=============================================
+[SIDP-615] - Grammatical error in error.jsp
 
 Changes in Release 2.4.1
 =============================================

Modified: branches/REL_2/src/main/webapp/error.jsp
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/webapp/error.jsp?rev=3197&r1=3196&r2=3197&view=diff
==============================================================================
--- branches/REL_2/src/main/webapp/error.jsp (original)
+++ branches/REL_2/src/main/webapp/error.jsp Thu Aug 28 11:34:26 2014
@@ -6,21 +6,21 @@
 	<img src="<%= request.getContextPath()%>/images/dummylogo.png" alt="Replace or remove this logo"/>
 	<h3>ERROR</h3>
 	<p>
-	    An error occurred while processing your request.  Please contact your helpdesk or
-	    user ID office for assistance.
+	   An error occurred while processing your request.  Please contact your helpdesk or
+	   user ID office for assistance.
 	</p>
 	<p>
-	   This service requires cookies.  Please ensure that they are enabled and try your 
-	   going back to your desired resource and trying to login again.
+	   This service requires cookies. Please ensure cookies are enabled in your browser,
+       then go back to your desired resource and try to login again.
 	</p>
 	<p>
 	   Use of your browser's back button may cause specific errors that can be resolved by
 	   going back to your desired resource and trying to login again.
 	</p>
-        <p>
-           If you think you were sent here in error,
-           please contact <idpui:serviceContact>technical support</idpui:serviceContact>
-        </p>       
+    <p>
+       If you think you were sent here in error,
+       please contact <idpui:serviceContact>technical support</idpui:serviceContact>
+    </p>       
 	<% 
        Throwable error = (Throwable) request.getAttribute(AbstractErrorHandler.ERROR_KEY);
 	   if(error != null){