Merge branch 'master' into 'master'

Master commit to prkos. Test of reverse merging

See merge request prkos/inkscape!1

6 files changed, 7 insertions, 7 deletions

diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index b83c5380f..5e843ee11 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -104,7 +104,7 @@ Dependency::~Dependency (void)
     \return  Whether or not the dependency passes.
 
     This function depends largely on all of the enums.  The first level
-    that is evaluted is the \c _type.
+    that is evaluated is the \c _type.
 
     If the type is \c TYPE_EXTENSION then the id for the extension is
     looked up in the database.  If the extension is found, and it is
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 143243a2e..f6eff09b1 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -45,7 +45,7 @@ class Effect : public Extension {
     void merge_menu (Inkscape::XML::Node * base, Inkscape::XML::Node * start, Inkscape::XML::Node * patern, Inkscape::XML::Node * mergee);
 
     /** \brief  This is the verb type that is used for all effect's verbs.
-                It provides convience functions and maintains a pointer
+                It provides convenience functions and maintains a pointer
                 back to the effect that created it.  */
     class EffectVerb : public Inkscape::Verb {
         private:
diff --git a/src/prefix.h b/src/prefix.h
index bdf3b6df4..ac3138ae6 100644
--- a/src/prefix.h
+++ b/src/prefix.h
@@ -44,7 +44,7 @@ extern "C" {
 #define br_prepend_prefix BR_NAMESPACE(br_prepend_prefix)
 
 #ifndef BR_NO_MACROS
-	/* These are convience macros that replace the ones usually used
+	/* These are convenience macros that replace the ones usually used
 	   in Autoconf/Automake projects */
 	#undef SELFPATH
 	#undef PREFIX
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 7daaefdfa..cbb51f312 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -281,7 +281,7 @@ sp_pathvector_boolop(Geom::PathVector const &pathva, Geom::PathVector const &pat
         free(toCut);
     } else if ( bop == bool_op_cut ) {
         // il faut appeler pour desallouer PointData (pas vital, mais bon)
-        // the Booleen() function did not deallocated the point_data array in theShape, because this
+        // the Booleen() function did not deallocate the point_data array in theShape, because this
         // function needs it.
         // this function uses the point_data to get the winding number of each path (ie: is a hole or not)
         // for later reconstruction in objects, you also need to extract which path is parent of holes (nesting info)
@@ -659,7 +659,7 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo,
         free(toCut);
     } else if ( bop == bool_op_cut ) {
         // il faut appeler pour desallouer PointData (pas vital, mais bon)
-        // the Booleen() function did not deallocated the point_data array in theShape, because this
+        // the Booleen() function did not deallocate the point_data array in theShape, because this
         // function needs it.
         // this function uses the point_data to get the winding number of each path (ie: is a hole or not)
         // for later reconstruction in objects, you also need to extract which path is parent of holes (nesting info)
diff --git a/src/svg-profile.h b/src/svg-profile.h
index 0baaf08e5..f312662d2 100644
--- a/src/svg-profile.h
+++ b/src/svg-profile.h
@@ -127,7 +127,7 @@ private:
                 return false;
             }
 
-            /** \brief A convience function to set a particular bit in the
+            /** \brief A convenience function to set a particular bit in the
                        bitfield
 
                 This function first find which integer the bit is in by
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 38eff98ea..0e57063dc 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -575,7 +575,7 @@ SPAction *TextVerb::make_action(Inkscape::ActionContext const & context)
 }
 
 /**
- * A quick little convience function to make building actions
+ * A quick little convenience function to make building actions
  * a little bit easier.
  *
  * This function does a couple of things.  The most obvious is that