Merge branch 'luzpaz/inkscape-typos' (!119)

11 files changed, 18 insertions, 18 deletions

diff --git a/src/display/drawing-context.cpp b/src/display/drawing-context.cpp
index 319136e06..1a1f20425 100644
--- a/src/display/drawing-context.cpp
+++ b/src/display/drawing-context.cpp
@@ -41,7 +41,7 @@ DrawingContext::Save::~Save()
 void DrawingContext::Save::save(DrawingContext &dc)
 {
     if (_dc) {
-        // TODO: it might be better to treat this occurence as a bug
+        // TODO: it might be better to treat this occurrence as a bug
         _dc->restore();
     }
     _dc = &dc;
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index c4af81efc..43db4f259 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -99,7 +99,7 @@ void set_cairo_blend_operator( DrawingContext &dc, unsigned blend_mode ) {
  * you always need to delete the item views of children before deleting
  * the view of the parent. Do not call delete on things returned from show()
  * - this will cause dangling pointers inside the SPItem and lead to a crash.
- * Use the corresponing hide() method.
+ * Use the corresponding hide() method.
  *
  * Outside of the SP tree, you should not use any references after the root node
  * has been deleted.
diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h
index dc1f93ed1..43e0e97e1 100644
--- a/src/display/drawing-pattern.h
+++ b/src/display/drawing-pattern.h
@@ -39,7 +39,7 @@ public:
      */
     void setPatternToUserTransform(Geom::Affine const &new_trans);
     /**
-     * Set the tile rect position and dimentions in content coordinate system
+     * Set the tile rect position and dimensions in content coordinate system
      */
     void setTileRect(Geom::Rect const &tile_rect);
     /**
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 1b979fa6c..c0d1ae411 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -145,7 +145,7 @@ void FilterDisplacementMap::area_enlarge(Geom::IntRect &area, Geom::Affine const
     double scalex = scale/2.*(std::fabs(trans[0])+std::fabs(trans[1]));
     double scaley = scale/2.*(std::fabs(trans[2])+std::fabs(trans[3]));
 
-    //FIXME: no +2 should be there!... (noticable only for big scales at big zoom factor)
+    //FIXME: no +2 should be there!... (noticeable only for big scales at big zoom factor)
     area.expandBy(scalex+2, scaley+2);
 }
 
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 24960af78..cdd01e75e 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -616,7 +616,7 @@ void FilterGaussian::render_cairo(FilterSlot &slot)
     // Decide which filter to use for X and Y
     // This threshold was determined by trial-and-error for one specific machine,
     // so there's a good chance that it's not optimal.
-    // Whatever you do, don't go below 1 (and preferrably not even below 2), as
+    // Whatever you do, don't go below 1 (and preferably not even below 2), as
     // the IIR filter gets unstable there.
     bool use_IIR_x = deviation_x > 3;
     bool use_IIR_y = deviation_y > 3;
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index af89d98e0..7e859314a 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -144,7 +144,7 @@ void FilterImage::render_cairo(FilterSlot &slot)
          * (See http://www.w3.org/TR/xmlbase/#resolution .) */
         gchar *fullname = feImageHref;
         if ( !g_file_test( fullname, G_FILE_TEST_EXISTS ) ) {
-            // Try to load from relative postion combined with document base
+            // Try to load from relative position combined with document base
             if( document ) {
                 fullname = g_build_filename( document->getBase(), feImageHref, NULL );
             }
diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/nr-filter-skeleton.cpp
index 86ab8141e..491c7f52a 100644
--- a/src/display/nr-filter-skeleton.cpp
+++ b/src/display/nr-filter-skeleton.cpp
@@ -1,14 +1,14 @@
 /*
  * Filter primitive renderer skeleton class
  * You can create your new filter primitive renderer by replacing
- * all occurences of Skeleton, skeleton and SKELETON with your filter
+ * all occurrences of Skeleton, skeleton and SKELETON with your filter
  * type, like gaussian or blend in respective case.
  *
  * This can be accomplished with the following sed command:
  * sed -e "s/Skeleton/Name/g" -e "s/skeleton/name/" -e "s/SKELETON/NAME/"
  * nr-filter-skeleton.cpp >nr-filter-name.cpp
  *
- * (on one line, replace occurences of 'name' with your filter name)
+ * (on one line, replace occurrences of 'name' with your filter name)
  *
  * Remember to convert the .h file too. The sed command is same for both
  * files.
diff --git a/src/display/nr-filter-skeleton.h b/src/display/nr-filter-skeleton.h
index e17c244c1..6c92a4a09 100644
--- a/src/display/nr-filter-skeleton.h
+++ b/src/display/nr-filter-skeleton.h
@@ -4,14 +4,14 @@
 /*
  * Filter primitive renderer skeleton class
  * You can create your new filter primitive renderer by replacing
- * all occurences of Skeleton, skeleton and SKELETON with your filter
+ * all occurrences of Skeleton, skeleton and SKELETON with your filter
  * type, like gaussian or blend in respective case.
  *
  * This can be accomplished with the following sed command:
  * sed -e "s/Skeleton/Name/g" -e "s/skeleton/name/" -e "s/SKELETON/NAME/"
  * nr-filter-skeleton.h >nr-filter-name.h
  *
- * (on one line, replace occurences of 'name' with your filter name)
+ * (on one line, replace occurrences of 'name' with your filter name)
  *
  * Remember to convert the .cpp file too. The sed command is same for both
  * files.
diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h
index 211d8ddd9..7028f2e81 100644
--- a/src/display/nr-filter.h
+++ b/src/display/nr-filter.h
@@ -40,7 +40,7 @@ public:
      * New primitive is placed so that it will be executed after all filter
      * primitives defined beforehand for this filter object.
      * Should this filter not have enough space for a new primitive, the filter
-     * is enlarged to accomodate the new filter element. It may be enlarged by
+     * is enlarged to accommodate the new filter element. It may be enlarged by
      * more that one element.
      * Returns a handle (non-negative integer) to the filter primitive created.
      * Returns -1, if type is not valid filter primitive type or filter
diff --git a/src/display/nr-light.h b/src/display/nr-light.h
index 94b573761..57c421f4a 100644
--- a/src/display/nr-light.h
+++ b/src/display/nr-light.h
@@ -42,14 +42,14 @@ class DistantLight {
         /**
          * Computes the light vector of the distant light
          *
-         * \param v a Fvector referece where we store the result
+         * \param v a Fvector reference where we store the result
          */
         void light_vector(NR::Fvector &v);
         
         /**
          * Computes the light components of the distant light
          *
-         * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B
+         * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B
          */
         void light_components(NR::Fvector &lc);
 
@@ -77,7 +77,7 @@ class PointLight {
          * x, y and z are given in the arena_item coordinate, they are used as
          * is
          *
-         * \param v a Fvector referece where we store the result
+         * \param v a Fvector reference where we store the result
          * \param x x coordinate of the current point
          * \param y y coordinate of the current point
          * \param z z coordinate of the current point
@@ -87,7 +87,7 @@ class PointLight {
         /**
          * Computes the light components of the distant light
          *
-         * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B
+         * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B
          */
         void light_components(NR::Fvector &lc);
 
@@ -118,7 +118,7 @@ class SpotLight {
          * x, y and z are given in the arena_item coordinate, they are used as
          * is
          *
-         * \param v a Fvector referece where we store the result
+         * \param v a Fvector reference where we store the result
          * \param x x coordinate of the current point
          * \param y y coordinate of the current point
          * \param z z coordinate of the current point
@@ -129,7 +129,7 @@ class SpotLight {
          * Computes the light components of the distant light at the current
          * point. We only need the light vector to compute theses
          *
-         * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B
+         * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B
          * \param L the light vector of the current point
          */
         void light_components(NR::Fvector &lc, const NR::Fvector &L);
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index 075e04e6d..a35f07c3d 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -212,7 +212,7 @@ void CtrlRect::render(SPCanvasBuf *buf)
             cairo_stroke_preserve(buf->ct);
         }
 
-        cairo_new_path( buf->ct ); // Clear path or get wierd artifacts.
+        cairo_new_path( buf->ct ); // Clear path or get weird artifacts.
         cairo_restore(buf->ct);
     }
 }