Author: buildbot
Date: Wed Sep 19 08:52:10 2012
New Revision: 832440
Log:
Staging update by buildbot for tserver
Modified:
websites/staging/trafficserver/trunk/cgi-bin/ (props changed)
websites/staging/trafficserver/trunk/content/ (props changed)
websites/staging/trafficserver/trunk/content/docs/trunk/admin/cluster-howto/index.en.html
websites/staging/trafficserver/trunk/content/docs/trunk/admin/configuration-files/records.config.en.html
websites/staging/trafficserver/trunk/content/docs/trunk/admin/security-options/index.en.html
Propchange: websites/staging/trafficserver/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 19 08:52:10 2012
@@ -1 +1 @@
-1387266
+1387493
Propchange: websites/staging/trafficserver/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Sep 19 08:52:10 2012
@@ -1 +1 @@
-1387266
+1387493
Modified:
websites/staging/trafficserver/trunk/content/docs/trunk/admin/cluster-howto/index.en.html
==============================================================================
---
websites/staging/trafficserver/trunk/content/docs/trunk/admin/cluster-howto/index.en.html
(original)
+++
websites/staging/trafficserver/trunk/content/docs/trunk/admin/cluster-howto/index.en.html
Wed Sep 19 08:52:10 2012
@@ -158,16 +158,16 @@ traffic_line -s proxy.config.cluster.eth
</pre></div>
-<p>process traffic_server and traffic_manager need to restart after the change
- of 'proxy.local.cluster.type' and
'proxy.config.cluster.ethernet_interface'</p>
+<p>The <code>traffic_server</code> and <code>traffic_manager</code> processes
will need to restart after the change
+ of 'proxy.local.cluster.type' and 'proxy.config.cluster.ethernet_interface'
have taken place.</p>
</li>
</ol>
-<p>Traffic Server will join into the Cluster in about 10 seconds and you can
run
-<code>traffic_line -r proxy.process.cluster.nodes</code> to check the hosts in
cluster
-or checkout the <a
href="../configuration-files/cluster.configcluster.config"><code>cluster.config</code></a>
+<p>Traffic Server will join into the cluster in about 10 seconds, and you can
run
+<code>traffic_line -r proxy.process.cluster.nodes</code> to check the hosts in
the cluster,
+or check out the <a
href="../configuration-files/cluster.configcluster.config"><code>cluster.config</code></a>
in the configuration directory.</p>
<p>After a successful join of the cluster, all changes of global
configurations on any
-node, will take effect on <strong>all</strong> nodes now.</p>
+node, will take effect on <strong>all</strong> nodes.</p>
<h1 id="DeletingNodesFromCluster">Deleting Nodes from a Cluster</h1>
<p>To delete a node from the Traffic Server cluster, just roll back
<code>proxy.config.cluster.type</code> to the default value 3 and reload.</p>
Modified:
websites/staging/trafficserver/trunk/content/docs/trunk/admin/configuration-files/records.config.en.html
==============================================================================
---
websites/staging/trafficserver/trunk/content/docs/trunk/admin/configuration-files/records.config.en.html
(original)
+++
websites/staging/trafficserver/trunk/content/docs/trunk/admin/configuration-files/records.config.en.html
Wed Sep 19 08:52:10 2012
@@ -1280,7 +1280,7 @@ would listen to ports <code>6060</code>,
<p>Default: <code>rw-r--r--</code></p>
</dd>
<dd>
-<p>The log file permissions. The standard UNIX file permissions are used
(owner, group, other). Permissable values are:</p>
+<p>The log file permissions. The standard UNIX file permissions are used
(owner, group, other). Permissible values are:</p>
<p><code>-</code>no permission
<code>r</code>read permission
<code>w</code>write permission
Modified:
websites/staging/trafficserver/trunk/content/docs/trunk/admin/security-options/index.en.html
==============================================================================
---
websites/staging/trafficserver/trunk/content/docs/trunk/admin/security-options/index.en.html
(original)
+++
websites/staging/trafficserver/trunk/content/docs/trunk/admin/security-options/index.en.html
Wed Sep 19 08:52:10 2012
@@ -28,7 +28,7 @@
</div>
<div class="fourcol right last" id="searchbox">
- <div id="header-main">Apache Traffic Server</div>
+ <div id="header-main">Adminstrator's Guide</div>
<div id="header-sub">Security Options </div>
</div>
@@ -122,7 +122,7 @@ the request and performs the SSL 'handsh
on the authentication options configured) and determine the encryption method
that will be used. If the client is allowed access, then Traffic Server checks
its cache for the requested content. </p>
-<p><strong>Step 2:</strong> If the request is a cache hit and the content is
fresh, thenTraffic
+<p><strong>Step 2:</strong> If the request is a cache hit and the content is
fresh, then Traffic
Server encrypts the content and sends it to the client. The client decrypts
the content (using the method determined during the handshake) and displays
it. </p>
