Merge branch 'meshtastic:master' into master

docs/community/_category_.yml

@@ -0,0 +1,7 @@
+position: 7
+label: Community
+collapsible: true # make the category collapsible
+link:
+  type: generated-index
+  title: Meshtastic Community
+  slug: /community

docs/community/local-groups.mdx

@@ -0,0 +1,30 @@
+---
+id: local-groups
+title: Local Groups
+sidebar_label: Local Groups
+slug: /community/local-groups
+sidebar_position: 1
+---
+
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+import LoRaRegions from "../blocks/_lora-regions.mdx";
+import Link from "@docusaurus/Link";
+
+Below is a list of groups that have been actively organizing Meshtastic networks in their regions. Feel free to contact
+them for assistance in getting started or if you're interested in contributing to the network. If you're a group
+organizer with an online presence and wish to be included in this list, please edit this page directly or reach out to
+us on [Discord](https://discord.com/invite/ktMAKGBnBs) to add your group.
+
+## Canada
+### Alberta
+- [YYC Mesh](https://yycmesh.com/)
+
+## United States
+### California
+- [SoCal Mesh](https://socalmesh.org)
+- [Laguna Mesh](https://lagunamesh.com)
+- [Mission Viejo Mesh](https://missionviejomesh.org/)
+
+### Hawaii
+- [Hawaii Meshnet](https://www.hawaiimesh.net/)

docs/community/software/index.mdx

@@ -1,16 +1,16 @@
 ---
 title: Community Apps
-slug: /software/community
+slug: /community/software
 sidebar_label: Community Apps
-sidebar_position: 10
+sidebar_position: 2
 ---
 
 The Meshtastic ecosystem is highly extensible, and a number of community projects have been made to fit different people's needs. If you wish to create your own application or module, please read the information in the developers section, and tell us about your project on the forum.
 
 Current community projects:
 
-- [ATAK (Android Team Awareness Kit) Forwarder](/docs/software/community/community-atak) - An ATAK plugin for forwarding CoT messages via a hardware layer which supports Meshtastic devices.
+- [ATAK (Android Team Awareness Kit) Forwarder](/docs/community/software/community-atak) - An ATAK plugin for forwarding CoT messages via a hardware layer which supports Meshtastic devices.
-- [Meshtasticator (Simulator)](/docs/software/community/community-meshtasticator) - Meshtasticator is a discrete-event and interactive simulator that mimics the radio section of the device software.
+- [Meshtasticator (Simulator)](/docs/community/software/community-meshtasticator) - Meshtasticator is a discrete-event and interactive simulator that mimics the radio section of the device software.
-- [Meshtastic Web API](/docs/software/community/meshtastic-web-api) - Meshtastic Web API provides a RESTful interface to interact with a Meshtastic node via a serial connection.
+- [Meshtastic Web API](/docs/community/software/meshtastic-web-api) - Meshtastic Web API provides a RESTful interface to interact with a Meshtastic node via a serial connection.
 
 Support for these projects should be sought from their respective authors.

docs/development/_category_.yml

@@ -1,6 +1,6 @@
 label: Development
 collapsible: true
-position: 7
+position: 8
 link:
   type: generated-index
   title: Developers