Author: mturk
Date: Wed Oct 8 03:47:16 2008
New Revision: 702803
URL: http://svn.apache.org/viewvc?rev=702803&view=rev
Log:
Run trough spell checker - English (British)
Modified:
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
tomcat/connectors/trunk/jk/xdocs/reference/iis.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml
tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml
tomcat/connectors/trunk/jk/xdocs/reference/workers.xml
Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?rev=702803&r1=702802&r2=702803&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Wed Oct 8 03:47:16
2008
@@ -33,12 +33,12 @@
<p>
Most of the directives are allowed once in the global part of the Apache httpd
configuration and once in every <VirtualHost> elements. Exceptions from
this rule are
-explicitely listed in the table below.
+explicitly listed in the table below.
</p>
<p>
Most values are inherited from the main server to the virtual hosts.
Since version 1.2.20 they can be overwritten in the virtual hosts.
-Exceptions from this rule are again explicitely listed in the table below.
+Exceptions from this rule are again explicitly listed in the table below.
See especially JkMountCopy.
</p>
<p><b>Waring: If Apache httpd and Tomcat are configured to serve content from
@@ -307,7 +307,7 @@
<attribute name="JkEnvVar" required="false"><p>
Adds a name and an optional default value of environment variable
that should be sent to servlet-engine as a request attribute.
-If the default value is not given explicitely, the variable
+If the default value is not given explicitly, the variable
will only be send, if it is set during runtime.
<br/>
The default is empty, so no additional variables will be sent.
@@ -335,7 +335,7 @@
<br/>
This directive has been introduced in version 1.2.21.
<br/>With version 1.2.27 and later this directive can have optional
-seddion ID identifier. If not specified it defaults to
+session ID identifier. If not specified it defaults to
<code>;jsessionid</code>.
</p>
</attribute>
@@ -614,7 +614,7 @@
is not set.
</p>
<p>
-You can also realize such a check with mod_rewrite, which is more powerful
+You can also realise such a check with mod_rewrite, which is more powerful
but also slightly more complicated.
<source>
@@ -764,7 +764,7 @@
The directive <b>JkEnvVar</b> allows you to forward environment variables
from Apache server to Tomcat engine.
You can add a default value as a second parameter to the directive.
-If the default value is not given explicitely, the variable
+If the default value is not given explicitly, the variable
will only be send, if it is set during runtime.
<br/>
The variables can be retrieved on the Tomcat side as request attributes
@@ -824,7 +824,7 @@
</source>
<p>
JkUnMount takes precedence over JkMount directives, meaning that the JK
-will first try to mount and then checks, if there is an exclusiond defined by a
+will first try to mount and then checks, if there is an exclusion defined by a
JkUnMount. A JkUnMount overrides a JkMount only, if the worker names in the
JkMount and in the JkUnMount are the same.
</p>
@@ -919,7 +919,7 @@
If the mount point uri starts with minus sign '-'
the mount point will only be disabled. A disabled mount can be reenabled
by deleting the minus sign and waiting for the JkMountFile to reload.
-An exclusion can be disabled by prefixing it with a mninus sign.
+An exclusion can be disabled by prefixing it with a minus sign.
</p>
<source>
# Sample uriworkermap.properties file
Modified: tomcat/connectors/trunk/jk/xdocs/reference/iis.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/iis.xml?rev=702803&r1=702802&r2=702803&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/iis.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/iis.xml Wed Oct 8 03:47:16 2008
@@ -133,7 +133,7 @@
<p>This directive has been added in version 1.2.21</p>
</attribute>
<attribute name="uri_select" required="false"><p>
-A string value which influences, how URIs are decoded and reencoded
+A string value which influences, how URIs are decoded and re-encoded
between IIS and Tomcat. You should leave this at it's default value,
unless you have a very good reason to change it.
</p>
@@ -151,15 +151,15 @@
</p>
<p>
If the value is "escaped", the forwarded URI
-will be the reencoded form of the URI used by "parsed".
+will be the re-encoded form of the URI used by "parsed".
Explicit path components like ".." will already be resolved.
This will not work in combination with URL encoded session IDs.
</p>
<p>
If the value is "proxy", the forwarded URI
-will be a partially reencoded form of the URI used by "parsed".
+will be a partially re-encoded form of the URI used by "parsed".
Explicit path components like ".." will already be resolved.
-and problematic are reencoded.
+and problematic are re-encoded.
</p>
<p>The default value since version 1.2.24 is "proxy". Before it was
"parsed".</p>
</attribute>
@@ -204,7 +204,7 @@
<section name="Using a properties file for configuration">
<p>
The ISAPI redirector can read it's configuration from a properties file
instead of the registry.
-This has the advantage that you can use multiple ISAPI redirectors with
independant configurations on the same server.
+This has the advantage that you can use multiple ISAPI redirectors with
independent configurations on the same server.
The redirector will check for the properties file during initialisation, and
use it in preference to the registry if present.
</p>
<p>
@@ -249,8 +249,8 @@
<section name="Using a simple rewrite rules">
<p>
-The ISAPI redirector with version 1.2.16 can do a simple URL rewriting.
Althought not
-as powerfull as Apache Httpd's mod_rewrite, it allows a simple exchange of
request uris
+The ISAPI redirector with version 1.2.16 can do a simple URL rewriting.
Although not
+as powerful as Apache Httpd's mod_rewrite, it allows a simple exchange of
request URIs
</p>
<p>
The rule is in the form rewritten=real-url.
Modified: tomcat/connectors/trunk/jk/xdocs/reference/status.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/status.xml?rev=702803&r1=702802&r2=702803&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/status.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/status.xml Wed Oct 8 03:47:16
2008
@@ -136,7 +136,7 @@
will start again as soon as you come back to one of the other actions.
</p>
<p>
-Many parts of the HTML page can be minimized, if they are not interesting for
you. There are a couple
+Many parts of the HTML page can be minimised, if they are not interesting for
you. There are a couple
of "Hide" links, which will collapse parts of the information. The feature
exists for the following
blocks of information:
<ul>
@@ -165,7 +165,7 @@
<b>AJP Configuration</b>: Do not show configuration data for ajp workers load
balancer members
</li>
</ul>
-The last three minimization features have been added in version 1.2.27.
+The last three minimisation features have been added in version 1.2.27.
</p>
</subsection>
@@ -179,7 +179,7 @@
virtual hosts. The downside of this is, that the status worker can only show
URL maps, for
the virtual host it is defined in. It is not able to reach the configuration
objects
for other virtual hosts. Of course you can define a status worker in any
virtual host you
-are using. All information presented apart from the URL maps will be the same,
independant
+are using. All information presented apart from the URL maps will be the same,
independent
of the virtual host the status worker has been called in.
</p>
</subsection>
@@ -229,10 +229,10 @@
</p>
</subsection>
-<subsection name="Output Customization">
+<subsection name="Output Customisation">
<br/>
<p>
-There are a couple of attributes for the workers.properties entries, which
allow to customize
+There are a couple of attributes for the workers.properties entries, which
allow to customise
various aspects of the output of the status worker.
</p>
<p>
@@ -250,13 +250,13 @@
stylesheet or improvements to the HTML layout, please contact us on the tomcat
developers list.
</p>
<p>
-The properties output format can be customized via the attribute
<b>prefix</b>. The names of all
+The properties output format can be customised via the attribute
<b>prefix</b>. The names of all
properties the status worker does output, will begin with this prefix. The
default is "worker".
</p>
<p>
Several attributes influence the format when writing XML output.
The attribute <b>ns</b> allows to set a namespace prefix, that will be used
for every status worker+element.
-The default is "jk:". Setting it to "-" disables the namesspace prefix.
+The default is "jk:". Setting it to "-" disables the namespace prefix.
</p>
<p>
With the attribute xmlns you can map the prefix to a namespace URL. The
default value
@@ -302,7 +302,7 @@
will check, if the name attached with the request is contained in it's "user"
list.
</p>
<p>
-The user list can be split over multiple occurences of the "user" attribute.
+The user list can be split over multiple occurrences of the "user" attribute.
</p>
<p>
By default, the user names are matched case sensitively. Starting with version
1.2.21 you can set
@@ -314,12 +314,12 @@
<br/>
<p>
For load balancing workers the status worker shows some interesting overview
information.
-It categorizes the members of the load balancer into the classes "good", "bad"
and degraded".
+It categorises the members of the load balancer into the classes "good", "bad"
and degraded".
This feature can be combined with external escalation procedures. Depending on
your global
-system design and your operating practises your preferred categorization might
vary.
+system design and your operating practises your preferred categorisation might
vary.
</p>
<p>
-The categorization is based on the activation state of the workers (active,
disabled or stopped),
+The categorisation is based on the activation state of the workers (active,
disabled or stopped),
which is a pure configuration state, and the runtime state
(OK or ERR with possible substates idle, busy, recovering, probing, and forced
recovery)
which only depends on the runtime situation.
@@ -338,7 +338,7 @@
</li>
<li>
<b>ERROR (recovering)</b>: The worker was in error state for some time and is
now
-marked for recovery. The next request suitable for thi worker will use it.
+marked for recovery. The next request suitable for this worker will use it.
</li>
<li>
<b>ERROR (probing)</b>: After setting the worker to recovering, we received a
request
@@ -371,7 +371,7 @@
</p>
<p>
The status worker first tries to match against the "bad" definitions, if this
doesn't succeed
-it tries to macth against "good", and finally it choses "degarded", if no
"bad" or "good" match
+it tries to match against "good", and finally it chooses "degraded", if no
"bad" or "good" match
can be found.
</p>
</subsection>
@@ -455,7 +455,7 @@
<b>0x0080</b>: hide load balancer status summary
</li>
<li>
-<b>0x0100</b>: hide configuraton for ajp and load balancer member workers
+<b>0x0100</b>: hide configuration for ajp and load balancer member workers
</li>
</ul>
Values 0x0040-0x0100 have been added in version 1.2.27.
Modified: tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml?rev=702803&r1=702802&r2=702803&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml Wed Oct 8
03:47:16 2008
@@ -173,7 +173,7 @@
An rule gets disabled, if it is suffixed with '-':
<source>
# We are not in maintenance.
- # The maintenance rule got defined someahere else.
+ # The maintenance rule got defined somewhere else.
-/*=maintenance
</source>
Exclusion rules can get disabled as well, then the rule starts with '-!'.
@@ -224,7 +224,7 @@
</p>
<p>
Note that /mysecondapp/* will be mapped to all virtual hosts present.
-In case one needs to prevent the mappings to some particular virual host then
+In case one needs to prevent the mappings to some particular virtual host then
the exclusion rule must be used
<source>
# Make sure the myapp is accessible by all virtual hosts
Modified: tomcat/connectors/trunk/jk/xdocs/reference/workers.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/workers.xml?rev=702803&r1=702802&r2=702803&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/workers.xml Wed Oct 8 03:47:16
2008
@@ -81,7 +81,7 @@
<p><strong><name>=<value></strong></p>
<p>
</p>
-Dots are used as part of the name to represent a configuration hierarchie.
+Dots are used as part of the name to represent a configuration hierarchy.
<p>
Invalid directives will be logged during web server startup and prevent the
web server
from working properly. Some directives have been deprecated. Although they will
@@ -89,7 +89,7 @@
<a href="#Deprecated Worker Directives">successors</a>.
</p>
<p>
-Some directives are allowed multiple times. This will be explicitely
+Some directives are allowed multiple times. This will be explicitly
noted in the tables below.
</p>
<p>
@@ -178,7 +178,7 @@
The directive "reference" allows to copy configurations between workers
in a hierarchical way. If worker castor sets
<b>worker.castor.reference=worker.pollux</b>
then it inherits all properties of <b>pollux</b>, except for the ones that
-are explicitely set for <b>castor</b>.
+are explicitly set for <b>castor</b>.
</p>
<p>
Please note, that the value of the directive is not only the name of the
referred worker,
@@ -274,7 +274,7 @@
</directive>
<directive name="ping_timeout" default="10000" required="false">
-Connections idle for longer than this interval in miliseconds are probed by
+Connections idle for longer than this interval in milliseconds are probed by
CPING packets whether they still work. The usage depend on the
<code>ping_mode</code> flags used.
<p>
@@ -420,7 +420,7 @@
Tomcat process death will not "kill" the entire site.
</p>
<warn>
-If you want to use session stickyness, you must set different jvmRoute
attributes
+If you want to use session stickiness, you must set different jvmRoute
attributes
in the Engine element in Tomcat's server.xml. Furthermore the names of the
workers
which are managed by the balancer have to be equal to the jvmRoute of the
Tomcat
instance they connect with.
@@ -458,7 +458,7 @@
Specifies whether requests with SESSION ID's for workers that are in error
state
should be rejected. If sticky_session_force is set to <b>True</b> or <b>1</b>
and the worker that matches that SESSION ID is in error state, client will
-recieve 500 (Server Error). If set to <b>False</b> or <b>0</b> failover on
+receive 500 (Server Error). If set to <b>False</b> or <b>0</b> failover on
another worker will be issued with loosing client session. This directive is
used only when you set <b>sticky_session=True</b>.
<p>
@@ -468,7 +468,7 @@
<directive name="method" default="Request" required="false">
Specifies what method load balancer is using for electing the best worker.
-Please note, that session stickyness and perfect load balancing are
+Please note, that session stickiness and perfect load balancing are
conflicting targets, especially when the number
of sessions is small, or the usage of sessions is extremely varying
For huge numbers of sessions this usually is not a problem.
@@ -518,7 +518,7 @@
</directive>
<directive name="lock" default="Optimistic" required="false">
-Specifies what lock method the load balancer will use for synchronizing
+Specifies what lock method the load balancer will use for synchronising
shared memory runtime data.
If lock is set to <b>O[ptimistic]</b> balancer will not use shared memory lock
to find the best worker. If set to <b>P[essimistic]</b> balancer will use
@@ -641,14 +641,14 @@
</p>
</directive>
<directive name="ns" default="jk:" required="false">
-This directive can be used to customize the XML output from the
+This directive can be used to customise the XML output from the
status worker. If set to <b>-</b> no namespace will be used.
<p>
This feature has been added in <b>jk 1.2.20</b>.
</p>
</directive>
<directive name="xmlns" default="" required="false">
-This directive can be used to customize the XML output from the
+This directive can be used to customise the XML output from the
status worker. If set to <b>-</b> no xmlns will be used.
<p>
Default value is set to xmlns:jk="http://tomcat.apache.org"
@@ -658,7 +658,7 @@
</p>
</directive>
<directive name="doctype" default="" required="false">
-This directive can be used to customize the XML output from the
+This directive can be used to customise the XML output from the
status worker. This value will be inserted to the output xml
after the xml header.
<p>
@@ -899,7 +899,7 @@
to a Tomcat instance into several load balancers with different balancing
configuration
(e.g. disabled, stopped) you can use this attribute.
<p>
-Define a seperate worker per lb and per Tomcat instance with an arbitrary
worker name and
+Define a separate worker per lb and per Tomcat instance with an arbitrary
worker name and
set the route attribute of the worker equal to the jvmRoute of the target
Tomcat instance.
</p>
<p>
@@ -952,7 +952,7 @@
SESSION ID is in error state then the redirect worker will be used instead.
It will be used even if being disabled, thus offering hot standby.
<p>
-If you explicitely set a route via the "route" attribute, you must set
"redirect"
+If you explicitly set a route via the "route" attribute, you must set
"redirect"
to this route of the preferred failover worker and not to its name.
</p>
<p>
@@ -1034,7 +1034,7 @@
<warn>This directive has been deprecated since 1.2.19.</warn>
If set to <b>True</b> or <b>1</b> the worker will be stopped if member
of load balancer. The flag is needed for stop complete traffic of a sticky
session
-worker. It is only usefull, when you have a cluster that replicated the
sessions.
+worker. It is only useful, when you have a cluster that replicated the
sessions.
This flag can be changed at runtime using status worker.
<p>
This feature has been added in <b>jk 1.2.11</b>.
@@ -1048,7 +1048,7 @@
to a Tomcat instance into several load balancers with different balancing
configuration
(e.g. disabled, stopped) you can use this attribute.
<p>
-Define a seperate worker per lb and per Tomcat instance with an arbitrary
worker name and
+Define a separate worker per lb and per Tomcat instance with an arbitrary
worker name and
set the jvm_route attribute of the worker equal to the jvmRoute of the target
Tomcat instance.
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
