From 5dd2e660de3e1a232fc5f3de6e7e8e01d5dd2dcf Mon Sep 17 00:00:00 2001 From: rcarteraz Date: Tue, 23 Jan 2024 13:40:02 -0700 Subject: [PATCH] consolidate license and trademark pages --- docs/legal/code_of_conduct.mdx | 1 + ...demark.mdx => licensing-and-trademark.mdx} | 20 ++++++++++++---- docs/legal/licensing.mdx | 11 --------- docs/legal/privacy.mdx | 2 +- docs/legal/trademark-grants.mdx | 23 +++++++++++++++++++ vercel.json | 8 +++++++ 6 files changed, 49 insertions(+), 16 deletions(-) rename docs/legal/{trademark.mdx => licensing-and-trademark.mdx} (91%) delete mode 100644 docs/legal/licensing.mdx diff --git a/docs/legal/code_of_conduct.mdx b/docs/legal/code_of_conduct.mdx index a059d1fc..aa79bbfb 100644 --- a/docs/legal/code_of_conduct.mdx +++ b/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 diff --git a/docs/legal/trademark.mdx b/docs/legal/licensing-and-trademark.mdx similarity index 91% rename from docs/legal/trademark.mdx rename to docs/legal/licensing-and-trademark.mdx index 782783ba..49661b34 100644 --- a/docs/legal/trademark.mdx +++ b/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). diff --git a/docs/legal/licensing.mdx b/docs/legal/licensing.mdx deleted file mode 100644 index bfbd0b58..00000000 --- a/docs/legal/licensing.mdx +++ /dev/null @@ -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. diff --git a/docs/legal/privacy.mdx b/docs/legal/privacy.mdx index 86d555aa..032f7398 100644 --- a/docs/legal/privacy.mdx +++ b/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. diff --git a/docs/legal/trademark-grants.mdx b/docs/legal/trademark-grants.mdx index ef779ab3..7f530f6f 100644 --- a/docs/legal/trademark-grants.mdx +++ b/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 diff --git a/vercel.json b/vercel.json index 24eb9515..fcaa6263 100644 --- a/vercel.json +++ b/vercel.json @@ -55,6 +55,14 @@ { "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" } ] } \ No newline at end of file