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.

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

Fixes xml issues in description field for options.html #191

Merged
merged 5 commits into from Apr 18, 2018
Merged

Fixes xml issues in description field for options.html #191

merged 5 commits into from Apr 18, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Mar 5, 2018

Fixes links in description fields

To verify:

  • Search using the for <link.
  • An example option with link: boot.initrd.luks.mitigateDMAAttacks

I say this finishes fixing #89 assuming that the commit that fixed it partially has this description:

links are still not rendered as HTML links

This now renders the links.

20180304213334

Styles literal and options

To verify:

  • boot.extraTTYs has both.

20180304213114

If there are extra tags I missed, don't hesitate to open an issue and tag me in it.

@grahamc
Copy link
Member

grahamc commented Mar 7, 2018

How did you test this? When I try it I get an error saying it can't load option data.

@samueldr
Copy link
Member Author

samueldr commented Mar 7, 2018 •
edited

Ah, I was running it out of an HTTP server, otherwise it becomes way harder to test json stuff:

ruby -run -ehttpd . -p8000

The equivalent python directive (and other language directives) should work too. That's a really basic HTTP server.

As with the packages.json.gz files, testing locally may be wonky, as the HTTP server will need to handle the gzipped content properly. To test, it is possible to simply gunzip the files and change the path the AJAX request loads, as described in the README.

@grahamc
Copy link
Member

grahamc commented Mar 7, 2018

Tested and LGTM

@samueldr
Finishes fix fo NixOS#89, <link> → <a>.
146ea99 
To verify:

Search using the <input> for `<link`.

An example option with link: `boot.initrd.luks.mitigateDMAAttacks`
@samueldr
Parses <option> and <literal>.
8796fac
@samueldr
Copy link
Member Author

Hi!

Saw this earlier today and thought I could sneak in a fix!

20180416203526

20180416203531

Furthermore, while searching for other stray XML tags, I have seen that <important> weren't parsed. This means that the important bits were run-in with the main paragraph! See virtualisation.virtualbox.host.enableHardening.

20180416203421

20180416203427

@matthewbauer
Copy link
Member

/cc @domenkozar @edolstra who are the only devs with write access to this repo.

@edolstra edolstra merged commit 30ae47f into NixOS:master Apr 18, 2018
@edolstra
Copy link
Member

Thanks!

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
4 participants
@samueldr @grahamc @matthewbauer @edolstra