2 commits - en-US/Books en-US/Courses.xml

[Jeroen van Meeuwen]

 en-US/Books/PuppetWorkshop/Course.xml |   22 +++++++++++++++++-----
 en-US/Courses.xml                     |    4 ----
 2 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 3c36ad9bab7bec53cff69216651a065f7156109c
Merge: 92d8663... e1fb656...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Oct 5 17:54:54 2008 +0200

    Merge branch 'master' of ssh://git.fedorahosted.org/git/courses



commit 92d86639841b00b9b7f6feb36326122bc2acfee2
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Oct 5 17:54:48 2008 +0200

    Updates to Puppet Workshop

diff --git a/en-US/Books/PuppetWorkshop/Course.xml
b/en-US/Books/PuppetWorkshop/Course.xml
index 30b45df..1166edf 100644
--- a/en-US/Books/PuppetWorkshop/Course.xml
+++ b/en-US/Books/PuppetWorkshop/Course.xml
@@ -838,12 +838,17 @@ debug: Calling fileserver.describe</screen>
                                 </listitem>
                                 <listitem>
                                     <para>
-                                        Whether or not to use autosigning of
certificates, using <code>[puppetca], autosign = false, true</code>. The
default is to <emphasis>not</emphasis> use autosigning.
+                                        Whether or not to use autosigning of
certificates, using
+                                        <screen>[puppetca]
+    autosign = <replaceable>false</replaceable></screen>
+                                        The default is to
<emphasis>not</emphasis> use autosigning.
                                     </para>
                                 </listitem>
                                 <listitem>
                                     <para>
-                                        Another setting to check is whether or not this
puppetmaster is going to be the Certificate Authority (<code>[puppetmasterd], ca =
<replaceable>false, true</replaceable></code>). The default is often set
to <code>true</code>.
+                                        Another setting to check is whether or not this
puppetmaster is going to be the Certificate Authority <screen>[puppetmasterd]
+    ca = <replaceable>true</replaceable></screen>
+                                        The default is often set to
<code>true</code>.
                                     </para>
                                 </listitem>
                             </itemizedlist>
@@ -855,17 +860,24 @@ debug: Calling fileserver.describe</screen>
                             <itemizedlist>
                                 <listitem>
                                     <para>
-                                        The location of tagmail.conf, <code>[main],
tagmap = <replaceable>/path/to/tagmail.conf</replaceable></code>, for
reporting changes applied to puppets, via email.
+                                        A list of environments using a comma seperated
list, in
+                                        <screen>[puppetmasterd]
+    environments =
<replaceable>development,testing,production</replaceable></screen>
                                     </para>
                                 </listitem>
                                 <listitem>
                                     <para>
-                                        A list of environments using a comma seperated
list, in <code>[puppetmasterd], environments =
<replaceable>environments</replaceable></code>.
+                                        Whether or not to use reporting, and what
reporting to use (tagmail, store, rrdgraph). Use
+                                        <screen>[puppetmasterd]
+    reports =
<replaceable>tagmail,store,rrdgraph</replaceable></screen>
+                                        to configure which reports should be used. This
is a comma separated list (without spaces).
                                     </para>
                                 </listitem>
                                 <listitem>
                                     <para>
-                                        whether or not to use reporting, and what
reporting to use (tagmail, store, rrdgraph)
+                                        The location of tagmail.conf, in order to map
tags you give to resources to email addresses the reports should be sent to;
<screen>[main]
+    tagmap = <replaceable>/path/to/tagmail.conf</replaceable></screen>
+                                        for reporting changes applied to puppets, via
email.
                                     </para>
                                 </listitem>
                                 <listitem>
diff --git a/en-US/Courses.xml b/en-US/Courses.xml
index 4c5be66..5174ea6 100644
--- a/en-US/Courses.xml
+++ b/en-US/Courses.xml
@@ -95,8 +95,6 @@
 
 //-->
 
-<!--
-    FIXME
                         <listitem>
                             <para>
                                 <xref linkend="PuppetWorkshop" />
@@ -105,8 +103,6 @@
                                 A workshop on implementing puppet for configuration
management, including best practices.
                             </para>
                         </listitem>
-//-->
-
                     </itemizedlist>
                 </para>
             </formalpara>