You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2014/12/05 15:52:57 UTC

svn commit: r931537 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/more-advanced-topics/ content/more-advanced-topics/images/ content/reference/recognized-annotations/

Author: buildbot
Date: Fri Dec  5 14:52:57 2014
New Revision: 931537

Log:
Staging update by buildbot for isis

Added:
    websites/staging/isis/trunk/content/more-advanced-topics/How-to-suppress-contributions.html
    websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-foodstuff.png   (with props)
    websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-person.png   (with props)
Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/documentation.html
    websites/staging/isis/trunk/content/more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html
    websites/staging/isis/trunk/content/reference/recognized-annotations/about.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec  5 14:52:57 2014
@@ -1 +1 @@
-1643248
+1643304

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec  5 14:52:57 2014
@@ -1 +1 @@
-1643248
+1643304

Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Fri Dec  5 14:52:57 2014
@@ -703,6 +703,7 @@
 <li><a href="./more-advanced-topics/are-you-sure-idiom.html">Are you sure?</a></li>
 <li><a href="./more-advanced-topics/how-to-09-020-How-to-write-a-typical-domain-service.html">Singleton &amp; request-scoped services</a></li>
 <li><a href="./more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html">Decoupling dependencies using contributions</a></li>
+<li><a href="./more-advanced-topics/how-to-suppress-contributions.html">How to suppress contributions</a></li>
 <li><a href="./more-advanced-topics/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html">Bulk actions, acting upon lists</a></li>
 <li><a href="./more-advanced-topics/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.html">Bidirectional relationships</a></li>
 <li><a href="./more-advanced-topics/ViewModel.html">View models</a></li>

Added: websites/staging/isis/trunk/content/more-advanced-topics/How-to-suppress-contributions.html
==============================================================================
--- websites/staging/isis/trunk/content/more-advanced-topics/How-to-suppress-contributions.html (added)
+++ websites/staging/isis/trunk/content/more-advanced-topics/How-to-suppress-contributions.html Fri Dec  5 14:52:57 2014
@@ -0,0 +1,518 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <meta charset="utf-8">
+      <title></title>
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    
+    <!-- Le styles -->
+    <link href="./../bootstrap-3.0.0/css/bootstrap.css" rel="stylesheet">
+    <link href="./../prettify.css" rel="stylesheet">
+
+    <style type="text/css">
+        body {
+          padding-top: 60px;
+        }
+        .sprite {
+            display: inline-block;
+            height: 20px;
+            margin: 0 auto 4px;
+            outline: medium none;
+            text-indent: -999em;
+            width: 24px;
+            background-image: url('./../images/sprites.png');
+            background-repeat: no-repeat;
+            overflow: hidden;
+            cursor: pointer;
+        }
+        .edit-page {
+            display: inline-block;
+            height: 20px;
+            margin: 0 auto 4px;
+            outline: medium none;
+            text-indent: -999em;
+            width: 24px;
+            background-image: url('./../images/edit.png');
+            background-repeat: no-repeat;
+            overflow: hidden;
+            cursor: pointer;
+        }
+        .fb-share {
+            background-position: 0px -40px;
+        }
+        .gp-share {
+            background-position: 0px 0px;
+        }
+        .tw-share {
+            background-position: 0px -80px;
+        }
+        .markdown-content {
+            min-height: 500px;
+        }
+        .book-image img {
+          border: 1px;
+          border-style: solid;
+        }
+        .release-matrix .heading {
+            background-color: #eeeeee;
+        }
+        .release-matrix .new {
+            color: #dd0000;
+            font-weight: bolder;
+        }
+        .stub,.note {
+            position: relative;
+            padding: 7px 15px;
+            margin-bottom: 18px;
+            color: #404040;
+            background-color: #eedc94;
+            background-repeat: repeat-x;
+            background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+            background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+            background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+            background-image: linear-gradient(top, #fceec1, #eedc94);
+            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+            text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+            border-color: #eedc94 #eedc94 #e4c652;
+            border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+            text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+            border-width: 1px;
+            border-style: solid;
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+            -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+        }
+        
+        div.XXXisis-tweak form {
+            margin-top: 6px;
+            margin-bottom: -2px;
+        }
+        
+        div.row div.col-md-12 {
+          border-top: 1px solid #eeeeee;
+       }
+        
+        
+        /* Isis specific stuff */
+
+        div.row div.col-md-12 {
+          margin-top: 20px;
+        }
+
+        .container {
+          width: 940px;
+        }
+
+        .markdown-content .documentation .span-one-third p {
+          margin-bottom: 0px;
+        }
+
+        .container .markdown-content .group,
+        .markdown-content .documentation .group {
+          margin-top: 9px;
+        }
+
+        .container .group h2,
+        .documentation .group h2 {
+          border-bottom: 1px solid #DDD
+        }
+
+        .container h2 a[name],
+        .documentation h2 a[name] {
+            padding-top: 50px;
+            margin-top: -50px;
+        }
+
+        .apacheconeu2014 h2 {
+          margin-top: 80px;
+        }
+        
+        .container h2 a[name],
+        .container h3 a[name],
+        .container h4 a[name],
+        .documentation h2 a[name],
+        .documentation h3 a[name],
+        .documentation h4 a[name] {
+            color: black;
+            display: inline-block; 
+        }
+        .container h2 a[name]:hover,
+        .container h3 a[name]:hover,
+        .container h4 a[name]:hover,
+        .documentation h2 a[name]:hover,
+        .documentation h3 a[name]:hover,
+        .documentation h4 a[name]:hover {
+            text-decoration: none;
+        }
+
+        .documentation h2 a:not([name]),
+        .documentation h3 a:not([name]),
+        .documentation h4 a:not([name]) {
+          /* same as code style */
+          padding: 0 3px 2px;
+          font-family: Monaco, Andale Mono, Courier New, monospace;
+          font-size: 12px;
+          -webkit-border-radius: 3px;
+          -moz-border-radius: 3px;
+          border-radius: 3px;
+          padding: 1px 3px;
+        }
+        
+        .carousel-indicators li {
+          border: 1px solid rgb(192,70,1);
+        }
+
+        .carousel-indicators li.active {
+          background-color: rgb(192,70,1);
+        }
+        
+        .carousel-control .icon-prev,
+        .carousel-control .icon-next {
+          color: rgb(192,70,1);
+          font-size: 60px;
+        }
+        
+        .page-header {
+          margin-top: 0px;
+        }
+
+        .container blockquote p {
+            font-size: small;
+        }
+
+        .container blockquote p:not([author]) {
+            font-style: italic;
+        }
+
+        .container blockquote p {
+            font-size: small;
+            font-style: italic;
+            font-weight: bold;
+        }
+        
+        footer hr {
+            margin-top: 100px;
+        }
+
+        .markdown-content img {
+            margin-top: 10px;
+            margin-bottom: 20px;
+        }
+
+        .markdown-content a img {
+            margin-top: 0px;
+            margin-bottom: 0px;
+        }
+
+        
+        #forkongithub a{
+            display: none;
+            background:#090;
+            color:#fff;
+            text-decoration:none;
+            font-family:arial, sans-serif;
+            text-align:center;
+            font-weight:bold;
+            padding:5px 40px;
+            font-size:1rem;
+            line-height:2rem;
+            position:relative;
+            transition:0.5s;
+        }
+        #forkongithub a:hover{
+            background:#0D0;
+            color:#fff;
+        }
+        #forkongithub a::before,
+        #forkongithub a::after{
+            content:"";width:100%;
+            display:block;
+            position:fixed;
+            top:1px;
+            left:0;
+            height:1px;
+            background:#fff;
+            z-index: 9999;
+        }
+        #forkongithub a::after{
+            bottom:1px;
+            top:auto;
+        }
+        @media screen and (min-width:768px){
+            #forkongithub{
+                position:fixed;
+                display:block;
+                top:0;
+                right:0;
+                width:250px;
+                overflow:hidden;
+                height:250px;
+                z-index: 9999;
+            }
+            #forkongithub a{
+                display:inherit;
+                width:250px;
+                position:fixed;
+                font-size:small;
+                top:40px;
+                right:-60px;
+                transform:rotate(45deg);
+                -webkit-transform:rotate(45deg);
+                -ms-transform:rotate(45deg);
+                box-shadow:4px 4px 10px rgba(0,0,0,0.8);
+            }
+        }        
+    </style>
+
+    <!-- courtesy of http://codepo8.github.io/css-fork-on-github-ribbon/ -->
+    <span id="forkongithub">
+        <a href="https://github.com/apache/isis">Fork me on GitHub</a>
+    </span>
+
+    <script type="text/javascript">
+      function fbshare () {
+          window.open(
+                  "http://www.facebook.com/sharer/sharer.php?u="+document.URL,
+                  'Share on Facebook',
+                  'width=640,height=426');
+      };
+      function gpshare () {
+          window.open(
+                  "https://plus.google.com/share?url="+document.URL,
+                  'Share on Google+',
+                  'width=584,height=385');
+      };
+      function twshare () {
+          window.open(
+                  "https://twitter.com/intent/tweet?url="+document.URL+"&text=",
+                  'Share on Twitter',
+                  'width=800,height=526');
+      };
+    </script>
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="./../images/favicon.ico">
+
+    <script src="./../javascript/prettify.js" type="text/javascript"></script>
+    
+    <script src="//code.jquery.com/jquery.js"></script>
+    <script src="./../javascript/prettyprint.js"></script>
+    <script src="./../bootstrap-3.0.0/js/bootstrap.js"></script>
+
+
+    <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+    <!--
+    <DISABLEDscript src="./../javascript/common.js"></DISABLEDscript>
+    -->
+
+    
+    
+    
+
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+
+    
+  </head>
+
+  <body>
+
+    <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+      <div class="container">
+        <a class="navbar-brand" href="./../index.html">Apache Isis&trade;</a>
+        <ul class="nav navbar-nav">
+
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
+              <li><a href="./../intro/tutorials/screencasts.html">Screencasts<img src="./../images/tv_show-25.png"></a></li>
+              <li><a href="./../intro/powered-by/powered-by.html">Powered by</a></li>
+              <li><a href="http://isisdemo.mmyco.co.uk/" target="_blank">Online Demo</a></li>
+            </ul>
+          </li>
+
+          <li><a href="./../documentation.html">Docs</a></li>
+          <li><a href="http://www.isisaddons.org" target="_blank">Add-ons</a></li>
+
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Downloads<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="./../intro/getting-started/simpleapp-archetype.html">Isis (Maven archetype)</a></li>
+              <li><a href="./../download.html">Isis (downloads)</a></li>
+              <li><a href="http://www.isisaddons.org" target="_blank">Isis Add-ons</a></li>
+            </ul>
+          </li>
+
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Help<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="./../support.html">Mailing Lists</a></li>
+              <li><a href="http://isis.markmail.org/search/?q=" target="_blank">ML Archives</a></li>
+              <li><a href="https://issues.apache.org/jira/browse/ISIS" target="_blank">JIRA</a></li>
+              <li><a href="http://stackoverflow.com/questions/tagged/isis" target="_blank">Stack Overflow</a></li>
+              <li><a href="http://github.com/apache/isis" target="_blank">Github mirror</a></li>
+            </ul>
+          </li>
+
+          <li class="dropdown navbar-right">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">@ASF<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li>
+                <a href="http://www.apache.org/" target="_blank">Apache Homepage <i class="icon-share-alt"></i></a>
+              </li>
+              <li>
+                <a href="http://www.apache.org/licenses/" target="_blank">Licenses <i class="icon-share-alt"></i></a>
+              </li>
+              <li>
+                <a href="http://www.apache.org/security/" target="_blank">Security <i class="icon-share-alt"></i></a>
+              </li>
+              <li>
+                <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship <i class="icon-share-alt"></i></a>
+              </li>
+              <li>
+                <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
+              </li>
+              <li>
+                <a href="./../more-thanks.html">More thanks <i class="icon-share-alt"></i></a>
+              </li>
+            </ul>
+          </li>
+      </ul>
+
+        <FORM class="navbar-form navbar-right" id="searchbox_012614087480249044419:dn-q5gtwxya" action="http://www.google.com/cse">
+        <div class="form-group">
+          <input type="hidden" name="cx" value="012614087480249044419:dn-q5gtwxya">
+          <INPUT type="hidden" name="cof" value="FORID:0">
+          <INPUT class="form-control" name="q" type="text" placeholder="Search">
+        </div>
+      </FORM>
+
+
+      </div>
+
+
+  </nav>
+
+    <div class="container">
+      <div class="markdown-content">
+      
+
+<div class="page-header">
+<p><a href="./../documentation.html">Docs</a>&nbsp;&raquo&nbsp;<a href="./../more-advanced-topics/about.html">More Advanced Topics</a></p>
+<h1>
+
+</h1>
+</div>
+
+<h2>How to suppress contributions to action parameters</h2>
+
+<p>If a contributed action has multiple parameters, then that action will be contributed to each of the parameter types.
+While this will often be what you want (or at least harmless), on some occasions you may want to suppress the contributed
+action on one of those parameter types.</p>
+
+<p>The <a href="https://github.com/isisaddons/isis-app-kitchensink">kitchen sink app</a> (part of <a href="http://www.isisaddons.org/">isisaddons.org</a>
+includes an example showing how this can be done.</p>
+
+<p>In its <code>contrib</code> package there are three entities:</p>
+
+<ul>
+<li><a href="https://github.com/isisaddons/isis-app-kitchensink/tree/d4fd4e8b799af42c343b7e451bbf6f5d218869a1/dom/src/main/java/org/isisaddons/app/kitchensink/dom/contrib/contributee/Person.java">Person</a></li>
+<li><a href="https://github.com/isisaddons/isis-app-kitchensink/tree/d4fd4e8b799af42c343b7e451bbf6f5d218869a1/dom/src/main/java/org/isisaddons/app/kitchensink/dom/contrib/contributed/Preference.java">Preference</a></li>
+<li><a href="https://github.com/isisaddons/isis-app-kitchensink/tree/d4fd4e8b799af42c343b7e451bbf6f5d218869a1/dom/src/main/java/org/isisaddons/app/kitchensink/dom/contrib/contributee/FoodStuff.java">FoodStuff</a></li>
+</ul>
+
+<p>eg Mary LIKEs Apple, Mungo HATEs Banana, Midge LOVEs Oranges</p>
+
+<p>Neither <code>Person</code> nor <code>FoodStuff</code> knows about <code>Preference</code>s; the <code>Preference</code> is the tuple that associates the two together.</p>
+
+<p>The <a href="https://github.com/isisaddons/isis-app-kitchensink/tree/d4fd4e8b799af42c343b7e451bbf6f5d218869a1/dom/src/main/java/org/isisaddons/app/kitchensink/dom/contrib/contributed/PreferenceContributions.java">PreferenceContributions</a> service contributes the following:</p>
+
+<ul>
+<li>"likes" - a contributed collection to <code>Person</code></li>
+<li>"firstLove" - contributed property, also to <code>Person</code></li>
+<li>"addPreference" - a contributed action to both <code>Person</code> and <code>FoodStuff</code></li>
+<li>"removePreference" - a contributed action to both <code>Person</code> and <code>FoodStuff</code></li>
+</ul>
+
+<p>However, although "addPreference" and "removePreference" <em>are</em> contributed to both <code>Person</code> and <code>FoodStuff</code>, this can be hidden using the <code>.layout.json</code> file.  Thus, in <a href="https://github.com/isisaddons/isis-app-kitchensink/tree/d4fd4e8b799af42c343b7e451bbf6f5d218869a1/dom/src/main/java/org/isisaddons/app/kitchensink/dom/contrib/contributee/FoodStuff.layout.json#L57-57">FoodStuff,layout.json</a> we have:</p>
+
+<p>"actions": {
+    ...
+    "removePreference": {
+      "actionLayout": {
+        "cssClass": "btn-warn",
+        "hidden": "EVERYWHERE"
+      }
+    }
+  }</p>
+
+<p>which means that the "removePreference" action cannot be seen when viewing a FoodStuff entity.</p>
+
+<p>You can see this in the screenshots below; <code>Person</code> has both actions:</p>
+
+<p><img src="images/suppressing-contributions-person.png" width="400px"/></p>
+
+<p>while <code>FoodStuff</code> has only one:</p>
+
+<p><img src="images/suppressing-contributions-foodstuff.png" width="400px"/></p>
+
+
+
+      </div>
+
+        <div id="edit" class="modal hide fade in" style="xxxdisplay: none; ">
+            <div class="modal-header">
+                <a class="close" data-dismiss="modal">x</a>
+
+                <h3>Thank you for contributing to the documention!</h3>
+            </div>
+            <div class="modal-body">
+                <h4>Any help with the documentation is greatly appreciated.</h4>
+                <p>All edits are reviewed before going live, so feel free to do much more than fix typos or links.  If you see a page that could benefit from an entire rewrite, we'd be thrilled to review it.  Don't be surprised if we like it so much we ask you for help with other pages :)</p>
+                <small>NOTICE: unless indicated otherwise on the pages in question, all editable content available from apache.org is presumed to be licensed under the Apache License (AL) version 2.0 and hence all submissions to apache.org treated as formal Contributions under the license terms.</small>
+                <!--[if gt IE 6]>
+                <h4>Internet Explorer Users</h4>
+                <p>If you are not an Apache committer, click the Yes link and enter a <i>anonymous</i> for the username and leave the password empty</p>
+                <![endif]-->
+
+            </div>
+            <div class="modal-footer">
+                Do you have an Apache ID?
+                <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))" class="btn">Yes</a>
+                <a href="javascript:void(location.href='https://anonymous:@cms.apache.org/redirect?uri='+escape(location.href))" class="btn">No</a>
+            </div>
+        </div>
+        <!--
+        <script src="./../javascript/bootstrap-modal.js"></script>
+        -->
+
+      <footer>
+        <hr/>
+        <p>
+        Copyright &copy; 2010~2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        <br/>
+        Apache Isis, Isis, Apache, the Apache feather logo, and the Apache Isis project logo are trademarks of The Apache Software Foundation.
+        </p>
+      </footer>
+
+    </div> <!-- /container -->
+
+  </body>
+</html>

Modified: websites/staging/isis/trunk/content/more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html
==============================================================================
--- websites/staging/isis/trunk/content/more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html (original)
+++ websites/staging/isis/trunk/content/more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html Fri Dec  5 14:52:57 2014
@@ -470,6 +470,10 @@ dependencies between entities, but as yo
 
 <p>Finally, the third action - that again will be some sort of repository query - will be rendered as a property o fhte owner; this is a contributed property.  Again, the <code>@NotContributed(As.ACTION)</code> suppresses the action from being contributed as an action also.</p>
 
+<h2>See also</h2>
+
+<p>For another example of contributions, see <a href="./how-to-suppress-contributions.html">this page</a> describing how to suppress contributions for one action parameter but not another.</p>
+
 
 
       </div>

Added: websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-foodstuff.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-foodstuff.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-person.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/isis/trunk/content/more-advanced-topics/images/suppressing-contributions-person.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: websites/staging/isis/trunk/content/reference/recognized-annotations/about.html
==============================================================================
--- websites/staging/isis/trunk/content/reference/recognized-annotations/about.html (original)
+++ websites/staging/isis/trunk/content/reference/recognized-annotations/about.html Fri Dec  5 14:52:57 2014
@@ -428,7 +428,7 @@
         <th>Annotation</th>
         <th>Layer</th>
         <th>Purpose</th>
-        <th><a href="../../components/viewers/wicket/dynamic-layouts.html">.layout.json</a> ?</th>
+        <th><a href="../../components/viewers/wicket/dynamic-layouts.html">.layout.json</a>?</th>
     </tr>
     <tr>
         <td><a href="./ActionInteraction.html">@ActionInteraction</a></td>
@@ -440,7 +440,7 @@
         <td><a href="./ActionLayout.html">@ActionLayout</a></td>
         <td>UI</td>
         <td>User interface hints for actions</td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./ActionSemantics.html">@ActionSemantics</a></td>
@@ -491,7 +491,7 @@
         <td><a href="./ClassLayout.html">@ClassLayout</a></td>
         <td>UI</td>
         <td>User interface hints for domain classes</td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./CollectionInteraction.html">@CollectionInteraction</a></td>
@@ -504,7 +504,7 @@
         <td><a href="./CollectionLayout.html">@CollectionLayout</a></td>
         <td>UI</td>
         <td>User interface hints for collections</td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./Command.html">@Command</a></td>
@@ -530,7 +530,7 @@
         <td>UI, Domain</td>
         <td>Object property cannot be edited, an object collection cannot be added to/removed from, or an
             object action cannot be invoked.</td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./DomainService.html">@DomainService</a></td>
@@ -581,18 +581,6 @@
         <td></td>
     </tr>
     <tr>
-        <td><a href="./PropertyLayout.html">@PropertyLayout</a></td>
-        <td>UI</td>
-        <td>Layout hints for a property (currently: its label position either to top or the left).</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td><a href="./ParameterLayout.html">@PropertyLayout</a></td>
-        <td>UI</td>
-        <td>Layout hints for an action parameter (currently: its label position either to top or the left).</td>
-        <td></td>
-    </tr>
-    <tr>
         <td><a href="./MaxLength.html">@MaxLength</a></td>
         <td>Domain</td>
         <td>Maximum length of a property value (strings).</td>
@@ -602,14 +590,14 @@
         <td><a href="./MemberGroupLayout.html">@MemberGroupLayout</a></td>
         <td>UI</td>
         <td>Grouping of properties into groups, and organizing of properties, collections into columns.</td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./MemberOrder.html">@MemberOrder</a></td>
         <td>UI</td>
         <td>Ordering of properties, collections and actions, and also associating actions with either a property or a
             collection.</td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./MinLength.html">@MinLength</a></td>
@@ -665,12 +653,24 @@
         <td></td>
     </tr>
     <tr>
+        <td><a href="./ParameterLayout.html">@PropertyLayout</a></td>
+        <td>UI</td>
+        <td>Layout hints for an action parameter (currently: its label position either to top or the left).</td>
+        <td>Yes</td>
+    </tr>
+    <tr>
         <td><a href="./Parseable.html">@Parseable</a></td>
         <td>UI/domain</td>
         <td>Indicates that a (value) class can be reconstructed from a string.</td>
         <td></td>
     </tr>
     <tr>
+        <td><a href="./Programmatic.html">@Programmatic</a></td>
+        <td>Domain</td>
+        <td>Ignore a public method, excluded from the Isis metamodel.</td>
+        <td></td>
+    </tr>
+    <tr>
         <td><a href="./PropertyInteraction.html">@PropertyInteraction</a></td>
         <td>Domain</td>
         <td>Enable subscribers to either veto, validate or take further steps before/after a property has been modified or
@@ -678,10 +678,10 @@
         <td></td>
     </tr>
     <tr>
-        <td><a href="./Programmatic.html">@Programmatic</a></td>
-        <td>Domain</td>
-        <td>Ignore a public method, excluded from the Isis metamodel.</td>
-        <td></td>
+        <td><a href="./PropertyLayout.html">@PropertyLayout</a></td>
+        <td>UI</td>
+        <td>Layout hints for a property (currently: its label position either to top or the left).</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./PublishedAction.html">@PublishedAction</a></td>
@@ -729,7 +729,6 @@
         <td>Specify that a class has value-semantics.
         </td>
         <td></td>
-        <td></td>
     </tr>
     <tr>
         <td><a href="./ViewModel.html">@ViewModel</a></td>
@@ -737,7 +736,6 @@
         <td>Specify that a class is a view model (as opposed to an entity or domain service).
         </td>
         <td></td>
-        <td></td>
     </tr>
 </table>
 
@@ -748,10 +746,10 @@
         <th>Annotation</th>
         <th>Layer</th>
         <th>Purpose</th>
-        <th><a href="../../components/viewers/wicket/dynamic-layouts.html">.layout.json</a> ?</th>
+        <th><a href="../../components/viewers/wicket/dynamic-layouts.html">.layout.json</a>?</th>
     </tr>
     <tr>
-        <td><a href="./ActionOrder-deprecated.html" style="text-decoration: line-through;" >@ActionOrder</a></td>
+        <td><a href="./ActionOrder-deprecated.html" >@ActionOrder</a></td>
         <td>UI</td>
         <td>Order of buttons and menu items representing actions.
         </td>
@@ -763,7 +761,7 @@
         <td>Allow visual representation of individual objects or object members layout to be customized by application-specific CSS.
         <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@ClassLayout</code>, <code>@PropertyLayout</code>, <code>@CollectionLayout</code>, <code>@ActionLayout</code> and <code>@ParameterLayout</code>
         </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./CssClassFa-deprecated.html">@CssClassFa</a></td>
@@ -771,10 +769,10 @@
         <td>So that font awesome icons can be applied to action buttons/menu items and optionally as an object icon.
         <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@ActionLayout</code>
         </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
-        <td><a href="./Debug-deprecated.html" style="text-decoration: line-through;" >@Debug</a></td>
+        <td><a href="./Debug-deprecated.html" >@Debug</a></td>
         <td>UI</td>
         <td>Action only invocable in debug mode.
         </td>
@@ -786,10 +784,10 @@
         <td>Provide a longer description/tool-tip of an object or object member.
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@ClassLayout</code>, <code>@PropertyLayout</code>, <code>@CollectionLayout</code>, <code>@ActionLayout</code> and <code>@ParameterLayout</code>
         </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
-        <td><a href="./Exploration-deprecated.html" style="text-decoration: line-through;" >@Exploration</a></td>
+        <td><a href="./Exploration-deprecated.html"  >@Exploration</a></td>
         <td>UI</td>
         <td>Action available in special 'exploration' mode.
             <br/>Deprecated in 1.8.0-SNAPSHOT
@@ -797,7 +795,7 @@
         <td></td>
     </tr>
     <tr>
-        <td><a href="./FieldOrder-deprecated.html" style="text-decoration: line-through;" >@FieldOrder</a></td>
+        <td><a href="./FieldOrder-deprecated.html"  >@FieldOrder</a></td>
         <td>UI</td>
         <td>Order of properties and collections
         </td>
@@ -809,17 +807,17 @@
         <td>Object member is not visible.
             <br/>Deprecated in 1.8.0-SNAPSHOT
         </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
-        <td><a href="./Idempotent-deprecated.html" style="text-decoration: line-through;" >@Idempotent</a></td>
+        <td><a href="./Idempotent-deprecated.html"  >@Idempotent</a></td>
         <td>Domain</td>
         <td>Replaced by @ActionSemantics.
         </td>
         <td></td>
     </tr>
     <tr>
-        <td><a href="./Ignore-deprecated.html" style="text-decoration: line-through;" >@Ignore</a></td>
+        <td><a href="./Ignore-deprecated.html"  >@Ignore</a></td>
         <td>Domain</td>
         <td>Replaced by @Programmatic.
         </td>
@@ -836,7 +834,7 @@
         <td><a href="./MemberGroups-deprecated.html">@MemberGroups</a></td>
         <td>UI</td>
         <td>Replaced by @MemberGroupLayout</td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./MultiLine-deprecated.html">@MultiLine</a></td>
@@ -844,7 +842,7 @@
         <td>Render string property over multiple lines (a textarea rather than a textbox).
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@PropertyLayout</code> and <code>@ParameterLayout</code>
             </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./Named-deprecated.html">@Named</a></td>
@@ -852,14 +850,14 @@
         <td>Override name inferred from class. Required for parameter names (prior to Java8).
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@ClassLayout</code>, <code>@PropertyLayout</code>, <code>@CollectionLayout</code>, <code>@ActionLayout</code> and <code>@ParameterLayout</code>
             </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./Paged-deprecated.html">@Paged</a></td>
         <td>UI</td>
         <td>Number of instances to display in tables representing (parented or standalone) collections.
             <br/>Deprecated in 1.8.0-SNAPSHOT</td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./Plural-deprecated.html">@Plural</a></td>
@@ -870,12 +868,11 @@
         <td></td>
     </tr>
     <tr>
-        <td><a href="./PostsPropertyChangedEvent-deprecated.html" style="text-decoration: line-through;" >@PostsPropertyChangedEvent</a></td>
+        <td><a href="./PostsPropertyChangedEvent-deprecated.html"  >@PostsPropertyChangedEvent</a></td>
         <td>Domain</td>
         <td>Replaced by @PropertyInteraction
         </td>
         <td></td>
-        <td>Y</td>
     </tr>
     <tr>
         <td><a href="./Prototype-deprecated.html">@Prototype</a></td>
@@ -883,10 +880,10 @@
         <td>Indicates that an action should only be visible in 'prototype' mode.
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@ActionLayout</code>
             </td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
-        <td><a href="./QueryOnly-deprecated.html" style="text-decoration: line-through;" >@QueryOnly</a></td>
+        <td><a href="./QueryOnly-deprecated.html"  >@QueryOnly</a></td>
         <td>Domain</td>
         <td>Replaced by @ActionSemantics.</td>
         <td></td>
@@ -897,7 +894,7 @@
         <td>Eagerly (or lazily) render the contents of a collection.
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@CollectionLayout</code>
             </td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./RenderedAsDayBefore-deprecated.html">@RenderedAsDayBefore</a></td>
@@ -908,10 +905,10 @@
         <td></td>
     </tr>
     <tr>
-        <td><a href="./Resolve-deprecated.html" style="text-decoration: line-through;" >@Resolve</a></td>
+        <td><a href="./Resolve-deprecated.html"  >@Resolve</a></td>
         <td>UI</td>
         <td>Replaced by <code>@Render</code>.</td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./SortedBy-deprecated.html">@SortedBy</a></td>
@@ -919,7 +916,7 @@
         <td>Display instances in collections in the order determined by the provided Comparator.
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@CollectionLayout</code>
             </td>
-        <td></td>
+        <td>Yes</td>
     </tr>
     <tr>
         <td><a href="./TypicalLength-deprecated.html">@TypicalLength</a></td>
@@ -927,7 +924,7 @@
         <td>The typical length of a string property, eg to determine a sensible length for a textbox.
             <br/>Deprecated in 1.8.0-SNAPSHOT, see <code>@PropertyLayout</code> and <code>@ParameterLayout</code>
         </td>
-        <td>Y</td>
+        <td>Yes</td>
     </tr>
 </table>