Skip to content

Documentation fixes #1447

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

Merged
merged 10 commits into from
Jul 10, 2017
Merged

Documentation fixes #1447

merged 10 commits into from
Jul 10, 2017

Conversation

robx
Copy link
Contributor

@robx robx commented Jul 7, 2017

Wanted to fix one small thing, and this is where I ended up...

I've tested that the manpages look good, not the HTML so far. I'm not sure all of this is semantically correct...

  • Is the "raw" ellipsis fine? It seems to work correctly in the manpage for me, but I'm not sure
  • While reading the nix-prefetch-url sources I saw the -A variant, but the usage seems weird enough that I didn't want to try documenting it

@grahamc
Copy link
Member

grahamc commented Jul 10, 2017

@shlevy this all looks good to me.

@shlevy
Copy link
Member

shlevy commented Jul 10, 2017

Testing locally

Copy link
Member

@shlevy shlevy left a comment

Choose a reason for hiding this comment

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

nix-build -A tarball release.nix fails with:

GEN doc/manual/manual.xmli
doc/manual/command-ref/nix-shell.xml:42: parser error : Opening and ending tag mismatch: arg line 36 and group

^
doc/manual/command-ref/main-commands.xml:14: element include: XInclude error : could not load doc/manual/command-ref/nix-shell.xml, and no fallback was found
GEN doc/manual/manual.is-valid
-:7121: element include: Relax-NG validity error : Expecting element refentry, got include
-:6887: element refentry: Relax-NG validity error : Did not expect element refentry there
-:6887: element refentry: Relax-NG validity error : Element chapter has extra content: refentry
-:5181: element chapter: Relax-NG validity error : Element part has extra content: chapter
-:4: element info: Relax-NG validity error : Element book has extra content: info

  • fails to validate
    make: *** [doc/manual/local.mk:32: doc/manual/manual.is-valid] Error 3

@robx
Copy link
Contributor Author

robx commented Jul 10, 2017

Oops, must have messed that up when sorting the commits. Should be fixed now.

@shlevy shlevy merged commit 30117fb into NixOS:master Jul 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants