[8.x](backport #42060) fix templates and docs to use correct --
command line args
#42204
+138
−31
--
command line args
#42204