Author: byron
Date: Thu Jan 1 02:23:39 2009
New Revision: 730521
URL: http://svn.apache.org/viewvc?rev=730521&view=rev
Log:
Fix xml error, and some grammer, in users-guide
Modified:
velocity/engine/trunk/xdocs/docs/user-guide.xml
Modified: velocity/engine/trunk/xdocs/docs/user-guide.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/user-guide.xml?rev=730521&r1=730520&r2=730521&view=diff
==============================================================================
--- velocity/engine/trunk/xdocs/docs/user-guide.xml (original)
+++ velocity/engine/trunk/xdocs/docs/user-guide.xml Thu Jan 1 02:23:39 2009
@@ -51,7 +51,7 @@
</li>
<li><a href="#formalreferencenotation">Formal Reference Notation</a></li>
<li><a href="#quietreferencenotation">Quiet Reference Notation</a></li>
-<li><a href="#strictreferences">Strict References Setting</a></li>
+<li><a href="#strictreferences">Strict Reference Mode</a></li>
<li><a href="#Case_Substitution">Case Substitution</a></li>
<li><a href="#Directives">Directives</a>
<ol>
@@ -700,7 +700,7 @@
]]></source>
</section>
-<section name="Strict References Setting" href="strictreferences">
+<section name="Strict Reference Mode" href="strictreferences">
<p>
Velocity 1.6 introduces the concept of strict reference mode which
is activated by setting the velocity configuration property
@@ -709,12 +709,12 @@
undefined or ambiguous, similar to a programming language, which
may be more appropriate for some uses of Velocity. In such
undefined or ambiguous cases Velocity will throw an exception. The
- following discussion outlines the cases that strict behavior is
+ following discussion outlines the cases in which strict behavior is
different from traditional behavior.
</p>
<p>
With this setting references are required to be either placed
- explicitly into the context or defined with a #set directive, or
+ explicitly into the context or defined with a #set directive or
Velocity will throw an exception. References that are in the
context with a value of null will not produce an exception.
Additionally, if an attempt is made to call a method or a property
@@ -757,8 +757,8 @@
#if ($foo && $foo == "bar")#end ## False and $foo == "bar" wil not be evaluated
#if ($foo1 || $foo2)#end ## False $foo1 and $foo2 are not
defined]]></source>
<p>
- Strict mode requires that comparisons of >, <, >= or <= within an
- #if directive make sense. Also, the argument to #foreach must be
+ Strict mode requires that comparisons of >, <, >= or <= within an
+ #if directive makes sense. Also, the argument to #foreach must be
iterable (this behavior can be modified with the property
directive.foreach.skip.invalid). Finally, undefined macro
references will also throw an exception in strict mode.
