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

Backport documentation comment changes to release-18.09 #49387

Merged
merged 5 commits into from Nov 10, 2018

Conversation

tazjin
Copy link
Member

@tazjin tazjin commented Oct 29, 2018

Motivation for this change

Backports the changes from #49383

cc: @grahamc

Please take a sanity-checking look at options.nix. I got an odd, minor merge conflict on that, but it all applied cleanly after fixing that and it looks normal to me.

Expands on some of the function comments and add some of the
special syntaxes recognised by nixdoc.
Updates documentation comments with extra information for nixdoc[1]
compatibility.

Some documentation strings have additionally been reworded for
clarity.

"Faux types" are added where applicable, but some functions do things
that are not trivially representable in the type notation used so they
were ignored for this purpose.

[1]: https://github.com/tazjin/nixdoc
Updates documentation comments with extra information for nixdoc[1]
compatibility.

[1]: https://github.com/tazjin/nixdoc
Documents functions in `lib.debug` for docs generation with nixdoc.

Note that type signatures and clearer descriptions are still missing
on some of these functions, but this is good enough for a first run.
Documents functions in `lib.options` for docs generation with nixdoc.

The formatting change in the `mkOption` arguments is due to the way
`nixdoc` parses documentation comments on pattern arguments. It's not
ideal, but it works.
@grahamc
Copy link
Member

grahamc commented Nov 10, 2018

I can't take careful look at the options.nix right now, but if someone else can, +1!

@samueldr
Copy link
Member

No actions required, it's not the hugest deal, but when backporting changes, it is preferred to use git cherry-pick -x. (editing (-e) is a suggestion, but -x is a requirement.)

Thanks for the contribution!

@samueldr samueldr merged commit 141f63c into NixOS:release-18.09 Nov 10, 2018
@tazjin tazjin deleted the chore/backport-doc-comments branch November 10, 2018 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants