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.

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

Preparing for submissions #1099

Merged
merged 3 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/index.md → docs/front/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ including SPDX Model contributions from OMG and its Contributors.
## Use of Specification - Terms, Conditions & Notices

This work is licensed under the
[Community Specification License 1.0](./licenses/Community-Spec-1.0.md)
[Community Specification License 1.0](../licenses/Community-Spec-1.0.md)
(Community-Spec-1.0).
Pre-existing portions of this work from copyright holders who have not
subsequently contributed under the Community-Spec-1.0 are provided under
[Creative Commons Attribution License 3.0 Unported](./licenses/CC-BY-3.0.md)
[Creative Commons Attribution License 3.0 Unported](../licenses/CC-BY-3.0.md)
(CC-BY-3.0).
Copies of these licenses are reproduced in their entirety herein.

Expand Down
File renamed without changes.
19 changes: 7 additions & 12 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ validation:
absolute_links: warn
unrecognized_links: warn
nav:
- 'Copyright': index.md
- 'Introduction': introduction.md
- 'Copyright': front/index.md
- 'Introduction': front/introduction.md
- '1. Scope': scope.md
- '2. References': references.md
- '3. Symbols': symbols.md
Expand All @@ -42,16 +42,11 @@ nav:
- '6. Model and serializations': serializations.md
- model: # [MODEL_PLACEHOLDER], to be replaced by content from mkdocs-files.yml
- annexes:
- 'A. Changes from the previous standard': annexes/changes-from-previous-iso.md
- 'B. RDF model definition and diagrams': annexes/rdf-model.md
- 'C. SPDX license expressions': annexes/spdx-license-expressions.md
- 'D. SPDX License List matching guidelines': annexes/license-matching-guidelines-and-templates.md
- 'E. SPDX Lite': annexes/spdx-lite.md
- 'F. Package URL specification': annexes/pkg-url-specification.md
- 'G. History with OMG': omg-history.md
- 'A. RDF model definition and diagrams': annexes/rdf-model.md
- 'B. SPDX license expressions': annexes/spdx-license-expressions.md
- 'C. SPDX License List matching guidelines': annexes/license-matching-guidelines-and-templates.md
- 'D. SPDX Lite': annexes/spdx-lite.md
- 'E. Package URL specification': annexes/pkg-url-specification.md
- licenses:
- 'Community Specification License 1.0': licenses/Community-Spec-1.0.md
- 'Creative Commons Attribution License 3.0 Unported': licenses/CC-BY-3.0.md
draft_docs: | # for preview with `mkdocs serve`, but excluded from `mkdocs build`
omg-preface.md
iso-foreword.md
32 changes: 32 additions & 0 deletions submissions/ISO/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

Here are files that are only relevant to the production of the PDF
that will be submitted to ISO.

The content here will be combined with the one in the `docs` directory
at the top of the repository.

The structure of the PDF will include the following (in order):

- TOC
- front/iso-foreword
- front/introduction

- scope
- references
- symbols
- terms-and-definitions
- conformance
- serializations

- model

- annexes/rdf-model
- annexes/spdx-license-expressions
- annexes/license-matching-guidelines-and-templates
- annexes/spdx-lite
- annexes/pkg-url-specification
- annexes/changes-from-previous-iso

- licenses/Community-Spec-1.0
- licenses/CC-BY-3.0

File renamed without changes.
35 changes: 35 additions & 0 deletions submissions/OMG/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

Here are files that are only relevant to the production of the PDF
that will be submitted to OMG.

The content here will be combined with the one in the `docs` directory
at the top of the repository.

The structure of the PDF will include the following (in order):

- front/cover
- front/second-page
- TOC
- front/introduction
- front/omg-preface

- scope
- references
- symbols
- terms-and-definitions
- conformance
- serializations
- people

- model

- annexes/rdf-model
- annexes/spdx-license-expressions
- annexes/license-matching-guidelines-and-templates
- annexes/spdx-lite
- annexes/pkg-url-specification
- annexes/omg-history

- licenses/Community-Spec-1.0
- licenses/CC-BY-3.0

File renamed without changes.
3 changes: 3 additions & 0 deletions submissions/OMG/front/cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

# The System Package Data Exchange (SPDX) Specification Version 3.0.1

File renamed without changes.
31 changes: 31 additions & 0 deletions submissions/OMG/front/second-page.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# The System Package Data Exchange® (SPDX®) Specification Version 3.0.1

Copyright © 2010-2024, The Linux Foundation and its Contributors,
including SPDX Model contributions from OMG and its Contributors.

## Use of Specification - Terms, Conditions & Notices

This work is licensed under the
[Community Specification License 1.0](./licenses/Community-Spec-1.0.md)
(Community-Spec-1.0).
Pre-existing portions of this work from copyright holders who have not
subsequently contributed under the Community-Spec-1.0 are provided under
[Creative Commons Attribution License 3.0 Unported](./licenses/CC-BY-3.0.md)
(CC-BY-3.0).
Copies of these licenses are reproduced in their entirety herein.

### Trademarks

SPDX® is a registered trademark of The Linux Foundation.

### Compliance

Use of the SPDX trademarks is subject to the SPDX Trademark License,
currently available at
[SPDX Legal Notices page](https://spdx.dev/about/legal-notices/).

Software developed under the terms of the licenses under which this
specification is issued may claim compliance or conformance with this
specification if and only if the software provider complies with the
SPDX Trademark License given above.

116 changes: 116 additions & 0 deletions submissions/OMG/people.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# Additional information

## Author acknowledgements

The following people authored this specification:

Adam Cohn,
Adolfo García Veytia,
Alan Tse,
Alexios Zavras,
Andrew Back,
Ann Thornton,
Armin Tänzer,
Arthit Suriyawongkul,
Ayumi Watanabe,
Basil Peace,
Bill Schineller,
Bradlee Edmondson,
Brandon Lum,
Bruno Cornec,
Ciaran Farrell,
Daniel German,
David Edelsohn,
David Kemp,
David A. Wheeler,
Debra McGlade,
Dennis Clark,
Dick Brooks,
Ed Warnicke,
Eran Strod,
Eric Thomas,
Esteban Rockett,
Gary O'Neall,
Gopi Krishnan Rajbahadur,
Guillaume Rousseau,
Hassib Khanafer,
Henk Birkholz,
Hiroyuki Fukuchi,
Itaru Hosomi,
Jack Manbeck,
Jaime Garcia,
Jeff Licquia,
Jeff Luszcz,
Jeff Schutt,
Jilayne Lovejoy,
John Ellis,
Jonas Oberg,
Joshua Watt,
Kamsang Salima,
Karen Bennet,
Karen Copenhaver,
Kate Stewart,
Kevin Mitchell,
Kim Weins,
Kirsten Newcomer,
Kouki Hama,
Kris Reeves,
Liang Cao,
Lon Hohberger,
Marc-Etienne Vargenau,
Mark Gisi,
Marshall Clow,
Martin Michlmayr,
Martin von Willebrand,
Mark Atwood,
Matija Šuklje,
Matt Germonprez,
Maximilian Huber,
Meret Behrens,
Michael J. Herzog,
Michel Ruffin,
Nicole Pappler,
Nisha Kumar,
Nobuyuki Tanaka,
Norio Kobota,
Nuno Brito,
Oliver Fendt,
Paul Madick,
Peter Williams,
Phil Robb,
Philip Koltun,
Philip Odence,
Philippe Ombredanne,
Pierre Lapointe,
Rana Rahal,
Robert Martin,
Robin Gandhi,
Rose Judge,
Sam Ellis,
Sameer Ahmed,
Satoru Koizumi,
Scott K Peterson,
Scott Lamons,
Scott Sterling,
Sean Barnum,
Sebastian Crane,
Shane Coughlan,
Steve Cropper,
Steve Winslow,
Stuart Hughes,
Takashi Ninjouji,
Thomas F. Incorvia,
Thomas Steenbergen,
Tom Callaway,
Tom Vidal,
Toru Taima,
Venkata Krishna,
W. Trevor King,
William Bartholomew,
Yev Bronshteyn,
Yoshiko Ouchi,
Yoshiyuki Ito,
Yuji Nomura,
Yumi Tomita,
and
Zachary McFarland.
6 changes: 6 additions & 0 deletions submissions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

This directory holds content relevant to the submissions
of the Specification to various organizations.

Please note that all the submissions happen only in PDF format.