Merge branch 'master' into openid

[rails.git] / public / 500.html

diff --git a/public/500.html b/public/500.html
index 552024a2db5cd8829bd528c5ade2022b1564ff91..b85842159dc6c633dc354a969dc5701458865379 100644 (file)
--- a/public/500.html
+++ b/public/500.html
@@ -6,8 +6,8 @@
   <div style="float:left;">
     <h1>Application error</h1>
     <p>The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)</p>
-    <p>Feel free to <a href="http://wiki.openstreetmap.org/index.php/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.</p>
-    <p>This may be a problem in our Ruby On Rails code. 500 ocurrs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)</p>
+    <p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if your problem persists. Make a note of the exact URL / post data of your request.</p>
+    <p>This may be a problem in our Ruby On Rails code. 500 occurs with exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code)</p>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>