Author: buildbot
Date: Tue Nov 25 09:33:24 2014
New Revision: 930414
Log:
Staging update by buildbot for ace
Modified:
websites/staging/ace/trunk/content/ (props changed)
websites/staging/ace/trunk/content/docs/user-guide.html
Propchange: websites/staging/ace/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Nov 25 09:33:24 2014
@@ -1 +1 @@
-1641553
+1641554
Modified: websites/staging/ace/trunk/content/docs/user-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/user-guide.html (original)
+++ websites/staging/ace/trunk/content/docs/user-guide.html Tue Nov 25 09:33:24
2014
@@ -424,11 +424,9 @@ be used. Server URLs that are not respon
is <tt>true</tt>, which means that all server URLs are checked. Use
<tt>false</tt> if your
ACE server(s) are not always available or when running the target on a flacky
network;</dd>
<dt><tt>agent.logging.level</tt></dt>
-<dd>defines the log level of the agent, and should be one of the following
values:</dd>
-</dl>
-<p><tt>DEBUG</tt>, <tt>INFO</tt>, <tt>WARNING</tt> or <tt>ERROR</tt>. The
default log level
-is <tt>INFO</tt>;</p>
-<dl>
+<dd>defines the log level of the agent, and should be one of the following
values:
+<tt>DEBUG</tt>, <tt>INFO</tt>, <tt>WARNING</tt> or <tt>ERROR</tt>. The
default log level
+is <tt>INFO</tt>;</dd>
<dt><tt>agent.controller.syncinterval</tt></dt>
<dd>defines the interval (in seconds) in which the agent should synchronize
with the ACE
server. A default of <tt>60</tt> seconds is used in case this option is not
supplied;</dd>
@@ -462,9 +460,10 @@ channel. This parameter takes one or mor
commas, for example, <tt>2001,2003,2005,3001</tt>. By default, <em>no</em>
events are excluded;</dd>
<dt><tt>agent.connection.authtype</tt></dt>
<dd>defines how to connections to the server are to be authenticated. Valid
values are
-<tt>NONE</tt> for no authentication, <tt>BASIC</tt> for using HTTP-BASIC
authentication or
-<tt>CLIENTCERT</tt> for using client certificates. In case this option is
omitted, a value
-of <tt>NONE</tt> is assumed and no authentication is used. In case of the
values
+<tt>NONE</tt> for no authentication, <tt>BASIC</tt> for <a
href="/docs/ace-authentication.html">using HTTP-BASIC
+authentication</a> or <tt>CLIENTCERT</tt> for <a
href="/docs/ace-client-certificates.html">using client
+certificates</a>. In case this option is omitted, a
+value of <tt>NONE</tt> is assumed and <strong>no</strong> authentication is
used. In case of the values
<tt>BASIC</tt> or <tt>CLIENTCERT</tt>, additional options should be supplied
(see below);</dd>
<dt><tt>agent.connection.username</tt> and
<tt>agent.connection.password</tt></dt>
<dd>provide the username and password used for HTTP-BASIC authentication;</dd>
@@ -484,11 +483,13 @@ the agent needs to synchronize with the
<tt>agent.controller.syncdelay</tt> and <tt>agent.controller.syncinterval</tt>
options
above. If a new target is seen this way by an ACE server instead of adding it
through the
"+" button above the targets column, it initially will be
<em>unregistered</em>. This means that
-no metadata is present in the ACE server yet and will not be created. To
register a
-target, you can double click the target to edit its properties. On the
"Management" tab,
-you can check the "Registered?" option (and optionally the "Auto approve?"
option as well)
-and close the dialog by pressing "Ok"<sup id="fnref:3"><a class="footnote-ref"
href="#fn:3" rel="footnote">3</a></sup>. Once a target is registered, it cannot
be
-unregistered unless it is deleted (using the trash-icon).</p>
+no metadata is present in the ACE server yet and will not be created.<br />
+To register a target, you can either double click the target. On the
"Management" tab, you
+can check the "Registered?" option (and optionally the "Auto approve?" option
as well) and
+close the dialog by pressing "Ok"<sup id="fnref:3"><a class="footnote-ref"
href="#fn:3" rel="footnote">3</a></sup>. Once a target is registered, it cannot
be
+unregistered unless it is deleted using the trash-icon. Alternatively, you can
register
+one or more targets directly by selecting them and pressing the "R" button
above the
+targets column.</p>
<h3 id="using-the-template-engine-for-targets">Using the template engine for
targets</h3>
<p>If you want to provision software to multiple targets, each of those
targets probably need
to have their own specific configuration. For example, the IP address on which
it should
