diff --git a/common/source/docs/common-pixhawk-serial-names.rst b/common/source/docs/common-pixhawk-serial-names.rst
index 916cec0522..3e1e847f55 100644
--- a/common/source/docs/common-pixhawk-serial-names.rst
+++ b/common/source/docs/common-pixhawk-serial-names.rst
@@ -9,7 +9,7 @@ Cube where ArduPilot is concerned.  This document attempts to supply a
 mapping between them.
 
 +-----------+-------------+------------+--------------+--------------+-----------------+----------------+
-| DataSheet | ParamPrefix | HW Label   | Cube Full CB | Def Role     | SERIAL_CONTROL* | Notes          |
+| DataSheet | ParamPrefix | HW Label   | Cube Full CB | Default Role | SERIAL_CONTROL* | Notes          |
 +===========+=============+============+==============+==============+=================+================+
 |           | \SERIAL0_   |            | Console      | Console      |                 | Micro-USB Plug |
 +-----------+-------------+------------+--------------+--------------+-----------------+----------------+
diff --git a/dev/source/docs/learning-ardupilot-uarts-and-the-console.rst b/dev/source/docs/learning-ardupilot-uarts-and-the-console.rst
index f3ef39a236..9d34743837 100644
--- a/dev/source/docs/learning-ardupilot-uarts-and-the-console.rst
+++ b/dev/source/docs/learning-ardupilot-uarts-and-the-console.rst
@@ -13,25 +13,25 @@ The 8 UARTs
 
 The ArduPilot HAL currently defines 8 UARTs. The HAL itself does not define any particular roles for these UARTs, but the other parts of ArduPilot assume they will be assigned particular functions. The command-line options for using with sim_vehicle.py the serial port should be preceded by :code:`-A` to pass along to the vehicle binary. Make sure to include the :code:`uart` protocol. Specifying a baudrate is not required, but is more consistent. For example, :code:`sim_vehicle.py --console --map -A --serial5=uart:/dev/ttyS15:115200`.
 
-+-------------+----------------------+----------+-------------------------+
-| ParamPrefix | Sim_vehicle Cmd Line | Def Role | Default Connection      |
-+=============+======================+==========+=========================+
-| \SERIAL0_   | \- -serial0=         | Console  | tcp:localhost:5760:wait |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL1_   | \- -serial1=         | MAVLink  | tcp:localhost:5762      |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL2_   | \- -serial2=         | MAVLink  | tcp:localhost:5763      |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL3_   | \- -serial3=         | GPS      | Simulated GPS           |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL4_   | \- -serial4=         | GPS      | Simulated GPS           |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL5_   | \- -serial5=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL6_   | \- -serial6=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL7_   | \- -serial7=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
++-------------+----------------------+--------------+-------------------------+
+| ParamPrefix | Sim_vehicle Cmd Line | Default Role | Default Connection      |
++=============+======================+==============+=========================+
+| \SERIAL0_   | \- -serial0=         | Console      | tcp:localhost:5760:wait |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL1_   | \- -serial1=         | MAVLink      | tcp:localhost:5762      |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL2_   | \- -serial2=         | MAVLink      | tcp:localhost:5763      |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL3_   | \- -serial3=         | GPS          | Simulated GPS           |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL4_   | \- -serial4=         | GPS          | Simulated GPS           |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL5_   | \- -serial5=         |              |                         |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL6_   | \- -serial6=         |              |                         |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL7_   | \- -serial7=         |              |                         |
++-------------+----------------------+--------------+-------------------------+
 
 The following are options for connecting a SITL serial port:
 
diff --git a/dev/source/docs/sitl-serial-mapping.rst b/dev/source/docs/sitl-serial-mapping.rst
index 1ae8864dce..606b0372ae 100644
--- a/dev/source/docs/sitl-serial-mapping.rst
+++ b/dev/source/docs/sitl-serial-mapping.rst
@@ -10,22 +10,22 @@ Archived: SITL Serial Mapping
 
 This document attempts to supply information about the virtual serial ports present in ArduPilot's SITL.
 
-+-------------+----------------------+----------+-------------------------+
-| ParamPrefix | Sim_vehicle Cmd Line | Def Role | Default Connection      |
-+=============+======================+==========+=========================+
-| \SERIAL0_   | \- -serial0=         | Console  | tcp:localhost:5760:wait |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL1_   | \- -serial1=         | MAVLink  | tcp:localhost:5762      |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL2_   | \- -serial2=         | MAVLink  | tcp:localhost:5763      |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL3_   | \- -serial3=         | GPS      | Simulated GPS           |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL4_   | \- -serial4=         | GPS      | Simulated GPS           |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL5_   | \- -serial5=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL6_   | \- -serial6=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
-| \SERIAL7_   | \- -serial7=         |          |                         |
-+-------------+----------------------+----------+-------------------------+
++-------------+----------------------+--------------+-------------------------+
+| ParamPrefix | Sim_vehicle Cmd Line | Default Role | Default Connection      |
++=============+======================+==============+=========================+
+| \SERIAL0_   | \- -serial0=         | Console      | tcp:localhost:5760:wait |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL1_   | \- -serial1=         | MAVLink      | tcp:localhost:5762      |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL2_   | \- -serial2=         | MAVLink      | tcp:localhost:5763      |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL3_   | \- -serial3=         | GPS          | Simulated GPS           |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL4_   | \- -serial4=         | GPS          | Simulated GPS           |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL5_   | \- -serial5=         |              |                         |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL6_   | \- -serial6=         |              |                         |
++-------------+----------------------+--------------+-------------------------+
+| \SERIAL7_   | \- -serial7=         |              |                         |
++-------------+----------------------+--------------+-------------------------+