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

nixos/doc: add md-to-db.sh, convert some sections to CommonMark, add 21.11 release notes stub #107444

Merged
merged 4 commits into from
May 23, 2021

Conversation

ryantm
Copy link
Member

@ryantm ryantm commented Dec 23, 2020

Motivation for this change

RFC 72

See the added README and comments in md-to-db.sh for motivation too.

@ryantm ryantm requested a review from jtojnar December 23, 2020 06:23
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Dec 23, 2020
@flokli
Copy link
Contributor

flokli commented Dec 24, 2020

I don't think this should be merged as-is until we have tooling to ensure programmatically (enforced Github Actions maybe?) there's no different versions of the two different versions.

Alternatively, if most of the migration is done by a script anyways, we could also have a long-living PR migrating ALL documentation at once, rebased every once and then, and on merge removing the docbook files it converted from.

@ryantm ryantm force-pushed the nixos-doc branch 4 times, most recently from 5db076b to 483e723 Compare December 24, 2020 04:21
@ryantm
Copy link
Member Author

ryantm commented Dec 24, 2020

I don't think this should be merged as-is until we have tooling to ensure programmatically (enforced Github Actions maybe?) there's no different versions of the two different versions.

I've added a GitHub Action to this PR to enforce consistency in the generated Markdown files.

For reference:

@ryantm
Copy link
Member Author

ryantm commented Apr 1, 2021

@Floki maybe in light of the progress on #108063 you'd be okay with merging this so we can start working on converting the NixOS manual to CommonMark.

@ryantm
Copy link
Member Author

ryantm commented May 7, 2021

@jonringer and I talked and he 21.11 release notes to be in Markdown, so I think after the 21.05 branch off we should merge this and create those release notes in Markdown. I can try to update this so it adds the release note stub file too.

@ryantm ryantm requested a review from a team as a code owner May 9, 2021 03:23
@ryantm ryantm changed the title nixos/doc: add md-to-db.sh, convert "Building Your Own NixOS CD" to CommonMark nixos/doc: add md-to-db.sh, convert some sections to CommonMark, add 21.11 release notes stub May 9, 2021
@ryantm
Copy link
Member Author

ryantm commented May 9, 2021

I've updated this to convert the "contributing to this manual" section (mentioning the need to run the md-to-db.sh script, and added the 21.11 release notes stub.

@jonringer
Copy link
Contributor

thanks for the release stub. Changes look great :)

@jonringer
Copy link
Contributor

The time has come!

@jonringer jonringer merged commit 6543c61 into NixOS:master May 23, 2021
name: NixOS manual checks

on:
pull_request:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just an FYI as actions have changed since the PR was opened: this won't run automatically for first time contributors so it's possible that the docs could drift out of sync.

https://github.blog/2021-04-22-github-actions-update-helping-maintainers-combat-bad-actors/

Would need to do the same as we did in 5ba2e4e (pull_request_target, permissions:, and the PR merge ref) to make it run unconditionally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, great point.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/happy-docsgiving/10214/27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion 8.has: changelog 8.has: documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants