summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-08-02 19:42:31 +0200
committerLudovic Courtès <ludo@gnu.org>2016-08-02 23:43:29 +0200
commite8b652d46b451f4fdb81a483234e0757bf5ed3de (patch)
treef8c7656f7d1623157624ae8e491a008eb6c2652d
parent201fff9ea1c8ab973a35881a2736e053b844d0d7 (diff)
downloadguix-e8b652d46b451f4fdb81a483234e0757bf5ed3de.tar.gz
doc: Clarify distinction between "service" and "Shepherd service".
* doc/guix.texi (Services): Distinguish "service" and "Shepherd
service".  Add xref to "Shepherd Services".
-rw-r--r--doc/guix.texi11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index e7dc896da0..27f10ba8f3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7445,11 +7445,12 @@ Configuration System}).  System services are typically daemons launched
 when the system boots, or other actions needed at that time---e.g.,
 configuring network access.
 
-Services are managed by the GNU@tie{}Shepherd (@pxref{Introduction,,,
-shepherd, The GNU Shepherd Manual}).  On a running system, the
-@command{herd} command allows you to list the available services, show
-their status, start and stop them, or do other specific operations
-(@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}).  For example:
+GuixSD has a broad definition of ``service'' (@pxref{Service
+Composition}), but many services are managed by the GNU@tie{}Shepherd
+(@pxref{Shepherd Services}).  On a running system, the @command{herd}
+command allows you to list the available services, show their status,
+start and stop them, or do other specific operations (@pxref{Jump
+Start,,, shepherd, The GNU Shepherd Manual}).  For example:
 
 @example
 # herd status