fix noon92 merge conflicts in #1310 (#1562)

docs/hardware/devices/rak-wireless/wisblock/peripherals.mdx

@@ -16,6 +16,7 @@ values={[
 {label: 'User Button', value: 'User Button'},
 {label: 'GPS Module', value: 'GPS'},
 {label: 'Buzzer', value: 'Buzzer'},
+{label: 'Vibration', value: 'Vibration'},
 {label: 'I/O Module', value: 'IO'},
 {label: 'Environmental Sensors', value:'Sensors'},
 {label: 'RTC Module', value:'RTC'}
@@ -37,8 +38,7 @@ One side of the switch should be on GND and the other on the recommended Pin per
 
 ### Resources
 
-For more information on the User Button functionality refer to
-
+For more information on the User Button functionality refer to 
 - [RAK WisBlock Hardware Buttons](https://meshtastic.org/docs/hardware/devices/rak/buttons/)
 
 </TabItem>
@@ -92,16 +92,43 @@ The RAK1910 is supported on the following base boards & slots:
 
 ## Buzzer
 
-The [RAK18001 Buzzer Module](https://store.rakwireless.com/products/wisblock-buzzer-module-rak18001) is currently being tested for integration with the External Notifications plugin. There is currently a known conflict with buzzer if the module is placed in Slot D, although other slots should work.
+### RAK Buzzer
 
-### Resources
+The [RAK18001 Buzzer Module](https://store.rakwireless.com/products/wisblock-buzzer-module-rak18001) may be used with the External Notifications plugin. There is currently a known conflict with the buzzer if the module is placed in Slot D, although other slots should work. NOTE: Many users have complained of the RAK buzzer being very quiet as currently implemented. As of yet, there is no fix for this issue.
+
+#### Resources
 
 - [RAK Documentation Center RAK18001](https://docs.rakwireless.com/Product-Categories/WisBlock/RAK18001/Overview/#product-description)
 - Purchase Links:
   - International
     - [RAK Wireless](https://store.rakwireless.com/products/wisblock-buzzer-module-rak18001)
 
-</TabItem>	
+### Third Party Buzzer
+
+Another option is to use a standard "passive buzzer" and a transistor (such as a 2N2222 transistor). This can be done by wiring the VCC pin to leg 1 of the transistor and the positive terminal of the buzzer to leg 3. To the central pin (2) of the transistor, connect pin RX1 on the Wisblock board. Connect the negative terminal of the buzzer to the GND pin on the Wisblock board. In settings, go to Device and set Redefine PIN_BUZZER (Buzzer GPIO) to 15. Then go to External Notification and set the module to Enabled, PWM buzzer to enabled, Alert Message Buzzer to enabled and Output Buzzer GPIO to 15. Save your settings and your buzzer should activate whenever you get an incoming message.
+
+#### Resources
+
+- Purchase Links:
+  - International
+    - Amazon: [Buzzer](https://www.amazon.com/dp/B018I1WBNQ)
+    - Amazon: [Transistor](https://www.amazon.com/dp/B07YN7KQQB)
+
+</TabItem>
+<TabItem value="Vibration">
+
+## Vibration
+
+To add vibration to your Wisblock device you'll need a standard 3V DC vibramotor and a transistor (such as a 2N2222 transistor). This can be done by wiring the VCC pin to leg 1 of the transistor and the positive (red) wire of the vibramotor to leg 3. To the central pin (2) of the transistor, connect pin AIN1 on the Wisblock board. Connect the negative wire (black) of the vibramotor to the GND pin on the Wisblock board. In settings, go to External Notification and set the module to Enabled, Alert Message Vibra to enabled and Output Vibra GPIO to 31. Save your settings and vibration should activate whenever you get an incoming message.
+
+### Resources
+
+- Purchase Links:
+  - International
+    - Amazon: [Vibrator](https://www.amazon.com/dp/B07Q1ZV4MJ)
+    - Amazon: [Transistor](https://www.amazon.com/dp/B07YN7KQQB)
+
+</TabItem>
 <TabItem value="IO">
 
 ## IO Module
@@ -126,7 +153,7 @@ There is development activity in progress to get sensors such as this added to t
   - International
     - [RAK Wireless](https://store.rakwireless.com/collections/wisblock-interface/products/adapter-module-rak13002)
 
-</TabItem>	
+</TabItem>
 <TabItem value="Sensors">
 
 ## Environmental Sensors
@@ -172,7 +199,7 @@ The [RAK1906 Environment Sensor](https://store.rakwireless.com/products/rak1906-
     - [RAK Wireless RAK1902](https://store.rakwireless.com/products/rak1902-kps22hb-barometric-pressure-sensor)
     - [RAK Wireless RAK1906](https://store.rakwireless.com/products/rak1906-bme680-environment-sensor)
 
-</TabItem>	
+</TabItem>
 <TabItem value="RTC">
 
 ## RTC Module
@@ -188,5 +215,5 @@ The [RAK12002 WisBlock RTC Module](https://store.rakwireless.com/products/rtc-mo
   - International
     - [RAK Wireless](https://store.rakwireless.com/products/rtc-module-rak12002)
 
-</TabItem>	
-</Tabs>
+</TabItem>
+</Tabs>

docs/software/meshtasticator/discrete-event-sim.mdx

@@ -40,7 +40,7 @@ Here we list some of the configurations, which you can change to model your scen
 
 ### Modem
 
-The LoRa modem ([see Meshtastic radio settings](/docs/overview/radio-settings#predefined-channels)) that is used, as defined below:
+The LoRa modem ([see Meshtastic radio settings](/docs/overview/radio-settings#presets)) that is used, as defined below:
 
 | Modem | Name           | Bandwidth (kHz) | Coding rate | Spreading Factor | Data rate (kbps) |
 | ----- | -------------- | --------------- | ----------- | ---------------- | ---------------- |