Skip to content

Commit 20247e7

Browse files
authored
Merge pull request #172 from Dyalog/43-licences-trademarks
Add licences and trademarks pages
2 parents 2de6118 + 31ab554 commit 20247e7

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

docs/licences-overview.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<h1 class="heading"><span class="name">Licences for third-party components</span></h1>
2+
3+
The software product you have received may include one or more third-party software components. Licence notices for these components are provided in Licences for third-party components.docx in the help subdirectory of the Dyalog installation directory.
4+
5+
Note that if your Dyalog licence permits the distribution of applications built upon Dyalog APL, or the redistribution of Dyalog APL itself, these licence notices must also be redistributed. For your convenience they are supplied as a Word document for use in your own documentation. If you have any concerns about redistributing these third party software products, please contact Dyalog to discuss your options.

docs/trademarks.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<h1 class="heading"><span class="name">Trademarks</span></h1>
2+
3+
"Dyalog APL" is a UK registered trademark of Dyalog Limited (number 1192130).
4+
5+
SQAPL is copyright of Insight Systems ApS.
6+
7+
Raspberry Pi is a trademark of the Raspberry Pi Foundation.
8+
9+
Oracle®, Javascript™ and Java™ are registered trademarks of Oracle and/or its affiliates.
10+
11+
UNIX® is a registered trademark in the United States and other countries, licensed exclusively through X/Open Company Limited.
12+
13+
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
14+
15+
Windows® is a registered trademark of Microsoft Corporation in the United States and other countries.
16+
17+
macOS® and OS X® (operating system software) are trademarks of Apple Inc., registered in the U.S. and other countries.
18+
19+
20+
21+
All other trademarks are the property of their respective owners.
22+
23+

mkdocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ nav:
7373
- Interface Guide: "!include ./interface-guide/mkdocs.yml"
7474
- .NET Interface: "!include ./dotnet-interface/mkdocs.yml"
7575
- UNIX User Guide: "!include ./unix-user-guide/mkdocs.yml"
76+
- Licences for third-party components: licences-overview.md
77+
- Trademarks: trademarks.md
7678

7779

7880

0 commit comments

Comments
 (0)