# HG changeset patch
# User Jesse Glick <jesse.glick@sun.com>
# Date 2008-01-05 20:35:46
# Node ID 2580d418e3f08d4bf22cdb0886d7e534004d2abb
# Parent  c5c9a022bd9ae50f160429f422113cc0cc636442

Issue #880: Simple misspelling ('occured') in web error message.

diff --git a/templates/error.tmpl b/templates/error.tmpl
--- a/templates/error.tmpl
+++ b/templates/error.tmpl
@@ -6,7 +6,7 @@
 <h2>Mercurial Error</h2>
 
 <p>
-An error occured while processing your request:
+An error occurred while processing your request:
 </p>
 <p>
 #error|escape#
diff --git a/templates/gitweb/error.tmpl b/templates/gitweb/error.tmpl
--- a/templates/gitweb/error.tmpl
+++ b/templates/gitweb/error.tmpl
@@ -17,7 +17,7 @@
 
 <div class="page_body">
 <br/>
-<i>An error occured while processing your request</i><br/>
+<i>An error occurred while processing your request</i><br/>
 <br/>
 {error|escape}
 </div>
diff --git a/tests/test-hgweb.out b/tests/test-hgweb.out
--- a/tests/test-hgweb.out
+++ b/tests/test-hgweb.out
@@ -35,7 +35,7 @@ 404 Not Found
 <h2>Mercurial Error</h2>
 
 <p>
-An error occured while processing your request:
+An error occurred while processing your request:
 </p>
 <p>
 Not Found