en-US/Books/PuppetWorkshop/Course.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9cd3b747e8e1811c4ab78fb241ff516a163ffc7e
Merge: 3c5674a... 3c36ad9...
Author: S.A. Hartsuiker <shartsuiker(a)stefan-vaio.lan>
Date: Sun Oct 5 18:03:43 2008 +0200
Merge branch 'master' of
ssh://git.fedorahosted.org/git/courses
commit 3c5674ab70b23367def0a3a47530f4e5362edb46
Author: S.A. Hartsuiker <shartsuiker(a)stefan-vaio.lan>
Date: Sun Oct 5 18:01:00 2008 +0200
Rewrote system resources
diff --git a/en-US/Books/PuppetWorkshop/Course.xml
b/en-US/Books/PuppetWorkshop/Course.xml
index 496c975..55c5da2 100644
--- a/en-US/Books/PuppetWorkshop/Course.xml
+++ b/en-US/Books/PuppetWorkshop/Course.xml
@@ -462,7 +462,10 @@ service { "ypbind":
<formalpara>
<title>system resource</title>
<para>
- A system resource is a resource available on the node
whether it is managed by puppet or not. Unlike in other cases, this term does not as much
to system hardware resources such as the CPU or memory available to the operating system,
because that.
+<!--
+FIXME:
+//-->
+ A system resource is a resource available on the node
whether it is managed by puppet or not. Unlike what is otherwise understood by system
resources, the puppet definition of system resources does not so much refer to resources
like CPU or memory, but rather to whether or not a package is installed or what version of
said package, or the $osversion, and so on and so forth.
</para>
</formalpara>
</listitem>
@@ -599,7 +602,7 @@ debug: Calling fileserver.describe</screen>
<formalpara>
<title>The puppet waits for 30 minutes</title>
<para>
- para
+ The next run the puppet performs/polls for is after a
configurable timeperiod, which defaults to 30 minutes.
</para>
</formalpara>
</listitem>