Merge branch 'master' into powerpencil

6 files changed, 8 insertions, 8 deletions

diff --git a/src/helper/geom-nodetype.h b/src/helper/geom-nodetype.h
index 2d299d545..0272318a2 100644
--- a/src/helper/geom-nodetype.h
+++ b/src/helper/geom-nodetype.h
@@ -32,7 +32,7 @@ typedef enum {
     NODE_CUSP,
 /**  This node continuously joins two segments, with continuous *unit* tangent. */
     NODE_SMOOTH,
-/**  This node is symmetric. I.e. continously joins two segments with continuous derivative */
+/**  This node is symmetric. I.e. continuously joins two segments with continuous derivative */
     NODE_SYMM
 } NodeType;
 
diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp
index 50627fd0b..c3e4f8213 100644
--- a/src/helper/geom-pathstroke.cpp
+++ b/src/helper/geom-pathstroke.cpp
@@ -341,8 +341,8 @@ Geom::Point adjust_circles( Geom::Circle &circle1, Geom::Circle &circle2, Geom::
     Geom::Point p0 = points[0].point();
     Geom::Point p1 = points[1].point();
     // std::cout << "    points: " << p0 << "; " << p1 << std::endl;
-    if( abs( Geom::distance( p0, circle2.center() ) - circle2.radius() ) <
-        abs( Geom::distance( p1, circle2.center() ) - circle2.radius() ) ) {
+    if( std::abs( Geom::distance( p0, circle2.center() ) - circle2.radius() ) <
+        std::abs( Geom::distance( p1, circle2.center() ) - circle2.radius() ) ) {
         return p0;
     } else {
         return p1;
diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp
index 8a92273d0..e3f4eb90f 100644
--- a/src/helper/geom-satellite.cpp
+++ b/src/helper/geom-satellite.cpp
@@ -113,7 +113,7 @@ double Satellite::radToLen(
     return len;
 }
 
-///Convert a satelite length -point position where fillet/chamfer knot be on original curve- to a arc radius of fillet/chamfer
+///Convert a satellite length -point position where fillet/chamfer knot be on original curve- to a arc radius of fillet/chamfer
 double Satellite::lenToRad(
     double const A, Geom::Curve const &curve_in,
     Geom::Curve const &curve_out,
diff --git a/src/helper/geom-satellite.h b/src/helper/geom-satellite.h
index b8ca2a490..198a95c9f 100644
--- a/src/helper/geom-satellite.h
+++ b/src/helper/geom-satellite.h
@@ -79,8 +79,8 @@ public:
     void setSatelliteType(gchar const *A);
     gchar const *getSatelliteTypeGchar() const;
     SatelliteType satellite_type;
-    //The value stored could be a time value of the satellite in the curve or a lenght of distance to the node from the satellite
-    //"is_time" tell is if is a time or lenght value
+    //The value stored could be a time value of the satellite in the curve or a length of distance to the node from the satellite
+    //"is_time" tells us if it's a time or length value
     bool is_time;
     bool selected;
     bool has_mirror;
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 8d7202111..8881f54a5 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -58,7 +58,7 @@ static void hide_other_items_recursively(SPObject *o, SPItem *i, unsigned dkey)
 
 
 // The following is a mutation of the flood fill code, the marker preview, and random other samplings.
-// The dpi settings dont do anything yet, but I want them to, and was wanting to keep reasonably close
+// The dpi settings don't do anything yet, but I want them to, and was wanting to keep reasonably close
 // to the call for the interface to the png writing.
 
 bool sp_export_jpg_file(SPDocument *doc, gchar const *filename,
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index 647e42916..930640a6c 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -171,7 +171,7 @@ sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc)
 
 // get_stock_item returns a pointer to an instance of the desired stock object in the current doc
 // if necessary it will import the object. Copes with name clashes through use of the inkscape:stockid property
-// This should be set to be the same as the id in the libary file.
+// This should be set to be the same as the id in the library file.
 
 SPObject *get_stock_item(gchar const *urn, gboolean stock)
 {