Skip to content

Commit 051b34d

Browse files
move sponsoring information to the web page (#1117)
1 parent 819d5ff commit 051b34d

File tree

6 files changed

+49
-56
lines changed

6 files changed

+49
-56
lines changed

_redirects

+4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@
3232
/tutorials/file-sets /tutorials/working-with-local-files 301
3333
/tutorials/module-system/module-system /tutorials/module-system/deep-dive 301
3434

35+
/acknowledgments /acknowledgements 301
36+
/acknowledgments/sponsors /acknowledgements 301
37+
3538
/permalink/stub-ld /guides/faq#how-to-run-non-nix-executables 301
3639
/manual/nix /reference/nix-manual 200
3740
/manual/nix/unstable/* https://hydra.nixos.org/job/nix/master/manual/latest/download/1/manual/:splat 200
3841
/manual/nix/development/* https://hydra.nixos.org/job/nix/master/manual/latest/download/1/manual/:splat 200
3942
/tutorials/nixos/continuous-integration-github-actions /guides/recipes/continuous-integration-github-actions 301
43+

maintainers/README.md

+3-38
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ In addition to the team members' responsibilities, a team lead is expected to:
7575
- Manage permissions for the [GitHub team] and the [GitHub project board]
7676
- Update [NixOS calendar] events
7777
- Merge pull requests approved by team members
78-
- Manage [the team's Open Collective page][documentation team on Open Collective]
78+
- Manage [the team's Open Collective page]
7979

8080
[GitHub team]: https://github.com/orgs/NixOS/teams/documentation-team
8181
[GitHub project board]: https://github.com/orgs/NixOS/projects/15
@@ -126,42 +126,7 @@ Meeting notes should contain:
126126

127127
If you want to help immediately, please see [How to contribute to documentation](https://nix.dev/contributing/documentation).
128128

129-
If you don't have time, consider donating to [documentation team on Open Collective].
129+
If you don't have time, consider donating to [documentation team on Open Collective][the team's Open Collective page].
130130

131-
## Sponsoring
132-
133-
- [@fricklerhandwerk] serves as the team lead since 2023-02, sponsored by [Antithesis](https://antithesis.com)
134-
- [@zmitchell] led the Learning Journey Working Group from 2023-03 to 2023-08, sponsored by [flox](https://floxdev.com)
135-
- [@infinisil] worked on the team between 2022-11 and 2024-05, sponsored by [Tweag]
136-
- [@lucperkins](https://github.com/lucperkins) served as the team lead from 2022-11 to 2023-01, sponsored by [Determinate Systems](https://determinate.systems)
137-
- [@fricklerhandwerk] served as the team lead from 2022-05 to 2022-10, sponsored by [Tweag]
138-
139-
[@fricklerhandwerk]: https://github.com/fricklerhandwerk
140-
[@zmitchell]: https://github.com/zmitchell
141-
[Tweag]: https://tweag.io
142-
[@infinisil]: https://github.com/infinisil
143-
144-
## History
145-
146-
Many thanks to past members, who helped make Nix documentation what it is today:
147-
148-
- [@infinisil] helped lead the team between 2022-11 and 2024-05.
149-
During that time he provided diligent technical reviews of countless contributions, reworked the [contribution guides for Nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), and rewrote his [module system tutorial](https://nix.dev/tutorials/module-system/deep-dive) for publication.
150-
151-
- [@olafklingt](https://github.com/olafklingt) volunteered on the team from 2022-10 to 2024-05, and was a formal member between 2022-10 and 2024-05.
152-
He added an [introduction to NixOS virtual machines](https://nix.dev/tutorials/nixos/nixos-configuration-on-vm) and greatly simplified the [tutorial on NixOS VM tests](https://nix.dev/tutorials/nixos/integration-testing-using-virtual-machines), and kept them up to date.
153-
Both articles enjoy great popularity and are central elements of our tutorial series.
154-
155-
- [@brianmcgee](https://github.com/brianmcgee) was part of the team from 2023-03 to 2023-10 and contributed to the Learning Journey Working Group effort.
156-
157-
- [@zmitchell] led the [Learning Journey Working Group](https://discourse.nixos.org/search?q=learning%20journey%20working%20group%20-%20meeting%20notes%20in%3Atitle%20order%3Alatest_topic) from 2023-03 to 2023-08 that added a number of tutorials.
158-
He published [regular updates on developments in documentation](https://discourse.nixos.org/search?q=This%20Month%20in%20Nix%20Docs%20in%3Atitle%20before%3A2023-10-30%20order%3Alatest_topic) in that period.
159-
160-
- [@Mic92](https://github.com/Mic92) was a founding member and part of the team from 2022-05 to 2023-01.
161-
Jörg had written a great deal of documentation on the NixOS Wiki, and shared his experience to set a direction for the documentation team.
162-
163-
- [@domenkozar](https://github.com/domenkozar) was a founding member and part of the team from 2022-05 to 2023-01.
164-
Domen originally started nix.dev, wrote many basic tutorials, and funded editorial work through [Cachix](https://www.cachix.org/).
165-
He helped bootstrap the documentation team, handed out permissions, and advised us on many aspects.
166-
Domen donated nix.dev to the NixOS Foundation 2023-07.
131+
[the team' Open Collective page]: https://opencollective.com/nixos/projects/nix-documentation
167132

source/acknowledgements/index.md

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
(acknowledgements)=
2+
# Acknowledgements
3+
4+
## Sponsoring
5+
6+
The following people and organisations have contributed to make this effort possible:
7+
8+
- [@fricklerhandwerk] serves as the team lead since 2023-02, sponsored by [Antithesis](https://antithesis.com) from 2023-02 to 2024-04
9+
- [@zmitchell] led the Learning Journey Working Group from 2023-03 to 2023-08, sponsored by [flox](https://floxdev.com)
10+
- [@infinisil] worked on the team between 2022-11 and 2024-05, sponsored by [Tweag]
11+
- [@lucperkins](https://github.com/lucperkins) served as the team lead from 2022-11 to 2023-01, sponsored by [Determinate Systems](https://determinate.systems)
12+
- [@fricklerhandwerk] served as the team lead from 2022-05 to 2022-10, sponsored by [Tweag]
13+
14+
[@fricklerhandwerk]: https://github.com/fricklerhandwerk
15+
[@zmitchell]: https://github.com/zmitchell
16+
[Tweag]: https://tweag.io
17+
[@infinisil]: https://github.com/infinisil
18+
19+
## History
20+
21+
Many thanks to past contributors, who helped make Nix documentation what it is today:
22+
23+
- [@infinisil] helped lead the team between 2022-11 and 2024-05.
24+
During that time he provided diligent technical reviews of countless contributions, reworked the [contribution guides for Nixpkgs](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md), and rewrote his [module system tutorial](https://nix.dev/tutorials/module-system/deep-dive) for publication.
25+
26+
- [@olafklingt](https://github.com/olafklingt) volunteered on the team from 2022-10 to 2024-05, and was a formal member between 2022-10 and 2024-05.
27+
He added an [introduction to NixOS virtual machines](https://nix.dev/tutorials/nixos/nixos-configuration-on-vm) and greatly simplified the [tutorial on NixOS VM tests](https://nix.dev/tutorials/nixos/integration-testing-using-virtual-machines), and kept them up to date.
28+
Both articles enjoy great popularity and are central elements of our tutorial series.
29+
30+
- [@brianmcgee](https://github.com/brianmcgee) was part of the team from 2023-03 to 2023-10 and contributed to the Learning Journey Working Group effort.
31+
32+
- [@zmitchell] led the [Learning Journey Working Group](https://discourse.nixos.org/search?q=learning%20journey%20working%20group%20-%20meeting%20notes%20in%3Atitle%20order%3Alatest_topic) from 2023-03 to 2023-08 that added a number of tutorials.
33+
He published [regular updates on developments in documentation](https://discourse.nixos.org/search?q=This%20Month%20in%20Nix%20Docs%20in%3Atitle%20before%3A2023-10-30%20order%3Alatest_topic) in that period.
34+
35+
- [@Mic92](https://github.com/Mic92) was a founding member and part of the team from 2022-05 to 2023-01.
36+
Jörg had written a great deal of documentation on the NixOS Wiki, and shared his experience to set a direction for the documentation team.
37+
38+
- [@domenkozar](https://github.com/domenkozar) was a founding member and part of the team from 2022-05 to 2023-01.
39+
Domen originally started nix.dev, wrote many basic tutorials, and funded editorial work through [Cachix](https://www.cachix.org/).
40+
He helped bootstrap the documentation team, handed out permissions, and advised us on many aspects.
41+
Domen donated nix.dev to the NixOS Foundation 2023-07.

source/acknowledgments/index.md

-9
This file was deleted.

source/acknowledgments/sponsors.md

-8
This file was deleted.

source/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ guides/index.md
9999
reference/index.md
100100
concepts/index.md
101101
contributing/index.md
102-
acknowledgments/index.md
102+
acknowledgements/index.md
103103
```

0 commit comments

Comments
 (0)