aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-02-13 18:32:04 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-02-13 20:45:42 +0200
commit011c77ee22f600548bffaf94e67608b31a3722c8 (patch)
tree0027de4d3f2df2b38ac9d4d24dd936faf52d1957 /docs/markdown
parent25ae7f95bd814e86d59d73996ed4d58150a26fa9 (diff)
downloadmeson-011c77ee22f600548bffaf94e67608b31a3722c8.zip
meson-011c77ee22f600548bffaf94e67608b31a3722c8.tar.gz
meson-011c77ee22f600548bffaf94e67608b31a3722c8.tar.bz2
New logo and license text. Closes #4921. [skip ci]
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/legal.md15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs/markdown/legal.md b/docs/markdown/legal.md
index 474d129..bd86ff4 100644
--- a/docs/markdown/legal.md
+++ b/docs/markdown/legal.md
@@ -1,12 +1,23 @@
# Legal information
-Meson is copyrighted by all members of the Meson development team. Meson is licensed under the [Apache 2 license].
+Meson is copyrighted by all members of the Meson development team.
+Meson is licensed under the [Apache 2 license].
Meson is a registered trademark of Jussi Pakkanen.
+## Meson logo licensing
+
+Meson's logo is (C) Jussi Pakkanen and used by the Meson project with
+specific permission. It is not licensed under the same terms as the
+rest of the project.
+
+If you are a third party and want to use the Meson logo, you must
+first must obtain written permission from Jussi Pakkanen.
+
## Website licensing
-The meson website content is released under [Creative Commons Attribution-ShareAlike 4.0 International].
+The meson website content is released under [Creative Commons
+Attribution-ShareAlike 4.0 International].
All code samples on the website are released under [CC0 1.0 Universal].