http://git-wip-us.apache.org/repos/asf/isis-site/blob/09aecf2c/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 6541ed8..d72e456 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -2068,7 +2068,7 @@ So, if you have used Apache Isis for prototyping
(discussed above), then note th
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.11.1 \
+ -D archetypeVersion=1.12.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -2105,7 +2105,7 @@ So, if you have used Apache Isis for prototyping
(discussed above), then note th
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.0-SNAPSHOT \
+ -D archetypeVersion=1.13.0-SNAPSHOT \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
@@ -5183,7 +5183,7 @@ TODO - easiest to simply store using DataNucleus'
support for collections, mark
<div class="sect2">
<h3 id="_ugfun_object-layout_static">5.1. Static Object Layout</h3>
<div class="paragraph">
-<p>Metadata providing UI hints can be specified either statically, using
annotations, or dynamically, using either a <a
href="#_ugfun_object-layout_dynamic_xml"><code>layout.xml</code></a> file
(<code>1.12.0-SNAPSHOT</code>) or a <a
href="#_ugfun_object-layout_dynamic"><code>.layout.json</code></a> file.</p>
+<p>Metadata providing UI hints can be specified either statically, using
annotations, or dynamically, using either a <a
href="#_ugfun_object-layout_dynamic_xml"><code>layout.xml</code></a> file or a
<a href="#_ugfun_object-layout_dynamic"><code>.layout.json</code></a> file.</p>
</div>
<div class="paragraph">
<p>This section describes the static approach, using annotations.</p>
@@ -5213,7 +5213,9 @@ TODO - easiest to simply store using DataNucleus'
support for collections, mark
<div class="ulist">
<ul>
<li>
-<p>for properties, the <code>name()</code> is used to group properties
together into a member group (also called a property group or (in
<code>1.12.0-SNAPSHOT</code>) a fieldset. The <code>sequence()</code> then
orders properties within these groups. If no <code>name()</code> is specified
then the property is placed in a fallback "General" group, called
"General".<br></p>
+<p>for properties, the <code>name()</code> is used to group properties
together into a member group (also called a property group
+or a fieldset. The <code>sequence()</code> then orders properties within
these groups. If no <code>name()</code> is specified then the
+property is placed in a fallback "General" group, called "General".<br></p>
<div class="paragraph">
<p>The name of these member groups/fieldsets are then referenced by <a
href="rgant.html#_rgant-MemberGroupLayout"><code>@MemberGroupLayout</code></a>.</p>
</div>
@@ -5321,7 +5323,7 @@ TODO - easiest to simply store using DataNucleus'
support for collections, mark
</td>
<td class="content">
<div class="paragraph">
-<p>It is also possible to combine <code>@MemberOrder</code> with dynamic
layouts, either using <a href="#_ugfun_object-layout_xml">XML</a>
(<code>1.12.0-SNAPSHOT</code>) or <a
href="#_ugfun_object-layout_dynamic">JSON</a>. The layout file defines only
the regions of a grid structure (fieldsets/columns etc), but does <em>not</em>
specify the properties/collections/actions within those grid regions. The
<code>@MemberOrder</code> annotation in effect "binds" the properties or
collections to those regions of the grid.</p>
+<p>It is also possible to combine <code>@MemberOrder</code> with dynamic
layouts, either using <a href="#_ugfun_object-layout_xml">XML</a> or <a
href="#_ugfun_object-layout_dynamic">JSON</a>. The layout file defines only
the regions of a grid structure (fieldsets/columns etc), but does <em>not</em>
specify the properties/collections/actions within those grid regions. The
<code>@MemberOrder</code> annotation in effect "binds" the properties or
collections to those regions of the grid.</p>
</div>
<div class="paragraph">
<p>When dynamic layouts are used this way, the <a
href="rgant.html#_rgant_MemberGroupLayout"><code>@MemberGroupLayout</code></a>
annotation is essentially ignored, but the metadata from the <a
href="rgant.html#_rgant_MemberOrder"><code>@MemberOrder</code></a> annotation
(and the other layout annotations, <a
href="rgant.html#_rgant_ActionLayout"><code>@ActionLayout</code></a>, <a
href="rgant.html#_rgant_PropertyLayout"><code>@PropertyLayout</code></a> and <a
href="rgant.html#_rgant_CollectionLayout"><code>@CollectionLayout</code></a>)
are all still honoured.</p>
@@ -5474,7 +5476,7 @@ TODO - easiest to simply store using DataNucleus'
support for collections, mark
</div>
</div>
<div class="sect2">
-<h3 id="_ugfun_object-layout_dynamic_xml">5.2. Dynamic (XML) Layout
(<code>1.12.0-SNAPSHOT</code>)</h3>
+<h3 id="_ugfun_object-layout_dynamic_xml">5.2. Dynamic (XML) Layout</h3>
<div class="paragraph">
<p>Metadata providing UI hints can be specified either <a
href="#_ugfun_object-layout_static">statically</a>, using annotations, or
dynamically using an <code>Xxx.layout.xml</code> file (where <code>Xxx</code>
is the entity or view model object to be rendered).</p>
</div>
@@ -5493,7 +5495,7 @@ is that IDEs such as IntelliJ and Eclipse can provide
"intellisense", making ite
</td>
<td class="content">
<div class="paragraph">
-<p>It is also possible to describe dynamic layouts using a
<code>.layout.json</code> file, as discussed <a
href="#_ugfun_object-layout_dynamic">here</a>. As of
<code>1.12.0-SNAPSHOT</code> the <code>.layout.json</code> file should be
considered as deprecated: the <code>.layout.xml</code> file also enables much
more sophisticated layouts than those afforded by <code>.layout.json</code>.</p>
+<p>It is also possible to describe dynamic layouts using a
<code>.layout.json</code> file, as discussed <a
href="#_ugfun_object-layout_dynamic">here</a>. The <code>.layout.json</code>
file should be considered as deprecated: the <code>.layout.xml</code> file also
enables much more sophisticated layouts than those afforded by
<code>.layout.json</code>.</p>
</div>
</td>
</tr>
@@ -6003,7 +6005,7 @@ below summarises the choices:</p>
</td>
<td class="content">
<div class="paragraph">
-<p>(As of <code>1.12.0-SNAPSHOT</code>), the use of dynamic layouts through
the <code>.layout.json</code> is DEPRECATED. Instead, use the
+<p>The use of dynamic layouts through the <code>.layout.json</code> is
DEPRECATED. Instead, use the
<code>.layout.xml</code> file, which enables much more sophisticated custom
layouts than those provided by <code>.layout.json</code>.</p>
</div>
<div class="paragraph">
@@ -7263,7 +7265,7 @@ example the <a
href="ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp
<li><a href="#_other_annotations">5.1.4. Other Annotations</a></li>
</ul>
</li>
-<li><a href="#_ugfun_object-layout_dynamic_xml">5.2. Dynamic (XML) Layout
(<code>1.12.0-SNAPSHOT</code>)</a>
+<li><a href="#_ugfun_object-layout_dynamic_xml">5.2. Dynamic (XML) Layout</a>
<ul class="sectlevel3">
<li><a href="#_grids_vs_components">5.2.1. Grids vs Components</a></li>
<li><a href="#_screencast">5.2.2. Screencast</a></li>
