diff --git a/doc/lightning-connect.7.md b/doc/lightning-connect.7.md
index 2209f67ec..d2f5a17e4 100644
--- a/doc/lightning-connect.7.md
+++ b/doc/lightning-connect.7.md
@@ -4,7 +4,7 @@ lightning-connect -- Command for connecting to another lightning node
 SYNOPSIS
 --------
 
-**connect** *id* \[*host* *port*\]
+**connect** *id* \[*host*\] \[*port*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-datastore.7.md b/doc/lightning-datastore.7.md
index f94e706aa..27704c00f 100644
--- a/doc/lightning-datastore.7.md
+++ b/doc/lightning-datastore.7.md
@@ -4,7 +4,7 @@ lightning-datastore -- Command for storing (plugin) data
 SYNOPSIS
 --------
 
-**datastore** *key* [*string*] [*hex*] [*mode*] [*generation*]
+**datastore** *key* \[*string*\] \[*hex*\] \[*mode*\] \[*generation*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-deldatastore.7.md b/doc/lightning-deldatastore.7.md
index 477887641..af63fc805 100644
--- a/doc/lightning-deldatastore.7.md
+++ b/doc/lightning-deldatastore.7.md
@@ -4,7 +4,7 @@ lightning-deldatastore -- Command for removing (plugin) data
 SYNOPSIS
 --------
 
-**deldatastore** *key* [*generation*]
+**deldatastore** *key* \[*generation*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-listconfigs.7.md b/doc/lightning-listconfigs.7.md
index b61f7d01f..26a80c0e5 100644
--- a/doc/lightning-listconfigs.7.md
+++ b/doc/lightning-listconfigs.7.md
@@ -4,7 +4,7 @@ lightning-listconfigs -- Command to list all configuration options.
 SYNOPSIS
 --------
 
-**listconfigs** \[config\]
+**listconfigs** \[*config*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-listdatastore.7.md b/doc/lightning-listdatastore.7.md
index 316e719e9..09f365b5f 100644
--- a/doc/lightning-listdatastore.7.md
+++ b/doc/lightning-listdatastore.7.md
@@ -4,7 +4,7 @@ lightning-listdatastore -- Command for listing (plugin) data
 SYNOPSIS
 --------
 
-**listdatastore** [*key*]
+**listdatastore** \[*key*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-listnodes.7.md b/doc/lightning-listnodes.7.md
index 3f36ce07f..c2f040600 100644
--- a/doc/lightning-listnodes.7.md
+++ b/doc/lightning-listnodes.7.md
@@ -4,7 +4,7 @@ lightning-listnodes -- Command to get the list of nodes in the known network.
 SYNOPSIS
 --------
 
-**listnodes** \[id\]
+**listnodes** \[*id*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-listpays.7.md b/doc/lightning-listpays.7.md
index a862b51e1..0a0805784 100644
--- a/doc/lightning-listpays.7.md
+++ b/doc/lightning-listpays.7.md
@@ -4,7 +4,7 @@ lightning-listpays -- Command for querying payment status
 SYNOPSIS
 --------
 
-**listpays** \[bolt11\] \[payment_hash\] \[status\]
+**listpays** \[*bolt11*\] \[*payment_hash*\] \[*status*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-ping.7.md b/doc/lightning-ping.7.md
index 225b48bf7..7d0918598 100644
--- a/doc/lightning-ping.7.md
+++ b/doc/lightning-ping.7.md
@@ -4,7 +4,7 @@ lightning-ping -- Command to check if a node is up.
 SYNOPSIS
 --------
 
-**ping** *id* \[len\] \[pongbytes\]
+**ping** *id* \[*len*\] \[*pongbytes*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-plugin.7.md b/doc/lightning-plugin.7.md
index 3b4f455c1..88003f1c0 100644
--- a/doc/lightning-plugin.7.md
+++ b/doc/lightning-plugin.7.md
@@ -4,7 +4,7 @@ lightning-plugin -- Manage plugins with RPC
 SYNOPSIS
 --------
 
-**plugin** command \[parameter\] \[second\_parameter\]
+**plugin** command \[*parameter*\] \[*second\_parameter*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-reserveinputs.7.md b/doc/lightning-reserveinputs.7.md
index 2cdc30649..1b2f4768c 100644
--- a/doc/lightning-reserveinputs.7.md
+++ b/doc/lightning-reserveinputs.7.md
@@ -4,7 +4,7 @@ lightning-reserveinputs -- Construct a transaction and reserve the UTXOs it spen
 SYNOPSIS
 --------
 
-**reserveinputs** *psbt* [*exclusive*] [*reserve*]
+**reserveinputs** *psbt* \[*exclusive*\] \[*reserve*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-sendpsbt.7.md b/doc/lightning-sendpsbt.7.md
index fd150b9d3..056e68e62 100644
--- a/doc/lightning-sendpsbt.7.md
+++ b/doc/lightning-sendpsbt.7.md
@@ -4,7 +4,7 @@ lightning-sendpsbt -- Command to finalize, extract and send a partially signed b
 SYNOPSIS
 --------
 
-**sendpsbt** *psbt* [*reserve*]
+**sendpsbt** *psbt* \[*reserve*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-signpsbt.7.md b/doc/lightning-signpsbt.7.md
index cef87f311..883f9120c 100644
--- a/doc/lightning-signpsbt.7.md
+++ b/doc/lightning-signpsbt.7.md
@@ -4,7 +4,7 @@ lightning-signpsbt -- Command to sign a wallet's inputs on a provided bitcoin tr
 SYNOPSIS
 --------
 
-**signpsbt** *psbt* [*signonly*]
+**signpsbt** *psbt* \[*signonly*\]
 
 DESCRIPTION
 -----------
diff --git a/doc/lightning-unreserveinputs.7.md b/doc/lightning-unreserveinputs.7.md
index 869adbb3f..e84b8f6a0 100644
--- a/doc/lightning-unreserveinputs.7.md
+++ b/doc/lightning-unreserveinputs.7.md
@@ -4,7 +4,7 @@ lightning-unreserveinputs -- Release reserved UTXOs
 SYNOPSIS
 --------
 
-**unreserveinputs** *psbt* [*reserve*]
+**unreserveinputs** *psbt* \[*reserve*\]
 
 DESCRIPTION
 -----------