civodul pushed a commit to branch master
in repository guix.
commit e8b652d46b451f4fdb81a483234e0757bf5ed3de
Author: Ludovic Courtès <[email protected]>
Date: Tue Aug 2 19:42:31 2016 +0200
doc: Clarify distinction between "service" and "Shepherd service".
* doc/guix.texi (Services): Distinguish "service" and "Shepherd
service". Add xref to "Shepherd Services".
---
doc/guix.texi | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index e7dc896..27f10ba 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
