aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-02 23:39:29 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-03 00:52:17 +0200
commit4110fbc6dd9e22f05ef738da7abbd72feaea93f9 (patch)
tree5f7a8f9669e8ffb0d7f0b721f602e339528ca7d3 /doc
parent9a37764014347dabf667a59b74eb4c4fcea3389a (diff)
downloadguix-4110fbc6dd9e22f05ef738da7abbd72feaea93f9.tar
guix-4110fbc6dd9e22f05ef738da7abbd72feaea93f9.tar.gz
services: '%desktop-services' uses NetworkManager instead of Wicd.
Discussed at <https://lists.gnu.org/archive/html/guix-devel/2017-08/msg00277.html>. * gnu/services/desktop.scm (%desktop-services): Remove call to 'wicd-service'. Add instances of NETWORK-MANAGER-SERVICE-TYPE and WPA-SUPPLICANT-SERVICE-TYPE. * doc/guix.texi (Networking Services): Document 'network-manager-service-type' as being part of '%desktop-services'. (Desktop Services): Replace Wicd with NM.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 781c5f04d1..689173921d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10010,6 +10010,9 @@ This is the service type for the
@uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager}
service. The value for this service type is a
@code{network-manager-configuration} record.
+
+This service is part of @code{%desktop-services} (@pxref{Desktop
+Services}).
@end defvr
@deftp {Data Type} network-manager-configuration
@@ -11573,7 +11576,7 @@ adds or adjusts services for a typical ``desktop'' setup.
In particular, it adds a graphical login manager (@pxref{X Window,
@code{slim-service}}), screen lockers, a network management tool
-(@pxref{Networking Services, @code{wicd-service}}), energy and color
+(@pxref{Networking Services, @code{network-manager-service-type}}), energy and color
management services, the @code{elogind} login and seat manager, the
Polkit privilege service, the GeoClue location service, the
AccountsService daemon that allows authorized users change system