diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-16 01:01:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-16 01:01:54 -0400 |
| commit | 7d02724b7bddb4d5e1cc93db99f737baa26840ca (patch) | |
| tree | bae1377073af72dd17b7c786fd6991f234d3732b /doc/guix.texi | |
| parent | 4c10c6cbc61d703b18b92c651a92300cf51d1eab (diff) | |
| parent | fef3cfaaab972b1f514724f90050aeb38516519b (diff) | |
| download | patches-7d02724b7bddb4d5e1cc93db99f737baa26840ca.tar patches-7d02724b7bddb4d5e1cc93db99f737baa26840ca.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc/guix.texi')
| -rw-r--r-- | doc/guix.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 46dccb8e2b..f707b5c58f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5475,7 +5475,7 @@ adds or adjust services for a typical ``desktop'' setup. In particular, it adds a graphical login manager (@pxref{X Window, @code{slim-service}}), a network management tool (@pxref{Networking Services, @code{wicd-service}}), energy and color management services, -an NTP client and an SSH server (@pxref{Networking Services}), the Avahi +an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS}). @end defvr |