[Doc] Fix some typo and openMVG_SfM binary from 2.0 update openMVG#1976

Thank you @CDluznie for reporting

docs/sphinx/rst/openMVG/sfm/sfm.rst

@@ -196,7 +196,7 @@ Global SfM
 
 [GlobalACSfM]_ is based on the paper "Global Fusion of Relative Motions for Robust, Accurate and Scalable Structure from Motion."  published at ICCV 2013.
 
-Multi-view structure from motion (SfM) estimates the position and orientation of pictures in a common 3D coordinate frame. When views are treated incrementally, this external calibration can be subject to drift, contrary to global methods that distribute residual errors evenly. Here, this method proposes a new global calibration approach based on the fusion of relative motions between image pairs. 
+Multi-view structure from motion (SfM) estimates the position and orientation of pictures in a common 3D coordinate frame. When views are treated incrementally, this external calibration can be subject to drift, contrary to global methods that distribute residual errors evenly. Here, this method proposes a new global calibration approach based on the fusion of relative motions between image pairs.
 
 .. code-block:: c++
 
@@ -240,5 +240,5 @@ This class allows to compute valid 3D triangulation from 2D matches and known ca
   for triplets of view
     - filter 3-view correspondences that leads to invalid triangulation
   merge 3-view validated correspondences
-    - robustly triangulate them 
+    - robustly triangulate them
   save the scene with the update structure

docs/sphinx/rst/software/Geodesy/geodesy.rst

@@ -97,7 +97,7 @@ Scene initialization
 ~~~~~~~~~~~~~~~~~~~~~
 
   .. code-block:: c++
-  
+
     $ openMVG_main_SfMInit_ImageListing -P [other args]
 
 **Optional parameters:**
@@ -108,15 +108,14 @@ Scene initialization
 
   - **[-w]**
 
-    - Allow to customize the pose prior weight in each XYZ dimention i.e. default is equivalent to "1.0;1.0;1.0"
+    - Allow to customize the pose prior weight in each XYZ dimension i.e. default is equivalent to "1.0;1.0;1.0"
 
 Force pose prior usage
 ~~~~~~~~~~~~~~~~~~~~~~
 
   .. code-block:: c++
-
-    $ openMVG_main_IncrementalSfM -P [other args]
-    $ openMVG_main_GlobalSfM -P [other args]
+
+    $ openMVG_main_SfM -P [other args]
 
 **Optional parameters:**
 
@@ -185,4 +184,3 @@ In green the SFM poses, and in blue the GPS Exif ECEF poses. We clearly see that
 
 .. figure:: swiss_quarry_registered.png
    :align: center
-

docs/sphinx/rst/software/SfM/GlobalSfM.rst

@@ -1,11 +1,9 @@
-
-*******************************
-openMVG_main_GlobalSfM
-*******************************
+openMVG_main_SfM --sfm_engine "GLOBAL"
+**************************************
 
 [GlobalACSfM]_ is based on the paper "Global Fusion of Relative Motions for Robust, Accurate and Scalable Structure from Motion."  published at ICCV 2013.
 
-Multi-view structure from motion (SfM) estimates the position and orientation of pictures in a common 3D coordinate frame. When views are treated incrementally, this external calibration can be subject to drift, contrary to global methods that distribute residual errors evenly. Here the method propose a new global calibration approach based on the fusion of relative motions between image pairs. 
+Multi-view structure from motion (SfM) estimates the position and orientation of pictures in a common 3D coordinate frame. When views are treated incrementally, this external calibration can be subject to drift, contrary to global methods that distribute residual errors evenly. Here the method propose a new global calibration approach based on the fusion of relative motions between image pairs.
 
 Algorithm of the Global Structure from Motion
 
@@ -24,7 +22,7 @@ Algorithm of the Global Structure from Motion
   compute relative translations
     - using triplet of views for stability and colinear motion support
   compute the global translation
-    - integration of the relative translation directions using a l-∞ method. 
+    - integration of the relative translation directions using a l-∞ method.
   final structure and motion
     - link tracks validated per triplets and compute global structure by triangulation,
     - refine estimated parameter in a 2 step Bundle Adjustment
@@ -38,7 +36,7 @@ The chain is designed to run on a sfm_data.json file and some pre-computed match
 The chain will only consider images with known approximate focal length. Image with invalid intrinsic id will be ignored.
 
   .. code-block:: c++
-  
+
     $ openMVG_main_SfM --engine GLOBAL -i Dataset/matches/sfm_data.json -m Dataset/matches/ -o Dataset/out_Global_Reconstruction/
 
 Arguments description:
@@ -52,7 +50,7 @@ Arguments description:
   - **[-m|--matchdir]**
 
     - path were geometric matches were stored
-  
+
   - **[-o|--outdir]**
 
     - path where the output data will be stored
@@ -72,21 +70,21 @@ Arguments description:
 
   - **[-f|--refineIntrinsics]**
       User can control exactly which parameter will be considered as constant/variable and combine them by using the '|' operator.
-      
+
     - ADJUST_ALL -> refine all existing parameters (default)
     - NONE -> intrinsic parameters are held as constant
     - ADJUST_FOCAL_LENGTH -> refine only the focal length
     - ADJUST_PRINCIPAL_POINT -> refine only the principal point position
     - ADJUST_DISTORTION -> refine only the distortion coefficient(s) (if any)
-    
+
     - NOTE Options can be combined thanks to '|':
 
       - ADJUST_FOCAL_LENGTH|ADJUST_PRINCIPAL_POINT
         -> refine the focal length & the principal point position
-      
+
       - ADJUST_FOCAL_LENGTH|ADJUST_DISTORTION
         -> refine the focal length & the distortion coefficient(s) (if any)
-      
+
       - ADJUST_PRINCIPAL_POINT|ADJUST_DISTORTION
         -> refine the principal point position & the distortion coefficient(s) (if any)
 
@@ -100,9 +98,3 @@ Arguments description:
 Please use:
  - "-p HIGH" option on openMVG_main_ComputeFeatures
  - "-r .8" on openMVG_main_ComputeMatches.
-
-
-
-
-
-

docs/sphinx/rst/software/SfM/IncrementalSfM.rst

@@ -1,7 +1,5 @@
-
-*************************************
-openMVG_main_IncrementalSfM
-*************************************
+openMVG_main_SfM --sfm_engine "INCREMENTAL"
+*******************************************
 
 The [ACSfM]_ SfM is an evolution of the implementation used for the paper "Adaptive Structure from Motion with a contrario model estimation"  published at ACCV 2012.
 

docs/sphinx/rst/software/SfM/SfM.rst

@@ -6,7 +6,7 @@ Structure from Motion computes an external camera pose per image (the motion) an
 
 - images,
 - some intrinsic camera parameters,
-- corresponding geometric valid features accross images.
+- corresponding geometric valid features across images.
 
 .. figure:: imagesInput.png
    :align: center
@@ -142,7 +142,7 @@ To know more about each tool visit the following link and read the doc below:
    ../MVS/MVS.rst
 
 
-PS: We strongly advise to use a 3 directories based data organisation structure
+PS: We strongly advise to use a 3 directories based data organization structure
 
 * **images**
 
@@ -196,5 +196,5 @@ Here as an example the pipeline to use in order to process equirectangular image
   $ openMVG_main_ComputeMatches -i [matches directory]/sfm_data.json -o [matches directory] -g a
 
   // Compute the reconstruction
-  $ openMVG_main_IncrementalSfM -i [matches directory]/sfm_data.json -m [matches directory] -o [reconstruction directory] -a R0010762.JPG -b R0010764.JPG
+  $ openMVG_main_SfM -i [matches directory]/sfm_data.json -m [matches directory] -o [reconstruction directory] -a R0010762.JPG -b R0010764.JPG
   // /!\ Since the spherical geometry is different than classic pinhole images, the best is to provide the initial pair by hand with the -a -b image basenames (i.e. R0010762.JPG).