Skip to content

Commit

Permalink
Merge pull request #946 from bact/add-english-normative-notes
Browse files Browse the repository at this point in the history
Add notes on English as normative language
  • Loading branch information
bact authored Jan 15, 2025
2 parents ac1c156 + 01798b7 commit 01ca260
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
24 changes: 20 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,32 @@ All use cases supported by the prior version are supported here as well.
This repository holds the model for the information captured in SPDX version 3
standard.

Translations of the information model may be available.
English remains the normative language in all cases.

## Branch Structure

The SPDX 3 model repo follows the [Gitflow](https://gist.github.com/HeratPatel/271b5d2304de2e2cd1823b9b62bf43e0) workflow with the addition of support branches.
The SPDX 3 model repo follows the
[Gitflow](https://gist.github.com/HeratPatel/271b5d2304de2e2cd1823b9b62bf43e0)
workflow with the addition of support branches.

The branches in use are:

- `main` - This will always be the latest released specification.
- `develop` - This branch will be where the active development for the next major or minor version takes place. Once released, the `develop` branch will be merged into the `main` branch.
- `support/x.y` - These branches will be long lived and contain any updates to a minor version of the specification. Additions such as translations can be added to the support branch. `x.y` represents the major.minor version. Once any changes are accepted and released, the support branch will be tagged and merged into both the develop and main branches.
- General feature or fix branches - there may be feature branches made for specific enhancements or fixes to the spec. These will be short lived and merged into either a support branch or the develop branch.
- `develop` - This branch will be where the active development for the next
major or minor version takes place.
Once released, the `develop` branch will be merged into the `main` branch.
- `support/x.y` - These branches will be long-lived and contain any updates to
a minor version of the specification.
Additions such as translations can be added to the support branch.
`x.y` represents the MAJOR.MINOR version, following Semantic Versioning
(SemVer) conventions.
Once any changes are accepted and released, the support branch will be tagged
and merged into both `develop` and `main` branches.
- General feature or fix branches - there may be feature branches made for
specific enhancements or fixes to the spec.
These will be short-lived and merged into either a `support` branch or the
`develop` branch.

## Formats

Expand Down
2 changes: 2 additions & 0 deletions docs/translation.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Therefore, the language tag used to identify the language must follow the
well-formedness rules defined in [IETF BCP 47 (RFC 5646)][rfc5646].
Appendix A of that document provides examples of valid language tags.

English remains the normative language in all cases.

[headings]: ./format.md#syntax
[language-tagged-string]: https://www.w3.org/TR/rdf11-concepts/#dfn-language-tagged-string
[rfc5646]: https://datatracker.ietf.org/doc/rfc5646
Expand Down

0 comments on commit 01ca260

Please sign in to comment.