Skip to content

Commit

Permalink
docs: Apply consistent nomenclature
Browse files Browse the repository at this point in the history
Signed-off-by: Michał Żygowski <[email protected]>
  • Loading branch information
miczyg1 committed Aug 18, 2023
1 parent fa057fa commit ccddb79
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 27 deletions.
40 changes: 25 additions & 15 deletions docs/dev-proc/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,35 @@ framework or other components included in Dasharo Release is through release
notes. Link to Dasharo Release Notes for your hardware platform can be found
in menu on the left side (Supported Hardware->Hardware Model->Releases).

## Dasharo Entry Subscription releases
Dasharo Releases can be divided into two categories:

Dasharo Entry Subscribers receive firmware updates more frequently than the
community. The number of updates per year depends on the number of Dasharo Entry
Subscriptions sold and the availability of other funding (e.g., NLNet,
corporate sponsors, community donations) but is less than 2 updates per year.
Dasharo Entry Subscription releases are characterized by a changing patch
version (`z`). Fixes and features introduced in Dasharo Entry Subscription
releases will also be available later as Dasharo Community Releases with public
pre-built binaries in the respective release pages. In short, being a Dasharo
Subscriber gives early access to the newest features and fixes.
* Dasharo Entry Subscription Releases (previous Dasharo Supporters Release for
Dasharo Support Entrance Subscribers)
* Dasharo Community Releases

[How to become Dasharo Entry Subscriber?](../ways-you-can-help-us.md#become-a-dasharo-supporter)
## Dasharo Entry Subscription Releases

## Community releases
Dasharo Entry Subscription subscribers receive firmware updates more
frequently than the community. The number of updates per year depends on the
number of Dasharo Entry Subscriptions sold and the availability of other
funding (e.g., NLNet, corporate sponsors, community donations) but is less
than 2 updates per year. Dasharo Entry Subscription Releases are characterized
by a changing patch version (`z`). Fixes and features introduced in Dasharo
Entry Subscription Releases will also be available later as Dasharo Community
Releases with public pre-built binaries in the respective release pages. In
short, being a Dasharo Subscriber gives early access to the newest features
and fixes.

Community releases are built and published once a year. Each community release
has a zero patch version (`x.y.0`) and the only changing number is the minor
version `y`.
[How to become Dasharo Entry Subscription subscriber?](../ways-you-can-help-us.md#become-a-dasharo-entry-subscription-subscriber)

## Dasharo Community Releases

Dasharo Community Releases are built and published once a year. Each Dasharo
Community Release has a zero patch version (`x.y.0`) and the only changing
number is the minor version `y`. To be up-to-date with latest Dasharo
Community Release updates, one can subscribed to free of charge mailing list
for given hardware platform, for which the link can be found in menu on the
left side (Supported Hardware->Hardware Model->Releases).

## Signing keys

Expand Down
8 changes: 4 additions & 4 deletions docs/osf-trivia-list/dts.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ debugging and development support.

Also refer to [DTS Overview](../dasharo-tools-suite/overview.md).

## How to get Dasharo Entry Subscription releases using Dasharo Tools Suite?
## How to get Dasharo Entry Subscription Releases using Dasharo Tools Suite?

Dasharo Entry Subscription releases can be used to perform firmware updates
with DTS by providing Dasharo Entry Subscribers credentials obtained after buying a
[subscription](../ways-you-can-help-us.md#become-a-dasharo-supporter).
Dasharo Entry Subscription Releases can be used to perform firmware updates
with DTS by providing Dasharo Entry Subscription credentials obtained after
buying a [Dasharo Entry Subscription](../ways-you-can-help-us.md#become-a-dasharo-entry-subscription-subscriber).

Commercial use of DTS should be discussed directly with
[3mdeb](mailto:[email protected]) or [Dasharo Team](mailto:[email protected]).
Expand Down
18 changes: 10 additions & 8 deletions docs/ways-you-can-help-us.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ open-source firmware mission. It is straightforward if you don't have time for
other contributions, and there are multiple options - feel free to choose one
that works for you.

### Become a Dasharo Supporter
### Become a Dasharo Entry Subscription subscriber

Buy the Dasharo Entry Subscription if you own/use/buy a machine running
Dasharo firmware:
Expand All @@ -77,21 +77,23 @@ Dasharo firmware:

[Link to all available subscriptions](https://shop.3mdeb.com/product-category/dasharo-entry-subscription/)

Or buy the hardware including the subscriptions from us, e.g.:
Or buy the hardware including the Dasharo Entry Subscription from us, e.g.:

* [MSI PRO Z690-A DDR4 motherboard with Dasharo Entry Subscription](https://shop.3mdeb.com/shop/open-source-hardware/dasharo-compatible-with-msi-pro-z-690a-ddr4-motherboard/)
* [MSI PRO Z690-A DDR4 with Dasharo Entry Subscription – Full PC Build](https://shop.3mdeb.com/shop/open-source-hardware/dasharo-compatible-with-msi-pro-z-690a-ddr4-full-pc-build/)
* or other platforms

As a Dasharo Supporter you will get:
As a Dasharo Entry Subscription subscriber you will get:

* The latest Dasharo releases issued by Dasharo Team
* Special Dasharo Updates for Supporters – Community receives one update per
year, but Supporters are not limited to it. Number of updates depends on the
number of Dasharo Subscriptions sold and the availability of other funding
* The latest Dasharo Entry Subscription Releases issued by Dasharo Team
* Special Dasharo Updates for Dasharo Entry Subscription subscribers –
Community receives one update per year, but Dasharo Entry Subscription
subscribers are not limited to it. Number of updates depends on the number
of Dasharo Entry Subscriptions sold and the availability of other funding
(e.g., NLNet, corporate sponsors, community donations).
* Dasharo Primer Support through invite-only Matrix channel where we often
gather Supporters opinion and share exciting news about Dasharo direction
gather Dasharo Entry Subscription subscribers' opinion and share exciting
news about Dasharo direction
* Insider's view and influence on Dasharo features roadmap – you can have a
real impact on Dasharo development

Expand Down

0 comments on commit ccddb79

Please sign in to comment.