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

Nix pills #153

Merged
merged 7 commits into from
Aug 22, 2017
Merged

Nix pills #153

merged 7 commits into from
Aug 22, 2017

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Aug 17, 2017

  1. Correct root path in manuals

Previous behavior added an extra ../ to the path, which works on web
(extra ../'s get removed once it gets to the root) but broke locally.

  1. When there are navigation links in docbook, present the top and bottom links

  2. Distribute the Nix Pills on the website

The about 60% of the nix pills have been ported to docbook. You could merge this now, or wait until they're fully ported. Also, of course, if you wish I did this differently, that'd be fine too :)

Previous behavior added an extra `../` to the path, which works on web
(extra ../'s get removed once it gets to the root) but broke locally.
@grahamc
Copy link
Member Author

grahamc commented Aug 19, 2017

@edolstra the Pills have all been ported. This is fully Ready To Go!

@grahamc
Copy link
Member Author

grahamc commented Aug 19, 2017

Please hold, actually. Verifying some changes to the makefile.

@grahamc
Copy link
Member Author

grahamc commented Aug 19, 2017

Ok, the patches I've made fix an issue where realpath failed if the website hadn't been generated before. Now it works OK and should be 🆗

layout.tt Outdated
@@ -59,6 +61,7 @@
<ul class="dropdown-menu">
<li><a href="[%root%]">NixOS</a></li>
<li><a href="[%root%]nix">Nix</a></li>
<li><a href="[%root%]nix-pills">Nix Pills</a></li>
Copy link
Member

Choose a reason for hiding this comment

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

It seems strange to put this in the drop down menu as a top-level project. Shouldn't it just be linked from the docs page?

Copy link
Member Author

Choose a reason for hiding this comment

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

It could be, I wasn't sure which top level project it would belong to for the menu, and was worried about it being confusing to click docs in nix/nixpkgs/nixos and end up in a different section. Then I put it in its own section. What do you recommend?

@grahamc
Copy link
Member Author

grahamc commented Aug 21, 2017

I moved the pills to nixos/support

@edolstra edolstra merged commit 10151c5 into NixOS:master Aug 22, 2017
@grahamc grahamc deleted the nix-pills branch August 22, 2017 11:17
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.

2 participants