diff --git a/doc/man1/rigctl.1 b/doc/man1/rigctl.1
index a0d6e8e32..d7176bd1f 100644
--- a/doc/man1/rigctl.1
+++ b/doc/man1/rigctl.1
@@ -739,6 +739,7 @@ symbols.  For Yaesu rigs use memory#1-5 or up to 50 char msg
 .EX
 Example from command line:  rigctl -m 3073 -r /dev/ttyUSB0 b "CQ CQ DE ME"
 Yaesu example to send message#1: rigctl -m 1035 -r /dev/ttyUSB0 b 1
+.EE
 .
 .TP
 .BR 0xbb ", " stop_morse "
@@ -1406,62 +1407,59 @@ Returns current lock mode status 1=On, 2=Off (only useful when using rigctld)
 .
 .TP
 .BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fP \(aq
-.EX
 Can send ASCII string or 0xnn values or xnn values -- there can be no spaces in the command string.
 Possible terminator values are CR, LF, ;, ICOM, 0-100 (bytes to read), or -1 meaning unknown (will timeout on read)
 Examples (note that a ; must be escaped in Unix/Linux):
+.IP
 For Windows & Unix/Linux we have a new colon-separated format for hex digits
+.EX
   send_raw icom 0xFE:0xFE:0x94:0x03:0xFD Note: colon-separated does not have to be escaped on Unix/Linux
   send_raw -1 0xFE:0xFE:0x94:0x03:0xFD
   send_raw 14 0xFE:0xFE:0x94:0x03:0xFD
   Note that ASCII commands still require escaping the semicolon on Unix/Linux
   send_raw \; FA\;MD\;
-  
+.EE
 For Windows:
+.EX
   send_raw icom 0xFE;0xFE;0x94;0x03;0xFD
   send_raw -1 0xFE;0xFE;0x94;0x03;0xFD
   send_raw 14 0xFE;0xFE;0x94;0x03;0xFD
-
-  For Unix/Linux
+.EE
+For Unix/Linux
+.EX
   send_raw icom 0xFE\;0xFE\;0x94\;0x03\;0xFD
   send_raw \; FA\;MD\;
   send_raw -1 0xFE\;0xFE\;0x94\;0x03\;0xFD
   send_raw 14 0xFE\;0xFE\;0x94\;0x03\;0xFD
+.EE
 .
 .TP
 .BR client_version " \(aq" \fIString\fP "\(aq
-.EX
   Client can send its version to rigctld and get feedback on compatibility, deprecation, and alternatives
 .TP
 .BR hamlib_version
-.EX
 Returns hamlib version with ISO8601 date/time
 .
 .TP
 .BR test
-.EX
 Performs test routines.  Under development.
 .
 .TP
 .BR set_gpio " \(aq" \fIGPIO#\fP "\(aq
-.EX
 Sets GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
 Can also use 1,2,3,4
 .
 .TP
 .BR get_gpio " \(aq" \fIGPIO#\fP "\(aq
-.EX
 Reads GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
 Can also use 1,2,3,4
 .
 .TP
 .BR skip_init
-.EX
 Skips rig initialization -- useful when executing commands with rigctl to speed up things
 .
 .TP
 .BR freq_skip " " 'skip'
-.EX
 When skip!=0 skips setting freq on TX_VFO when in RX and on RX_VFO when in TX -- for use with gpredict and rigs that do not have TARGETABLE_VFO
 .
 .SH READLINE
diff --git a/doc/man1/rigctld.1 b/doc/man1/rigctld.1
index 5d2f18055..439c3a742 100644
--- a/doc/man1/rigctld.1
+++ b/doc/man1/rigctld.1
@@ -736,6 +736,7 @@ symbols.  For Yaesu rigs use memory# (1-5 for most rigs) or up to 50 char messag
 .EX
 Example from rigctld socket:  b CQ CQ DE ME
 Yaesu example to send message#1 frm rigctld socket: b 1
+.EE
 .
 .TP
 .BR 0xbb ", " stop_morse "
@@ -1211,38 +1212,34 @@ Returns current lock mode status 1=On, 2=Off (only useful with rigctld)
 .
 .TP
 .BR send_raw " \(aq" \fITerminator\fP "\(aq \(aq" \fIString\fP \(aq
-.EX
 Can send ASCII string or 0xnn values -- there can be no spaces in the command string.
 Possible terminator values are CR, LF, ;, ICOM, 0-100 (bytes to read), or -1 meaning unknown (will timeout on read)
 Examples:
+.EX
   send_raw ; FA;MD;
   send_raw icom 0xFE;0xFE;0x94;0x03;0xFD
   send_raw -1 0xFE;0xFE;0x94;0x03;0xFD
   send_raw 14 0xFE;0xFE;0x94;0x03;0xFD
+.EE
 .
 .TP
 .BR client_version " \(aq" \fIString\fP "\(aq
-.EX
 Client can send its version to rigctld and get feedback on compatibility, deprecation, and alternatives
 .TP
 .BR hamlib_version
-.EX
 Returns Hamlib version with ISO8601 date/time
 .
 .TP
 .BR test
-.EX
 Performs test routines.  Under development.
 .
 .TP
 .BR set_gpio " \(aq" \fIGPIO#\fP "\(aq
-.EX
 Sets GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
 Can also use 1,2,3,4
 .
 .TP
 .BR get_gpio " \(aq" \fIGPIO#\fP "\(aq
-.EX
 Reads GPIO1, GPIO2, GPIO3, GPIO4 on the GPIO ptt port
 Can also use 1,2,3,4
 .