Merge pull request #939 from rcarteraz/master

Update Trademark to include M-Powered/PWRD Logos

docs/legal/code_of_conduct.mdx

@@ -2,6 +2,7 @@
 id: conduct
 title: Code of Conduct
 sidebar_label: Conduct
+sidebar_position: 1
 ---
 
 # Contributor Covenant Code of Conduct

docs/legal/index.mdx

@@ -4,19 +4,19 @@ sidebar_label: Legal
 slug: /legal
 sidebar_position: 9
 ---
-
 ## Disclaimers
 
-This project is still pretty young but moving at a pretty good pace. Not all features are fully implemented in the current alpha builds.
+**Project Status:** Meshtastic is now at a stage where it offers a _mostly_ stable and reliable functionality, thanks to the dedicated efforts of our development team. While the core aspects of the project are well-established, we are still rapidly evolving and actively adding new features. As we continue to innovate and expand, some features in our current builds are in development, reflecting our commitment to continuous improvement and growth. We appreciate your engagement as we advance further in this exciting journey.
 
-- We don't make these devices and they haven't been tested by UL or the FCC. If you use them, you are experimenting and we can't promise they won't burn your house down ;-)
-- The encryption implementation is good but see this list of [caveats](/docs/overview/encryption#summary-of-strengthsweaknesses-of-our-current-implementation) to determine risks you might face.
+**Safety and Regulations:** Please be aware that the devices related to this project are not manufactured by us and have not been tested by regulatory organizations such as UL or the FCC. Therefore, using these devices should be considered experimental. While we focus on safety in our designs, we advise users to exercise caution to avoid any potential risks.
+
+**Encryption and Security:** Our encryption measures are robust and a significant aspect of our project. However, it's important to recognize the limitations and risks associated with any encryption technology. For an in-depth understanding of these aspects, kindly review this list of [caveats](/docs/overview/encryption#summary-of-strengthsweaknesses-of-our-current-implementation).
 
 ## Legal FAQ
 
 ### Q: Do you have plans to commercialize this project
 
-Nope. though if some other person/group wanted to use this software and a more customized device we think that would be awesome (as long as they obey the GPL license). [See more details here](/docs/legal/licensing).
+**A:** We do not have plans to commercialize Meshtastic. However, we are open to and supportive of others using our software in their commercial endeavors, provided they comply with the GPL license. More details can be found on [our licensing guidelines](/docs/legal/licensing-and-trademark).
 
 ### Q: Does this project use patented algorithms?
 

docs/legal/licensing-and-trademark.mdx

@@ -1,12 +1,24 @@
 ---
-id: trademark
-title: Trademark Rules & Brand Guidelines
-sidebar_label: Trademark
+id: licensing-and-trademark
+title: Licensing & Trademark Rules
+sidebar_label: Licensing & Trademark
+sidebar_position: 3
 ---
 
 Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see [GitHub](https://github.com/meshtastic) for details. No warranty is provided - use at your own risk.
 
-## Meshtastic Trademark Policy
+## Licensing
+
+You are hereby granted a two-year, non-exclusive license to use the Meshtastic® logo and trademark on your products or projects, in accordance with our [trademark guidelines](/docs/legal/licensing-and-trademark#meshtastic-trademark-policy--brand-guidelines). While there is no fee for this usage, we suggest allocating $1 per unit sold to a fund that will eventually support Meshtastic. This contribution, though not mandatory, is greatly appreciated.
+
+Please ensure the inclusion of the following statement in your support documentation:
+
+
+> Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see GitHub for details. No warranty is provided - use at your own risk.
+
+Alternatively, if you prefer, you can use our community project logos, "M-Powered" and "M-PWRD", which are specifically designed for projects that utilize Meshtastic technology. These logos offer a straightforward way to show compatibility with our platform without needing a trademark grant. For more information on these logos, including usage guidelines and design files, please refer to [Community Project Logos: M-Powered & M-PWRD](/docs/legal/licensing-and-trademark#community-project-logos-m-powered--m-pwrd).
+
+## Meshtastic Trademark Policy & Brand Guidelines
 
 Meshtastic, and Meshtastic logo ("Meshtastic Logo"), either separately or in combination, are hereinafter referred to as "Meshtastic Trademarks" and are trademarks of the Meshtastic LLC. Except as provided in these guidelines, you may not use the Meshtastic Trademarks or any confusingly similar mark as a trademark for your product, or use the Meshtastic Trademarks in any other manner that might cause confusion in the marketplace, including but not limited to in advertising, on websites, or on software. In fact, the law obligates trademark owners to police their marks and prevent the use of confusingly similar names by third parties. If you have questions about this policy, please contact the Trademark Supervisor by enquiring at [trademark@meshtastic.org](mailto:trademark@meshtastic.org).
 
@@ -84,6 +96,21 @@ It is permissible to use the Meshtastic Trademarks in the title and content of a
 - the Logo Usage Guidelines are strictly observed.
 - a copy of the use of the Meshtastic Trademarks is provided to the Trademark Supervisor within seven (7) days of its initial use, for example by sending a URL or other copy of such use.
 
+### Community Project Logos: M-Powered & M-PWRD
+
+We are excited to introduce two new logos for our community members: the "M-Powered" and "M-PWRD" logos. These logos are designed to be used by projects that are powered by Meshtastic technology, offering an easy way to indicate compatibility with our platform.
+
+#### Usage Guidelines
+
+- **Variants:**
+  - "M-Powered" with the full word "powered."
+  - "M-PWRD" with an abbreviated "PWRD" for a cleaner, concise design. This version is particularly recommended for 3D printed objects such as enclosures.
+- **Freedom of Use:** Unlike the main Meshtastic logo, using the "M-Powered" or "M-PWRD" logos does not require a trademark grant. These logos are intended for broader use in the community to signify that a project is Meshtastic-compatible.
+- **Appropriate Contexts:** In most scenarios, the "M-Powered" or "M-PWRD" logos will be more suitable than the official Meshtastic logo. They are ideal for project documentation, promotional materials, and product designs to show compatibility with Meshtastic.
+- **Non-Endorsement:** It's important to note that using these logos does not imply endorsement or sponsorship by the Meshtastic Project. They are purely for indicating compatibility or association with Meshtastic technology.
+
+We have provided design files for these logos in our [Meshtastic Design repository](https://github.com/meshtastic/design/tree/master/Meshtastic%20Powered%20Logo).
+
 ## Usage that Require Prior Written Approval
 
 ### Social Media

docs/legal/licensing.mdx

@@ -1,11 +0,0 @@
----
-id: licensing
-title: Licensing & Commercial Projects Usage
-sidebar_label: Licensing
----
-
-You are hereby granted a two-year non-exclusive license to use the Meshtastic® logo and trademark on your product/project provided you adhere to the [trademark guidelines](/docs/legal/trademark). No fee is required for this usage, though if you wish keeping $1/unit set-aside so that it can eventually fund Meshtastic it would be appreciated.
-
-We ask that you include a line in your support text that states:
-
-> Meshtastic® is a registered trademark of Meshtastic LLC. Meshtastic software components are released under various licenses, see GitHub for details. No warranty is provided - use at your own risk.

docs/legal/privacy.mdx

@@ -2,7 +2,7 @@
 id: privacy
 title: Meshtastic privacy policy
 sidebar_label: Privacy
-custom_edit_url: null
+sidebar_position: 2
 ---
 
 We don't collect any personal identifying information. We never capture usernames, the contents of your texts, or your location data.

docs/legal/trademark-grants.mdx

@@ -2,8 +2,31 @@
 id: trademark-grants
 title: Trademark Grants
 sidebar_label: Trademark Grants
+sidebar_position: 4
 ---
 
+## Overview
+
+A trademark grant from Meshtastic LLC is an authorization given to individuals, organizations, or projects to use the Meshtastic® trademark and associated logos. This grant is provided under specific terms and conditions that align with Meshtastic's policies. It allows the grantee to legally use the Meshtastic® trademark in connection with their products, services, or projects, indicating compatibility or association with Meshtastic technology. The grant is typically non-exclusive and time-bound, ensuring that the usage adheres to the quality and standards set by Meshtastic LLC while fostering community engagement and innovation. For detailed guidelines and conditions of our trademark policy, please visit our [Licensing and Trademark page](/docs/legal/licensing-and-trademark).
+
+## How to Request a Trademark Grant
+
+If you are interested in obtaining a trademark grant for using the Meshtastic® trademark and logos, please follow these steps:
+
+1. **Prepare Your Request**: Review the currently approved trademark grants on this page to understand the typical format and information required.
+
+2. **Edit the Page**: At the bottom of this page, click "Edit this page." This action will redirect you to GitHub, where the page is hosted. Note: A GitHub account is required to make edits. If you don't have one, you will need to create it.
+
+3. **Add Your Information**: Once on GitHub, use the existing grants as a template to add your information. Include details such as your name or organization, the nature of your project, and how you intend to use the Meshtastic® trademark.
+
+4. **Submit for Review**: After adding your information, submit your edit as a pull request. This request will be reviewed by one of the Meshtastic project admins.
+
+5. **Approval Process**: The admin team will review your submission to ensure it aligns with our trademark policies and community standards. If approved, your grant will be listed on this page.
+
+This process ensures transparency and community involvement in the granting of trademark usage, while also maintaining the integrity and purpose of the Meshtastic brand.
+
+## Active Trademark Grants
+
 - Grant: http://meshtastic.pt
   - Details: Meshtastic.pt is a fan page created before the trademark usage guidelines were authored. Agreement with Sérgio Matos that meshtastic.pt may continue use of meshtastic in domain name provided they stay non commercial and maintain that they are non-official. The grant is revokable at any time for any reason.
 - Grant: https://meshbrasil.com

vercel.json

@@ -55,6 +55,22 @@
     {
       "source": "/docs/hardware/supported-hardware",
       "destination": "/docs/hardware/devices"
+    },
+    {
+      "source": "/docs/legal/trademark",
+      "destination": "/docs/legal/licensing-and-trademark"
+    },
+    {
+      "source": "/docs/legal/licensing",
+      "destination": "/docs/legal/licensing-and-trademark"
+    },
+    {
+      "source": "/docs/legal/trademark/",
+      "destination": "/docs/legal/licensing-and-trademark"
+    },
+    {
+      "source": "/docs/legal/licensing/",
+      "destination": "/docs/legal/licensing-and-trademark"
     }
   ]
 }