Merge branch 4.x

doc/js_tutorials/js_imgproc/js_gradients/js_gradients.markdown

@@ -15,7 +15,7 @@ We will see each one of them.
 
 ### 1. Sobel and Scharr Derivatives
 
-Sobel operators is a joint Gausssian smoothing plus differentiation operation, so it is more
+Sobel operators is a joint Gaussian smoothing plus differentiation operation, so it is more
 resistant to noise. You can specify the direction of derivatives to be taken, vertical or horizontal
 (by the arguments, yorder and xorder respectively). You can also specify the size of kernel by the
 argument ksize. If ksize = -1, a 3x3 Scharr filter is used which gives better results than 3x3 Sobel
@@ -97,4 +97,4 @@ Try it
 <iframe src="../../js_gradients_absSobel.html" width="100%"
         onload="this.style.height=this.contentDocument.body.scrollHeight +'px';">
 </iframe>
-\endhtmlonly
+\endhtmlonly

doc/js_tutorials/js_setup/js_setup/js_setup.markdown

@@ -135,14 +135,7 @@ Building OpenCV.js from Source
 
     For example:
     @code{.bash}
-    python ./platforms/js/build_js.py build_js --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules"
-    @endcode
-
--#  [optional] To enable OpenCV contrib modules append `--cmake_option="-DOPENCV_EXTRA_MODULES_PATH=/path/to/opencv_contrib/modules/"`
-
-    For example:
-    @code{.bash}
-    python ./platforms/js/build_js.py build_js --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules"
+    emcmake python ./platforms/js/build_js.py build_js --cmake_option="-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules"
     @endcode
 
 -#  [optional] To enable WebNN backend, append `--webnn` option.