movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

doc,nixos/doc: unescape ellipses

Browse source 
Leftovers from the CommonMark conversion.
This commit is contained in:
Naïm Favier 2022-12-21 21:52:56 +01:00
parent e9e65810ac
commit 3f6fed2e59
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
9 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/contributing/submitting-changes.chapter.md
View file

@ -199,7 +199,7 @@ It’s important to test any executables generated by a build when you change or
### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards} ### Meets Nixpkgs contribution standards {#submitting-changes-contribution-standards}
The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc\... Everyone should read and understand the standards the community has for contributing before submitting a pull request. The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). The contributing document has detailed information on standards the Nix community has for commit messages, reviews, licensing of contributions you make to the project, etc... Everyone should read and understand the standards the community has for contributing before submitting a pull request.
## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests} ## Hotfixing pull requests {#submitting-changes-hotfixing-pull-requests}

2
nixos/doc/manual/configuration/x-windows.chapter.md
View file

@ -313,7 +313,7 @@ prefer to keep the layout definitions inside the NixOS configuration.
Unfortunately, the Xorg server does not (currently) support setting a Unfortunately, the Xorg server does not (currently) support setting a
keymap directly but relies instead on XKB rules to select the matching keymap directly but relies instead on XKB rules to select the matching
components (keycodes, types, \...) of a layout. This means that components (keycodes, types, ...) of a layout. This means that
components other than symbols won't be loaded by default. As a components other than symbols won't be loaded by default. As a
workaround, you can set the keymap using `setxkbmap` at the start of the workaround, you can set the keymap using `setxkbmap` at the start of the
session with: session with:

2
nixos/doc/manual/development/option-declarations.section.md
View file

@ -149,7 +149,7 @@ multiple modules, or as an alternative to related `enable` options.
As an example, we will take the case of display managers. There is a As an example, we will take the case of display managers. There is a
central display manager module for generic display manager options and a central display manager module for generic display manager options and a
module file per display manager backend (sddm, gdm \...). module file per display manager backend (sddm, gdm ...).
There are two approaches we could take with this module structure: There are two approaches we could take with this module structure:

2
nixos/doc/manual/development/option-types.section.md
View file

@ -324,7 +324,7 @@ Composed types are types that take a type as parameter. `listOf
: Type *`t1`* or type *`t2`*, e.g. `with types; either int str`. : Type *`t1`* or type *`t2`*, e.g. `with types; either int str`.
Multiple definitions cannot be merged. Multiple definitions cannot be merged.
`types.oneOf` \[ *`t1 t2`* \... \] `types.oneOf` \[ *`t1 t2`* ... \]
: Type *`t1`* or type *`t2`* and so forth, e.g. : Type *`t1`* or type *`t2`* and so forth, e.g.
`with types; oneOf [ int str bool ]`. Multiple definitions cannot be `with types; oneOf [ int str bool ]`. Multiple definitions cannot be

2
nixos/doc/manual/development/settings-options.section.md
View file

@ -24,7 +24,7 @@ can be declared. File formats can be separated into two categories:
an `extraConfig` option of type `lines` to allow arbitrary text an `extraConfig` option of type `lines` to allow arbitrary text
after the autogenerated part of the file. after the autogenerated part of the file.
## Nix-representable Formats (JSON, YAML, TOML, INI, \...) {#sec-settings-nix-representable} ## Nix-representable Formats (JSON, YAML, TOML, INI, ...) {#sec-settings-nix-representable}
By convention, formats like this are handled with a generic `settings` By convention, formats like this are handled with a generic `settings`
option, representing the full program configuration as a Nix value. The option, representing the full program configuration as a Nix value. The

2
nixos/doc/manual/from_md/configuration/x-windows.chapter.xml
View file

@ -352,7 +352,7 @@ services.xserver.extraLayouts.media = {
<para> <para>
Unfortunately, the Xorg server does not (currently) support Unfortunately, the Xorg server does not (currently) support
setting a keymap directly but relies instead on XKB rules to setting a keymap directly but relies instead on XKB rules to
select the matching components (keycodes, types, ...) of a layout. select the matching components (keycodes, types, …) of a layout.
This means that components other than symbols won’t be loaded by This means that components other than symbols won’t be loaded by
default. As a workaround, you can set the keymap using default. As a workaround, you can set the keymap using
<literal>setxkbmap</literal> at the start of the session with: <literal>setxkbmap</literal> at the start of the session with:

2
nixos/doc/manual/from_md/development/option-declarations.section.xml
View file

@ -222,7 +222,7 @@ lib.mkOption {
As an example, we will take the case of display managers. As an example, we will take the case of display managers.
There is a central display manager module for generic There is a central display manager module for generic
display manager options and a module file per display display manager options and a module file per display
manager backend (sddm, gdm ...). manager backend (sddm, gdm …).
</para> </para>
<para> <para>
There are two approaches we could take with this module There are two approaches we could take with this module

2
nixos/doc/manual/from_md/development/option-types.section.xml
View file

@ -668,7 +668,7 @@
<varlistentry> <varlistentry>
<term> <term>
<literal>types.oneOf</literal> [ <literal>types.oneOf</literal> [
<emphasis><literal>t1 t2</literal></emphasis> ... ] <emphasis><literal>t1 t2</literal></emphasis> … ]
</term> </term>
<listitem> <listitem>
<para> <para>

3
nixos/doc/manual/from_md/development/settings-options.section.xml
View file

@ -42,8 +42,7 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<section xml:id="sec-settings-nix-representable"> <section xml:id="sec-settings-nix-representable">
<title>Nix-representable Formats (JSON, YAML, TOML, INI, <title>Nix-representable Formats (JSON, YAML, TOML, INI, …)</title>
...)</title>
<para> <para>
By convention, formats like this are handled with a generic By convention, formats like this are handled with a generic
<literal>settings</literal> option, representing the full program <literal>settings</literal> option, representing the full program