20 files changed, 26 insertions(+), 25 deletions(-)

M doc/guix.texi
M gnu-system.am
M gnu/services/avahi.scm
M gnu/services/base.scm
M gnu/services/databases.scm
M gnu/services/dbus.scm
M gnu/services/desktop.scm
M gnu/services/lirc.scm
M gnu/services/mail.scm
M gnu/services/networking.scm
R gnu/services/{dmd => shepherd}.scm
M gnu/services/ssh.scm
M gnu/services/web.scm
M gnu/services/xorg.scm
M gnu/system.scm
M gnu/system/install.scm
M guix/scripts/system.scm
M po/guix/POTFILES.in
M tests/guix-system.sh
M tests/services.scm

@@ 9783,10 9783,11 @@ extend it by passing it lists of packages to add to the system profile.
 
 @cindex PID 1
 @cindex init system
-The @code{(gnu services dmd)} provides a way to define services managed
-by the GNU@tie{}Shepherd, which is GuixSD initialization system---the
-first process that is started when the system boots, aka. PID@tie{}1
-(@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}).
+The @code{(gnu services shepherd)} provides a way to define services
+managed by the GNU@tie{}Shepherd, which is GuixSD initialization
+system---the first process that is started when the system boots,
+aka. PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd
+Manual}).
 
 Services in the Shepherd can depend on each other.  For instance, the
 SSH daemon may need to be started after the syslog daemon has been

@@ 362,10 362,10 @@ GNU_SYSTEM_MODULES =				\
   gnu/services/databases.scm			\
   gnu/services/dbus.scm				\
   gnu/services/desktop.scm			\
-  gnu/services/dmd.scm				\
   gnu/services/lirc.scm				\
   gnu/services/mail.scm				\
   gnu/services/networking.scm			\
+  gnu/services/shepherd.scm			\
   gnu/services/ssh.scm				\
   gnu/services/web.scm				\
   gnu/services/xorg.scm				\

@@ 19,7 19,7 @@
 (define-module (gnu services avahi)
   #:use-module (gnu services)
   #:use-module (gnu services base)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services dbus)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages avahi)

@@ 22,7 22,7 @@
 (define-module (gnu services base)
   #:use-module (guix store)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services networking)
   #:use-module (gnu system pam)
   #:use-module (gnu system shadow)                ; 'user-account', etc.

@@ 19,7 19,7 @@
 
 (define-module (gnu services databases)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages databases)

@@ 19,7 19,7 @@
 
 (define-module (gnu services dbus)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module ((gnu packages glib) #:select (dbus/activation))
   #:use-module (gnu packages admin)

@@ 20,7 20,7 @@
 
 (define-module (gnu services desktop)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
   #:use-module (gnu services dbus)
   #:use-module (gnu services avahi)

@@ 19,7 19,7 @@
 
 (define-module (gnu services lirc)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages lirc)
   #:use-module (guix gexp)
   #:use-module (guix records)

@@ 21,7 21,7 @@
 (define-module (gnu services mail)
   #:use-module (gnu services)
   #:use-module (gnu services base)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages mail)

@@ 19,7 19,7 @@
 
 (define-module (gnu services networking)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services dbus)
   #:use-module (gnu system shadow)
   #:use-module (gnu system pam)

@@ 16,7 16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu services dmd)
+(define-module (gnu services shepherd)
   #:use-module (guix ui)
   #:use-module (guix sets)
   #:use-module (guix gexp)


@@ 272,4 272,4 @@ the list of <dmd-service> that depend on it."
   (lambda (service)
     (vhash-foldq* cons '() service edges)))
 
-;;; dmd.scm ends here
+;;; shepherd.scm ends here

@@ 20,7 20,7 @@
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module (gnu packages lsh)
   #:use-module (srfi srfi-26)

@@ 19,7 19,7 @@
 
 (define-module (gnu services web)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages web)

@@ 20,7 20,7 @@
 (define-module (gnu services xorg)
   #:use-module (gnu artwork)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module ((gnu packages base) #:select (canonical-package))
   #:use-module (gnu packages guile)

@@ 44,7 44,7 @@
   #:use-module (gnu packages firmware)
   #:autoload   (gnu packages cryptsetup) (cryptsetup)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
   #:use-module (gnu system grub)
   #:use-module (gnu system shadow)

@@ 24,7 24,7 @@
   #:use-module (guix monads)
   #:use-module ((guix store) #:select (%store-prefix))
   #:use-module (guix profiles)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages linux)

@@ 40,7 40,7 @@
   #:use-module (gnu system vm)
   #:use-module (gnu system grub)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages grub)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-19)

@@ 3,7 3,7 @@
 gnu/packages.scm
 gnu/services.scm
 gnu/system.scm
-gnu/services/dmd.scm
+gnu/services/shepherd.scm
 gnu/system/shadow.scm
 guix/scripts.scm
 guix/scripts/build.scm

@@ 114,10 114,10 @@ else
     grep "service 'networking'.*more than once" "$errorfile"
 fi
 
-# Reporting unmet dmd requirements.
+# Reporting unmet shepherd requirements.
 
 cat > "$tmpfile" <<EOF
-(use-modules (gnu) (gnu services dmd))
+(use-modules (gnu) (gnu services shepherd))
 (use-service-modules networking)
 
 (define buggy-service-type

@@ 18,7 18,7 @@
 
 (define-module (test-services)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)