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

nixos/nginx: drop extra semicolon in return example #76055

Merged
merged 1 commit into from Dec 19, 2019

Conversation

brprice
Copy link
Contributor

@brprice brprice commented Dec 19, 2019

nix appends a semicolon when it generates nginx's configuration file. If the string has a trailing semicolon, then nginx complains about having a duplicated semicolon.

The manual builds and has the correct example when this patch is applied to release-19.09.
However, the manual appears broken on master, so it was not tested there.
(

manual-combined.xml:19885: element para: Relax-NG validity error : Did not expect element para there
 19881    </para></listitem>
 19882    <listitem><para>
 19883      <literal>"strong"</literal>: authentication by username/password. If user is not registered his access is denied regardless of ACLs.
 19884    </para></listitem>
 19885  </itemizedlist></para><para>Double authentication is possible, e.g.
 19886  <para>
 19887    {

)

There is still the problem that in the manual's options.html, the embedded $ shows up escaped: Example: "301 http://example.com\$request_uri;" , but it is correctly not escaped in the searchable options. I haven't yet looked into this.

@danbst danbst merged commit 5b21085 into NixOS:master Dec 19, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Jan 16, 2020
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

2 participants