--- a/_exceptions.py	Thu Feb 13 15:11:07 2014 +0100
+++ b/_exceptions.py	Tue Feb 11 11:03:01 2014 +0100
@@ -187,9 +187,9 @@
     :param txuuid: Unique identifier of the partialy undone transaction
 
     :type errors: list
-    :param errors: List of errors occured during undoing
+    :param errors: List of errors occurred during undoing
     """
-    msg = u"The following error(s) occured while undoing transaction #%d : %s"
+    msg = u"The following error(s) occurred while undoing transaction #%d : %s"
 
     def __init__(self, txuuid, errors):
         super(UndoTransactionException, self).__init__(txuuid, errors)

--- a/ext/rest.py	Thu Feb 13 15:11:07 2014 +0100
+++ b/ext/rest.py	Tue Feb 11 11:03:01 2014 +0100
@@ -127,7 +127,7 @@
         view = _cw.vreg['views'].select(vid, _cw, rset=rset)
         content = view.render()
     except Exception as exc:
-        content = 'an error occured while interpreting this rql directive: %r' % exc
+        content = 'an error occurred while interpreting this rql directive: %r' % exc
     set_classes(options)
     return [nodes.raw('', content, format='html')], []
 
@@ -184,7 +184,7 @@
         view = _cw.vreg['views'].select(vid, _cw, rset=rset)
         content = view.render()
     except Exception, exc:
-        content = 'An error occured while interpreting directive bookmark: %r' % exc
+        content = 'An error occurred while interpreting directive bookmark: %r' % exc
     set_classes(options)
     return [nodes.raw('', content, format='html')], []
 

--- a/ext/test/unittest_rest.py	Thu Feb 13 15:11:07 2014 +0100
+++ b/ext/test/unittest_rest.py	Tue Feb 11 11:03:01 2014 +0100
@@ -68,7 +68,7 @@
     def test_rql_role_with_unknown_vid(self):
         context = self.context()
         out = rest_publish(context, ':rql:`Any X WHERE X is CWUser:toto`')
-        self.assertTrue(out.startswith("<p>an error occured while interpreting this rql directive: ObjectNotFound(u'toto',)</p>"))
+        self.assertTrue(out.startswith("<p>an error occurred while interpreting this rql directive: ObjectNotFound(u'toto',)</p>"))
 
     def test_rql_role_without_vid(self):
         context = self.context()

--- a/server/sources/datafeed.py	Thu Feb 13 15:11:07 2014 +0100
+++ b/server/sources/datafeed.py	Tue Feb 11 11:03:01 2014 +0100
@@ -193,7 +193,7 @@
         myuris = self.source_cwuris(session)
         parser = self._get_parser(session, sourceuris=myuris, import_log=importlog)
         if self.process_urls(parser, self.urls, raise_on_error):
-            self.warning("some error occured, don't attempt to delete entities")
+            self.warning("some error occurred, don't attempt to delete entities")
         else:
             parser.handle_deletion(self.config, session, myuris)
         self.update_latest_retrieval(session)