Skip to content

Fix nix-instantiate manpage indentation #1444

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jul 7, 2017
Merged

Fix nix-instantiate manpage indentation #1444

merged 2 commits into from
Jul 7, 2017
+2 −3

Conversation

robx
Copy link
Contributor

@robx robx commented Jul 6, 2017

The second command variant is now its own cmdsynopsis, which ensures it's not indented as was the case using sbrk.

I also included a trivial cleanup commit I made while debugging a local build issue -- would you prefer I put this in a separate PR?

Before:

       nix-instantiate [--parse | --eval [--strict] [--xml] ]
                                      [--read-write-mode] [--arg name value]
                                      [{--attr | -A} attrPath]
                                      [--add-root path] [--indirect] {--expr |
                                      -E} files...
                                      nix-instantiate --find-file files...

After:

       nix-instantiate [--parse | --eval [--strict] [--xml] ]
                       [--read-write-mode] [--arg name value]
                       [{--attr | -A} attrPath] [--add-root path] [--indirect]
                       {--expr | -E} files...

       nix-instantiate --find-file files...

robx added 2 commits July 6, 2017 22:35
@robx
Fix nix-instantiate manpage indentation

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
60da5d2 
The second command variant is now its own cmdsynopsis, which ensures
it's not indented as was the case using sbrk.
@robx
Remove unused variable from test script
01722b3
@edolstra edolstra merged commit eef09c2 into NixOS:master Jul 7, 2017
@edolstra
Copy link
Member

edolstra commented Jul 7, 2017

Thanks!

@robx robx deleted the man branch July 7, 2017 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@robx @edolstra