Rename (gnu services dmd) to (gnu services shepherd).

* gnu/services/dmd.scm: Rename to...
* gnu/services/shepherd.scm: ... this.
* gnu/system.scm: Use it.
* gnu/system/install.scm: Likewise.
* gnu/services/xorg.scm: Likewise.
* gnu/services/web.scm: Likewise.
* gnu/services/ssh.scm: Likewise.
* gnu/services/networking.scm: Likewise.
* gnu/services/mail.scm: Likewise.
* gnu/services/lirc.scm: Likewise.
* gnu/services/desktop.scm: Likewise.
* gnu/services/dbus.scm: Likewise.
* gnu/services/databases.scm: Likewise.
* gnu/services/base.scm: Likewise.
* gnu/services/avahi.scm: Likewise.
* guix/scripts/system.scm: Likewise.
* tests/services.scm: Likewise.
* tests/guix-system.sh: Likewise.
* doc/guix.texi (Shepherd Services): Adjust accordingly.
* gnu-system.am (GNU_SYSTEM_MODULES): Likewise.
* po/guix/POTFILES.in: Likewise.

20 files changed, 26 insertions, 25 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 7dd66a86ab..d126dd3ec3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
diff --git a/gnu-system.am b/gnu-system.am
index 19f7ca77ac..94526079a5 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -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				\
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 909abeffe6..d458042365 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.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)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6483a66b5a..10df9270d9 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -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.
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 8fdd222a3b..c85606e62d 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -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)
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 9b0d198683..3e5fa14a38 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -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)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 694a8eda7e..e6d323270e 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -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)
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index 6ae622579d..bfaca9b853 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -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)
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index f49a4a4341..181693aeba 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -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)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index ce21b1d9ff..bce1778b5b 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -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)
diff --git a/gnu/services/dmd.scm b/gnu/services/shepherd.scm
index 828d781e4a..a33985efa1 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/shepherd.scm
@@ -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
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 4b0380e8fd..d6365023ce 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -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)
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 84bb30d8fd..bc0aa62a35 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -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)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 7fea6829d5..4b81bd90d4 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -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)
diff --git a/gnu/system.scm b/gnu/system.scm
index 024518445d..97103a9992 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -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)
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 887bceb155..fcbb630517 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -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)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 564ed02d59..3f368ca55f 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -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)
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index bf65416638..27cc64929d 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -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
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 02e2524d9e..cd135b9a88 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -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
diff --git a/tests/services.scm b/tests/services.scm
index 7d2e31b3a9..ab8f293c43 100644
--- a/tests/services.scm
+++ b/tests/services.scm
@@ -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)