diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-15 15:56:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 15:56:48 +0000 |
commit | 4583e293fd5f4df1246b658d802a1b519bc05cd8 (patch) | |
tree | 93d7c269358c5e3a8d0e7ab33cfa1498358f7475 /nixos/doc | |
parent | d6fa5402bb7d35a7e7d0574d61a271c7e88ce079 (diff) | |
parent | 9c7db09e485529608dec9471067700d34ebdad0a (diff) | |
download | nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar.gz nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar.bz2 nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar.lz nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar.xz nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.tar.zst nixlib-4583e293fd5f4df1246b658d802a1b519bc05cd8.zip |
Merge pull request #73251 from worldofpeace/remove-slim
nixos/slim: remove
Diffstat (limited to 'nixos/doc')
-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-2003.xml | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index f6f659b02afa..9206f43ea392 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 eee81bf64263..56ebf4816306 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-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 7370614b70a9..407e0d11584c 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -135,6 +135,13 @@ <link linkend="opt-networking.interfaces">networking.interfaces.<name>.…</link> options. </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> |