Description: fix spelling mistakes
Author: Jakub Wilk <jwilk@debian.org>
Forwarded: no
Reviewed-by: Daniel Stender <debian@danielstender.com>
Last-Update: 2014-07-08

--- a/doc/src/ga_optimization.txt
+++ b/doc/src/ga_optimization.txt
@@ -8,7 +8,7 @@ Introduction
 Feature Selection, Weighting and Genetic Algorithms
 '''''''''''''''''''''''''''''''''''''''''''''''''''
 
-Feature selection is the techique of selecting a subset of good features
+Feature selection is the technique of selecting a subset of good features
 out of a larger featureset to obtain the features which are suitable
 for the best possible classification. Feature weighting is a generalization
 of feature selection with real-valued weights between [0,1] instead of the
--- a/gamera/gui/gaoptimizer/SettingsPanel.py
+++ b/gamera/gui/gaoptimizer/SettingsPanel.py
@@ -301,7 +301,7 @@ class SettingsPanel(wx.ScrolledWindow):
                 elif expertWidget.GetName() == "randomSelection":
                     selection.setRandomSelection()
                 else:
-                    raise RuntimeError("Unknown selection method choosen")
+                    raise RuntimeError("Unknown selection method chosen")
 
         # Crossover GA settings
         cross = knnga.GACrossover()
@@ -323,10 +323,10 @@ class SettingsPanel(wx.ScrolledWindow):
                     cross.setHypercubeCrossover(self.frame.classifier.num_features, 0.0, 1.0, \
                         self.crossoverPanel.hypercubeCrossoverAlpha.GetValue())
                 else:
-                    raise RuntimeError("Unknown crossover method choosen")
+                    raise RuntimeError("Unknown crossover method chosen")
                 crossOpSet = True
         if not crossOpSet:
-            raise RuntimeError("At least one crossover operator must be choosen")
+            raise RuntimeError("At least one crossover operator must be chosen")
 
         # Mutation GA settings
         muta = knnga.GAMutation()
@@ -347,10 +347,10 @@ class SettingsPanel(wx.ScrolledWindow):
                         self.mutationPanel.gaussMutationSigma.GetValue(), \
                         self.mutationPanel.gaussMutationPchance.GetValue())
                 else:
-                    raise RuntimeError("Unknown mutation method choosen")
+                    raise RuntimeError("Unknown mutation method chosen")
                 mutOpSet = True
         if not mutOpSet:
-            raise RuntimeError("At least one mutation operator must be choosen")
+            raise RuntimeError("At least one mutation operator must be chosen")
 
         # Replacement GA settings
         replacement = knnga.GAReplacement()
@@ -364,7 +364,7 @@ class SettingsPanel(wx.ScrolledWindow):
                 elif expertWidget.GetName() == "SSGAdetTournament":
                     replacement.setSSGAdetTournament(self.replacementPanel.ssgaDetTourTsize.GetValue())
                 else:
-                    raise RuntimeError("Unknown replacement method choosen")
+                    raise RuntimeError("Unknown replacement method chosen")
 
         # Stop Criteria GA settings
         stop = knnga.GAStopCriteria()
@@ -382,10 +382,10 @@ class SettingsPanel(wx.ScrolledWindow):
                     stop.setSteadyStateStop(self.stopCriteriaPanel.steadyContinueMin.GetValue(), \
                         self.stopCriteriaPanel.steadyContinueNoChange.GetValue())
                 else:
-                    raise RuntimeError("Unknown stop criteria choosen")
+                    raise RuntimeError("Unknown stop criteria chosen")
                 stopCritSet = True
         if not stopCritSet:
-            raise RuntimeError("At least one stop criteria must be choosen")
+            raise RuntimeError("At least one stop criteria must be chosen")
 
         # Parallelization GA settings
         para = knnga.GAParallelization()
--- a/src/knngamodule.cpp
+++ b/src/knngamodule.cpp
@@ -496,7 +496,7 @@ void init_GASelectionType(PyObject *d) {
         "The ``GASelection`` constructor creates a new settings object "
         "for the GA-optimization which specifies the used individuals selection method. "
         "This object can later be used in an ``GAOptimization``-object. \n\n"
-        "Only one selection method can be choosen. Multiple settings will "
+        "Only one selection method can be chosen. Multiple settings will "
         "override each other.";
 
     PyType_Ready(&GASelectionType);
@@ -556,9 +556,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *eta* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -573,9 +573,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *alpha* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -590,9 +590,9 @@ PyMethodDef GACrossover_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min* (optional)\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max* (optional)\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *alpha* (optional)\n"
                "    the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
     },
@@ -811,7 +811,7 @@ PyMethodDef GAMutation_methods[] = {
                "individuals. This means that this operator only effects "
                "feature selection.\n\n"
                "double *rate* (optional)\n"
-               "    the probability for mutation of an allel (should be in [0,1])\n"
+               "    the probability for mutation of an allele (should be in [0,1])\n"
                "bool *normalize* (optional)\n"
                "    if true ``rate/chromosomeSize`` is used"
     },
@@ -825,14 +825,14 @@ PyMethodDef GAMutation_methods[] = {
                "    the number of used features. Usually this value is set to "
                "``classifier.num_features``.\n"
                "double *min*\n"
-               "    the minimum value which is allowed in an allel (usually 0.0)\n"
+               "    the minimum value which is allowed in an allele (usually 0.0)\n"
                "double *max*\n"
-               "    the maximum value which is allowed in an allel (usually 1.0)\n"
+               "    the maximum value which is allowed in an allele (usually 1.0)\n"
                "double *sigma*\n"
                "    the standard deviation of the gaussian distribution. This "
-               "paramater determines the strength of the mutation.\n"
+               "parameter determines the strength of the mutation.\n"
                "double *rate*\n"
-               "    the probability for mutating an allel (should be in [0,1])\n"
+               "    the probability for mutating an allele (should be in [0,1])\n"
     },
     { NULL }
 };
@@ -1136,7 +1136,7 @@ void init_GAReplacementType(PyObject *d)
         "The ``GAReplacement`` constructor creates a new settings object "
         "for the GA-optimization which specifies the used replacement method. "
         "This object can later be used in an ``GAOptimization``-object. \n\n"
-        "Only one replacement method can be choosen. Multiple settings will "
+        "Only one replacement method can be chosen. Multiple settings will "
         "override each other.";
 
     PyType_Ready(&GAReplacementType);
--- a/src/eodev/utils/eoParser.cpp
+++ b/eodev/utils/eoParser.cpp
@@ -82,7 +82,7 @@ eoParser::eoParser ( unsigned _argc, cha
     programDescription( _programDescription),
     needHelpMessage( false ),
     needHelp(false, "help", "Prints this message", 'h'),
-    stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unkown param entered", '\0')
+    stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unknown param entered", '\0')
 {
     // need to process the param file first
     // if we want command-line to have highest priority
--- a/gamera/plugins/image_conversion.py
+++ b/gamera/plugins/image_conversion.py
@@ -23,7 +23,7 @@ import image_utilities, _image_conversio
 
 class to_rgb(PluginFunction):
     """
-    Converts the given image to an RGB image according to teh following rules:
+    Converts the given image to an RGB image according to the following rules:
 
     - for ONEBIT images, 0 is mapped to (255,255,255) and everything else to (0,0,0)
     - for GREYSCALE and GREY16 images, R=G=B
--- a/INSTALL
+++ b/INSTALL
@@ -39,7 +39,7 @@ Prerequisites
    Fixes for common problems:
 
     - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
-      which is an errenous in some versions of Mingw32. To fix it, you can
+      which is an erroneous in some versions of Mingw32. To fix it, you can
       recreate the file from the DLL ``msvcr90.dll`` that comes with
       Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
 
@@ -162,7 +162,7 @@ terminal and type::
   python setup.py build
   sudo python setup.py install
 
-By default, parallelization of the genetica algorithms is only compiled
+By default, parallelization of the genetic algorithms is only compiled
 into Gamera under Linux and with gcc version > 4.2, because we could only
 get it running in this environment. If you are sure that you have unbroken
 OpenMP support on your system, you can compile Gamera with::
@@ -175,8 +175,8 @@ on your system for some reason, you can
   python setup.py build --openmp=no
 
 
-Installing without root priviledges
------------------------------------
+Installing without root privileges
+----------------------------------
 
 .. _without_root:
 
@@ -195,7 +195,7 @@ instructions (without using sudo)::
 Alternatively, you can set up a local installation by hand.
 
 Make a local python module directory somewhere that you have write
-priviledges (such as your home directory)::
+privileges (such as your home directory)::
 
   mkdir ~/python
 
@@ -276,7 +276,7 @@ To build Gamera, open a terminal and typ
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo pythonw setup.py install
 
@@ -308,11 +308,11 @@ to your search PATH, or install the scri
   ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
 
 
-Installing without root priviledges
-```````````````````````````````````
+Installing without root privileges
+``````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -372,7 +372,7 @@ To build Gamera, open a X11 terminal and
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo python setup.py install
 
@@ -385,11 +385,11 @@ The scripts can be installed by::
   default installed to
   ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
 
-Installing without root priviledges
-```````````````````````````````````
+Installing without root privileges
+``````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
--- a/doc/src/install.txt
+++ b/doc/src/install.txt
@@ -43,7 +43,7 @@ terminal and type::
   python setup.py build
   sudo python setup.py install
 
-By default, parallelization of the genetica algorithms is only compiled
+By default, parallelization of the genetical algorithms is only compiled
 into Gamera under Linux and with gcc version > 4.2, because we could only
 get it running in this environment. If you are sure that you have unbroken
 OpenMP support on your system, you can compile Gamera with::
@@ -56,7 +56,7 @@ on your system for some reason, you can
   python setup.py build --openmp=no
 
 
-Installing without root priviledges
+Installing without root privileges
 -----------------------------------
 
 .. _without_root:
@@ -76,7 +76,7 @@ instructions (without using sudo)::
 Alternatively, you can set up a local installation by hand.
 
 Make a local python module directory somewhere that you have write
-priviledges (such as your home directory)::
+privileges (such as your home directory)::
 
   mkdir ~/python
 
@@ -157,7 +157,7 @@ To build Gamera, open a terminal and typ
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo pythonw setup.py install
 
@@ -189,11 +189,11 @@ to your search PATH, or install the scri
   ``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
 
 
-Installing without root priviledges
+Installing without root privileges
 ```````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -253,7 +253,7 @@ To build Gamera, open a X11 terminal and
 
   python setup.py build
 
-and then to install (you'll need to have admin priviledges)::
+and then to install (you'll need to have admin privileges)::
 
   sudo python setup.py install
 
@@ -266,11 +266,11 @@ The scripts can be installed by::
   default installed to
   ``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
 
-Installing without root priviledges
+Installing without root privileges
 ```````````````````````````````````
 
 The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
+privileges`__ can also be used on Mac OS-X.
 
 __ without_root_
 
@@ -399,7 +399,7 @@ in the Explorer, or from the DOS command
    Fixes for common problems:
 
     - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
-      which is an errenous in some versions of Mingw32. To fix it, you can
+      which is an erroneous in some versions of Mingw32. To fix it, you can
       recreate the file from the DLL ``msvcr90.dll`` that comes with
       Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
 
--- a/doc/src/kdtree.txt
+++ b/doc/src/kdtree.txt
@@ -132,7 +132,7 @@ Each kd-tree is represented by instances
 Even though there are general kd-tree algorithms to add and remove
 nodes dynamically (see [Bentley1975]_), the present implementation
 does not support alteration of a once built tree. This has the
-consequence that tree nodes must be passed to the contructor of
+consequence that tree nodes must be passed to the constructor of
 ``KdTree``.
 
 A ``KdTree`` has the following (read only) properties:
--- a/doc/src/plugins_custom_types.txt
+++ b/doc/src/plugins_custom_types.txt
@@ -226,7 +226,7 @@ wrapper of the form:
       self.property2 = mc.property2
       # ...
 
-  # the plugin implementing the actual contructor of MyClass
+  # the plugin implementing the actual constructor of MyClass
   class create_myclass(PluginFunction):
     self_type = None
     args = Args([Int("arg1"), Real("arg2")])
--- a/gamera/knn.py
+++ b/gamera/knn.py
@@ -458,7 +458,7 @@ Set the selection vector elements by the
    described in get_selections_by_features.
 
 The dictionary must contain an entry for every feature of the currently
-active feature set, that has been set in the contructor of the classifier or
+active feature set, that has been set in the constructor of the classifier or
 by *change_feature_set*. Example:
 
 .. code:: Python
@@ -499,7 +499,7 @@ Set the selection vector elements for on
 
 Set the weighing vector elements by the corresponding feature name.
 The dictionary must contain an entry for every feature of the currently
-active feature set, that has been set in the contructor of the classifier or
+active feature set, that has been set in the constructor of the classifier or
 by *change_feature_set*. Example:
 
 .. code:: Python
--- a/src/knnga.cpp
+++ b/src/knnga.cpp
@@ -558,7 +558,7 @@ void GAOptimization<EOT>::StartCalculati
 
     // adjust the individual size for the case of weighting with
     // prior deselected features and build an index relation map
-    // for futher index mapping
+    // for further index mapping
     unsigned int indiLength = (unsigned int)this->knn->num_features;
     std::map<unsigned int, unsigned int> indexRelation;
     unsigned int indiIndex = 0;
--- a/src/pointobject.cpp
+++ b/src/pointobject.cpp
@@ -54,7 +54,7 @@ static PyGetSetDef point_getset[] = {
 
 static PyMethodDef point_methods[] = {
   { (char *)"move", point_move, METH_VARARGS,
-    (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lineas are equivalent:\n\n.. code:: Python\n\n    p.move(x,y)\n    p += Point(x,y)"},
+    (char *)"**move** (*x*, *y*)\n\nMoves the point by the given *x*, *y* coordinate, i.e. the vector (*x*, *y*) is added to the point. The following two lines are equivalent:\n\n.. code:: Python\n\n    p.move(x,y)\n    p += Point(x,y)"},
   { NULL }
 };