diff options
author | Naïm Favier <n@monade.li> | 2022-12-21 21:24:48 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-12-27 17:13:47 +0100 |
commit | d11832fd96ec146fc57ad11ec71dda7c0a2dee9c (patch) | |
tree | e55dc2eee608ef69d10eda418d0306a92a914e98 /nixos/doc/manual/from_md | |
parent | 3fc528ff7fa9d0de0343ffd877cdb76287be2549 (diff) | |
download | nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar.gz nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar.bz2 nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar.lz nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar.xz nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.tar.zst nixpkgs-d11832fd96ec146fc57ad11ec71dda7c0a2dee9c.zip |
doc,nixos/doc: unescape apostrophes
Leftovers from the CommonMark conversion.
Diffstat (limited to 'nixos/doc/manual/from_md')
30 files changed, 223 insertions, 222 deletions
diff --git a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml index 8b01b8f896a..cb69184378b 100644 --- a/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/administration/service-mgmt.chapter.xml @@ -85,7 +85,7 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. Packages in Nixpkgs sometimes provide systemd units with them, usually in e.g <literal>#pkg-out#/lib/systemd/</literal>. Putting such a package in <literal>environment.systemPackages</literal> - doesn't make the service available to users or the system. + doesn’t make the service available to users or the system. </para> <para> In order to enable a systemd <emphasis>system</emphasis> service @@ -97,9 +97,9 @@ systemd.packages = [ pkgs.packagekit ]; <para> Usually NixOS modules written by the community do the above, plus take care of other details. If a module was written for a service - you are interested in, you'd probably need only to use + you are interested in, you’d probably need only to use <literal>services.#name#.enable = true;</literal>. These services - are defined in Nixpkgs' + are defined in Nixpkgs’ <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"> <literal>nixos/modules/</literal> directory </link>. In case the service is simple enough, the above method should work, and start @@ -111,8 +111,8 @@ systemd.packages = [ pkgs.packagekit ]; unit file at <literal>#pkg-out#/lib/systemd/user/</literal>, using <xref linkend="opt-systemd.packages" /> will make you able to start the service via <literal>systemctl --user start</literal>, - but it won't start automatically on login. However, You can - imperatively enable it by adding the package's attribute to + but it won’t start automatically on login. However, You can + imperatively enable it by adding the package’s attribute to <xref linkend="opt-systemd.packages" /> and then do this (e.g): </para> <programlisting> @@ -129,7 +129,7 @@ $ systemctl --user enable syncthing.service </para> <para> Using <literal>systemctl --user enable syncthing.service</literal> - instead of the above, will work, but it'll use the absolute path + instead of the above, will work, but it’ll use the absolute path of <literal>syncthing.service</literal> for the symlink, and this path is in <literal>/nix/store/.../lib/systemd/user/</literal>. Hence <link linkend="sec-nix-gc">garbage collection</link> will diff --git a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml index 6f5fc130c6a..307754a8ee6 100644 --- a/nixos/doc/manual/from_md/configuration/profiles.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/profiles.chapter.xml @@ -4,7 +4,7 @@ In some cases, it may be desirable to take advantage of commonly-used, predefined configurations provided by nixpkgs, but different from those that come as default. This is a role fulfilled - by NixOS's Profiles, which come as files living in + by NixOS’s Profiles, which come as files living in <literal><nixpkgs/nixos/modules/profiles></literal>. That is to say, expected usage is to add them to the imports list of your <literal>/etc/configuration.nix</literal> as such: diff --git a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml index a2d7d2a9f11..ee4adca5640 100644 --- a/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/user-mgmt.chapter.xml @@ -36,7 +36,7 @@ users.users.alice = { <xref linkend="opt-users.users" /> and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users and groups, such as useradd, are no longer available. - Passwords may still be assigned by setting the user's + Passwords may still be assigned by setting the user’s <link linkend="opt-users.users._name_.hashedPassword">hashedPassword</link> option. A hashed password can be generated using <literal>mkpasswd</literal>. diff --git a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml index 1e90d4f3117..0f8cbbf448b 100644 --- a/nixos/doc/manual/from_md/configuration/wayland.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/wayland.chapter.xml @@ -5,9 +5,10 @@ display technology on NixOS, Wayland support is steadily improving. Where X11 separates the X Server and the window manager, on Wayland those are combined: a Wayland Compositor is like an X11 window - manager, but also embeds the Wayland 'Server' functionality. This - means it is sufficient to install a Wayland Compositor such as sway - without separately enabling a Wayland server: + manager, but also embeds the Wayland <quote>Server</quote> + functionality. This means it is sufficient to install a Wayland + Compositor such as sway without separately enabling a Wayland + server: </para> <programlisting language="bash"> programs.sway.enable = true; diff --git a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml index c17e98983b2..d588e2fc562 100644 --- a/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/x-windows.chapter.xml @@ -88,7 +88,7 @@ hardware.opengl.driSupport32Bit = true; <para> To enable auto-login, you need to define your default window manager and desktop environment. If you wanted no desktop - environment and i3 as your your window manager, you'd define: + environment and i3 as your your window manager, you’d define: </para> <programlisting language="bash"> services.xserver.displayManager.defaultSession = "none+i3"; @@ -122,8 +122,8 @@ services.xserver.displayManager.autoLogin.user = "alice"; <para> The second driver, <literal>intel</literal>, is specific to Intel GPUs, but not recommended by most distributions: it lacks several - modern features (for example, it doesn't support Glamor) and the - package hasn't been officially updated since 2015. + modern features (for example, it doesn’t support Glamor) and the + package hasn’t been officially updated since 2015. </para> <para> The results vary depending on the hardware, so you may have to try @@ -181,7 +181,7 @@ services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; <para> AMD provides a proprietary driver for its graphics cards that is not enabled by default because it’s not Free Software, is often - broken in nixpkgs and as of this writing doesn't offer more + broken in nixpkgs and as of this writing doesn’t offer more features or performance. If you still want to use it anyway, you need to explicitly set: </para> @@ -244,7 +244,7 @@ qt5.style = "gtk2"; <para> Create a file called <literal>us-greek</literal> with the following content (under a directory called - <literal>symbols</literal>; it's an XKB peculiarity that will help + <literal>symbols</literal>; it’s an XKB peculiarity that will help with testing): </para> <programlisting language="bash"> @@ -279,7 +279,7 @@ services.xserver.extraLayouts.us-greek = { <para> Applying this customization requires rebuilding several packages, and a broken XKB file can lead to the X session crashing at login. - Therefore, you're strongly advised to <emphasis role="strong">test + Therefore, you’re strongly advised to <emphasis role="strong">test your layout before applying it</emphasis>: </para> <programlisting> @@ -353,7 +353,7 @@ services.xserver.extraLayouts.media = { Unfortunately, the Xorg server does not (currently) support setting a keymap directly but relies instead on XKB rules to 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 <literal>setxkbmap</literal> at the start of the session with: </para> @@ -363,7 +363,7 @@ services.xserver.displayManager.sessionCommands = "setxkbmap -keycodes medi <para> If you are manually starting the X server, you should set the argument <literal>-xkbdir /etc/X11/xkb</literal>, otherwise X - won't find your layout files. For example with + won’t find your layout files. For example with <literal>xinit</literal> run </para> <programlisting> diff --git a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml index 42e70d1d81d..2deec20395e 100644 --- a/nixos/doc/manual/from_md/configuration/xfce.chapter.xml +++ b/nixos/doc/manual/from_md/configuration/xfce.chapter.xml @@ -36,8 +36,8 @@ services.picom = { <xref linkend="opt-environment.systemPackages" />. </para> <para> - If you'd like to add extra plugins to Thunar, add them to - <xref linkend="opt-programs.thunar.plugins" />. You shouldn't just + If you’d like to add extra plugins to Thunar, add them to + <xref linkend="opt-programs.thunar.plugins" />. You shouldn’t just add them to <xref linkend="opt-environment.systemPackages" />. </para> </section> diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml index c0f40cb3423..f7870f8beb3 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -152,13 +152,13 @@ <warning> <para> This type will be deprecated in the future because it - doesn't recurse into attribute sets, silently drops - earlier attribute definitions, and doesn't discharge + doesn’t recurse into attribute sets, silently drops + earlier attribute definitions, and doesn’t discharge <literal>lib.mkDefault</literal>, <literal>lib.mkIf</literal> and co. For allowing arbitrary attribute sets, prefer <literal>types.attrsOf types.anything</literal> instead - which doesn't have these problems. + which doesn’t have these problems. </para> </warning> </listitem> @@ -453,7 +453,7 @@ <literal>_module.args</literal> should be used instead for most arguments since it allows overriding. <emphasis><literal>specialArgs</literal></emphasis> - should only be used for arguments that can't go through + should only be used for arguments that can’t go through the module fixed-point, because of infinite recursion or other problems. An example is overriding the <literal>lib</literal> argument, because @@ -477,7 +477,7 @@ instead of requiring <literal>the-submodule.config.config = "value"</literal>. This is because only when modules - <emphasis>don't</emphasis> set the + <emphasis>don’t</emphasis> set the <literal>config</literal> or <literal>options</literal> keys, all keys are interpreted as option definitions in the <literal>config</literal> section. Enabling this diff --git a/nixos/doc/manual/from_md/development/replace-modules.section.xml b/nixos/doc/manual/from_md/development/replace-modules.section.xml index cf8a39ba844..d5115092bf6 100644 --- a/nixos/doc/manual/from_md/development/replace-modules.section.xml +++ b/nixos/doc/manual/from_md/development/replace-modules.section.xml @@ -3,8 +3,8 @@ <para> Modules that are imported can also be disabled. The option declarations, config implementation and the imports of a disabled - module will be ignored, allowing another to take it's place. This - can be used to import a set of modules from another channel while + module will be ignored, allowing another to take its place. This can + be used to import a set of modules from another channel while keeping the rest of the system on a stable release. </para> <para> @@ -19,7 +19,7 @@ This example will replace the existing postgresql module with the version defined in the nixos-unstable channel while keeping the rest of the modules and packages from the original nixos channel. This - only overrides the module definition, this won't use postgresql from + only overrides the module definition, this won’t use postgresql from nixos-unstable unless explicitly configured to do so. </para> <programlisting language="bash"> @@ -40,7 +40,7 @@ <para> This example shows how to define a custom module as a replacement for an existing module. Importing this module will disable the - original module without having to know it's implementation details. + original module without having to know its implementation details. </para> <programlisting language="bash"> { config, lib, pkgs, ... }: diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml index d26dd96243d..6fbe242ab6f 100644 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -19,10 +19,10 @@ </listitem> <listitem> <para> - Non-nix-representable ones: These can't be trivially mapped to a + Non-nix-representable ones: These can’t be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement - <literal>if true; then echo hi; fi</literal> doesn't have a + <literal>if true; then echo hi; fi</literal> doesn’t have a trivial representation in Nix. </para> <para> diff --git a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml index 079c8006057..0d8a33df206 100644 --- a/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-documentation.chapter.xml @@ -23,7 +23,7 @@ $ nix-shell nix-shell$ make </programlisting> <para> - Once you are done making modifications to the manual, it's + Once you are done making modifications to the manual, it’s important to build it before committing. You can do that as follows: </para> diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml index 367731eda09..ec061a31892 100644 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -90,7 +90,7 @@ This <literal>imports</literal> list enumerates the paths to other NixOS modules that should be included in the evaluation of the system configuration. A default set of modules is defined in - the file <literal>modules/module-list.nix</literal>. These don't + the file <literal>modules/module-list.nix</literal>. These don’t need to be added in the import list. </para> </listitem> diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 99bd37808c2..8e91b683f44 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -255,7 +255,7 @@ start_all() <listitem> <para> Return a list of different interpretations of what is - currently visible on the machine's screen using optical + currently visible on the machine’s screen using optical character recognition. The number and order of the interpretations is not specified and is subject to change, but if no exception is raised at least one will be returned. @@ -276,7 +276,7 @@ start_all() <listitem> <para> Return a textual representation of what is currently visible - on the machine's screen using optical character recognition. + on the machine’s screen using optical character recognition. </para> <note> <para> @@ -630,8 +630,8 @@ machine.wait_for_unit("xautolock.service", "x-session-user") <literal>stop_job</literal>. </para> <para> - For faster dev cycles it's also possible to disable the - code-linters (this shouldn't be committed though): + For faster dev cycles it’s also possible to disable the + code-linters (this shouldn’t be committed though): </para> <programlisting language="bash"> { @@ -650,7 +650,7 @@ machine.wait_for_unit("xautolock.service", "x-session-user") <para> This will produce a Nix warning at evaluation time. To fully disable the linter, wrap the test script in comment directives to - disable the Black linter directly (again, don't commit this within + disable the Black linter directly (again, don’t commit this within the Nixpkgs repository): </para> <programlisting language="bash"> diff --git a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml index 86f0b15b41c..0f299fafadd 100644 --- a/nixos/doc/manual/from_md/installation/changing-config.chapter.xml +++ b/nixos/doc/manual/from_md/installation/changing-config.chapter.xml @@ -16,7 +16,7 @@ </para> <warning> <para> - This command doesn't start/stop + This command doesn’t start/stop <link linkend="opt-systemd.user.services">user services</link> automatically. <literal>nixos-rebuild</literal> only runs a <literal>daemon-reload</literal> for each user with running user @@ -64,8 +64,8 @@ <para> which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu - <quote>NixOS - Profile 'test'</quote>. This can be useful to - separate test configurations from <quote>stable</quote> + <quote>NixOS - Profile <quote>test</quote></quote>. This can be + useful to separate test configurations from <quote>stable</quote> configurations. </para> <para> diff --git a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml index f29200952ac..bcb8573f1b4 100644 --- a/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml @@ -53,7 +53,7 @@ $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell Switch to the NixOS channel: </para> <para> - If you've just installed Nix on a non-NixOS distribution, you + If you’ve just installed Nix on a non-NixOS distribution, you will be on the <literal>nixpkgs</literal> channel by default. </para> <programlisting> @@ -78,11 +78,11 @@ $ nix-channel --add https://nixos.org/channels/nixos-version nixpkgs Install the NixOS installation tools: </para> <para> - You'll need <literal>nixos-generate-config</literal> and + You’ll need <literal>nixos-generate-config</literal> and <literal>nixos-install</literal>, but this also makes some man pages and <literal>nixos-enter</literal> available, just in case you want to chroot into your NixOS partition. NixOS installs - these by default, but you don't have NixOS yet.. + these by default, but you don’t have NixOS yet.. </para> <programlisting> $ nix-env -f '<nixpkgs>' -iA nixos-install-tools @@ -105,7 +105,7 @@ $ nix-env -f '<nixpkgs>' -iA nixos-install-tools mounting steps of <xref linkend="sec-installation" /> </para> <para> - If you're about to install NixOS in place using + If you’re about to install NixOS in place using <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step. </para> @@ -118,14 +118,14 @@ $ nix-env -f '<nixpkgs>' -iA nixos-install-tools $ sudo `which nixos-generate-config` --root /mnt </programlisting> <para> - You'll probably want to edit the configuration files. Refer to + You’ll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref linkend="sec-installation" /> for more information. </para> <para> Consider setting up the NixOS bootloader to give you the ability to boot on your existing Linux partition. For instance, if - you're using GRUB and your existing distribution is running + you’re using GRUB and your existing distribution is running Ubuntu, you may want to add something like this to your <literal>configuration.nix</literal>: </para> @@ -215,17 +215,17 @@ $ sudo `which nixos-generate-config` </programlisting> <para> Note that this will place the generated configuration files in - <literal>/etc/nixos</literal>. You'll probably want to edit the + <literal>/etc/nixos</literal>. You’ll probably want to edit the configuration files. Refer to the <literal>nixos-generate-config</literal> step in <xref linkend="sec-installation" /> for more information. </para> <para> - You'll likely want to set a root password for your first boot - using the configuration files because you won't have a chance to + You’ll likely want to set a root password for your first boot + using the configuration files because you won’t have a chance to enter a password until after you reboot. You can initialize the root password to an empty one with this line: (and of course - don't forget to set one once you've rebooted or to lock the + don’t forget to set one once you’ve rebooted or to lock the account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>) </para> @@ -262,7 +262,7 @@ $ sudo chown -R 0:0 /nix </para> <para> <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup - scripts to move <emphasis>everything</emphasis> that's in the + scripts to move <emphasis>everything</emphasis> that’s in the root partition to <literal>/old-root</literal>. This will move your existing distribution out of the way in the very early stages of the NixOS bootup. There are exceptions (we do need to @@ -294,7 +294,7 @@ $ sudo chown -R 0:0 /nix wiping of the existing distribution. Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS to remove all mutable files from your root partition - (anything that's not in <literal>/nix</literal> or + (anything that’s not in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on the next boot. </para> @@ -307,14 +307,14 @@ $ sudo chown -R 0:0 /nix </para> </note> <para> - Let's create the files: + Let’s create the files: </para> <programlisting> $ sudo touch /etc/NIXOS $ sudo touch /etc/NIXOS_LUSTRATE </programlisting> <para> - Let's also make sure the NixOS configuration files are kept once + Let’s also make sure the NixOS configuration files are kept once we reboot on NixOS: </para> <programlisting> @@ -331,7 +331,7 @@ $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE <warning> <para> Once you complete this step, your current distribution will no - longer be bootable! If you didn't get all the NixOS + longer be bootable! If you didn’t get all the NixOS configuration right, especially those settings pertaining to boot loading and root partition, NixOS may not be bootable either. Have a USB rescue device ready in case this happens. @@ -349,7 +349,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot <listitem> <para> If for some reason you want to revert to the old distribution, - you'll need to boot on a USB rescue disk and do something along + you’ll need to boot on a USB rescue disk and do something along these lines: </para> <programlisting> @@ -367,7 +367,7 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot loader. </para> <para> - And of course, if you're happy with NixOS and no longer need the + And of course, if you’re happy with NixOS and no longer need the old distribution: </para> <programlisting> @@ -376,7 +376,7 @@ sudo rm -rf /old-root </listitem> <listitem> <para> - It's also worth noting that this whole process can be automated. + It’s also worth noting that this whole process can be automated. This is especially useful for Cloud VMs, where provider do not provide NixOS. For instance, <link xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link> diff --git a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml index 46ea0d59b6c..93d1d47faef 100644 --- a/nixos/doc/manual/from_md/installation/installing-kexec.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-kexec.section.xml @@ -54,7 +54,7 @@ nix-build -A kexec.x86_64-linux '<nixpkgs/nixos/release.nix>' running Linux Distribution. </para> <para> - Note it’s symlinks pointing elsewhere, so <literal>cd</literal> in, + Note its symlinks pointing elsewhere, so <literal>cd</literal> in, and use <literal>scp * root@$destination</literal> to copy it over, rather than rsync. </para> diff --git a/nixos/doc/manual/from_md/installation/installing-usb.section.xml b/nixos/doc/manual/from_md/installation/installing-usb.section.xml index 9d12ac45aac..e89d812ecc7 100644 --- a/nixos/doc/manual/from_md/installation/installing-usb.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-usb.section.xml @@ -116,9 +116,9 @@ sudo dd if=<path-to-image> of=/dev/rdiskX bs=4m </para> <note> <para> - Using the 'raw' <literal>rdiskX</literal> device instead of - <literal>diskX</literal> with dd completes in minutes instead of - hours. + Using the <quote>raw</quote> <literal>rdiskX</literal> device + instead of <literal>diskX</literal> with dd completes in minutes + instead of hours. </para> </note> <orderedlist numeration="arabic" spacing="compact"> diff --git a/nixos/doc/manual/from_md/installation/installing.chapter.xml b/nixos/doc/manual/from_md/installation/installing.chapter.xml index c8d1e26b5e7..5654eb424fc 100644 --- a/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -345,12 +345,12 @@ OK <!-- legacy anchor --> </para> <para> - Here's an example partition scheme for UEFI, using + Here’s an example partition scheme for UEFI, using <literal>/dev/sda</literal> as the device. </para> <note> <para> - You can safely ignore <literal>parted</literal>'s + You can safely ignore <literal>parted</literal>’s informational message about needing to update /etc/fstab. </para> </note> @@ -415,12 +415,12 @@ OK <!-- legacy anchor --> </para> <para> - Here's an example partition scheme for Legacy Boot, using + Here’s an example partition scheme for Legacy Boot, using <literal>/dev/sda</literal> as the device. </para> <note> <para> - You can safely ignore <literal>parted</literal>'s + You can safely ignore <literal>parted</literal>’s informational message about needing to update /etc/fstab. </para> </note> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml index 68d2ab389e8..8b9ab5a544c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1509.section.xml @@ -14,7 +14,7 @@ <link xlink:href="http://hackage.haskell.org/">Hackage</link> -- well in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the - <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's + <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User’s Guide to the Haskell Infrastructure</link>. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we @@ -464,7 +464,7 @@ </listitem> <listitem> <para> - Steam now doesn't need root rights to work. Instead of using + Steam now doesn’t need root rights to work. Instead of using <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>. <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>, and old @@ -542,7 +542,7 @@ inconvenience is the sheer size of the Haskell package set. Name-based lookups are expensive, and most <literal>nix-env -qa</literal> operations would become much - slower if we'd add the entire Hackage database into the top + slower if we’d add the entire Hackage database into the top level attribute set. Instead, the list of Haskell packages can be displayed by running: </para> @@ -566,13 +566,13 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc <para> Previous versions of NixOS came with a feature called <literal>ghc-wrapper</literal>, a small script that allowed GHC - to transparently pick up on libraries installed in the user's + to transparently pick up on libraries installed in the user’s profile. This feature has been deprecated; <literal>ghc-wrapper</literal> was removed from the distribution. The proper way to register Haskell libraries with the compiler now is the <literal>haskellPackages.ghcWithPackages</literal> function. The - <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's + <link xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User’s Guide to the Haskell Infrastructure</link> provides more information about this subject. </para> @@ -593,7 +593,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc have a function attribute called <literal>extension</literal> that users could override in their <literal>~/.nixpkgs/config.nix</literal> files to configure - additional attributes, etc. That function still exists, but it's + additional attributes, etc. That function still exists, but it’s now called <literal>overrides</literal>. </para> </listitem> @@ -748,7 +748,7 @@ in <literal>/etc/ssh/moduli</literal> file with respect to the <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities discovered in the Diffie-Hellman key exchange</link> can now - replace OpenSSH's default version with one they generated + replace OpenSSH’s default version with one they generated themselves using the new <literal>services.openssh.moduliFile</literal> option. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml index afbd2fd2c79..dd869dcb756 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1603.section.xml @@ -403,7 +403,7 @@ nginx.override { </listitem> <listitem> <para> - <literal>s3sync</literal> is removed, as it hasn't been + <literal>s3sync</literal> is removed, as it hasn’t been developed by upstream for 4 years and only runs with ruby 1.8. For an actively-developer alternative look at <literal>tarsnap</literal> and others. @@ -411,7 +411,7 @@ nginx.override { </listitem> <listitem> <para> - <literal>ruby_1_8</literal> has been removed as it's not + <literal>ruby_1_8</literal> has been removed as it’s not supported from upstream anymore and probably contains security issues. </para> @@ -439,7 +439,7 @@ nginx.override { <listitem> <para> The <literal>Ctrl+Alt+Backspace</literal> key combination no - longer kills the X server by default. There's a new option + longer kills the X server by default. There’s a new option <literal>services.xserver.enableCtrlAltBackspace</literal> allowing to enable the combination again. </para> @@ -457,7 +457,7 @@ nginx.override { <literal>/var/lib/postfix</literal>. Old configurations are migrated automatically. <literal>service.postfix</literal> module has also received many improvements, such as correct - directories' access rights, new <literal>aliasFiles</literal> + directories’ access rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and more. </para> </listitem> @@ -497,7 +497,7 @@ nginx.override { <para> There are also Gutenprint improvements; in particular, a new option <literal>services.printing.gutenprint</literal> is added - to enable automatic updating of Gutenprint PPMs; it's greatly + to enable automatic updating of Gutenprint PPMs; it’s greatly recommended to enable it instead of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list. @@ -545,7 +545,7 @@ nginx.override { <literal>services.udev.extraRules</literal> option now writes rules to <literal>99-local.rules</literal> instead of <literal>10-local.rules</literal>. This makes all the user rules - apply after others, so their results wouldn't be overridden by + apply after others, so their results wouldn’t be overridden by anything else. </para> </listitem> @@ -633,7 +633,7 @@ error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be creat has been removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no longer requires (or even supports) the "start everything as a child of the - agent" scheme we've implemented in NixOS for older + agent" scheme we’ve implemented in NixOS for older versions. To configure the gpg-agent for your X session, add the following code to <literal>~/.bashrc</literal> or some file that’s sourced when your shell is started: diff --git a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml index 0fba40a0e78..b0b0ed5aeac 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1609.section.xml @@ -78,7 +78,7 @@ LTS Haskell package set. That support has been dropped. The previously provided <literal>haskell.packages.lts-x_y</literal> package sets still exist in name to aviod breaking user code, - but these package sets don't actually contain the versions + but these package sets don’t actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and @@ -119,7 +119,7 @@ </listitem> <listitem> <para> - Gitlab's maintainance script <literal>gitlab-runner</literal> + Gitlab’s maintainance script <literal>gitlab-runner</literal> was removed and split up into the more clearer <literal>gitlab-run</literal> and <literal>gitlab-rake</literal> scripts, because <literal>gitlab-runner</literal> is a component @@ -164,7 +164,7 @@ <para> <literal>goPackages</literal> was replaced with separated Go applications in appropriate <literal>nixpkgs</literal> - categories. Each Go package uses its own dependency set. There's + categories. Each Go package uses its own dependency set. There’s also a new <literal>go2nix</literal> tool introduced to generate a Go package definition from its Go source automatically. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml index 1119ec53dfc..01447b38462 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1703.section.xml @@ -22,7 +22,7 @@ </listitem> <listitem> <para> - The default desktop environment now is KDE's Plasma 5. KDE 4 + The default desktop environment now is KDE’s Plasma 5. KDE 4 has been removed </para> </listitem> @@ -560,7 +560,7 @@ Parsoid service now uses YAML configuration format. <literal>service.parsoid.interwikis</literal> is now called <literal>service.parsoid.wikis</literal> and is a list of - either API URLs or attribute sets as specified in parsoid's + either API URLs or attribute sets as specified in parsoid’s documentation. </para> </listitem> @@ -647,7 +647,7 @@ in <listitem> <para> <literal>local_recipient_maps</literal> is not set to empty - value by Postfix service. It's an insecure default as stated + value by Postfix service. It’s an insecure default as stated by Postfix documentation. Those who want to retain this setting need to set it via <literal>services.postfix.extraConfig</literal>. @@ -669,7 +669,7 @@ in <listitem> <para> The socket handling of the <literal>services.rmilter</literal> - module has been fixed and refactored. As rmilter doesn't + module has been fixed and refactored. As rmilter doesn’t support binding to more than one socket, the options <literal>bindUnixSockets</literal> and <literal>bindInetSockets</literal> have been replaced by @@ -729,7 +729,7 @@ in improves visual consistency and makes Java follow system font style, improving the situation on HighDPI displays. This has a cost of increased closure size; for server and other headless - workloads it's recommended to use + workloads it’s recommended to use <literal>jre_headless</literal>. </para> </listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml index fc5d11f07c8..8aafd9f23c8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1709.section.xml @@ -26,7 +26,7 @@ The module option <literal>services.xserver.xrandrHeads</literal> now causes the first head specified in this list to be set as the primary - head. Apart from that, it's now possible to also set + head. Apart from that, it’s now possible to also set additional options by using an attribute set, for example: </para> <programlisting language="bash"> @@ -543,7 +543,7 @@ </listitem> <listitem> <para> - Radicale's default package has changed from 1.x to 2.x. + Radicale’s default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by @@ -582,7 +582,7 @@ </listitem> <listitem> <para> - <literal>flexget</literal>'s state database cannot be upgraded + <literal>flexget</literal>’s state database cannot be upgraded to its new internal format, requiring removal of any existing <literal>db-config.sqlite</literal> which will be automatically recreated. @@ -590,9 +590,9 @@ </listitem> <listitem> <para> - The <literal>ipfs</literal> service now doesn't ignore the - <literal>dataDir</literal> option anymore. If you've ever set - this option to anything other than the default you'll have to + The <literal>ipfs</literal> service now doesn’t ignore the + <literal>dataDir</literal> option anymore. If you’ve ever set + this option to anything other than the default you’ll have to either unset it (so the default gets used) or migrate the old data manually with </para> @@ -651,16 +651,16 @@ rmdir /var/lib/ipfs/.ipfs </listitem> <listitem> <para> - <literal>cc-wrapper</literal>'s setup-hook now exports a + <literal>cc-wrapper</literal><quote>s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. <literal>LD</literal>, <literal>STRIP</literal>, <literal>RANLIB</literal>, etc). - This is done to prevent packages' build systems guessing, - which is harder to predict, especially when cross-compiling. - However, some packages have broken due to this—their build - systems either not supporting, or claiming to support without - adequate testing, taking such environment variables as - parameters. + This is done to prevent packages</quote> build systems + guessing, which is harder to predict, especially when + cross-compiling. However, some packages have broken due to + this—their build systems either not supporting, or claiming to + support without adequate testing, taking such environment + variables as parameters. </para> </listitem> <listitem> @@ -688,10 +688,10 @@ rmdir /var/lib/ipfs/.ipfs </listitem> <listitem> <para> - grsecurity/PaX support has been dropped, following upstream's + grsecurity/PaX support has been dropped, following upstream’s decision to cease free support. See <link xlink:href="https://grsecurity.net/passing_the_baton.php"> - upstream's announcement</link> for more information. No + upstream’s announcement</link> for more information. No complete replacement for grsecurity/PaX is available presently. </para> @@ -794,7 +794,7 @@ FLUSH PRIVILEGES; <para> Modules can now be disabled by using <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules"> - disabledModules</link>, allowing another to take it's place. + disabledModules</link>, allowing another to take it’s place. This can be used to import a set of modules from another channel while keeping the rest of the system on a stable release. @@ -808,7 +808,7 @@ FLUSH PRIVILEGES; provided by fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults are less invasive and provide rendering that is more consistent with other systems - and hopefully with each font designer's intent. Some + and hopefully with each font designer’s intent. Some system-wide configuration has been removed from the Fontconfig NixOS module where user Fontconfig settings are available. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml index 910cad467e9..6c2a7344f90 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml @@ -16,9 +16,9 @@ <listitem> <para> Platform support: x86_64-linux and x86_64-darwin since release - time (the latter isn't NixOS, really). Binaries for + time (the latter isn’t NixOS, really). Binaries for aarch64-linux are available, but no channel exists yet, as - it's waiting for some test fixes, etc. + it’s waiting for some test fixes, etc. </para> </listitem> <listitem> @@ -497,7 +497,7 @@ with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs - manual. The old logic isn't but is easy to describe: + manual. The old logic isn’t but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many <literal>propagatedNativeBuildInputs</literal> should instead @@ -541,7 +541,7 @@ Previously, if other options in the Postfix module like <literal>services.postfix.useSrs</literal> were set and the user set config options that were also set by such options, - the resulting config wouldn't include all options that were + the resulting config wouldn’t include all options that were needed. They are now merged correctly. If config options need to be overridden, <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be used. @@ -626,7 +626,7 @@ if <literal>config.networking.domain</literal> is set, <literal>matomo.${config.networking.hostName}</literal> if it is not set. If you change your - <literal>serverName</literal>, remember you'll need to + <literal>serverName</literal>, remember you’ll need to update the <literal>trustedHosts[]</literal> array in <literal>/var/lib/matomo/config/config.ini.php</literal> as well. @@ -793,7 +793,7 @@ <para> <literal>services.btrfs.autoScrub</literal> has been added, to periodically check btrfs filesystems for data corruption. If - there's a correct copy available, it will automatically repair + there’s a correct copy available, it will automatically repair corrupted blocks. </para> </listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml index aa4637a99b6..e3db02aed8c 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1809.section.xml @@ -523,8 +523,8 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <listitem> <para> The <literal>netcat</literal> package is now taken directly - from OpenBSD's <literal>libressl</literal>, instead of relying - on Debian's fork. The new version should be very close to the + from OpenBSD’s <literal>libressl</literal>, instead of relying + on Debian’s fork. The new version should be very close to the old version, but there are some minor differences. Importantly, flags like -b, -q, -C, and -Z are no longer accepted by the nc command. @@ -533,7 +533,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <listitem> <para> The <literal>services.docker-registry.extraConfig</literal> - object doesn't contain environment variables anymore. Instead + object doesn’t contain environment variables anymore. Instead it needs to provide an object structure that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the @@ -543,7 +543,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <listitem> <para> <literal>gnucash</literal> has changed from version 2.4 to - 3.x. If you've been using <literal>gnucash</literal> (version + 3.x. If you’ve been using <literal>gnucash</literal> (version 2.4) instead of <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data file(s) with <literal>gnucash26</literal> and then save them to upgrade the @@ -874,7 +874,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' The <literal>programs.screen</literal> module provides allows to configure <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as the config exists, - but the package wasn't available. Since 18.09 + but the package wasn’t available. Since 18.09 <literal>pkgs.screen</literal> will be added to <literal>environment.systemPackages</literal>. </para> @@ -920,7 +920,7 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <para> NixOS option descriptions are now automatically broken up into individual paragraphs if the text contains two consecutive - newlines, so it's no longer necessary to use + newlines, so it’s no longer necessary to use <literal></para><para></literal> to start a new paragraph. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml index 31c5c1fc7f4..a876cad30c5 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1903.section.xml @@ -29,9 +29,9 @@ <para> By default, <literal>services.xserver.desktopManager.pantheon</literal> - enables LightDM as a display manager, as pantheon's screen + enables LightDM as a display manager, as pantheon’s screen locking implementation relies on it. Because of that it is - recommended to leave LightDM enabled. If you'd like to + recommended to leave LightDM enabled. If you’d like to disable it anyway, set <literal>services.xserver.displayManager.lightdm.enable</literal> to <literal>false</literal> and enable your preferred @@ -39,8 +39,8 @@ </para> </note> <para> - Also note that Pantheon's LightDM greeter is not enabled by - default, because it has numerous issues in NixOS and isn't + Also note that Pantheon’s LightDM greeter is not enabled by + default, because it has numerous issues in NixOS and isn’t optimal for use here yet. </para> </listitem> @@ -200,7 +200,7 @@ <listitem> <para> The <literal>ntp</literal> module now has sane default - restrictions. If you're relying on the previous defaults, + restrictions. If you’re relying on the previous defaults, which permitted all queries and commands from all firewall-permitted sources, you can set <literal>services.ntp.restrictDefault</literal> and @@ -360,9 +360,9 @@ presence of <literal>services.sssd.enable = true</literal> because nscd caching would interfere with <literal>sssd</literal> in unpredictable ways as well. Because - we're using nscd not for caching, but for convincing glibc to + we’re using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, - we have decided to disable caching globally now, as it's + we have decided to disable caching globally now, as it’s usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the @@ -453,7 +453,7 @@ with its control field set to <literal>sufficient</literal> instead of <literal>required</literal>, so that password managed only by later PAM password modules are being executed. - Previously, for example, changing an LDAP account's password + Previously, for example, changing an LDAP account’s password through PAM was not possible: the whole password module verification was exited prematurely by <literal>pam_unix</literal>, preventing @@ -497,11 +497,11 @@ <link xlink:href="https://matrix.org/blog/2019/02/05/synapse-0-99-0/">the last version to accept self-signed certificates</link>. As such, it is now recommended to use a proper certificate - verified by a root CA (for example Let's Encrypt). The new + verified by a root CA (for example Let’s Encrypt). The new <link linkend="module-services-matrix">manual chapter on Matrix</link> contains a working example of using nginx as a reverse proxy in front of <literal>matrix-synapse</literal>, - using Let's Encrypt certificates. + using Let’s Encrypt certificates. </para> </listitem> <listitem> @@ -682,7 +682,7 @@ <link xlink:href="options.html#opt-services.ndppd.enable">all config options</link> provided by the current upstream version as service options. Additionally the <literal>ndppd</literal> - package doesn't contain the systemd unit configuration from + package doesn’t contain the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml index f9b99961d27..f8b8129cfe4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1909.section.xml @@ -82,13 +82,13 @@ </listitem> <listitem> <para> - We've updated to Xfce 4.14, which brings a new module + We’ve updated to Xfce 4.14, which brings a new module <literal>services.xserver.desktopManager.xfce4-14</literal>. - If you'd like to upgrade, please switch from the + If you’d like to upgrade, please switch from the <literal>services.xserver.desktopManager.xfce</literal> module - as it will be deprecated in a future release. They're - incompatibilities with the current Xfce module; it doesn't - support <literal>thunarPlugins</literal> and it isn't + as it will be deprecated in a future release. They’re + incompatibilities with the current Xfce module; it doesn’t + support <literal>thunarPlugins</literal> and it isn’t recommended to use <literal>services.xserver.desktopManager.xfce</literal> and <literal>services.xserver.desktopManager.xfce4-14</literal> @@ -125,7 +125,7 @@ </itemizedlist> <para> With these options we hope to give users finer grained control - over their systems. Prior to this change you'd either have to + over their systems. Prior to this change you’d either have to manually disable options or use <literal>environment.gnome3.excludePackages</literal> which only excluded the optional applications. @@ -138,7 +138,7 @@ <listitem> <para> Orthogonal to the previous changes to the GNOME 3 desktop - manager module, we've updated all default services and + manager module, we’ve updated all default services and applications to match as close as possible to a default reference GNOME 3 experience. </para> @@ -295,7 +295,7 @@ <literal>services.xserver.desktopManager.mate</literal> Note Mate uses <literal>programs.system-config-printer</literal> as it - doesn't use it as a service, but its graphical interface + doesn’t use it as a service, but its graphical interface directly. </para> </listitem> @@ -347,7 +347,7 @@ <literal>services.prometheus.alertmanager.user</literal> and <literal>services.prometheus.alertmanager.group</literal> have been removed because the alertmanager service is now using - systemd's + systemd’s <link xlink:href="http://0pointer.net/blog/dynamic-users-with-systemd.html"> DynamicUser mechanism</link> which obviates these options. </para> @@ -366,7 +366,7 @@ The <literal>services.nzbget.configFile</literal> and <literal>services.nzbget.openFirewall</literal> options were removed as they are managed internally by the nzbget. The - <literal>services.nzbget.dataDir</literal> option hadn't + <literal>services.nzbget.dataDir</literal> option hadn’t actually been used by the module for some time and so was removed as cleanup. </para> @@ -475,7 +475,7 @@ Make sure you set the <literal>_netdev</literal> option for each of the file systems referring to block devices provided by the autoLuks module. Not doing this might render the system - in a state where it doesn't boot anymore. + in a state where it doesn’t boot anymore. </para> <para> If you are actively using the <literal>autoLuks</literal> @@ -667,7 +667,7 @@ instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase. This will mean nginx will - no longer depend on certificates it isn't explicitly managing + no longer depend on certificates it isn’t explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at @@ -687,8 +687,8 @@ <literal>services.xserver.desktopManager.xterm</literal> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher. Previously the xterm desktopManager was - enabled when xserver was enabled, but it isn't useful for all - people so it didn't make sense to have any desktopManager + enabled when xserver was enabled, but it isn’t useful for all + people so it didn’t make sense to have any desktopManager enabled default. </para> </listitem> @@ -696,7 +696,7 @@ <para> The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been - removed as it doesn't receive any updates from upstream and + removed as it doesn’t receive any updates from upstream and depends on outdated Python2-based modules. </para> </listitem> @@ -744,8 +744,8 @@ <literal>services.gitlab.secrets.dbFile</literal>, <literal>services.gitlab.secrets.otpFile</literal> and <literal>services.gitlab.secrets.jwsFile</literal>). This was - done so that secrets aren't stored in the world-readable nix - store, but means that for each option you'll have to create a + done so that secrets aren’t stored in the world-readable nix + store, but means that for each option you’ll have to create a file with the same exact string, add "File" to the end of the option name, and change the definition to a string pointing to the corresponding file; e.g. @@ -791,7 +791,7 @@ <listitem> <para> The <literal>nodejs-11_x</literal> package has been removed as - it's EOLed by upstream. + it’s EOLed by upstream. </para> </listitem> <listitem> @@ -961,7 +961,7 @@ from the upstream default <literal>speex-float-1</literal> to <literal>speex-float-5</literal>. Be aware that low-powered ARM-based and MIPS-based boards will struggle with this so - you'll need to set + you’ll need to set <literal>hardware.pulseaudio.daemon.config.resample-method</literal> back to <literal>speex-float-1</literal>. </para> @@ -1004,7 +1004,7 @@ </listitem> <listitem> <para> - It's now possible to change configuration in + It’s now possible to change configuration in <link xlink:href="options.html#opt-services.nextcloud.enable">services.nextcloud</link> after the initial deploy since all config parameters are persisted in an additional config file generated by the @@ -1178,7 +1178,7 @@ <link xlink:href="https://ceph.com/releases/v14-2-0-nautilus-released/">release notes</link> for details. The mgr dashboard as well as osds backed by loop-devices is no longer explicitly supported by - the package and module. Note: There's been some issues with + the package and module. Note: There’s been some issues with python-cherrypy, which is used by the dashboard and prometheus mgr modules (and possibly others), hence 0000-dont-check-cherrypy-version.patch. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml index 53e6e1329a9..fbd2212f295 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2003.section.xml @@ -73,7 +73,7 @@ <listitem> <para> The graphical installer image starts the graphical session - automatically. Before you'd be greeted by a tty and asked to + automatically. Before you’d be greeted by a tty and asked to enter <literal>systemctl start display-manager</literal>. It is now possible to disable the display-manager from running by selecting the <literal>Disable display-manager</literal> quirk @@ -93,7 +93,7 @@ <link xlink:href="options.html#opt-services.xserver.desktopManager.pantheon.enable">services.xserver.desktopManager.pantheon.enable</link>, we now default to also use <link xlink:href="https://blog.elementary.io/say-hello-to-the-new-greeter/"> - Pantheon's newly designed greeter </link>. Contrary to NixOS's + Pantheon’s newly designed greeter </link>. Contrary to NixOS’s usual update policy, Pantheon will receive updates during the cycle of NixOS 20.03 when backwards compatible. </para> @@ -196,7 +196,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. </listitem> <listitem> <para> - UPower's configuration is now managed by NixOS and can be + UPower’s configuration is now managed by NixOS and can be customized via <literal>services.upower</literal>. </para> </listitem> @@ -505,7 +505,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>. </para> <para> - We already don't support the global + We already don’t support the global <link xlink:href="options.html#opt-networking.useDHCP">networking.useDHCP</link>, <link xlink:href="options.html#opt-networking.defaultGateway">networking.defaultGateway</link> and @@ -522,7 +522,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. The stdenv now runs all bash with <literal>set -u</literal>, to catch the use of undefined variables. Before, it itself used <literal>set -u</literal> but was careful to unset it so - other packages' code ran as before. Now, all bash code is held + other packages’ code ran as before. Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded. </para> @@ -558,7 +558,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14 packages. And in the future NixOS releases will be the latest released version of Xfce available at the time of - the release's development (if viable). + the release’s development (if viable). </para> </listitem> <listitem> @@ -662,7 +662,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. <listitem> <para> The <literal>dump1090</literal> derivation has been changed to - use FlightAware's dump1090 as its upstream. However, this + use FlightAware’s dump1090 as its upstream. However, this version does not have an internal webserver anymore. The assets in the <literal>share/dump1090</literal> directory of the derivation can be used in conjunction with an external @@ -890,7 +890,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. <listitem> <para> The<literal>services.buildkite-agent.openssh.publicKeyPath</literal> - option has been removed, as it's not necessary to deploy + option has been removed, as it’s not necessary to deploy public keys to clone private repositories. </para> </listitem> @@ -932,7 +932,7 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. The <literal>services.xserver.displayManager.auto</literal> module has been removed. It was only intended for use in internal NixOS tests, and gave the false impression of it - being a special display manager when it's actually LightDM. + being a special display manager when it’s actually LightDM. Please use the <literal>services.xserver.displayManager.lightdm.autoLogin</literal> options instead, or any other display manager in NixOS as they @@ -962,13 +962,13 @@ See https://github.com/NixOS/nixpkgs/pull/71684 for details. auth required pam_succeed_if.so quiet </programlisting> <para> - line, where default it's: + line, where default it’s: </para> <programlisting> auth required pam_succeed_if.so uid >= 1000 quiet </programlisting> <para> - not permitting users with uid's below 1000 (like root). All + not permitting users with uid’s below 1000 (like root). All other display managers in NixOS are configured like this. </para> </listitem> @@ -1051,14 +1051,14 @@ auth required pam_succeed_if.so quiet <listitem> <para> The <literal>*psu</literal> versions of oraclejdk8 have been - removed as they aren't provided by upstream anymore. + removed as they aren’t provided by upstream anymore. </para> </listitem> <listitem> <para> The <literal>services.dnscrypt-proxy</literal> module has been removed as it used the deprecated version of dnscrypt-proxy. - We've added + We’ve added <link xlink:href="options.html#opt-services.dnscrypt-proxy2.enable">services.dnscrypt-proxy2.enable</link> to use the supported version. This module supports configuration via the Nix attribute set @@ -1093,7 +1093,7 @@ auth required pam_succeed_if.so quiet </listitem> <listitem> <para> - sqldeveloper_18 has been removed as it's not maintained + sqldeveloper_18 has been removed as it’s not maintained anymore, sqldeveloper has been updated to version <literal>19.4</literal>. Please note that this means that this means that the oraclejdk is now required. For further @@ -1110,7 +1110,7 @@ auth required pam_succeed_if.so quiet the different lists of dependencies mashed together as one big list, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different - dependency parameters and don't need to algorithmically + dependency parameters and don’t need to algorithmically partition anything. </para> <para> @@ -1123,7 +1123,7 @@ auth required pam_succeed_if.so quiet </listitem> <listitem> <para> - The gcc-snapshot-package has been removed. It's marked as + The gcc-snapshot-package has been removed. It’s marked as broken for >2 years and used to point to a fairly old snapshot from the gcc7-branch. </para> @@ -1158,7 +1158,7 @@ auth required pam_succeed_if.so quiet <listitem> <para> nextcloud has been updated to <literal>v18.0.2</literal>. This - means that users from NixOS 19.09 can't upgrade directly since + means that users from NixOS 19.09 can’t upgrade directly since you can only move one version forward and 19.09 uses <literal>v16.0.8</literal>. </para> @@ -1181,7 +1181,7 @@ auth required pam_succeed_if.so quiet Existing setups will be detected using <link xlink:href="options.html#opt-system.stateVersion">system.stateVersion</link>: by default, nextcloud17 will be used, but will raise a - warning which notes that after that deploy it's + warning which notes that after that deploy it’s recommended to update to the latest stable version (nextcloud18) by declaring the newly introduced setting <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link>. @@ -1194,7 +1194,7 @@ auth required pam_succeed_if.so quiet get an evaluation error by default. This is done to ensure that our <link xlink:href="options.html#opt-services.nextcloud.package">package</link>-option - doesn't select an older version by accident. It's + doesn’t select an older version by accident. It’s recommended to use pkgs.nextcloud18 or to set <link xlink:href="options.html#opt-services.nextcloud.package">package</link> to pkgs.nextcloud explicitly. @@ -1203,7 +1203,7 @@ auth required pam_succeed_if.so quiet </itemizedlist> <warning> <para> - Please note that if you're coming from + Please note that if you’re coming from <literal>19.03</literal> or older, you have to manually upgrade to <literal>19.09</literal> first to upgrade your server to Nextcloud v16. @@ -1215,7 +1215,7 @@ auth required pam_succeed_if.so quiet Hydra has gained a massive performance improvement due to <link xlink:href="https://github.com/NixOS/hydra/pull/710">some database schema changes</link> by adding several IDs and - better indexing. However, it's necessary to upgrade Hydra in + better indexing. However, it’s necessary to upgrade Hydra in multiple steps: </para> <itemizedlist> @@ -1266,12 +1266,12 @@ $ hydra-backfill-ids <link xlink:href="options.html#opt-system.stateVersion">stateVersion</link> is set to <literal>20.03</literal> or greater, hydra-unstable will be used automatically! This will break - your setup if you didn't run the migration. + your setup if you didn’t run the migration. </para> </warning> <para> Please note that Hydra is currently not available with - nixStable as this doesn't compile anymore. + nixStable as this doesn’t compile anymore. </para> <warning> <para> @@ -1281,7 +1281,7 @@ $ hydra-backfill-ids assertion error will be thrown. To circumvent this, you need to set <link xlink:href="options.html#opt-services.hydra.package">services.hydra.package</link> - to pkgs.hydra explicitly and make sure you know what you're + to pkgs.hydra explicitly and make sure you know what you’re doing! </para> </warning> @@ -1413,14 +1413,14 @@ $ hydra-backfill-ids <itemizedlist> <listitem> <para> - If you use <literal>sqlite3</literal> you don't need to do + If you use <literal>sqlite3</literal> you don’t need to do anything. </para> </listitem> <listitem> <para> If you use <literal>postgresql</literal> on a different - server, you don't need to change anything as well since + server, you don’t need to change anything as well since this module was never designed to configure remote databases. </para> @@ -1460,7 +1460,7 @@ $ hydra-backfill-ids <literal>nixos-unstable</literal> <emphasis>after</emphasis> the <literal>19.09</literal>-release, your database is misconfigured due to a regression in NixOS. For now, - matrix-synapse will startup with a warning, but it's + matrix-synapse will startup with a warning, but it’s recommended to reconfigure the database to set the values <literal>LC_COLLATE</literal> and <literal>LC_CTYPE</literal> to @@ -1473,7 +1473,7 @@ $ hydra-backfill-ids <link xlink:href="options.html#opt-systemd.network.links">systemd.network.links</link> option is now respected even when <link xlink:href="options.html#opt-systemd.network.enable">systemd-networkd</link> - is disabled. This mirrors the behaviour of systemd - It's udev + is disabled. This mirrors the behaviour of systemd - It’s udev that parses <literal>.link</literal> files, not <literal>systemd-networkd</literal>. </para> @@ -1486,8 +1486,8 @@ $ hydra-backfill-ids <para> Please note that mongodb has been relicensed under their own <link xlink:href="https://www.mongodb.com/licensing/server-side-public-license/faq"><literal> sspl</literal></link>-license. - Since it's not entirely free and not OSI-approved, it's - listed as non-free. This means that Hydra doesn't provide + Since it’s not entirely free and not OSI-approved, it’s + listed as non-free. This means that Hydra doesn’t provide prebuilt mongodb-packages and needs to be built locally. </para> </warning> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml index edebd92b327..4ba5406d97a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2009.section.xml @@ -722,7 +722,7 @@ See <link xlink:href="https://mariadb.com/kb/en/authentication-from-mariadb-104/">Authentication from MariaDB 10.4</link>. unix_socket auth plugin does not use - a password, and uses the connecting user's UID instead. When a + a password, and uses the connecting user’s UID instead. When a new MariaDB data directory is initialized, two MariaDB users are created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: @@ -864,7 +864,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <para> <literal>buildGoModule</literal> now internally creates a vendor directory in the source tree for downloaded modules - instead of using go's + instead of using go’s <link xlink:href="https://golang.org/cmd/go/#hdr-Module_proxy_protocol">module proxy protocol</link>. This storage format is simpler and therefore less likely to break with future versions of go. As @@ -941,17 +941,17 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ <para> If you used the <literal>boot.initrd.network.ssh.host*Key</literal> options, - you'll get an error explaining how to convert your host keys + you’ll get an error explaining how to convert your host keys and migrate to the new <literal>boot.initrd.network.ssh.hostKeys</literal> option. - Otherwise, if you don't have any host keys set, you'll need to + Otherwise, if you don’t have any host keys set, you’ll need to generate some; see the <literal>hostKeys</literal> option documentation for instructions. </para> </listitem> <listitem> <para> - Since this release there's an easy way to customize your PHP + Since this release there’s an easy way to customize your PHP install to get a much smaller base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP with the extensions <literal>imagick</literal>, @@ -973,7 +973,7 @@ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ } </programlisting> <para> - The default <literal>php</literal> attribute hasn't lost any + The default <literal>php</literal> attribute hasn’t lost any extensions. The <literal>opcache</literal> extension has been added. All upstream PHP extensions are available under php.extensions.<name?>. @@ -1162,7 +1162,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test <para> The <literal>systemd-networkd</literal> option <literal>systemd.network.networks.<name>.dhcp.CriticalConnection</literal> - has been removed following upstream systemd's deprecation of + has been removed following upstream systemd’s deprecation of the same. It is recommended to use <literal>systemd.network.networks.<name>.networkConfig.KeepConfiguration</literal> instead. See systemd.network 5 for details. @@ -1174,7 +1174,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test <literal>systemd.network.networks._name_.dhcpConfig</literal> has been renamed to <link xlink:href="options.html#opt-systemd.network.networks._name_.dhcpV4Config">systemd.network.networks.<emphasis>name</emphasis>.dhcpV4Config</link> - following upstream systemd's documentation change. See + following upstream systemd’s documentation change. See systemd.network 5 for details. </para> </listitem> @@ -1283,7 +1283,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test The <link xlink:href="https://github.com/okTurtles/dnschain">DNSChain</link> package and NixOS module have been removed from Nixpkgs as the - software is unmaintained and can't be built. For more + software is unmaintained and can’t be built. For more information see issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/89205">#89205</link>. </para> @@ -1350,7 +1350,7 @@ $ sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test </listitem> <listitem> <para> - Radicale's default package has changed from 2.x to 3.x. An + Radicale’s default package has changed from 2.x to 3.x. An upgrade checklist can be found <link xlink:href="https://github.com/Kozea/Radicale/blob/3.0.x/NEWS.md#upgrade-checklist">here</link>. You can use the newer version in the NixOS service by setting @@ -1587,7 +1587,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; <listitem> <para> The <literal>security.rngd</literal> service is now disabled - by default. This choice was made because there's krngd in the + by default. This choice was made because there’s krngd in the linux kernel space making it (for most usecases) functionally redundent. </para> @@ -1609,13 +1609,13 @@ CREATE ROLE postgres LOGIN SUPERUSER; will be EOL (end of life) within the lifetime of 20.09</link>. </para> <para> - It's necessary to upgrade to nextcloud19: + It’s necessary to upgrade to nextcloud19: </para> <itemizedlist> <listitem> <para> From nextcloud17, you have to upgrade to nextcloud18 first - as Nextcloud doesn't allow going multiple major revisions + as Nextcloud doesn’t allow going multiple major revisions forward in a single upgrade. This is possible by setting <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link> to nextcloud18. @@ -1623,7 +1623,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; </listitem> <listitem> <para> - From nextcloud18, it's possible to directly upgrade to + From nextcloud18, it’s possible to directly upgrade to nextcloud19 by setting <link xlink:href="options.html#opt-services.nextcloud.package">services.nextcloud.package</link> to nextcloud19. @@ -1685,7 +1685,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; <listitem> <para> The notmuch package moves its emacs-related binaries and emacs - lisp files to a separate output. They're not part of the + lisp files to a separate output. They’re not part of the default <literal>out</literal> output anymore - if you relied on the <literal>notmuch-emacs-mua</literal> binary or the emacs lisp files, access them via the @@ -1736,7 +1736,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; </listitem> <listitem> <para> - The cc- and binutils-wrapper's "infix salt" and + The cc- and binutils-wrapper’s "infix salt" and <literal>_BUILD_</literal> and <literal>_TARGET_</literal> user infixes have been replaced with with a "suffix salt" and suffixes and <literal>_FOR_BUILD</literal> and @@ -1774,8 +1774,8 @@ CREATE ROLE postgres LOGIN SUPERUSER; <literal>network-link-*</literal> units, which have been removed. Bringing the interface up has been moved to the beginning of the <literal>network-addresses-*</literal> unit. - Note this doesn't require <literal>systemd-networkd</literal> - - it's udev that parses <literal>.link</literal> files. Extra + Note this doesn’t require <literal>systemd-networkd</literal> + - it’s udev that parses <literal>.link</literal> files. Extra care needs to be taken in the presence of <link xlink:href="https://wiki.debian.org/NetworkInterfaceNames#THE_.22PERSISTENT_NAMES.22_SCHEME">legacy udev rules</link> to rename interfaces, as MAC Address and MTU @@ -1850,7 +1850,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; With this release <literal>systemd-networkd</literal> (when enabled through <link xlink:href="options.html#opt-networking.useNetworkd">networking.useNetworkd</link>) - has it's netlink socket created through a + has it’s netlink socket created through a <literal>systemd.socket</literal> unit. This gives us control over socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual) devices @@ -1873,7 +1873,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; </para> <para> Since the actual memory requirements depend on hardware, - timing, exact configurations etc. it isn't currently possible + timing, exact configurations etc. it isn’t currently possible to infer a good default from within the NixOS module system. Administrators are advised to monitor the logs of <literal>systemd-networkd</literal> for @@ -1882,7 +1882,7 @@ CREATE ROLE postgres LOGIN SUPERUSER; </para> <para> Note: Increasing the <literal>ReceiveBufferSize=</literal> - doesn't allocate any memory. It just increases the upper bound + doesn’t allocate any memory. It just increases the upper bound on the kernel side. The memory allocation depends on the amount of messages that are queued on the kernel side of the netlink socket. @@ -1934,8 +1934,8 @@ CREATE ROLE postgres LOGIN SUPERUSER; </para> <para> If you have an existing installation, please make sure that - you're on nextcloud18 before upgrading to nextcloud19 since - Nextcloud doesn't support upgrades across multiple major + you’re on nextcloud18 before upgrading to nextcloud19 since + Nextcloud doesn’t support upgrades across multiple major versions. </para> </listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index 3477f29f428..3f84323f3a4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -237,7 +237,7 @@ installs the upstream-provided 80-iwd.link file, which sets the NamePolicy= for all wlan devices to "keep kernel", to avoid race conditions between iwd and - networkd. If you don't want this, you can set + networkd. If you don’t want this, you can set <literal>systemd.network.links."80-iwd" = lib.mkForce {}</literal>. </para> </listitem> @@ -245,7 +245,7 @@ <para> <literal>rubyMinimal</literal> was removed due to being unused and unusable. The default ruby interpreter includes JIT - support, which makes it reference it's compiler. Since JIT + support, which makes it reference it’s compiler. Since JIT support is probably needed by some Gems, it was decided to enable this feature with all cc references by default, and allow to build a Ruby derivation without references to cc, by @@ -427,7 +427,7 @@ <para> <link xlink:href="options.html#opt-networking.wireguard.interfaces">networking.wireguard.interfaces.<name>.generatePrivateKeyFile</link>, which is off by default, had a <literal>chmod</literal> race - condition fixed. As an aside, the parent directory's + condition fixed. As an aside, the parent directory’s permissions were widened, and the key files were made owner-writable. This only affects newly created keys. However, if the exact permissions are important for your setup, read @@ -527,7 +527,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' this directory are guarded to only run if the files they want to manipulate do not already exist, and so will not re-apply their changes if the IMDS response changes. - Examples: <literal>root</literal>'s SSH key is only added if + Examples: <literal>root</literal>’s SSH key is only added if <literal>/root/.ssh/authorized_keys</literal> does not exist, and SSH host keys are only set from user data if they do not exist in <literal>/etc/ssh</literal>. @@ -550,7 +550,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' configures Privoxy, and the <literal>services.tor.client.privoxy.enable</literal> option has been removed. To enable Privoxy, and to configure it to - use Tor's faster port, use the following configuration: + use Tor’s faster port, use the following configuration: </para> <programlisting language="bash"> { @@ -628,7 +628,7 @@ $ slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' exporter no longer accepts a fixed command-line parameter to specify the URL of the endpoint serving JSON. It now expects this URL to be passed as an URL parameter, when scraping the - exporter's <literal>/probe</literal> endpoint. In the + exporter’s <literal>/probe</literal> endpoint. In the prometheus scrape configuration the scrape target might look like this: </para> @@ -790,7 +790,7 @@ self: super: for any device that the kernel recognises as an hardware RNG, as it will automatically run the krngd task to periodically collect random data from the device and mix it into the - kernel's RNG. + kernel’s RNG. </para> <para> The default SMTP port for GitLab has been changed to @@ -893,7 +893,7 @@ self: super: <literal>services.minio.dataDir</literal> changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding. Currently, the - service doesn't enforce nor checks the correct number of paths + service doesn’t enforce nor checks the correct number of paths to correspond to minio requirements. </para> </listitem> @@ -910,7 +910,7 @@ self: super: <literal>dvorak-programmer</literal> in <literal>console.keyMap</literal> now instead of <literal>dvp</literal>. In - <literal>services.xserver.xkbVariant</literal> it's still + <literal>services.xserver.xkbVariant</literal> it’s still <literal>dvp</literal>. </para> </listitem> @@ -954,7 +954,7 @@ self: super: supported. </para> <para> - Furthermore, Radicale's systemd unit was hardened which might + Furthermore, Radicale’s systemd unit was hardened which might break some deployments. In particular, a non-default <literal>filesystem_folder</literal> has to be added to <literal>systemd.services.radicale.serviceConfig.ReadWritePaths</literal> @@ -991,7 +991,7 @@ self: super: <listitem> <para> <link xlink:href="https://www.gnuradio.org/">GNURadio</link> - has a <literal>pkgs</literal> attribute set, and there's a + has a <literal>pkgs</literal> attribute set, and there’s a <literal>gnuradio.callPackage</literal> function that extends <literal>pkgs</literal> with a <literal>mkDerivation</literal>, and a @@ -1098,9 +1098,9 @@ self: super: <listitem> <para> The default-version of <literal>nextcloud</literal> is - nextcloud21. Please note that it's <emphasis>not</emphasis> + nextcloud21. Please note that it’s <emphasis>not</emphasis> possible to upgrade <literal>nextcloud</literal> across - multiple major versions! This means that it's e.g. not + multiple major versions! This means that it’s e.g. not possible to upgrade from nextcloud18 to nextcloud20 in a single deploy and most <literal>20.09</literal> users will have to upgrade to nextcloud20 first. @@ -1122,7 +1122,7 @@ self: super: </listitem> <listitem> <para> - NixOS now emits a deprecation warning if systemd's + NixOS now emits a deprecation warning if systemd’s <literal>StartLimitInterval</literal> setting is used in a <literal>serviceConfig</literal> section instead of in a <literal>unitConfig</literal>; that setting is deprecated and @@ -1255,8 +1255,8 @@ self: super: <listitem> <para> The <literal>services.dnscrypt-proxy2</literal> module now - takes the upstream's example configuration and updates it with - the user's settings. An option has been added to restore the + takes the upstream’s example configuration and updates it with + the user’s settings. An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch. </para> @@ -1317,7 +1317,7 @@ self: super: now always ensures home directory permissions to be <literal>0700</literal>. Permissions had previously been ignored for already existing home directories, possibly - leaving them readable by others. The option's description was + leaving them readable by others. The option’s description was incorrect regarding ownership management and has been simplified greatly. </para> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 9b6e755fd47..644b67f0fb3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -723,7 +723,7 @@ Superuser created successfully. </listitem> <listitem> <para> - The <literal>erigon</literal> ethereum node has moved it’s + The <literal>erigon</literal> ethereum node has moved its database location in <literal>2021-08-03</literal>, users upgrading must manually move their chaindata (see <link xlink:href="https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03">release |