Skip to content
Snippets Groups Projects
Commit 753dee20 authored by Martyn Welch's avatar Martyn Welch Committed by Emanuele Aina
Browse files

Move policy documentation to a new "policies" section


Start organising the documents on the website. Move documents that are
concerned with Apertis policies (one way or another) into a "policies"
section and link to this from the main page.

Signed-off-by: default avatarMartyn Welch <martyn.welch@collabora.com>
parent 2d082093
No related branches found
No related tags found
1 merge request!28Wip/martyn/website improvements
...@@ -31,7 +31,7 @@ languageCode = "en-us" ...@@ -31,7 +31,7 @@ languageCode = "en-us"
[menu] [menu]
# Header # Header
[[menu.main]] [[menu.main]]
url = "community/" url = "policies/community/"
name = "Community" name = "Community"
weight = 1 weight = 1
[[menu.main]] [[menu.main]]
...@@ -45,23 +45,23 @@ languageCode = "en-us" ...@@ -45,23 +45,23 @@ languageCode = "en-us"
# Footer # Footer
[[menu.footer]] [[menu.footer]]
url = "copyrights/" url = "policies/copyrights/"
name = "Copyright Statement" name = "Copyright Statement"
weight = 1 weight = 1
[[menu.footer]] [[menu.footer]]
url = "about_apertis/" url = "policies/about_apertis/"
name = "About Apertis" name = "About Apertis"
weight = 2 weight = 2
[[menu.footer]] [[menu.footer]]
url = "privacy_policy/" url = "policies/privacy_policy/"
name = "Privacy Policy" name = "Privacy Policy"
weight = 3 weight = 3
[[menu.footer]] [[menu.footer]]
url = "general_disclaimer/" url = "policies/general_disclaimer/"
name = "Disclaimer" name = "Disclaimer"
weight = 4 weight = 4
[[menu.footer]] [[menu.footer]]
url = "code_of_conduct/" url = "policies/code_of_conduct/"
name = "Code of Conduct" name = "Code of Conduct"
weight = 5 weight = 5
......
...@@ -33,7 +33,7 @@ Apertis undergoes regular [automated and manual testing](https://qa.apertis.org) ...@@ -33,7 +33,7 @@ Apertis undergoes regular [automated and manual testing](https://qa.apertis.org)
## Further Links ## Further Links
* [Licensing](https://designs.apertis.org/latest/license-expectations.html) * [Policy Documentation]( {{< ref "policies" >}} )
* [Quality Assurance]( {{< ref "/qa/_index.md" >}} ) * [Quality Assurance]( {{< ref "/qa/_index.md" >}} )
* [Test results](https://lavaphabbridge.apertis.org) * [Test results](https://lavaphabbridge.apertis.org)
...@@ -52,7 +52,7 @@ For more information, see [Release flow and product lines](https://designs.apert ...@@ -52,7 +52,7 @@ For more information, see [Release flow and product lines](https://designs.apert
* Current stable release: [v2020.0]( {{< ref "/release/v2020.0/releasenotes.md" >}} ) * Current stable release: [v2020.0]( {{< ref "/release/v2020.0/releasenotes.md" >}} )
* Current old stable release: [v2019.2]( {{< ref "/release/v2019.2/releasenotes.md" >}} ) * Current old stable release: [v2019.2]( {{< ref "/release/v2019.2/releasenotes.md" >}} )
* Current development release: [v2021dev1]( {{< ref "/release/v2021dev1/releasenotes.md" >}} ) * Current development release: [v2021dev1]( {{< ref "/release/v2021dev1/releasenotes.md" >}} )
* [Further Releases]( {{< ref "/releases.md" >}} ) * [Further Releases]( {{< ref "releases.md" >}} )
# Developer Ready # Developer Ready
......
...@@ -2,38 +2,9 @@ ...@@ -2,38 +2,9 @@
date = "2017-05-11" date = "2017-05-11"
weight = 100 weight = 100
title = "Marketing resources" title = "Presentations"
aliases = [
"/old-wiki/Marketing_resources"
]
+++ +++
## Apertis key visual
The Apertis key visuals can be used to represent Apertis. Use them on
slides and when talking about Apertis.
These key visuals are copyright Collabora Ltd and licensed under
[BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/).
Visual with the words "Apertis":
![Apertis-100.png](/images/apertis-100.png)
- ![100×100 px](/images/apertis-100.png)
- ![500×500 px](/images/apertis-500.png)
- ![SVG](/images/apertis_logo.svg)
Visual without text:
![A-100.png](/images/a-100.png)
- ![100×100 px](/images/a-100.png)
- ![500×500 px](/images/a-500.png)
## Slides and presentations
These are some of the slides and presentations which members of the These are some of the slides and presentations which members of the
Apertis community have previously shared (ordered newest to oldest): Apertis community have previously shared (ordered newest to oldest):
......
...@@ -52,7 +52,7 @@ packages and package update will be required (e.g. kernel, bootloader, ...@@ -52,7 +52,7 @@ packages and package update will be required (e.g. kernel, bootloader,
firmware, graphics stack). firmware, graphics stack).
For more information about the requirements with respect to hardware For more information about the requirements with respect to hardware
enabling see the [Hardware Interfaces]( {{< ref "/hardware_interfaces.md" >}} ) enabling see the [Hardware Enablement]( {{< ref "hardware_enablement.md" >}} )
page. page.
Once the hardware support is available in packages and accepted in the Once the hardware support is available in packages and accepted in the
......
...@@ -13,9 +13,9 @@ Apertis is a ...@@ -13,9 +13,9 @@ Apertis is a
[FOSS](https://en.wikipedia.org/wiki/Free_and_open-source_software) [FOSS](https://en.wikipedia.org/wiki/Free_and_open-source_software)
([Free](https://en.wikipedia.org/wiki/Free_software) and [open ([Free](https://en.wikipedia.org/wiki/Free_software) and [open
source](https://en.wikipedia.org/wiki/Open-source_software)) GNU/Linux-based source](https://en.wikipedia.org/wiki/Open-source_software)) GNU/Linux-based
platform for infotainment in automotive vehicles. It is a distribution platform tailored to the automotive needs and fit for a wide variety of
derived from Debian/Ubuntu and geared towards the creation of electronic devices. It is a distribution derived from Debian/Ubuntu and geared
product-specific images for ARM and Intel x86 systems. towards the creation of product-specific images for ARM and Intel x86 systems.
Apertis comes with a range of built-in features, which can be expanded Apertis comes with a range of built-in features, which can be expanded
upon with custom applications that are available through an App Store. upon with custom applications that are available through an App Store.
...@@ -33,7 +33,7 @@ Apertis is primarily licensed under the [Mozilla Public License ...@@ -33,7 +33,7 @@ Apertis is primarily licensed under the [Mozilla Public License
Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/), with images and Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/), with images and
documentation licensed under [CC documentation licensed under [CC
BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/legalcode). BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/legalcode).
You can find more information about the licensing for each repository in Individual You can find more information about the licensing for each repository in
the `COPYING` files in each repository. the `COPYING` files in each repository.
Apertis also makes use of other projects such as the Linux kernel, Apertis also makes use of other projects such as the Linux kernel,
......
File moved
...@@ -25,4 +25,4 @@ The best ways to get in touch with the community are through: ...@@ -25,4 +25,4 @@ The best ways to get in touch with the community are through:
contact *listmaster at apertis.org* contact *listmaster at apertis.org*
Remember that all contributors to Apertis are expected to [treat others Remember that all contributors to Apertis are expected to [treat others
with respect]( {{< ref "/code_of_conduct.md" >}} ). with respect]( {{< ref "code_of_conduct.md" >}} ).
...@@ -9,29 +9,29 @@ aliases = [ ...@@ -9,29 +9,29 @@ aliases = [
] ]
+++ +++
The text of the Apertis wiki is copyrighted (automatically, under the The text of the Apertis website is copyrighted (automatically, under the
Berne Convention) by Apertis editors and contributors and is formally Berne Convention) by Apertis editors and contributors and is formally
licensed under Creative Commons Attribution-ShareAlike 3.0 Unported licensed under Creative Commons Attribution-ShareAlike 4.0 Unported
License (CC BY-SA) unless explicitly stated otherwise. License (CC BY-SA) unless explicitly stated otherwise.
The licenses that the Apertis wiki uses grant free access to our content The licenses that the Apertis website uses grant free access to our content
in the same sense that free software is licensed freely. Apertis wiki in the same sense that free software is licensed freely. Apertis website
content can be copied, modified, and redistributed *if and only if* the content can be copied, modified, and redistributed *if and only if* the
copied version is made available on the same terms to others and copied version is made available on the same terms to others and
acknowledgment of the authors of the Apertis wiki article used is acknowledgment of the authors of the Apertis website article used is
included (a link back to the article is generally thought to satisfy the included (a link back to the article is generally thought to satisfy the
attribution requirement; see below for more details). Copied Apertis attribution requirement; see below for more details). Copied Apertis
wiki content will therefore remain *free* under appropriate license and website content will therefore remain *free* under appropriate license and
can continue to be used by anyone subject to certain restrictions, most can continue to be used by anyone subject to certain restrictions, most
of which aim to ensure that freedom. This principle is known as of which aim to ensure that freedom. This principle is known as
**copyleft** in contrast to typical copyright licenses. **copyleft** in contrast to typical copyright licenses.
The English text of the CC BY-SA license is the only legally binding The English text of the CC BY-SA license is the only legally binding
restriction between authors and users of the Apertis wiki content. restriction between authors and users of the Apertis website content.
## Contributors' rights and obligations ## Contributors' rights and obligations
If you contribute text directly to the Apertis wiki, you thereby license If you contribute text directly to the Apertis website, you thereby license
it to the public for reuse under CC BY-SA. Non-text media may be it to the public for reuse under CC BY-SA. Non-text media may be
contributed under a variety of different licenses that support the contributed under a variety of different licenses that support the
general goal of allowing unrestricted re-use and re-distribution. general goal of allowing unrestricted re-use and re-distribution.
...@@ -40,7 +40,7 @@ If you want to import text that you have found elsewhere or that you ...@@ -40,7 +40,7 @@ If you want to import text that you have found elsewhere or that you
have co-authored with others, you can only do so if it is available have co-authored with others, you can only do so if it is available
under terms that are compatible with the CC BY-SA license. under terms that are compatible with the CC BY-SA license.
You retain copyright to materials you contribute to the Apertis wiki, You retain copyright to materials you contribute to the Apertis website,
text and media. Copyright is *never* transferred to Apertis. You can text and media. Copyright is *never* transferred to Apertis. You can
later republish and relicense them in any way you like. However, you can later republish and relicense them in any way you like. However, you can
never retract or alter the license for copies of materials that you never retract or alter the license for copies of materials that you
...@@ -57,7 +57,7 @@ license on their behalf. ...@@ -57,7 +57,7 @@ license on their behalf.
### Re-use of text ### Re-use of text
- Attribution: To re-distribute text from the Apertis wiki in any - Attribution: To re-distribute text from the Apertis website in any
form, provide credit to the authors either by including a) a form, provide credit to the authors either by including a) a
hyperlink (where possible) or URL to the page or pages you are hyperlink (where possible) or URL to the page or pages you are
re-using, b) a hyperlink (where possible) or URL to an alternative, re-using, b) a hyperlink (where possible) or URL to an alternative,
...@@ -68,23 +68,23 @@ license on their behalf. ...@@ -68,23 +68,23 @@ license on their behalf.
or irrelevant contributions.) or irrelevant contributions.)
Copyleft/Share Alike: If you make modifications or additions to the Copyleft/Share Alike: If you make modifications or additions to the
page you re-use, you must license them under the Creative Commons page you re-use, you must license them under the Creative Commons
Attribution-Share-Alike License 3.0 or later. Attribution-Share-Alike License 4.0 or later.
Indicate changes: If you make modifications or additions, you must Indicate changes: If you make modifications or additions, you must
indicate in a reasonable fashion that the original work has been indicate in a reasonable fashion that the original work has been
modified. If you are re-using the page in a wiki, for example, modified. If you are re-using the page in a website, for example,
indicating this in the page history is sufficient. indicating this in the page history is sufficient.
Licensing notice: Each copy or modified version that you distribute Licensing notice: Each copy or modified version that you distribute
must include a licensing notice stating that the work is released must include a licensing notice stating that the work is released
under CC BY-SA and either a) a hyperlink or URL to the text of the under CC BY-SA and either a) a hyperlink or URL to the text of the
license or b) a copy of the license. For this purpose, a suitable license or b) a copy of the license. For this purpose, a suitable
URL is: <http://creativecommons.org/licenses/by-sa/3.0/> URL is: <http://creativecommons.org/licenses/by-sa/4.0/>
**For further information**, please refer to the [legal code of the CC **For further information**, please refer to the [legal code of the CC
BY-SA License](http://creativecommons.org/licenses/by-sa/3.0/legalcode). BY-SA License](http://creativecommons.org/licenses/by-sa/4.0/legalcode).
## Notes ## Notes
This page applies only to the Apertis wiki. The Apertis code is licensed This page applies only to the Apertis website. The Apertis code is licensed
separately and the licenses can be found in the code repositories, separately and the licenses can be found in the code repositories,
normally in a file called COPYING. normally in a file called COPYING.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
date = "2019-12-03" date = "2019-12-03"
weight = 100 weight = 100
title = "Hardware Interfaces" title = "Hardware Enablement"
aliases = [ aliases = [
"/hardware_interface.md", "/hardware_interface.md",
...@@ -36,8 +36,6 @@ improving). However even in that case, the components should be freely ...@@ -36,8 +36,6 @@ improving). However even in that case, the components should be freely
distributable (such that Apertis images can be distributed with them) distributable (such that Apertis images can be distributed with them)
and use standard APIs. and use standard APIs.
# Hardware Enablement
The following sections highlight for different types of hardware what The following sections highlight for different types of hardware what
software interface should be provided to enable it. As the list is not software interface should be provided to enable it. As the list is not
exhaustive with respect to all available types of hardware (e.g. new exhaustive with respect to all available types of hardware (e.g. new
......
+++
date = "2017-05-11"
weight = 100
title = "Marketing Resources"
aliases = [
"/old-wiki/Marketing_resources"
]
+++
# The Apertis Logo
The Apertis logo consists of 2 elements:
1. The Symbol
2. The Wordmark
In most situations the Symbol and the Workmark should remain connected and
used as a whole. In isolated cases, where suitable, it is permitted that
the Symbol can be separated from the Workmark, likewise the Wordmark can
be removed from the Symbol.
When using the Symbol and Wordmark togther, please ensure that you
maintain the spacing /layout between them as below.
The Apertis logo are copyright Collabora Ltd and licensed under
[BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/).
The logo can be used to represent Apertis. Use them on slides and when
talking about Apertis.
## Symbol and Wordmark
| PNG (100x100px) | PNG (500x500px) | SVG |
| --------------- | --------------- | --- |
| ![100×100 px](/images/apertis-100.png) | ![500×500 px](/images/apertis-500.png) | ![SVG](/images/apertis_logo.svg) |
## Symbol
| PNG (100x100px) | PNG (500x500px) |
| -------------------------------- | -------------------------------- |
| ![100×100 px](/images/a-100.png) | ![500×500 px](/images/a-500.png) |
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment