Merge 2003415 into d09b6a4

scons/scons-local-2.5.0/SCons/Errors.py

@@ -73,7 +73,7 @@ class BuildError(Exception):
         Information about the cause of the location of the error:
         ---------------------------------------------------------
 
-        node : the error occured while building this target node(s)
+        node : the error occurred while building this target node(s)
         
         executor : the executor that caused the build to fail (might
                    be None if the build failures is not due to the

scons/scons-local-2.5.0/SCons/Script/Main.py

@@ -564,7 +564,7 @@ def find_deepest_user_frame(tb):
 
 def _scons_user_error(e):
     """Handle user errors. Print out a message and a description of the
-    error, along with the line number and routine where it occured.
+    error, along with the line number and routine where it occurred.
     The file and line number will be the deepest stack frame that is
     not part of SCons itself.
     """
@@ -579,7 +579,7 @@ def _scons_user_error(e):
 
 def _scons_user_warning(e):
     """Handle user warnings. Print out a message and a description of
-    the warning, along with the line number and routine where it occured.
+    the warning, along with the line number and routine where it occurred.
     The file and line number will be the deepest stack frame that is
     not part of SCons itself.
     """

src/load_map.cpp

@@ -755,7 +755,7 @@ void map_parser::parse_layer(Map & map, xml_node const& node)
                 }
                 catch (...)
                 {
-                    throw config_error("Unknown exception occured attempting to create datasoure for layer '" + lyr.name() + "'");
+                    throw config_error("Unknown exception occurred attempting to create datasoure for layer '" + lyr.name() + "'");
                 }
             }
         }

src/map.cpp

@@ -695,7 +695,7 @@ featureset_ptr Map::query_point(unsigned index, double x, double y) const
 {
     if (!current_extent_.valid())
     {
-        throw std::runtime_error("query_point: map extent is not intialized, you need to set a valid extent before querying");
+        throw std::runtime_error("query_point: map extent is not initialized, you need to set a valid extent before querying");
     }
     if (!current_extent_.intersects(x,y))
     {

src/marker_cache.cpp

@@ -267,7 +267,7 @@ std::shared_ptr<mapnik::marker const> marker_cache::find(std::string const& uri,
                 }
                 else
                 {
-                    MAPNIK_LOG_ERROR(marker_cache) << "could not intialize reader for: '" << uri << "'";
+                    MAPNIK_LOG_ERROR(marker_cache) << "could not initialize reader for: '" << uri << "'";
                     return std::make_shared<mapnik::marker const>(mapnik::marker_null());
                 }
             }