diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
commit | be7125dde7d3521725cf2e2ea70b3c309eebd0e4 (patch) | |
tree | df53225733ad8ae20afffa30f06bfb64d42cf2cd /nixos/doc/manual | |
parent | 27313767b8ed680d1dcfcfc0cb87c81562bba605 (diff) | |
parent | 1421eee65dddd47f34c68be6374e9646fe4cf175 (diff) | |
download | nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.gz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.bz2 nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.lz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.xz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.zst nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/configuration/x-windows.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/development/option-declarations.xml | 10 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 13 |
4 files changed, 19 insertions, 8 deletions
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index f6f659b02af..9206f43ea39 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -39,7 +39,7 @@ can select an alternative one by picking one of the following lines: <programlisting> <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true; -<xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true; +<xref linkend="opt-services.xserver.displayManager.gdm.enable"/> = true; </programlisting> </para> <para> diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index eee81bf6426..56ebf481630 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -99,7 +99,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> <para> 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 module file - per display manager backend (slim, sddm, gdm ...). + per display manager backend (sddm, gdm ...). </para> <para> @@ -146,7 +146,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> />), and to extend it in each backend module (<xref - linkend='ex-option-declaration-eot-backend-slim' />, + linkend='ex-option-declaration-eot-backend-gdm' />, <xref linkend='ex-option-declaration-eot-backend-sddm' />). </para> @@ -167,11 +167,11 @@ services.xserver.displayManager.enable = mkOption { };</screen> </example> - <example xml:id='ex-option-declaration-eot-backend-slim'> - <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module</title> + <example xml:id='ex-option-declaration-eot-backend-gdm'> + <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>gdm</literal> module</title> <screen> services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "slim" ]); + type = with types; nullOr (enum [ "gdm" ]); };</screen> </example> diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 8bd353a3430..4102fe206e1 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -543,7 +543,7 @@ <listitem> <para> The <option>networking.useDHCP</option> option is unsupported in combination with - <option>networking.useNetworkd</option> in anticipation of defaulting to it by default. + <option>networking.useNetworkd</option> in anticipation of defaulting to it. It has to be set to <literal>false</literal> and enabled per interface with <option>networking.interfaces.<name>.useDHCP = true;</option> </para> diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index d02e52cb0cf..5cdc535f333 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -71,7 +71,11 @@ <itemizedlist> <listitem> - <para /> + <para> + The kubernetes kube-proxy now supports a new hostname configuration + <literal>services.kubernetes.proxy.hostname</literal> which has to + be set if the hostname of the node should be non default. + </para> </listitem> </itemizedlist> @@ -138,6 +142,13 @@ Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded. </para> </listitem> + <listitem> + <para> + The SLIM Display Manager has been removed, as it has been unmaintained since 2013. + Consider migrating to a different display manager such as LightDM (current default in NixOS), + SDDM, GDM, or using the startx module which uses Xinitrc. + </para> + </listitem> </itemizedlist> </section> |