From cf17f4870d3b6a12272e342e93b14ff91bb9d0b9 Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Fri, 18 Aug 2017 17:11:15 -0700 Subject: [PATCH] doc: fix typos and licensing text Signed-off-by: David B. Kinder --- README.rst | 2 +- doc/index.rst | 2 +- doc/introduction/introducing_zephyr.rst | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index eb2ce3a8bb4..651e98fe6a3 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ resource-constrained systems: from simple embedded environmental sensors and LED wearables to sophisticated smart watches and IoT wireless gateways. The Zephyr kernel supports multiple architectures, including ARM Cortex-M, -Intel x86, ARC, NIOS II and RISC V, and a large number of +Intel x86, ARC, NIOS II, Tensilica Xtensa, and RISC V, and a large number of `supported boards`_. .. below included in doc/introduction/introduction.rst diff --git a/doc/index.rst b/doc/index.rst index ca8f00601f0..5c6c46e8778 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -25,7 +25,7 @@ Zephyr Project Documentation For more information about previous releases, please consult the published :ref:`zephyr_release_notes`. -The Zephyr OS is provided under the :download:`Apache 2.0 license. <../LICENSE>`. +The Zephyr OS is provided under the :download:`Apache 2.0 license<../LICENSE>`. The Zephyr OS also imports or reuses packages, scripts, and other files that are not covered by the Apache License. A list of those licenses can be found under :ref:`zephyr_licensing`. diff --git a/doc/introduction/introducing_zephyr.rst b/doc/introduction/introducing_zephyr.rst index 3c42e0ce372..6fe59374163 100644 --- a/doc/introduction/introducing_zephyr.rst +++ b/doc/introduction/introducing_zephyr.rst @@ -14,8 +14,16 @@ boards can be found :ref:`here `. Licensing ********* -The Zephyr project associated with the kernel makes it available -to users and developers under the Apache License, version 2.0. +Zephyr uses the `Apache 2.0 license`_ (as found in the LICENSE file in the +project's `GitHub repo`_). There are some +imported or reused components of the Zephyr project that use other licensing, +as described in :ref:`Zephyr_Licensing`. + +.. _Apache 2.0 license: + https://github.com/zephyrproject-rtos/zephyr/blob/master/LICENSE + +.. _GitHub repo: https://github.com/zephyrproject-rtos/zephyr + Distinguishing Features ***********************