You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/19 19:57:52 UTC

git commit: TAP5-2212: Errors in the If documentation

Updated Branches:
  refs/heads/master 06ce2fbed -> 15d1a8402


TAP5-2212: Errors in the If documentation


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/15d1a840
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/15d1a840
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/15d1a840

Branch: refs/heads/master
Commit: 15d1a84022ffa65bca0f1bd132c5afab6e5fff16
Parents: 06ce2fb
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Nov 19 10:57:45 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Nov 19 10:57:45 2013 -0800

----------------------------------------------------------------------
 .../org/apache/tapestry5/corelib/components/If.xdoc  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/15d1a840/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.xdoc
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.xdoc b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.xdoc
index bd2f804..0cee83d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.xdoc
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.xdoc
@@ -5,15 +5,15 @@
             <subsection name="Start.tml">
 
                 <source><![CDATA[
-<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd" xmlns:p="tapestry:parameter">
     <body>
         <h1>Welcome!</h1>
 
         <t:if test="user">
             Welcome back, ${user.firstName}
             <p:else>
-                <t:pagelink name="login">Login</t:pagelink> /
-                <t:pagelink name="register">Register</t:pagelink>
+                <t:pagelink page="login">Login</t:pagelink> /
+                <t:pagelink page="register">Register</t:pagelink>
             </p:else>
         </t:if>
         
@@ -27,13 +27,6 @@
                     page are rendered.
                 </p>
 
-                <p>
-                    Note the use of the
-                    <code>p:</code>
-                    namespace (new in Tapestry 5.1). In 5.0, this would be
-                    <code>&lt;t:parameter name="else"&gt;</code>.
-                </p>
-
             </subsection>
 
 
@@ -53,7 +46,7 @@
                 <dt>Collection</dt>
                 <dd>True if non-empty</dd>
                 <dt>Object</dt>
-                <dd>True (as long as its not null)</dd>
+                <dd>True (as long as it's not null)</dd>
             </dl>