From 8e904fb14f080530042fa2e64dd8f0c05245305a Mon Sep 17 00:00:00 2001 From: Arul Kumaran <arulkumaran.devarajan@huawei.com> Date: Fri, 26 Mar 2021 04:34:56 +0000 Subject: [PATCH] License and Copyright Info: Resolved all threads. * Fixed review comments and resolved all threads in MR. Signed-off-by: Arul Kumaran <arulkumaran.devarajan@huawei.com> --- .gitignore | 2 +- conf.py | 2 +- quick-start/build-open-harmony.rst | 4 ++-- quick-start/freeRTOS-flavour.rst | 4 ++-- quick-start/linux-flavour.rst | 4 ++-- quick-start/zephyr-flavour.rst | 4 ++-- readme/Contributing-to-the-Documentation.rst | 4 ++-- readme/Contribution-Process.rst | 4 ++-- readthedocs.yml | 2 ++ readthedocs.yml.license | 3 --- requirements.txt | 2 +- supported-boards/96b-nitrogen.rst | 4 ++-- supported-boards/README.rst | 4 ++-- 13 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 readthedocs.yml.license diff --git a/.gitignore b/.gitignore index 6abf6b1..dadd486 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .. SPDX-FileCopyrightText: Huawei Inc. .. -.. SPDX-License-Identifier: CC-BY-4.0 +.. SPDX-License-Identifier: Apache-2.0 .project build contributing/*.md diff --git a/conf.py b/conf.py index b3b960b..81dac10 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,6 @@ #.. SPDX-FileCopyrightText: Huawei Inc. #.. -#.. SPDX-License-Identifier: CC-BY-4.0 +#.. SPDX-License-Identifier: Apache-2.0 # Configuration file for the Sphinx documentation builder. # # This file only contains a selection of the most common options. For a full diff --git a/quick-start/build-open-harmony.rst b/quick-start/build-open-harmony.rst index a720006..126e3c8 100644 --- a/quick-start/build-open-harmony.rst +++ b/quick-start/build-open-harmony.rst @@ -1,9 +1,9 @@ -.. _BuildOpenharmony: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _BuildOpenharmony: + .. include:: ../definitions.rst Building and Running |main_project_name| image diff --git a/quick-start/freeRTOS-flavour.rst b/quick-start/freeRTOS-flavour.rst index f9a71f7..4da1104 100644 --- a/quick-start/freeRTOS-flavour.rst +++ b/quick-start/freeRTOS-flavour.rst @@ -1,9 +1,9 @@ -.. _freertos_flavour: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _freertos_flavour: + .. include:: ../definitions.rst FreeRTOS flavour diff --git a/quick-start/linux-flavour.rst b/quick-start/linux-flavour.rst index 66784c2..3cc5a72 100644 --- a/quick-start/linux-flavour.rst +++ b/quick-start/linux-flavour.rst @@ -1,9 +1,9 @@ -.. _linux_flavour: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _linux_flavour: + .. include:: ../definitions.rst Linux flavour diff --git a/quick-start/zephyr-flavour.rst b/quick-start/zephyr-flavour.rst index 194ae87..5e8c1e7 100644 --- a/quick-start/zephyr-flavour.rst +++ b/quick-start/zephyr-flavour.rst @@ -1,9 +1,9 @@ -.. _zephyr_flavour: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _zephyr_flavour: + .. include:: ../definitions.rst Zephyr flavour diff --git a/readme/Contributing-to-the-Documentation.rst b/readme/Contributing-to-the-Documentation.rst index 85ed1d6..16b0350 100644 --- a/readme/Contributing-to-the-Documentation.rst +++ b/readme/Contributing-to-the-Documentation.rst @@ -1,9 +1,9 @@ -.. _document-contribution: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _document-contribution: + .. include:: ../definitions.rst Documentation Contribution diff --git a/readme/Contribution-Process.rst b/readme/Contribution-Process.rst index 1112bdc..4b6d3a1 100644 --- a/readme/Contribution-Process.rst +++ b/readme/Contribution-Process.rst @@ -1,9 +1,9 @@ -.. _contribution-process: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _contribution-process: + .. include:: ../definitions.rst Contribution Process diff --git a/readthedocs.yml b/readthedocs.yml index 8a5cd3b..85e6b11 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -1,3 +1,5 @@ +#.. SPDX-FileCopyrightText: Huawei Inc. +#.. SPDX-License-Identifier: CC-BY-4.0 # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details diff --git a/readthedocs.yml.license b/readthedocs.yml.license deleted file mode 100644 index b23a85e..0000000 --- a/readthedocs.yml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: Huawei Inc. - -SPDX-License-Identifier: CC-BY-4.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 688169b..d4ba658 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ .. SPDX-FileCopyrightText: Huawei Inc. .. -.. SPDX-License-Identifier: CC-BY-4.0 +.. SPDX-License-Identifier: Apache-2.0 six recommonmark diff --git a/supported-boards/96b-nitrogen.rst b/supported-boards/96b-nitrogen.rst index b67cf3c..6920a9b 100644 --- a/supported-boards/96b-nitrogen.rst +++ b/supported-boards/96b-nitrogen.rst @@ -1,9 +1,9 @@ -.. _nitogen: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _nitogen: + .. include:: ../definitions.rst 96Boards Nitrogen diff --git a/supported-boards/README.rst b/supported-boards/README.rst index ec2dcf4..47ffb67 100644 --- a/supported-boards/README.rst +++ b/supported-boards/README.rst @@ -1,9 +1,9 @@ -.. _supported-boards: - .. SPDX-FileCopyrightText: Huawei Inc. .. .. SPDX-License-Identifier: CC-BY-4.0 +.. _supported-boards: + .. include:: ../definitions.rst Supported Boards -- GitLab