From db4fdc04cc05495788ee54ae25baf8cd056917dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 19 Feb 2014 20:58:24 +0100
Subject: gnu: Introduce the (gnu services ...) modules.

* gnu/system/dmd.scm: Remove file.  Move contents to...
* gnu/services.scm, gnu/services/base.scm, gnu/services/dmd.scm,
  gnu/services/networking.scm, gnu/services/xorg.scm: ... here.  New
  files.
* gnu/system.scm, gnu/system/vm.scm: Adjust accordingly.
* guix/scripts/system.scm (%user-module): Likewise.
* doc/guix.texi (Using the Configuration System): Likewise.
  (Defining Services): Likewise.
---
 doc/guix.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/guix.texi')

diff --git a/doc/guix.texi b/doc/guix.texi
index e6636dc71f..9a0deeac59 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2562,9 +2562,9 @@ Linux-Libre kernel, initial RAM disk, and boot loader looks like this:
 
 @findex operating-system
 @lisp
-(use-modules (gnu system)
+(use-modules (gnu services base)
+             (gnu services ssh)    ; for 'lsh-service'
              (gnu system shadow)   ; for 'user-account'
-             (gnu system service)  ; for 'lsh-service'
              (gnu packages base)   ; Coreutils, grep, etc.
              (gnu packages bash)   ; Bash
              (gnu packages admin)  ; dmd, Inetutils
@@ -2603,7 +2603,7 @@ visible on the system, for all user accounts---i.e., in every user's
 
 The @code{services} field lists @dfn{system services} to be made
 available when the system starts.  The @var{%standard-services} list,
-from the @code{(gnu system)} module, provides the basic services one
+from the @code{(gnu services base)} module, provides the basic services one
 would expect from a GNU system: a login service (mingetty) on each tty,
 syslogd, libc's name service cache daemon (nscd), etc.
 
@@ -2666,7 +2666,7 @@ The VM shares its store with the host system.
 @node Defining Services
 @subsection Defining Services
 
-The @code{(gnu system dmd)} module defines several procedures that allow
+The @code{(gnu services @dots{})} modules define several procedures that allow
 users to declare the operating system's services (@pxref{Using the
 Configuration System}).  These procedures are @emph{monadic
 procedures}---i.e., procedures that return a monadic value in the store
-- 
cgit v1.2.3