Skip to content

Commit

Permalink
Merge pull request #336 from asam-ev/333-correct-position-of-trademark
Browse files Browse the repository at this point in the history
Correct position of trademark, correct disclaimer
  • Loading branch information
ClemensLinnhoff authored Jan 29, 2025
2 parents 9246598 + bec56ed commit 15f3573
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion antora-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Source: https://code.asam.net/common/templates/antora-base-repo-example/-/blob/standard_generator/site.yml
# tag::site[]
site:
title: ASAM OpenMATERIAL 3D®
title: ASAM OpenMATERIAL® 3D
url: https://asam-ev.github.io/OpenMATERIAL-3D/
start_page: asamopenmaterial:specification:index.adoc
# end::site[]
Expand Down
3 changes: 2 additions & 1 deletion content/general-docs/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ Notes, footnotes, and examples shall not contain requirements or any information

The following deliverables are provided for {THIS_STANDARD}:

* https://asam-ev.github.io/OpenMATERIAL-3D/asamopenmaterial/latest/specification/index.html[{THIS_STANDARD}® BS 1-0-0 Specification, 2025-MM-DD] (this document, contained in this site)

* https://asam-ev.github.io/OpenMATERIAL-3D/asamopenmaterial/latest/specification/index.html[ASAM OpenMATERIAL® 3D BS 1-0-0 Specification, 2025-MM-DD] (this document, contained in this site)
* https://github.com/asam-ev/OpenMATERIAL-3D/tree/main/schemas[JSON schema files] for all json formats (contained in the {THIS_STANDARD} Github repository)
* https://github.com/asam-ev/OpenMATERIAL-3D/tree/main/examples[Example files] for all defined file formats (contained in the {THIS_STANDARD} Github repository) and further examples of
** a https://github.com/asam-ev/OpenMATERIAL-3D/tree/main/examples/vehicle_example[vehicle] (contained in the {THIS_STANDARD} Github repository)
Expand Down
2 changes: 1 addition & 1 deletion content/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This document is the copyrighted property of ASAM e.V.
In alteration to the regular https://www.asam.net/license[license terms], ASAM allows unrestricted distribution of this standard. §2 (1) of ASAM's regular https://www.asam.net/license[license terms] is therefore substituted by the following clause: "The licensor grants everyone a basic, non-exclusive and unlimited license to use the standard {THIS_STANDARD}".
====
ASAM OpenMATERIAL 3D is a registered trademark of ASAM e.V.
ASAM OpenMATERIAL is a registered trademark of ASAM e.V.
//
// DO NOT CHANGE!!!
Expand Down

0 comments on commit 15f3573

Please sign in to comment.