[isis] 01/02: ISIS-1742: removes @Render and @Resolve from .adoc's

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 6abd99f10867cb192b134b13a79d5dde622bb990
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 15:02:55 2017 +0100

    ISIS-1742: removes @Render and @Resolve from .adoc's
---
 .../main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc  | 14 --------------
 .../ugvw/_ugvw_extending_replacing-page-elements.adoc      |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index 3a05ef0..03ccb06 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -228,26 +228,12 @@ Also part of the toString representation of bookmarks, if using the Bookmark Ser
 |Domain
 |
 
-|`@Render`
-|Eagerly (or lazily) render the contents of a collection.
-|xref:../rgant/rgant.adoc#_rgant-CollectionLayout_render[`@CollectionLayout` +
-`#render()`]
-|UI
-|Yes
-
 |`@RenderedAsDayBefore`
 |Render dates as the day before; ie store [a,b) internally but render [a,b-1]) to end-user.
 |`#renderedAsDayBefore()` attribute for xref:../rgant/rgant.adoc#_rgant-PropertyLayout_renderedAsDayBefore[`@PropertyLayout`] and xref:../rgant/rgant.adoc#_rgant-ParameterLayout_renderedAsDayBefore[`@ParameterLayout`].
 |UI
 |
 
-|`@Resolve`
-|Eagerly (or lazily) render the contents of a collection (same as `@Render)`
-|xref:../rgant/rgant.adoc#_rgant-CollectionLayout_render[`@CollectionLayout` +
-`#render()`]
-|UI
-|Yes
-
 |`@SortedBy`
 |Display instances in collections in the order determined by the provided Comparator.
 |xref:../rgant/rgant.adoc#_rgant-CollectionLayout_sortedBy[`@CollectionLayout` +
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
index d7a593f..39fe361 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
@@ -124,7 +124,7 @@ public class MyAppApplication extends IsisWicketApplication {
 
 As explained above, in most cases Apache Isis' Wicket viewer will search for the first `ComponentFactory` that can render an element, and use it. In the case of (either standalone or parented) collections, though, Apache Isis will show all available views.
 
-For example, out-of-the-box Apache Isis provides a table view, a summary view (totals/sums/averages of any data), and a collapsed view (for `@Render(LAZILY)` collections). These are selected by clicking on the toolbar by each collection.
+For example, out-of-the-box Apache Isis provides a table view, a summary view (totals/sums/averages of any data), and a collapsed view. These are selected by clicking on the toolbar by each collection.
 
 Additional views though could render the objects in the collection as a variety of ways. Indeed, some third-party implementations in the (non-ASF) link:http://platform.incode.org[Incode Platform^] already exist, including:
 

-- 
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.