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

doc,nixos/doc: minor cleanups #207150

Merged
merged 4 commits into from
Dec 27, 2022
Merged

doc,nixos/doc: minor cleanups #207150

merged 4 commits into from
Dec 27, 2022

Conversation

ncfavier
Copy link
Member

@ncfavier ncfavier commented Dec 21, 2022

  • Remove backslashes left over from the conversion from DocBook. For example, it's in the original DocBook would have been converted to it\'s in CommonMark to avoid triggering the "smart" typography mode that would turn it into it’s. Whether we want actually smart quotes or not in the manual is another question.
    Those were done with a bulk sed -i and then manually inspected to avoid breaking code snippets.
  • Bump the channel in the md-to-db shebang, which bumps Pandoc, which fixes Markdown to Docbook pandoc conversion loses information about language in fenced code block #125511, except it doesn't actually change anything because the DocBook → HTML conversion also loses information...

By the way, why aren't we calling md-to-db automatically in the derivation? Committing generated files seems like a bad idea, and this would avoid the concerns of #168598. EDIT: found some backlog: #63513 #106847 (comment) #175586 (comment)

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Dec 21, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 21, 2022
@@ -199,7 +199,7 @@ It’s important to test any executables generated by a build when you change or

### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}

The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps we could use real ellipsis in the Markdown.

Copy link
Member Author

Choose a reason for hiding this comment

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

As long as smart is enabled, it doesn't matter. I think disabling smart would make sense though. But then there's the problem of uniformity: there's no way we're going to enforce consistent use of across the manuals.

@jtojnar
Copy link
Member

jtojnar commented Dec 22, 2022

By the way, why aren't we calling md-to-db automatically in the derivation?

People do not want NixOS systems to depend on pandoc/GHC.

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/tweag-nix-dev-update-42/24204/1

Leftovers from the CommonMark conversion.
Leftovers from the CommonMark conversion.
Leftovers from the CommonMark conversion.
Update the pinned channel in `md-to-db`, which bumps the Pandoc version,
which fixes NixOS#125511 maybe.
@ncfavier ncfavier merged commit 23d58da into NixOS:master Dec 27, 2022
@ncfavier ncfavier deleted the doc-minor branch December 27, 2022 16:35
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 8.has: changelog 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Markdown to Docbook pandoc conversion loses information about language in fenced code block
3 participants