diff --git a/doc/source/programs/gdalwarp.rst b/doc/source/programs/gdalwarp.rst
index 639fa780d9be..d21f00e50ece 100644
--- a/doc/source/programs/gdalwarp.rst
+++ b/doc/source/programs/gdalwarp.rst
@@ -15,27 +15,36 @@ Synopsis
 
 .. code-block::
 
-       gdalwarp [--help] [--long-usage] [--help-general]
-                [--quiet] [-overwrite] [-of <output_format>] [-co <NAME>=<VALUE>]... [-s_srs <srs_def>]
-                [-t_srs <srs_def>]
-                [[-srcalpha]|[-nosrcalpha]]
-                [-dstalpha] [-tr <xres> <yres>|square] [-ts <width> <height>] [-te <xmin> <ymin> <max> <ymaX]
-                [-te_srs <srs_def>] [-r near|bilinear|cubic|cubicspline|lanczos|average|rms|mode|min|max|med|q1|q3|sum]
-                [-ot Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
-                <src_dataset_name>... <dst_dataset_name>
-
-       Advanced options:
-                [-wo <NAME>=<VALUE>]... [-multi] [-s_coord_epoch <epoch>] [-t_coord_epoch <epoch>] [-ct <string>]
-                [[-tps]|[-rpc]|[-geoloc]]
-                [-order <1|2|3>] [-refine_gcps <tolerance> [<minimum_gcps>]] [-to <NAME>=<VALUE>]...
-                [-et <err_threshold>] [-wm <memory_in_mb>] [-srcnodata <value>[ <value>...]]
-                [-dstnodata <value>[ <value>...]] [-tap] [-wt Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
-                [-cutline <datasource>|<WKT>] [-cutline_srs <srs_def>] [-cwhere <expression>]
-                [[-cl <layername>]|[-csql <query>]]
-                [-cblend <distance>] [-crop_to_cutline] [-nomd] [-cvmd <meta_conflict_value>] [-setci]
-                [-oo <NAME>=<VALUE>]... [-doo <NAME>=<VALUE>]... [-ovr <level>|AUTO|AUTO-<n>|NONE]
-                [[-vshift]|[-novshiftgrid]]
-                [-if <format>]... [-srcband <band>]... [-dstband <band>]...
+   gdalwarp [--help] [--long-usage] [--help-general]
+            [--quiet] [-overwrite] [-of <output_format>] [-co <NAME>=<VALUE>]...
+            [-s_srs <srs_def>] [-t_srs <srs_def>]
+            [[-srcalpha]|[-nosrcalpha]]
+            [-dstalpha] [-tr <xres> <yres>|square] [-ts <width> <height>]
+            [-te <xmin> <ymin> <max> <ymaX]
+            [-te_srs <srs_def>]
+            [-r near|bilinear|cubic|cubicspline|lanczos|average|rms|mode|min|max|med|q1|q3|sum]
+            [-ot Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
+            <src_dataset_name>... <dst_dataset_name>
+
+   Advanced options:
+            [-wo <NAME>=<VALUE>]... [-multi]
+            [-s_coord_epoch <epoch>] [-t_coord_epoch <epoch>] [-ct <string>]
+            [[-tps]|[-rpc]|[-geoloc]]
+            [-order <1|2|3>] [-refine_gcps <tolerance> [<minimum_gcps>]]
+            [-to <NAME>=<VALUE>]...
+            [-et <err_threshold>] [-wm <memory_in_mb>]
+            [-srcnodata <value>[ <value>...]]
+            [-dstnodata <value>[ <value>...]] [-tap]
+            [-wt Byte|Int8|[U]Int{16|32|64}|CInt{16|32}|[C]Float{32|64}]
+            [-cutline <datasource>|<WKT>] [-cutline_srs <srs_def>]
+            [-cwhere <expression>]
+            [[-cl <layername>]|[-csql <query>]]
+            [-cblend <distance>] [-crop_to_cutline]
+            [-nomd] [-cvmd <meta_conflict_value>] [-setci]
+            [-oo <NAME>=<VALUE>]... [-doo <NAME>=<VALUE>]...
+            [-ovr <level>|AUTO|AUTO-<n>|NONE]
+            [[-vshift]|[-novshiftgrid]]
+            [-if <format>]... [-srcband <band>]... [-dstband <band>]...
 
 
 Description
diff --git a/doc/source/programs/ogr2ogr.rst b/doc/source/programs/ogr2ogr.rst
index b840e4863374..0b190f6dba04 100644
--- a/doc/source/programs/ogr2ogr.rst
+++ b/doc/source/programs/ogr2ogr.rst
@@ -16,38 +16,53 @@ Synopsis
 .. code-block::
 
     ogr2ogr [--help] [--long-usage] [--help-general]
-            [-of <output_format>] [-dsco <NAME>=<VALUE>]... [-lco <NAME>=<VALUE>]...
+            [-of <output_format>]
+            [-dsco <NAME>=<VALUE>]... [-lco <NAME>=<VALUE>]...
             [[-append]|[-upsert]|[-overwrite]]
-            [-update] [-sql <statement>|@<filename>] [-dialect <dialect>] [-spat <xmin> <ymin> <xmax> <ymax>]
-            [-where <restricted_where>|@<filename>] [-select <field_list>] [-nln <name>] [-nlt <type>]...
+            [-update] [-sql <statement>|@<filename>] [-dialect <dialect>]
+            [-spat <xmin> <ymin> <xmax> <ymax>]
+            [-where <restricted_where>|@<filename>] [-select <field_list>]
+            [-nln <name>] [-nlt <type>]...
             [-s_srs <srs_def>]
             [[-a_srs <srs_def>]|[-t_srs <srs_def>]]
             <dst_dataset_name> <src_dataset_name> [<layer_name>]...
 
     Field related options:
-           [-addfields] [-relaxedFieldNameMatch] [-fieldTypeToString All|<type1>[,<type2>]...]
-           [-mapFieldType <srctype>|All=<dsttype>[,<srctype2>=<dsttype2>]...] [-fieldmap <field_1>[,<field_2>]...]
-           [-splitlistfields] [-maxsubfields <n>] [-emptyStrAsNull] [-forceNullable] [-unsetFieldWidth]
-           [-unsetDefault] [-resolveDomains] [-dateTimeTo UTC|UTC(+|-)<HH>|UTC(+|-)<HH>:<MM>] [-noNativeData]
+           [-addfields] [-relaxedFieldNameMatch]
+           [-fieldTypeToString All|<type1>[,<type2>]...]
+           [-mapFieldType <srctype>|All=<dsttype>[,<srctype2>=<dsttype2>]...]
+           [-fieldmap <field_1>[,<field_2>]...]
+           [-splitlistfields] [-maxsubfields <n>] [-emptyStrAsNull]
+           [-forceNullable] [-unsetFieldWidth]
+           [-unsetDefault] [-resolveDomains]
+           [-dateTimeTo UTC|UTC(+|-)<HH>|UTC(+|-)<HH>:<MM>] [-noNativeData]
 
     Advanced geometry and SRS related options:
-           [-dim layer_dim|2|XY|3|XYZ|XYM|XYZM] [-s_coord_epoch <epoch>] [-a_coord_epoch <epoch>]
-           [-t_coord_epoch <epoch>] [-ct <pipeline_def>] [-spat_srs <srs_def>] [-geomfield <name>]
-           [-segmentize <max_dist>] [-simplify <tolerance>] [-makevalid] [-wrapdateline]
-           [-datelineoffset <val_in_degree>]
+           [-dim layer_dim|2|XY|3|XYZ|XYM|XYZM]
+           [-s_coord_epoch <epoch>] [-a_coord_epoch <epoch>]
+           [-t_coord_epoch <epoch>] [-ct <pipeline_def>]
+           [-spat_srs <srs_def>] [-geomfield <name>]
+           [-segmentize <max_dist>] [-simplify <tolerance>]
+           [-makevalid] [-wrapdateline] [-datelineoffset <val_in_degree>]
            [-clipsrc [<xmin> <ymin> <xmax> <ymax>]|<WKT>|<datasource>|spat_extent]
-           [-clipsrcsql <sql_statement>] [-clipsrclayer <layername>] [-clipsrcwhere <expression>]
-           [-clipdst [<xmin> <ymin> <xmax> <ymax>]|<WKT>|<datasource>] [-clipdstsql <sql_statement>]
-           [-clipdstlayer <layername>] [-clipdstwhere <expression>] [-explodecollections] [-zfield <name>]
+           [-clipsrcsql <sql_statement>] [-clipsrclayer <layername>]
+           [-clipsrcwhere <expression>]
+           [-clipdst [<xmin> <ymin> <xmax> <ymax>]|<WKT>|<datasource>]
+           [-clipdstsql <sql_statement>] [-clipdstlayer <layername>]
+           [-clipdstwhere <expression>]
+           [-explodecollections] [-zfield <name>]
            [-gcp <ungeoref_x> <ungeoref_y> <georef_x> <georef_y> [<elevation>]]...
            [-tps] [-order 1|2|3]
-           [-xyRes <val>[ m|mm|deg]] [-zRes <val>[ m|mm]] [-mRes <val>] [-unsetCoordPrecision]
+           [-xyRes <val>[ m|mm|deg]] [-zRes <val>[ m|mm]] [-mRes <val>]
+           [-unsetCoordPrecision]
 
     Other options:
-           [--quiet] [-progress] [-if <format>]... [-oo <NAME>=<VALUE>]... [-doo <NAME>=<VALUE>]...
+           [--quiet] [-progress] [-if <format>]...
+           [-oo <NAME>=<VALUE>]... [-doo <NAME>=<VALUE>]...
            [-fid <FID>] [-preserve_fid] [-unsetFid]
            [[-skipfailures]|[-gt <n>|unlimited]]
-           [-limit <nb_features>] [-ds_transaction] [-mo <NAME>=<VALUE>]... [-nomd]
+           [-limit <nb_features>] [-ds_transaction]
+           [-mo <NAME>=<VALUE>]... [-nomd]
 
 Description
 -----------