Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

trivial: adjust docs to clearly state that licenses are SPDX expressions #123

Merged
merged 1 commit into from Jul 16, 2017
Merged

trivial: adjust docs to clearly state that licenses are SPDX expressions #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 docs/sources/collection/xmldata.xml
View file
Open in desktop
@@ -168,11 +168,11 @@
<listitem>
<para>
The <code>&lt;project_license/&gt;</code> tag is indicating the license of the component.
It should be a string in SPDX format. Licenses may be combined using <emphasis>and</emphasis> and <emphasis>or</emphasis> logic.
It should be a <ulink url="https://spdx.org/specifications">SPDX license expression</ulink>.
Possible values include:
<itemizedlist>
<listitem><para>GPL-2.0</para></listitem>
<listitem><para>LGPL-3.0+ and GPL-3.0+</para></listitem>
<listitem><para>LGPL-3.0+ AND GPL-3.0+</para></listitem>
<listitem><para>MIT</para></listitem>
<listitem><para>CC-BY-SA-2.0</para></listitem>
<listitem><para>...</para></listitem>
4 docs/sources/metainfo/component.xml
View file
Open in desktop
@@ -521,11 +521,11 @@
<listitem>
<para>
The <code>&lt;project_license/&gt;</code> tag is indicating the license of the component (application/library/addon/font/etc.) described in the metadata document.
It should be a string in SPDX format. Licenses may be combined using <emphasis>and</emphasis> and <emphasis>or</emphasis> logic.
It should be a <ulink url="https://spdx.org/specifications">SPDX license expression</ulink>.
Possible values include:
<itemizedlist>
<listitem><para><literal>GPL-2.0</literal></para></listitem>
<listitem><para><literal>LGPL-3.0+ and GPL-3.0+</literal></para></listitem>
<listitem><para><literal>LGPL-3.0+ AND GPL-3.0+</literal></para></listitem>
<listitem><para><literal>MIT</literal></para></listitem>
<listitem><para><literal>CC-BY-SA-2.0</literal></para></listitem>
</itemizedlist>