From dbabeffa8a56d0671c9211b8057cad2cc00b01f0 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Tue, 9 Jun 2020 09:52:26 -0400 Subject: [PATCH] Properly reference MIT license consistently. --- docs/docs/dev-clean-room.md | 4 ++-- docs/docs/intro.md | 2 +- docs/docusaurus.config.js | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/docs/dev-clean-room.md b/docs/docs/dev-clean-room.md index 7ca0b256..c11171c8 100644 --- a/docs/docs/dev-clean-room.md +++ b/docs/docs/dev-clean-room.md @@ -12,7 +12,7 @@ Anyone wanting to contribute code to ZMK _must_ read this, and adhere to the ste ZMK Firmware is a [clean room design](https://en.wikipedia.org/wiki/Clean_room_design) keyboard firmware, that borrows/implements a lot of the features found in popular keyboard firmwares projects like [QMK](https://qmk.fm) -and [TMK](https://github.com/tmk/tmk_keyboard). However, in order for ZMK to use the Apache 2.0, it _must_ not +and [TMK](https://github.com/tmk/tmk_keyboard). However, in order for ZMK to use the MIT, it _must_ not incorporate any of the GPL licensed code from those projects. In order to achieve this, all code for ZMK has been implemented completely fresh, _without_ referencing, copying, @@ -22,7 +22,7 @@ or duplicating any of the GPL code found in those other projects, even though th Contributors to ZMK must adhere to the following standard. -- Implementations of features for ZMK _MUST_ not reuse any existing code from any projects not licensed with the Apache 2.0 license. +- Implementations of features for ZMK _MUST_ not reuse any existing code from any projects not licensed with the MIT license. - Contributors _MUST_ not study or refer to any GPL licensed source code while working on ZMK. - Contributors _MAY_ read the documentation from other GPL licensed projects, to gain a broad understanding of the behavior of certain features in order to implement equivalent features for ZMK. - Contributors _MAY_ refer to the [QMK Configurator](https://config.qmk.fm/) to inspect existing layouts/keymaps for diff --git a/docs/docs/intro.md b/docs/docs/intro.md index 15f7a1b3..3b6b87c8 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -4,7 +4,7 @@ title: Introduction to ZMK sidebar_label: Introduction --- -ZMK Firmware is an open source (Apache 2.0) keyboard +ZMK Firmware is an open source (MIT) keyboard firmware built on the [Zephyr Project](https://zephyrproject.com/) RTOS. The goal is to provider a powerful, featureful keyboard firmware that is free diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index bc3312d7..1653a0f1 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -47,18 +47,18 @@ module.exports = { { title: "Community", items: [ - // { - // label: "Stack Overflow", - // href: "https://stackoverflow.com/questions/tagged/docusaurus", - // }, - { - label: "Discord", - href: "https://discord.gg/VJnx9kr", - }, - // { - // label: "Twitter", - // href: "https://twitter.com/docusaurus", - // }, + // { + // label: "Stack Overflow", + // href: "https://stackoverflow.com/questions/tagged/docusaurus", + // }, + { + label: "Discord", + href: "https://discord.gg/VJnx9kr", + }, + // { + // label: "Twitter", + // href: "https://twitter.com/docusaurus", + // }, ], }, {