Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct position of trademark, correct disclaimer #336

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Correct position of trademark, correct disclaimer #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c276a5c
Correct position of trademark, correct disclaimer
FKlopfer Jan 29, 2025
aa13df8
Solve merge conflicts
FKlopfer Jan 29, 2025
bec56ed
Merge branch 'main' into 333-correct-position-of-trademark
FKlopfer Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion antora-playbook.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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