Merge branch 'master' into network-config

docs/configuration/device-config/channels.mdx

@@ -62,17 +62,7 @@ To ensure devices with different PRIMARY channel name transmit on the same frequ
 
 ## Channel Settings Values
 
-The Channel Settings options are: ID, Name, PSK, Downlink Enabled, and Uplink Enabled. Channel settings are embedded in the `Channel` protobuf as a `ChannelSettings` protobuf and sent as an admin message.
-
-:::note
-The full globally unique ID will be constructed from the Name and ID (`<name>.<id>`) where ID is base36 encoded. Assuming that the number of Meshtastic users is below 20K (true for a long time) the chance of this 64 bit random number colliding with anyone else is super low. The penalty for collision is low as well.
-:::
-
-### ID
-
-Used to construct a globally unique channel ID.
-
-Set to `0` by default.
+The Channel Settings options are: Name, PSK, Downlink Enabled, and Uplink Enabled. Channel settings are embedded in the `Channel` protobuf as a `ChannelSettings` protobuf and sent as an admin message.
 
 ### Name
 
@@ -103,6 +93,8 @@ If enabled, messages from the mesh will be sent to the **public** internet throu
 
 Set to `false` by default for all channels.
 
+## Examples
+
 <Tabs
 groupId="settings"
 defaultValue="cli"
@@ -162,11 +154,6 @@ meshtastic --ch-set name "My Channel" --ch-set psk random --ch-set uplink_enable
 
 :::
 
-### Id
-
-```shell title="Set the PRIMARY channel ID"
-meshtastic --ch-set id 1234 --ch-index 0
-```
 
 ### Name
 

docs/configuration/device-config/lora.mdx

@@ -9,7 +9,7 @@ import Tabs from "@theme/Tabs";
 import TabItem from "@theme/TabItem";
 import LoRaRegions from "../../blocks/_lora-regions.mdx";
 
-The LoRa config options are: Region, Modem Preset, Max Hops, Transmit Power, Bandwidth, Spread Factor, Coding Rate, Frequency Offset, Transmit Enabled, Channel Number and Ignore Incoming Array. LoRa config uses an admin message sending a `Config.LoRa` protobuf.
+The LoRa config options are: Region, Modem Preset, Max Hops, Transmit Power, Bandwidth, Spread Factor, Coding Rate, Frequency Offset, Transmit Enabled, Channel Number, Ignore Incoming Array, Override Duty Cycle Limit, SX126x RX Boosted Gain, and Override Frequency. LoRa config uses an admin message sending a `Config.LoRa` protobuf.
 
 :::note
 In order to communicate fully, devices within a mesh must have identical settings for Region and Modem Preset, or identical custom Modem settings.
@@ -134,7 +134,7 @@ values={[
 
 :::info
 
-LoRa Config options such as Region, Modem Preset, and Hop Limit can be configured on Android.
+LoRa Config options are available on Android.
 
 1. Open the Meshtastic App
 2. Navigate to: **Vertical Ellipsis (3 dots top right) > Radio Configuration > LoRa**
@@ -145,7 +145,7 @@ LoRa Config options such as Region, Modem Preset, and Hop Limit can be configure
 <TabItem value="apple">
 
 :::info
-Configuration of Region, Modem Preset and Hop Limit is available on iOS, iPadOS and macOS at Settings > Radio Configuration > LoRa.
+Configuration of Region, Modem Preset, Transmit Enabled, Hop Limit, Channel Number and RX Boosted gain is available on iOS, iPadOS and macOS at Settings > Radio Configuration > LoRa.
 :::
 
 </TabItem>

docs/getting-started/flashing-firmware/esp32/external-serial-adapter.mdx

@@ -19,7 +19,7 @@ Make sure not to power the radio on without first attaching the antenna! You cou
 
 ## Background
 
-Situations that may require usage an external USB to Serial Adapter:
+Situations that may require using an external USB to Serial Adapter:
 
 - Due to the chip shortage, recently purchased devices such as the TTGO T-Beam may come with legacy or non-standard USB to Serial adapter chips that are unreliable in some cases.
 - Certain devices might have defective USB to Serial chip.

docs/getting-started/serial-drivers/test-serial-driver-installation.mdx

@@ -43,12 +43,13 @@ values={[
 </TabItem>
 <TabItem value="macos">
 
-1. Navigate to `Apple Menu  > About This Mac > System Report... > Hardware > USB`.
+1. Navigate to `Apple Menu  > About This Mac > More Info > System Report... > Hardware > USB`.
 2. You should see similar to one of the following entries:
 
 - `CP210X USB to UART Bridge Controller`
 - `CH9102 USB to UART Bridge Controller`
 - `WisCore RAK4631 Board`
+- `USB Single Serial`
 
 </TabItem>
 <TabItem value="windows">
@@ -58,7 +59,8 @@ values={[
 
 - `Silicon Labs CP210X USB to UART Bridge (COM5)`
 - `Silicon Labs CH9102 USB to UART Bridge (COM5)`
-- `FIXME (WISBLOCK OUTPUT)`
+- `USB-Enhanced-SERIAL CH9102 (COM5)`
+- `USB Serial Device (COM5)`
 
 </TabItem>
 </Tabs>