aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Dependencies.md8
-rw-r--r--docs/markdown/legal.md15
-rw-r--r--docs/markdown/snippets/coarray.md3
-rw-r--r--docs/theme/extra/images/favicon.pngbin9637 -> 3970 bytes
-rw-r--r--docs/theme/extra/images/meson_logo.pngbin8008 -> 3970 bytes
5 files changed, 24 insertions, 2 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md
index 259f09e..608f3b2 100644
--- a/docs/markdown/Dependencies.md
+++ b/docs/markdown/Dependencies.md
@@ -255,6 +255,14 @@ libraries that have been compiled for single-threaded use instead.
`method` may be `auto`, `config-tool`, `pkg-config`, `cmake` or `extraframework`.
+## Fortran Coarrays
+
+As of 0.50.0 Coarrays are a Fortran language intrinsic feature, enabled by
+`dependency('coarray')`.
+
+GCC will use OpenCoarrays if present to implement coarrays, while Intel and NAG
+use internal coarray support.
+
## GL
This finds the OpenGL library in a way appropriate to the platform.
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].
diff --git a/docs/markdown/snippets/coarray.md b/docs/markdown/snippets/coarray.md
new file mode 100644
index 0000000..961dce4
--- /dev/null
+++ b/docs/markdown/snippets/coarray.md
@@ -0,0 +1,3 @@
+## Fortran Coarray
+
+Fortran 2008 / 2018 coarray support was added via `dependency('coarray')`
diff --git a/docs/theme/extra/images/favicon.png b/docs/theme/extra/images/favicon.png
index 5e7b941..6800fe8 100644
--- a/docs/theme/extra/images/favicon.png
+++ b/docs/theme/extra/images/favicon.png
Binary files differ
diff --git a/docs/theme/extra/images/meson_logo.png b/docs/theme/extra/images/meson_logo.png
index 2720af5..6800fe8 100644
--- a/docs/theme/extra/images/meson_logo.png
+++ b/docs/theme/extra/images/meson_logo.png
Binary files differ