diff --git a/docs/markdown/legal.md b/docs/markdown/legal.md index 474d1294f9c7..bd86ff4c2d73 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]. diff --git a/docs/theme/extra/images/favicon.png b/docs/theme/extra/images/favicon.png index 5e7b9410d731..6800fe80eedd 100644 Binary files a/docs/theme/extra/images/favicon.png and b/docs/theme/extra/images/favicon.png differ diff --git a/docs/theme/extra/images/meson_logo.png b/docs/theme/extra/images/meson_logo.png index 2720af5074e8..6800fe80eedd 100644 Binary files a/docs/theme/extra/images/meson_logo.png and b/docs/theme/extra/images/meson_logo.png differ diff --git a/graphics/meson_logo.svg b/graphics/meson_logo.svg index 5e647fe84168..d5b47bcf4ead 100644 --- a/graphics/meson_logo.svg +++ b/graphics/meson_logo.svg @@ -7,17 +7,60 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" - id="svg2" + width="210mm" + height="297mm" + viewBox="0 0 210 297" version="1.1" - inkscape:version="0.91 r13725" + id="svg1769" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="meson_logo.svg"> + id="defs1763"> + + + + + + + + + + - - - - - - - + inkscape:window-width="1226" + inkscape:window-height="910" + inkscape:window-x="536" + inkscape:window-y="82" + inkscape:window-maximized="0" /> + id="metadata1766"> image/svg+xml - + @@ -78,21 +95,246 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26416996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 96.975039,102.57831 c -3.04835,1.72126 -4.94049,4.94629 -4.95784,8.44909 3.18944,1.73892 6.93427,1.67939 9.836611,0.0181 2.6e-4,-0.008 7.9e-4,-0.0165 0.001,-0.0248 -0.004,-3.484 -1.863431,-6.70217 -4.879301,-8.44238 z m 1.64176,3.72948 c 0.45198,0.30715 0.38492,1.04655 0.31212,1.55288 -0.0926,0.55776 -0.62713,1.47487 -1.32188,2.07326 0.0899,0.12885 0.14181,0.28753 0.14108,0.45682 -0.43052,0.21761 -0.85742,-0.0278 -1.37408,-0.47026 -0.51665,-0.44244 -1.07391,-1.32905 -1.25884,-2.24017 -0.16403,0.0174 -0.33188,-0.0192 -0.47594,-0.11007 0.0376,-0.51089 0.57985,-0.8146 1.0604,-0.99374 0.48056,-0.17913 1.71868,-0.2395 2.59158,0.0708 0.0681,-0.1429 0.18071,-0.26288 0.32556,-0.339 z" + id="path817-6-2-9-7-9-93-9-8-1-2-4-6" /> diff --git a/graphics/meson_logo_big.png b/graphics/meson_logo_big.png index d285135b0702..e2abe1b24b10 100644 Binary files a/graphics/meson_logo_big.png and b/graphics/meson_logo_big.png differ