fixed several typos, including the old ones from ticket #854

modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst

@@ -172,7 +172,7 @@ DescriptorMatcher::match
 
     :param mask: Mask specifying permissible matches between an input query and train matrices of descriptors.
 
-    :param masks: Set of masks. Each  ``masks[i]``  specifies permissible matches between input query descriptors and stored train descriptors from the i-th image ``trainDescCollection[i]``.
+    :param masks: Set of masks. Each  ``masks[i]``  specifies permissible matches between the input query descriptors and stored train descriptors from the i-th image ``trainDescCollection[i]``.
 
 In the first variant of this method, the train descriptors are passed as an input argument. In the second variant of the method, train descriptors collection that was set by ``DescriptorMatcher::add`` is used. Optional mask (or masks) can be passed to specify which query and training descriptors can be matched. Namely, ``queryDescriptors[i]`` can be matched with ``trainDescriptors[j]`` only if ``mask.at<uchar>(i,j)`` is non-zero. 
 
@@ -186,7 +186,13 @@ DescriptorMatcher::knnMatch
 
     Finds the k best matches for each descriptor from a query set.
 
-    :param queryDescriptors, trainDescriptors, mask, masks: See  :ref:`DescriptorMatcher::match` .
+    :param queryDescriptors: Query set of descriptors.
+
+    :param trainDescriptors: Train set of descriptors. This set is not added to the train descriptors collection stored in the class object.
+
+    :param mask: Mask specifying permissible matches between an input query and train matrices of descriptors.
+
+    :param masks: Set of masks. Each  ``masks[i]``  specifies permissible matches between the input query descriptors and stored train descriptors from the i-th image ``trainDescCollection[i]``.
 
     :param matches: Matches. Each  ``matches[i]``  is k or less matches for the same query descriptor.
 
@@ -206,9 +212,17 @@ DescriptorMatcher::radiusMatch
 
     For each query descriptor, finds the training descriptors not farther than the specified distance.
 
-    :param queryDescriptors, trainDescriptors, mask, masks: See :cpp:func:`DescriptorMatcher::match`.??look at the output - the 1st paarm is omitted
+    :param queryDescriptors: Query set of descriptors.
 
-    :param matches, compactResult: See :cpp:func:`DescriptorMatcher::knnMatch`.??look at the output - the 1st paarm is omitted
+    :param trainDescriptors: Train set of descriptors. This set is not added to the train descriptors collection stored in the class object.
+
+    :param mask: Mask specifying permissible matches between an input query and train matrices of descriptors.
+
+    :param masks: Set of masks. Each  ``masks[i]``  specifies permissible matches between the input query descriptors and stored train descriptors from the i-th image ``trainDescCollection[i]``.
+
+    :param matches: The found matches.
+
+    :param compactResult: Parameter that is used when the mask (or masks) is not empty. If  ``compactResult``  is false, the  ``matches``  vector has the same size as  ``queryDescriptors``  rows. If  ``compactResult``  is true, the  ``matches``  vector does not contain matches for fully masked-out query descriptors.
 
     :param maxDistance: Threshold for the distance between matched descriptors.
     
@@ -222,9 +236,7 @@ DescriptorMatcher::clone
 
     Clones the matcher.
 
-    :param emptyTrainData: If ``emptyTrainData`` is false, the method creates a deep copy of the object, that is, copies
-             both parameters and train data. If ``emptyTrainData`` is true, the method creates an object copy with the current parameters
-             but with empty train data.
+    :param emptyTrainData: If ``emptyTrainData`` is false, the method creates a deep copy of the object, that is, copies both parameters and train data. If ``emptyTrainData`` is true, the method creates an object copy with the current parameters but with empty train data.
 
 .. index:: DescriptorMatcher::create
 
@@ -235,17 +247,17 @@ DescriptorMatcher::create
     Creates a descriptor matcher of a given type with the default parameters (using default constructor).
 
     :param descriptorMatcherType: Descriptor matcher type. Now the following matcher types are supported:
-	
+
         * 
-		  ``BruteForce`` (it uses ``L2`` )
+            ``BruteForce`` (it uses ``L2`` )
         * 
-		  ``BruteForce-L1``
+            ``BruteForce-L1``
         * 
-		  ``BruteForce-Hamming``
+            ``BruteForce-Hamming``
         * 
-		  ``BruteForce-HammingLUT``
+            ``BruteForce-HammingLUT``
         * 
-		  ``FlannBased``
+            ``FlannBased``
 
 .. index:: BruteForceMatcher
 
@@ -310,7 +322,7 @@ For efficiency, ``BruteForceMatcher`` is used as a template parameterized with t
     };
 
     /*
-     * Hamming distance (city block distance) functor
+     * Hamming distance functor
      */
     struct HammingLUT
     {

modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst

@@ -9,7 +9,8 @@ drawMatches
 .. cpp:function:: void drawMatches( const Mat& img1, const vector<KeyPoint>& keypoints1,          const Mat& img2, const vector<KeyPoint>& keypoints2,          const vector<DMatch>& matches1to2, Mat& outImg,          const Scalar& matchColor=Scalar::all(-1),           const Scalar& singlePointColor=Scalar::all(-1),          const vector<char>& matchesMask=vector<char>(),          int flags=DrawMatchesFlags::DEFAULT )
 
 .. cpp:function:: void drawMatches( const Mat& img1, const vector<KeyPoint>& keypoints1,           const Mat& img2, const vector<KeyPoint>& keypoints2,           const vector<vector<DMatch> >& matches1to2, Mat& outImg,           const Scalar& matchColor=Scalar::all(-1),            const Scalar& singlePointColor=Scalar::all(-1),           const vector<vector<char>>& matchesMask=           vector<vector<char> >(),           int flags=DrawMatchesFlags::DEFAULT )
-	??Description??
+    
+    Draw the found matches of keypoints from two images
 
     :param img1: The first source image.
 

modules/features2d/include/opencv2/features2d/features2d.hpp

@@ -251,7 +251,7 @@ public:
     static float overlap(const KeyPoint& kp1, const KeyPoint& kp2);
 
     CV_PROP_RW Point2f pt; //!< coordinates of the keypoints
-    CV_PROP_RW float size; //!< diameter of the meaningfull keypoint neighborhood
+    CV_PROP_RW float size; //!< diameter of the meaningful keypoint neighborhood
     CV_PROP_RW float angle; //!< computed orientation of the keypoint (-1 if not applicable)
     CV_PROP_RW float response; //!< the response by which the most strong keypoints have been selected. Can be used for the further sorting or subsampling
     CV_PROP_RW int octave; //!< octave (pyramid layer) from which the keypoint has been extracted
@@ -2215,7 +2215,7 @@ public:
      * Train matcher (e.g. train flann index).
      * In all methods to match the method train() is run every time before matching.
      * Some descriptor matchers (e.g. BruteForceMatcher) have empty implementation
-     * of this method, other matchers realy train their inner structures
+     * of this method, other matchers really train their inner structures
      * (e.g. FlannBasedMatcher trains flann::Index). So nonempty implementation
      * of train() should check the class object state and do traing/retraining
      * only if the state requires that (e.g. FlannBasedMatcher trains flann::Index