You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/02/10 22:27:45 UTC

svn commit: r1566750 [1/2] - in /isis/site/trunk/content: ./ applib-guide/ archetypes/ archetypes/release-notes/ components/objectstores/jdo/ components/security/shiro/ core/ core/guides/ core/images/ core/services/ getting-started/ how-tos/ how-tos2/ ...

Author: danhaywood
Date: Mon Feb 10 21:27:41 2014
New Revision: 1566750

URL: http://svn.apache.org/r1566750
Log:
reorganizing; lots of links will be broken...

Added:
    isis/site/trunk/content/archetypes/
    isis/site/trunk/content/archetypes/release-notes/
      - copied from r1557348, isis/site/trunk/content/getting-started/release-notes/
    isis/site/trunk/content/how-tos/
      - copied from r1557348, isis/site/trunk/content/applib-guide/how-tos/
    isis/site/trunk/content/how-tos/about.md
      - copied, changed from r1565152, isis/site/trunk/content/applib-guide/how-tos/about.md
    isis/site/trunk/content/how-tos/how-to-01-010-How-to-have-a-domain-object-be-a-POJO.md
      - copied unchanged from r1559512, isis/site/trunk/content/applib-guide/how-tos/how-to-01-010-How-to-have-a-domain-object-be-a-POJO.md
    isis/site/trunk/content/how-tos/how-to-01-150-How-to-inject-services-into-a-domain-entity-or-other-service.md
      - copied unchanged from r1559516, isis/site/trunk/content/applib-guide/how-tos/how-to-01-150-How-to-inject-services-into-a-domain-entity-or-other-service.md
    isis/site/trunk/content/how-tos/how-to-09-010-How-to-register-domain-services,-repositories-and-factories.md
      - copied unchanged from r1559511, isis/site/trunk/content/applib-guide/domain-services/how-to-09-010-How-to-register-domain-services,-repositories-and-factories.md
    isis/site/trunk/content/how-tos/how-to-write-a-view-model.md
      - copied unchanged from r1559585, isis/site/trunk/content/applib-guide/how-tos/how-to-write-a-view-model.md
    isis/site/trunk/content/how-tos2/
    isis/site/trunk/content/how-tos2/03-Fixtures-and-SwitchUser.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/supporting-features/03-Fixtures-and-SwitchUser.md
    isis/site/trunk/content/how-tos2/ViewModel.md
      - copied unchanged from r1565141, isis/site/trunk/content/applib-guide/reference/ViewModel.md
    isis/site/trunk/content/how-tos2/deployment-type.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/deployment-type.md
    isis/site/trunk/content/how-tos2/dynamic-layouts.md
      - copied, changed from r1557348, isis/site/trunk/content/core/dynamic-layouts.md
    isis/site/trunk/content/how-tos2/how-to-01-062-How-to-decouple-dependencies-using-contributions.md
      - copied unchanged from r1559585, isis/site/trunk/content/applib-guide/how-tos/how-to-01-062-How-to-decouple-dependencies-using-contributions.md
    isis/site/trunk/content/how-tos2/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.md
    isis/site/trunk/content/how-tos2/how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.md
    isis/site/trunk/content/how-tos2/how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.md
    isis/site/trunk/content/how-tos2/how-to-02-090-How-to-specify-that-an-object-is-immutable.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-02-090-How-to-specify-that-an-object-is-immutable.md
    isis/site/trunk/content/how-tos2/how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.md
    isis/site/trunk/content/how-tos2/how-to-04-010-How-to-make-a-derived-property.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-010-How-to-make-a-derived-property.md
    isis/site/trunk/content/how-tos2/how-to-04-020-How-to-make-a-derived-collection.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-020-How-to-make-a-derived-collection.md
    isis/site/trunk/content/how-tos2/how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.md
    isis/site/trunk/content/how-tos2/how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.md
    isis/site/trunk/content/how-tos2/how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.md
    isis/site/trunk/content/how-tos2/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.md
    isis/site/trunk/content/how-tos2/how-to-05-010-How-to-specify-a-name-or-description-for-an-object.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-05-010-How-to-specify-a-name-or-description-for-an-object.md
    isis/site/trunk/content/how-tos2/how-to-05-020-How-to-specify-a-name-or-description-for-a-property.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-05-020-How-to-specify-a-name-or-description-for-a-property.md
    isis/site/trunk/content/how-tos2/how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.md
    isis/site/trunk/content/how-tos2/how-to-05-040-How-to-specify-names-or-description-for-an-action.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-05-040-How-to-specify-names-or-description-for-an-action.md
    isis/site/trunk/content/how-tos2/how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.md
    isis/site/trunk/content/how-tos2/how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.md
      - copied unchanged from r1565152, isis/site/trunk/content/applib-guide/how-tos/how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.md
    isis/site/trunk/content/how-tos2/how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.md
    isis/site/trunk/content/how-tos2/how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.md
    isis/site/trunk/content/how-tos2/how-to-07-030-How-to-ensure-object-is-in-valid-state.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-030-How-to-ensure-object-is-in-valid-state.md
    isis/site/trunk/content/how-tos2/how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.md
    isis/site/trunk/content/how-tos2/how-to-07-050-How-to-perform-lazy-loading.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-050-How-to-perform-lazy-loading.md
    isis/site/trunk/content/how-tos2/how-to-07-060-How-to-perform-dirty-object-tracking.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-07-060-How-to-perform-dirty-object-tracking.md
    isis/site/trunk/content/how-tos2/how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.md
    isis/site/trunk/content/how-tos2/how-to-08-020-How-to-use-Isis-authorization-manager.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/how-tos/how-to-08-020-How-to-use-Isis-authorization-manager.md
    isis/site/trunk/content/how-tos2/how-to-09-020-How-to-write-a-typical-domain-service.md
      - copied, changed from r1559516, isis/site/trunk/content/applib-guide/domain-services/how-to-09-020-How-to-write-a-typical-domain-service.md
    isis/site/trunk/content/how-tos2/how-to-09-030-How-to-use-a-generic-repository.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/domain-services/how-to-09-030-How-to-use-a-generic-repository.md
    isis/site/trunk/content/how-tos2/how-to-09-040-How-to-write-a-custom-repository.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/domain-services/how-to-09-040-How-to-write-a-custom-repository.md
    isis/site/trunk/content/how-tos2/how-to-09-050-How-to-use-Factories.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/domain-services/how-to-09-050-How-to-use-Factories.md
    isis/site/trunk/content/how-tos2/how-to-tweak-the-ui-using-css-classes.md
      - copied unchanged from r1559586, isis/site/trunk/content/applib-guide/how-tos/how-to-tweak-the-ui-using-css-classes.md
    isis/site/trunk/content/how-tos2/images/
      - copied from r1557348, isis/site/trunk/content/applib-guide/supporting-features/images/
    isis/site/trunk/content/how-tos2/metamodel-finetuning-the-programming-model.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/metamodel-finetuning-the-programming-model.md
    isis/site/trunk/content/intro/
    isis/site/trunk/content/intro/about.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/about.md
    isis/site/trunk/content/intro/elevator-pitch/
    isis/site/trunk/content/intro/elevator-pitch/common-use-cases.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/common-use-cases.md
    isis/site/trunk/content/intro/elevator-pitch/isis-in-pictures.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/screenshots.md
    isis/site/trunk/content/intro/getting-started/
    isis/site/trunk/content/intro/getting-started/images/
      - copied from r1557348, isis/site/trunk/content/getting-started/images/
    isis/site/trunk/content/intro/getting-started/quickstart-archetype.md
      - copied, changed from r1563903, isis/site/trunk/content/getting-started/quickstart-archetype.md
    isis/site/trunk/content/intro/getting-started/simple-archetype.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/simple-archetype.md
    isis/site/trunk/content/intro/learning-more/
    isis/site/trunk/content/intro/learning-more/Pawson-Naked-Objects-thesis.pdf
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/resources/Pawson-Naked-Objects-thesis.pdf
    isis/site/trunk/content/intro/learning-more/about.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/about.md
    isis/site/trunk/content/intro/learning-more/articles-and-presentations.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/articles-and-presentations.md
    isis/site/trunk/content/intro/learning-more/books.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/books.md
    isis/site/trunk/content/intro/learning-more/hexagonal-architecture.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/hexagonal-architecture.md
    isis/site/trunk/content/intro/learning-more/resources/
    isis/site/trunk/content/intro/learning-more/resources/books/
      - copied from r1557348, isis/site/trunk/content/learning-more/resources/books/
    isis/site/trunk/content/intro/powered-by/
    isis/site/trunk/content/intro/powered-by/TransportPlanner/
      - copied from r1557348, isis/site/trunk/content/getting-started/TransportPlanner/
    isis/site/trunk/content/intro/powered-by/powered-by.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/powered-by.md
    isis/site/trunk/content/intro/resources/
    isis/site/trunk/content/intro/resources/cheat-sheet.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/cheat-sheet.md
    isis/site/trunk/content/intro/resources/downloadable-presentations.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/presentations.md
    isis/site/trunk/content/intro/resources/editor-templates.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/editor-templates.md
    isis/site/trunk/content/intro/resources/icons.md
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/icons.md
    isis/site/trunk/content/intro/resources/resources/
      - copied from r1557348, isis/site/trunk/content/learning-more/resources/presentations/
    isis/site/trunk/content/intro/resources/resources/IsisCheatSheet.docx
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/IsisCheatSheet.docx
    isis/site/trunk/content/intro/resources/resources/IsisCheatSheet.pdf
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/IsisCheatSheet.pdf
    isis/site/trunk/content/intro/resources/resources/isis-templates.xml
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/isis-templates.xml
    isis/site/trunk/content/intro/resources/resources/isis-templates2.xml
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/isis-templates2.xml
    isis/site/trunk/content/intro/resources/resources/jmock2-templates.xml
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/jmock2-templates.xml
    isis/site/trunk/content/intro/resources/resources/junit4-templates.xml
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/junit4-templates.xml
    isis/site/trunk/content/intro/resources/resources/quickstart_dnd_junit_bdd.tar.gz
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/quickstart_dnd_junit_bdd.tar.gz
    isis/site/trunk/content/intro/resources/resources/quickstart_wicket_restful_jdo.tar.gz
      - copied unchanged from r1557348, isis/site/trunk/content/getting-started/resources/quickstart_wicket_restful_jdo.tar.gz
    isis/site/trunk/content/intro/tutorials/
    isis/site/trunk/content/intro/tutorials/resources/
    isis/site/trunk/content/intro/tutorials/resources/rrraddd/
      - copied from r1557348, isis/site/trunk/content/learning-more/resources/tutorials/rrraddd/
    isis/site/trunk/content/intro/tutorials/screencasts.md
      - copied unchanged from r1560843, isis/site/trunk/content/getting-started/screencasts.md
    isis/site/trunk/content/intro/tutorials/tutorials.md
      - copied unchanged from r1557348, isis/site/trunk/content/learning-more/tutorials.md
    isis/site/trunk/content/reference/
    isis/site/trunk/content/reference/DomainObjectContainer.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/reference/DomainObjectContainer.md
    isis/site/trunk/content/reference/Event.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/reference/Event.md
    isis/site/trunk/content/reference/Recognized-Methods-and-Prefixes.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/reference/Recognized-Methods-and-Prefixes.md
    isis/site/trunk/content/reference/Security.md
      - copied unchanged from r1565673, isis/site/trunk/content/applib-guide/reference/Security.md
    isis/site/trunk/content/reference/Utility.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/reference/Utility.md
    isis/site/trunk/content/reference/configuration-files.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/configuration-files.md
    isis/site/trunk/content/reference/images/
      - copied from r1557348, isis/site/trunk/content/applib-guide/reference/images/
    isis/site/trunk/content/reference/non-ui/
    isis/site/trunk/content/reference/object-lifecycle-callbacks.md
      - copied unchanged from r1557398, isis/site/trunk/content/applib-guide/how-tos/how-to-07-070-How-to-hook-into-the-object-lifecycle-using-callbacks.md
    isis/site/trunk/content/reference/recognized-annotations/
      - copied from r1557348, isis/site/trunk/content/applib-guide/reference/recognized-annotations/
    isis/site/trunk/content/reference/recognized-annotations/ActionOrder.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/ActionOrder.md
    isis/site/trunk/content/reference/recognized-annotations/ActionSemantics.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/ActionSemantics.md
    isis/site/trunk/content/reference/recognized-annotations/Aggregated.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Aggregated.md
    isis/site/trunk/content/reference/recognized-annotations/Audited.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Audited.md
    isis/site/trunk/content/reference/recognized-annotations/AutoComplete.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/AutoComplete.md
    isis/site/trunk/content/reference/recognized-annotations/Bounded.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Bounded.md
    isis/site/trunk/content/reference/recognized-annotations/Bulk.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Bulk.md
    isis/site/trunk/content/reference/recognized-annotations/Command.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Command.md
    isis/site/trunk/content/reference/recognized-annotations/Debug.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Debug.md
    isis/site/trunk/content/reference/recognized-annotations/Defaulted.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Defaulted.md
    isis/site/trunk/content/reference/recognized-annotations/DescribedAs.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/DescribedAs.md
    isis/site/trunk/content/reference/recognized-annotations/Disabled.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Disabled.md
    isis/site/trunk/content/reference/recognized-annotations/Encodable.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Encodable.md
    isis/site/trunk/content/reference/recognized-annotations/EqualByContent.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/EqualByContent.md
    isis/site/trunk/content/reference/recognized-annotations/Exploration.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Exploration.md
    isis/site/trunk/content/reference/recognized-annotations/Facets.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Facets.md
    isis/site/trunk/content/reference/recognized-annotations/FieldOrder.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/FieldOrder.md
    isis/site/trunk/content/reference/recognized-annotations/Hidden.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Hidden.md
    isis/site/trunk/content/reference/recognized-annotations/Idempotent-deprecated.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Idempotent-deprecated.md
    isis/site/trunk/content/reference/recognized-annotations/Ignore-deprecated.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Ignore-deprecated.md
    isis/site/trunk/content/reference/recognized-annotations/Immutable.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Immutable.md
    isis/site/trunk/content/reference/recognized-annotations/Mask.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Mask.md
    isis/site/trunk/content/reference/recognized-annotations/MaxLength.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/MaxLength.md
    isis/site/trunk/content/reference/recognized-annotations/MemberGroups.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/MemberGroups.md
    isis/site/trunk/content/reference/recognized-annotations/MemberOrder.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/MemberOrder.md
    isis/site/trunk/content/reference/recognized-annotations/MultiLine.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/MultiLine.md
    isis/site/trunk/content/reference/recognized-annotations/MustSatisfy.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/MustSatisfy.md
    isis/site/trunk/content/reference/recognized-annotations/Named.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Named.md
    isis/site/trunk/content/reference/recognized-annotations/NotContributed.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/NotContributed.md
    isis/site/trunk/content/reference/recognized-annotations/NotInServiceMenu.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/NotInServiceMenu.md
    isis/site/trunk/content/reference/recognized-annotations/NotPersistable.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/NotPersistable.md
    isis/site/trunk/content/reference/recognized-annotations/NotPersisted.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/NotPersisted.md
    isis/site/trunk/content/reference/recognized-annotations/ObjectType.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/ObjectType.md
    isis/site/trunk/content/reference/recognized-annotations/Optional.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Optional.md
    isis/site/trunk/content/reference/recognized-annotations/Paged.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Paged.md
    isis/site/trunk/content/reference/recognized-annotations/Parseable.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Parseable.md
    isis/site/trunk/content/reference/recognized-annotations/Plural.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Plural.md
    isis/site/trunk/content/reference/recognized-annotations/Programmatic.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Programmatic.md
    isis/site/trunk/content/reference/recognized-annotations/Prototype.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Prototype.md
    isis/site/trunk/content/reference/recognized-annotations/PublishedAction.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/PublishedAction.md
    isis/site/trunk/content/reference/recognized-annotations/PublishedObject.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/PublishedObject.md
    isis/site/trunk/content/reference/recognized-annotations/QueryOnly-deprecated.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/QueryOnly-deprecated.md
    isis/site/trunk/content/reference/recognized-annotations/RegEx.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/RegEx.md
    isis/site/trunk/content/reference/recognized-annotations/Render.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Render.md
    isis/site/trunk/content/reference/recognized-annotations/Resolve.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Resolve.md
    isis/site/trunk/content/reference/recognized-annotations/SortedBy.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/SortedBy.md
    isis/site/trunk/content/reference/recognized-annotations/Title.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Title.md
    isis/site/trunk/content/reference/recognized-annotations/TypeOf.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/TypeOf.md
    isis/site/trunk/content/reference/recognized-annotations/TypicalLength.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/TypicalLength.md
    isis/site/trunk/content/reference/recognized-annotations/Value.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/Value.md
    isis/site/trunk/content/reference/recognized-annotations/about.md
      - copied unchanged from r1566714, isis/site/trunk/content/applib-guide/reference/recognized-annotations/about.md
    isis/site/trunk/content/reference/services/
    isis/site/trunk/content/reference/services/01-Clock.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/supporting-features/01-Clock.md
    isis/site/trunk/content/reference/services/02-Profiles.md
      - copied unchanged from r1557348, isis/site/trunk/content/applib-guide/supporting-features/02-Profiles.md
    isis/site/trunk/content/reference/services/about.md
      - copied, changed from r1566292, isis/site/trunk/content/core/services/about.md
    isis/site/trunk/content/reference/services/auditing-service.md
      - copied unchanged from r1565668, isis/site/trunk/content/core/services/auditing-service.md
    isis/site/trunk/content/reference/services/background-service.md
      - copied unchanged from r1566714, isis/site/trunk/content/core/services/background-service.md
    isis/site/trunk/content/reference/services/bookmark-service.md
      - copied unchanged from r1565141, isis/site/trunk/content/core/services/bookmark-service.md
    isis/site/trunk/content/reference/services/bulk-interaction.md
      - copied unchanged from r1565668, isis/site/trunk/content/core/services/bulk-interaction.md
    isis/site/trunk/content/reference/services/command-context.md
      - copied unchanged from r1566291, isis/site/trunk/content/core/services/command-context.md
    isis/site/trunk/content/reference/services/developer-utilities-service.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/services/developer-utilities-service.md
    isis/site/trunk/content/reference/services/exception-recognizers.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/services/exception-recognizers.md
    isis/site/trunk/content/reference/services/images/
      - copied from r1557348, isis/site/trunk/content/core/services/images/
    isis/site/trunk/content/reference/services/memento-service.md
      - copied unchanged from r1565141, isis/site/trunk/content/core/services/memento-service.md
    isis/site/trunk/content/reference/services/publishing-service.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/services/publishing-service.md
    isis/site/trunk/content/reference/services/query-results-cache.md
      - copied unchanged from r1565141, isis/site/trunk/content/core/services/query-results-cache.md
    isis/site/trunk/content/reference/services/scratchpad.md
      - copied unchanged from r1566291, isis/site/trunk/content/core/services/scratchpad.md
    isis/site/trunk/content/reference/services/settings-services.md
      - copied unchanged from r1557348, isis/site/trunk/content/core/services/settings-services.md
    isis/site/trunk/content/reference/services/xmlsnapshot-service.md
      - copied, changed from r1565668, isis/site/trunk/content/core/services/xmlsnapshot-service.md
    isis/site/trunk/content/reference/value-types.md
Removed:
    isis/site/trunk/content/applib-guide/
    isis/site/trunk/content/core/configuration-files.md
    isis/site/trunk/content/core/deployment-type.md
    isis/site/trunk/content/core/dynamic-layouts.md
    isis/site/trunk/content/core/guides/
    isis/site/trunk/content/core/images/
    isis/site/trunk/content/core/metamodel-finetuning-the-programming-model.md
    isis/site/trunk/content/core/services/
    isis/site/trunk/content/getting-started/
    isis/site/trunk/content/how-tos/how-to-01-010-How-to-have-a-domain-entity-be-a-POJO.md
    isis/site/trunk/content/how-tos/how-to-01-020-How-to-have-a-domain-service-be-a-POJO.md
    isis/site/trunk/content/how-tos/how-to-01-062-How-to-decouple-dependencies-using-contributions.md
    isis/site/trunk/content/how-tos/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.md
    isis/site/trunk/content/how-tos/how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.md
    isis/site/trunk/content/how-tos/how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.md
    isis/site/trunk/content/how-tos/how-to-02-090-How-to-specify-that-an-object-is-immutable.md
    isis/site/trunk/content/how-tos/how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.md
    isis/site/trunk/content/how-tos/how-to-04-010-How-to-make-a-derived-property.md
    isis/site/trunk/content/how-tos/how-to-04-020-How-to-make-a-derived-collection.md
    isis/site/trunk/content/how-tos/how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.md
    isis/site/trunk/content/how-tos/how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.md
    isis/site/trunk/content/how-tos/how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.md
    isis/site/trunk/content/how-tos/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.md
    isis/site/trunk/content/how-tos/how-to-05-010-How-to-specify-a-name-or-description-for-an-object.md
    isis/site/trunk/content/how-tos/how-to-05-020-How-to-specify-a-name-or-description-for-a-property.md
    isis/site/trunk/content/how-tos/how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.md
    isis/site/trunk/content/how-tos/how-to-05-040-How-to-specify-names-or-description-for-an-action.md
    isis/site/trunk/content/how-tos/how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.md
    isis/site/trunk/content/how-tos/how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.md
    isis/site/trunk/content/how-tos/how-to-06-020-How-to-deal-with-an-unexpected-error.md
    isis/site/trunk/content/how-tos/how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.md
    isis/site/trunk/content/how-tos/how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.md
    isis/site/trunk/content/how-tos/how-to-07-030-How-to-ensure-object-is-in-valid-state.md
    isis/site/trunk/content/how-tos/how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.md
    isis/site/trunk/content/how-tos/how-to-07-050-How-to-perform-lazy-loading.md
    isis/site/trunk/content/how-tos/how-to-07-060-How-to-perform-dirty-object-tracking.md
    isis/site/trunk/content/how-tos/how-to-07-070-How-to-hook-into-the-object-lifecycle-using-callbacks.md
    isis/site/trunk/content/how-tos/how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.md
    isis/site/trunk/content/how-tos/how-to-08-020-How-to-use-Isis-authorization-manager.md
    isis/site/trunk/content/learning-more/
    isis/site/trunk/content/reference/recognized-annotations/ViewModel.md
Modified:
    isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md
    isis/site/trunk/content/components/security/shiro/configuring-shiro.md
    isis/site/trunk/content/documentation.md
    isis/site/trunk/content/download.md

Modified: isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md?rev=1566750&r1=1566749&r2=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md (original)
+++ isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md Mon Feb 10 21:27:41 2014
@@ -83,7 +83,7 @@ In the root project's `pom.xml`, specify
     </properties>
 
 where the versions should be the same as the one referenced by the 
-JDO Objectstore.  (The apps generated by the [archetype](../../../getting-started/simple-archetype.html) are
+JDO Objectstore.  (The apps generated by the [archetype](../../../intro/getting-started/simple-archetype.html) are
 configured with the correct versions to use).
 
 Then, in the `dom` project's `pom.xml`, update the DataNucleus enhancer plugin to force it to use a specific version of the DataNucleus core: 

Modified: isis/site/trunk/content/components/security/shiro/configuring-shiro.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/security/shiro/configuring-shiro.md?rev=1566750&r1=1566749&r2=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/components/security/shiro/configuring-shiro.md (original)
+++ isis/site/trunk/content/components/security/shiro/configuring-shiro.md Mon Feb 10 21:27:41 2014
@@ -2,7 +2,7 @@ Title: Configuring Isis to use Shiro
 
 ### Example Configuration
 
-The [simple archetype](../../../getting-started/quickstart-archetype.html) and the [quickstart archetype](../../../getting-started/simple-archetype.html) are both configured with Shiro; you should see all the configuration explained below in these.
+The [simple archetype](../../../intro/getting-started/quickstart-archetype.html) and the [quickstart archetype](../../../intro/getting-started/simple-archetype.html) are both configured with Shiro; you should see all the configuration explained below in these.
 
 
 ## Bootstrapping Shiro
@@ -39,7 +39,7 @@ This then installs Isis components (spec
 
 ## Knowing your way around the Shiro config files
 
-The `shiro.ini` file as configured in the [simple archetype](../../../getting-started/simple-archetype.html) is configured to simple use the built-in `$iniRealm`, by way of the line:
+The `shiro.ini` file as configured in the [simple archetype](../../../intro/getting-started/simple-archetype.html) is configured to simple use the built-in `$iniRealm`, by way of the line:
 
     securityManager.realms = $iniRealm
 

Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1566750&r1=1566749&r2=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Mon Feb 10 21:27:41 2014
@@ -7,41 +7,41 @@ Title: Documentation
 {col-md-4
 #### Elevator pitch
 
-  - **[What's Isis?](getting-started/screenshots.html) ... in pictures**
-  - [Common Use Cases](learning-more/common-use-cases.html)
-  - [Online demo](http://isisdemo.mmyco.co.uk/) (ToDo App)
+- **[What's Isis?](intro/elevator-pitch/isis-in-pictures.html) ... in pictures**
+- [Common Use Cases](intro/elevator-pitch/common-use-cases.html)
+- [Online demo](http://isisdemo.mmyco.co.uk/) (ToDo App)
 
 #### Getting started
 
-  - **[Simple Archetype](getting-started/simple-archetype.html) ([1.3.1](getting-started/release-notes/about.html))**
+- **[Simple Archetype](intro/getting-started/simple-archetype.html) ([1.3.1](intro/getting-started/release-notes/about.html))**
 
 }
 
 {col-md-4
 #### Tutorials, screencasts
-  - [Tutorials](learning-more/tutorials.html)
-  - **[Screencasts](getting-started/screencasts.html)**
-  - [Using JRebel](getting-started/screencasts.html#jrebel)
+
+- [Tutorials](intro/tutorials/tutorials.html)
+- **[Screencasts](intro/tutorials/screencasts.html)**
 
 #### Learning more
 
-  - [Articles, Conferences, Podcasts](learning-more/articles-and-presentations.html)
-  - [Books](learning-more/books.html)
-  - [Naked Objects PhD thesis](learning-more/resources/Pawson-Naked-Objects-thesis.pdf) (Pawson)
-  - [Downloadable Presentations](learning-more/presentations.html)
+- [Articles, Conferences, Podcasts](intro/learning-more/articles-and-presentations.html)
+- [Books](intro/learning-more/books.html)
+- [Naked Objects PhD thesis](intro/learning-more/Pawson-Naked-Objects-thesis.pdf) (Pawson)
 
 }
 
 {col-md-4
 #### Resources
 
-  - **[Editor templates](getting-started/editor-templates.html)**
-  - [Icons](getting-started/icons.html)
-  - **[Programming Model Cheat Sheet](getting-started/cheat-sheet.html)**
+- [Downloadable Presentations](intro/resources/downloadable-presentations.html)
+- **[Editor templates](intro/resources/editor-templates.html)**
+- [Icons](intro/resources/icons.html)
+- **[Programming Model Cheat Sheet](intro/resources/cheat-sheet.html)**
 
 #### Releases
 
-- [Release Matrix](release-matrix.html)
+- [Release Matrix](./release-matrix.html)
 
 }
 
@@ -50,7 +50,7 @@ Title: Documentation
 {row
 
 {col-md-12
-## Programming model
+## Programming model How-tos
 
 }
 
@@ -60,29 +60,23 @@ Title: Documentation
 
 {col-md-4
 
-#### Principles
-
-* [About domain entities](./applib-guide/how-tos/about.html)
-* [About domain services](./applib-guide/domain-services/about.html)
-* [About value Types](./applib-guide/value-types/about.html)
-
 #### Pojos
 
-* [Pojo vs Inheriting from framework](./applib-guide/how-tos/how-to-01-010-How-to-have-a-domain-object-be-a-POJO.html)
-* [Registering a domain service](./applib-guide/domain-services/how-to-09-010-How-to-register-domain-services,-repositories-and-factories.html)
-* [Entity property](./applib-guide/how-tos/how-to-01-030-How-to-add-a-property-to-a-domain-entity.html)
+* [Pojo vs Inheriting from framework](./how-tos/how-to-01-010-How-to-have-a-domain-object-be-a-POJO.html)
+* [Registering a domain service](./how-tos/how-to-09-010-How-to-register-domain-services,-repositories-and-factories.html)
+* [Entity property](./how-tos/how-to-01-030-How-to-add-a-property-to-a-domain-entity.html)
 * [Built-in Value Types](./applib-guide/value-types/010-Built-in-Value-Types.html)
-* [Entity title](./applib-guide/how-tos/how-to-01-040-How-to-specify-a-title-for-a-domain-entity.html)
-* [Entity collection](./applib-guide/how-tos/how-to-01-050-How-to-add-a-collection-to-a-domain-entity.html)
-* [Entity or service action](./applib-guide/how-tos/how-to-01-060-How-to-add-an-action-to-a-domain-entity-or-service.html)
-* [Names/description of action param](./applib-guide/how-tos/how-to-01-140-How-to-specify-names-or-descriptions-for-an-action-parameter.html)
-* [Injecting services](./applib-guide/how-tos/how-to-01-150-How-to-inject-services-into-a-domain-entity-or-other-service.html)
+* [Entity title](./how-tos/how-to-01-040-How-to-specify-a-title-for-a-domain-entity.html)
+* [Entity collection](./how-tos/how-to-01-050-How-to-add-a-collection-to-a-domain-entity.html)
+* [Entity or service action](./how-tos/how-to-01-060-How-to-add-an-action-to-a-domain-entity-or-service.html)
+* [Names/description of action param](./how-tos/how-to-01-140-How-to-specify-names-or-descriptions-for-an-action-parameter.html)
+* [Injecting services](./how-tos/how-to-01-150-How-to-inject-services-into-a-domain-entity-or-other-service.html)
 
 #### Object management
 
-* [Finding objects](./applib-guide/domain-services/how-to-09-040-How-to-write-a-custom-repository.html)
-* [Instantiating and persisting objects](./applib-guide/domain-services/how-to-09-050-How-to-use-Factories.html)
-* [Create/delete objects](./applib-guide/how-tos/how-to-01-160-How-to-create-or-delete-objects-within-your-code.html)
+* [Finding objects](./how-tos/how-to-09-040-How-to-write-a-custom-repository.html)
+* [Instantiating and persisting objects](./how-tos/how-to-09-050-How-to-use-Factories.html)
+* [Create/delete objects](./how-tos/how-to-01-160-How-to-create-or-delete-objects-within-your-code.html)
 
 }
 
@@ -90,29 +84,29 @@ Title: Documentation
 
 #### UI hints
 
-* [Entity icons](./applib-guide/how-tos/how-to-01-070-How-to-specify-the-icon-for-a-domain-entity.html)
-* [Ordering prop/colls in the UI](./applib-guide/how-tos/how-to-01-080-How-to-specify-the-order-in-which-properties-or-collections-are-displayed.html)
-* [Ordering actions in the UI](./applib-guide/how-tos/how-to-01-090-How-to-specify-the-order-in-which-actions-appear-on-the-menu.html)
+* [Entity icons](./how-tos/how-to-01-070-How-to-specify-the-icon-for-a-domain-entity.html)
+* [Ordering prop/colls in the UI](./how-tos/how-to-01-080-How-to-specify-the-order-in-which-properties-or-collections-are-displayed.html)
+* [Ordering actions in the UI](./how-tos/how-to-01-090-How-to-specify-the-order-in-which-actions-appear-on-the-menu.html)
 
 #### Business rules
 
 Visibility ("see it")
 
-* [Hide a property](./applib-guide/how-tos/how-to-02-010-How-to-hide-a-property.html)
-* [Hide a collection](./applib-guide/how-tos/how-to-02-020-How-to-hide-a-collection.html)
-* [Hide an action](./applib-guide/how-tos/how-to-02-030-How-to-hide-an-action.html)
+* [Hide a property](./how-tos/how-to-02-010-How-to-hide-a-property.html)
+* [Hide a collection](./how-tos/how-to-02-020-How-to-hide-a-collection.html)
+* [Hide an action](./how-tos/how-to-02-030-How-to-hide-an-action.html)
 
 Usability ("use it")
 
-* [Unmodifiable property](./applib-guide/how-tos/how-to-02-050-How-to-prevent-a-property-from-being-modified.html)
-* [Unmodifiable collection](./applib-guide/how-tos/how-to-02-060-How-to-prevent-a-collection-from-being-modified.html)
-* [Uninvokable action](./applib-guide/how-tos/how-to-02-070-How-to-prevent-an-action-from-being-invoked.html)
+* [Unmodifiable property](./how-tos/how-to-02-050-How-to-prevent-a-property-from-being-modified.html)
+* [Unmodifiable collection](./how-tos/how-to-02-060-How-to-prevent-a-collection-from-being-modified.html)
+* [Uninvokable action](./how-tos/how-to-02-070-How-to-prevent-an-action-from-being-invoked.html)
 
 Validity ("do it")
 
-* [Validate property](./applib-guide/how-tos/how-to-02-100-How-to-validate-user-input-for-a-property.html)
-* [Validate collection add/remove](./applib-guide/how-tos/how-to-02-110-How-to-validate-an-object-being-added-or-removed-from-a-collection.html)
-* [Validate action params](./applib-guide/how-tos/how-to-02-120-How-to-validate-an-action-parameter-argument.html)
+* [Validate property](./how-tos/how-to-02-100-How-to-validate-user-input-for-a-property.html)
+* [Validate collection add/remove](./how-tos/how-to-02-110-How-to-validate-an-object-being-added-or-removed-from-a-collection.html)
+* [Validate action params](./how-tos/how-to-02-120-How-to-validate-an-action-parameter-argument.html)
 
 }
 
@@ -120,30 +114,30 @@ Validity ("do it")
 
 #### Common constraints
 
-* [Optional property](./applib-guide/how-tos/how-to-01-100-How-to-make-a-property-optional.html)
-* [Optional action ](./applib-guide/how-tos/how-to-01-110-How-to-make-an-action-parameter-optional.html)
-* [Size of string properties](./applib-guide/how-tos/how-to-01-120-How-to-specify-the-size-of-String-properties.html)
-* [Size of string action params](./applib-guide/how-tos/how-to-01-130-How-to-specify-the-size-of-String-action-parameters.html)
+* [Optional property](./how-tos/how-to-01-100-How-to-make-a-property-optional.html)
+* [Optional action ](./how-tos/how-to-01-110-How-to-make-an-action-parameter-optional.html)
+* [Size of string properties](./how-tos/how-to-01-120-How-to-specify-the-size-of-String-properties.html)
+* [Size of string action params](./how-tos/how-to-01-130-How-to-specify-the-size-of-String-action-parameters.html)
 
 #### Drop-downs &amp; defaults
 
 For properties:
 
-* [Choices for property](./applib-guide/how-tos/how-to-03-010-How-to-specify-a-set-of-choices-for-a-property.html)
-* [Auto-complete for property](./applib-guide/how-tos/how-to-03-015-How-to-specify-an-autocomplete-for-a-property.html)
-* [Default for property](./applib-guide/how-tos/how-to-03-017-How-to-specify-default-value-of-an-object-property.html)
+* [Choices for property](./how-tos/how-to-03-010-How-to-specify-a-set-of-choices-for-a-property.html)
+* [Auto-complete for property](./how-tos/how-to-03-015-How-to-specify-an-autocomplete-for-a-property.html)
+* [Default for property](./how-tos/how-to-03-017-How-to-specify-default-value-of-an-object-property.html)
 
 For actions:
 
-* [Choices for action param](./applib-guide/how-tos/how-to-03-020-How-to-specify-a-set-of-choices-for-an-action-parameter.html)
-* [Dependent choices for action params](./applib-guide/how-tos/how-to-03-022-How-to-specify-dependent-choices-for-action-parameters.html)
-* [Auto-complete for action param](./applib-guide/how-tos/how-to-03-025-How-to-specify-an-autocomplete-for-an-action-parameter.html)
-* [Default for action param](./applib-guide/how-tos/how-to-03-050-How-to-specify-default-values-for-an-action-parameter.html)
+* [Choices for action param](./how-tos/how-to-03-020-How-to-specify-a-set-of-choices-for-an-action-parameter.html)
+* [Dependent choices for action params](./how-tos/how-to-03-022-How-to-specify-dependent-choices-for-action-parameters.html)
+* [Auto-complete for action param](./how-tos/how-to-03-025-How-to-specify-an-autocomplete-for-an-action-parameter.html)
+* [Default for action param](./how-tos/how-to-03-050-How-to-specify-default-values-for-an-action-parameter.html)
 
 For both:
 
-* [Drop-down for limited # instances](./applib-guide/how-tos/how-to-03-030-How-to-specify-that-a-class-of-objects-has-a-limited-number-of-instances.html)
-* [Auto-complete (repository-based)](./applib-guide/how-tos/how-to-03-040-How-to-find-an-entity-(for-an-action-parameter-or-property)-using-auto-complete.html)
+* [Drop-down for limited # instances](./how-tos/how-to-03-030-How-to-specify-that-a-class-of-objects-has-a-limited-number-of-instances.html)
+* [Auto-complete (repository-based)](./how-tos/how-to-03-040-How-to-find-an-entity-(for-an-action-parameter-or-property)-using-auto-complete.html)
 
 }
 
@@ -165,27 +159,31 @@ For both:
 
 #### Idioms and patterns
 
-* [Singleton &amp; request-scoped services](./applib-guide/domain-services/how-to-09-020-How-to-write-a-typical-domain-service.html)
-* [Decoupling dependencies using contributions](./applib-guide/how-tos/how-to-01-062-How-to-decouple-dependencies-using-contributions.html)
-* [Bulk actions, acting upon lists](./applib-guide/how-tos/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html)
-* [Bidirectional relationships](./applib-guide/how-tos/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.html)
-* [View models](./applib-guide/reference/ViewModel.html)
+* [Singleton &amp; request-scoped services](./how-tos2/how-to-09-020-How-to-write-a-typical-domain-service.html)
+* [Decoupling dependencies using contributions](./how-tos2/how-to-01-062-How-to-decouple-dependencies-using-contributions.html)
+* [Bulk actions, acting upon lists](./how-tos2/how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html)
+* [Bidirectional relationships](./how-tos2/how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.html)
+* [View models](./how-tos2/ViewModel.html)
 
 #### Derived props/colls
 
-* [Derived property](./applib-guide/how-tos/how-to-04-010-How-to-make-a-derived-property.html)
-* [Derived collection](./applib-guide/how-tos/how-to-04-020-How-to-make-a-derived-collection.html)
-* [Inlining query-only repository action](./applib-guide/how-tos/how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.html)
-* [Trigger on property change](./applib-guide/how-tos/how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.html)
-* [Trigger on collection change](./applib-guide/how-tos/how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.html)
+* [Derived property](./how-tos2/how-to-04-010-How-to-make-a-derived-property.html)
+* [Derived collection](./how-tos2/how-to-04-020-How-to-make-a-derived-collection.html)
+* [Inlining query-only repository action](./how-tos2/how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.html)
+* [Trigger on property change](./how-tos2/how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.html)
+* [Trigger on collection change](./how-tos2/how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.html)
 
 #### Business rules
 
-* [All members hidden](./applib-guide/how-tos/how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.html)
-* [All members unmodifiable](./applib-guide/how-tos/how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.html)
-* [Immutable object](./applib-guide/how-tos/how-to-02-090-How-to-specify-that-an-object-is-immutable.html)
-* [Declarative validation using @MustSatisfy](./applib-guide/how-tos/how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.html)
+* [All members hidden](./how-tos2/how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.html)
+* [All members unmodifiable](./how-tos2/how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.html)
+* [Immutable object](./how-tos2/how-to-02-090-How-to-specify-that-an-object-is-immutable.html)
+* [Declarative validation using @MustSatisfy](./how-tos2/how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.html)
 
+#### Domain services
+
+* [Custom repository](./how-tos2/how-to-09-040-How-to-write-a-custom-repository.html)
+* [Factories](./how-tos2/how-to-09-050-How-to-use-Factories.html)
 
 }
 
@@ -193,23 +191,28 @@ For both:
 
 #### UI layout & hints
 
-* [Static and dynamic layouts](core/dynamic-layouts.html)
-* [Tweaking CSS classes](./applib-guide/how-tos/how-to-tweak-the-ui-using-css-classes.html)
-* [Name/description of an object](./applib-guide/how-tos/how-to-05-010-How-to-specify-a-name-or-description-for-an-object.html)
-* [Name/description of a property](./applib-guide/how-tos/how-to-05-020-How-to-specify-a-name-or-description-for-a-property.html)
-* [Name/description of a collection](./applib-guide/how-tos/how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.html)
-* [Name/description of an action](./applib-guide/how-tos/how-to-05-040-How-to-specify-names-or-description-for-an-action.html)
-* [Entity icons reflecting object's state](./applib-guide/how-tos/how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.html)
+* [Static and dynamic layouts](how-tos2/dynamic-layouts.html)
+* [Tweaking CSS classes](./how-tos2/how-to-tweak-the-ui-using-css-classes.html)
+* [Name/descr. of an object](./how-tos2/how-to-05-010-How-to-specify-a-name-or-description-for-an-object.html)
+* [Name/descr. of a property](./how-tos2/how-to-05-020-How-to-specify-a-name-or-description-for-a-property.html)
+* [Name/descr. of a collection](./how-tos2/how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.html)
+* [Name/descr. of an action](./how-tos2/how-to-05-040-How-to-specify-names-or-description-for-an-action.html)
+* [Entity icons reflecting object's state](./how-tos2/how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.html)
 
 #### Error handling
 
-* [Raise message/errors to users](./applib-guide/how-tos/how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.html)
-* [Exception Recognizer](core/services/exception-recognizers.html) service
+* [Raise message/errors to users](./how-tos2/how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.html)
+* [Exception Recognizer](./reference/services/exception-recognizers.html) service
 
 #### Prototyping tips
 
-* [Generic repository](./applib-guide/domain-services/how-to-09-030-How-to-use-a-generic-repository.html)
+* [Generic repository](./how-tos2/how-to-09-030-How-to-use-a-generic-repository.html)
+* [Fixtures](./how-tos2/about.html)
+* [Deployment Types](how-tos2/deployment-type.html)
+
+#### Customisation
 
+* [Finetuning the Programming Model](how-tos2/metamodel-finetuning-the-programming-model.html)
 
 }
 
@@ -217,23 +220,19 @@ For both:
 
 #### Persistence lifecycle
 
-* [Initial value of property](./applib-guide/how-tos/how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.html)
-* [Lifecycle hooks](./applib-guide/how-tos/how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.html)
-* [Ensuring object in valid state](./applib-guide/how-tos/how-to-07-030-How-to-ensure-object-is-in-valid-state.html)
-* [Non-persistable entities](./applib-guide/how-tos/how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.html)
-* [Lazy loading](./applib-guide/how-tos/how-to-07-050-How-to-perform-lazy-loading.html)
-* [Dirty object tracking](./applib-guide/how-tos/how-to-07-060-How-to-perform-dirty-object-tracking.html)
+* [Initial value of property](./how-tos2/how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.html)
+* [Lifecycle hooks](./how-tos2/how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.html)
+* [Ensuring object in valid state](./how-tos2/how-to-07-030-How-to-ensure-object-is-in-valid-state.html)
+* [Non-persistable entities](./how-tos2/how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.html)
+* [Lazy loading](./how-tos2/how-to-07-050-How-to-perform-lazy-loading.html)
+* [Dirty object tracking](./how-tos2/how-to-07-060-How-to-perform-dirty-object-tracking.html)
 
 
 #### Permissions
 
-* [Hide/disable/validate per user/role](./applib-guide/how-tos/how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.html)
-* [The authorization manager](./applib-guide/how-tos/how-to-08-020-How-to-use-Isis-authorization-manager.html)
-
-#### Value Types
+* [Hide/disable/validate per user/role](./how-tos2/how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.html)
+* [The authorization manager](./how-tos2/how-to-08-020-How-to-use-Isis-authorization-manager.html)
 
-* [Custom Value Types](./applib-guide/value-types/020-Custom-Value-Types.html)
-* [Third-party Value Types](./applib-guide/value-types/030-Third-party-Value-Types.html)
 
 }
 
@@ -254,15 +253,16 @@ For both:
 
 #### Common
 
-* [DomainObjectContainer interface](./applib-guide/reference/DomainObjectContainer.html)
-* [Exception Recognizers](core/services/exception-recognizers.html)
-* [Clock, Fixtures, etc](./applib-guide/supporting-features/about.html)
+* [DomainObjectContainer interface](./reference/DomainObjectContainer.html)
+* [Exception Recognizers](./reference/services/exception-recognizers.html)
+* [Clock](./reference/services/01-Clock.html)
+* [User Profiles](./reference/services/02-Profiles.html)
 
 #### Bookmark/memento
 
-* [Bookmark Service](core/services/bookmark-service.html)
-* [Memento Service](core/services/memento-service.html) [1.4.0-SNAPSHOT]
-* [XmlSnapshot Service](core/services/xmlsnapshot-service.html) [1.4.0-SNAPSHOT, stub]
+* [Bookmark Service](./reference/services/bookmark-service.html)
+* [Memento Service](./reference/services/memento-service.html) [1.4.0-SNAPSHOT]
+* [XmlSnapshot Service](./reference/services/xmlsnapshot-service.html) [1.4.0-SNAPSHOT, stub]
 
 }
 
@@ -270,13 +270,13 @@ For both:
 
 #### Profiling/background execution [1.4.0-snapshot]
 
-* [Command Context/Service](core/services/command-context.html)
-* [Background Service / Background Command Service](core/services/background-service.html)
+* [Command Context/Service](./reference/services/command-context.html)
+* [Background Service / Background Command Service](./reference/services/background-service.html)
 
 #### Publishing/auditing:
 
-* [Auditing Service](core/services/auditing-service.html)
-* [Publishing Service](core/services/publishing-service.html)
+* [Auditing Service](./reference/services/auditing-service.html)
+* [Publishing Service](./reference/services/publishing-service.html)
 
 }
 
@@ -284,14 +284,19 @@ For both:
 
 #### Performance tuning/co-ordination [1.4.0-snapshot]
 
-* [QueryResultsCache](core/services/query-results-cache.html)
-* [Scratchpad](core/services/scratchpad.html)
-* [Bulk.Interaction](core/services/bulk-interaction.html) [stub]
+* [QueryResultsCache](./reference/services/query-results-cache.html)
+* [Scratchpad](./reference/services/scratchpad.html)
+* [Bulk.Interaction](./reference/services/bulk-interaction.html) [stub]
 
 #### Other:
 
-* [Settings Services](core/services/settings-services.html)
-* [Developer Utilities Service](core/services/developer-utilities-service.html)
+* [Settings Services](./reference/services/settings-services.html)
+* [Developer Utilities Service](./reference/services/developer-utilities-service.html)
+
+####  Non-UI execution [1.4.0-SNAPSHOT]
+
+- [IsisSessionTemplate](./reference/non-ui/isis-session-template.html)
+- [BackgroundCommandExecution](./reference/non-ui/background-command-execution.html)
 
 }
 
@@ -300,7 +305,7 @@ For both:
 {row
 
 {col-md-12
-## Applib (other)
+## Reference
 
 }
 
@@ -310,11 +315,9 @@ For both:
 
 {col-md-4
 
-#### Files and Types
-
-* [Configuration Files](core/configuration-files.html)
-* [Deployment Types](core/deployment-type.html)
+#### Config
 
+* [Configuration Files](./reference/configuration-files.html)
 
 }
 
@@ -322,10 +325,10 @@ For both:
 
 ####  Reference
 
-* [Recognized Methods and Prefixes](./applib-guide/reference/Recognized-Methods-and-Prefixes.html)
-* [Recognized Annotations](./applib-guide/reference/recognized-annotations/about.html)
-* [Lifecycle callbacks](./applib-guide/how-tos/how-to-07-070-How-to-hook-into-the-object-lifecycle-using-callbacks.html)
-* [Applib utility classes](applib-guide/reference/Utility.html)
+* [Recognized Methods](./reference/Recognized-Methods-and-Prefixes.html)
+* [Annotations](./reference/recognized-annotations/about.html)
+* [Lifecycle callbacks](./how-tos/object-lifecycle-callbacks.html)
+* [Value types](./reference/value-types.html)
 
 }
 
@@ -334,17 +337,9 @@ For both:
 
 #### Supporting features
 
-* [Security](./applib-guide/reference/Security.html)
-* [Applib Events](./applib-guide/reference/Event.html)
-
-####  Non-UI execution [1.4.0-SNAPSHOT]
-
-- [IsisSessionTemplate](./isis-session-template.html)
-- [BackgroundCommandExecution](./background-command-execution.html)
-
-#### Customisation
-
-  - [Finetuning the Programming Model](core/metamodel-finetuning-the-programming-model.html)
+* [Security](./reference/Security.html)
+* [Applib utility classes](./reference/Utility.html)
+* [Applib Events](./reference/Event.html)
 
 }
 
@@ -366,10 +361,10 @@ For both:
 #### Dev support
 <p class="display:none"/>
 
-  * [Unit Test Support](core/unittestsupport.html)
-  * [Integration Test Support](core/integtestsupport.html)
-  * [BDD/Integ Test Support](core/specsupport-and-integtestsupport.html)
-  * [Wrapper Factory](core/wrapper.html) [stub]
+* [Unit Test Support](core/unittestsupport.html)
+* [Integration Test Support](core/integtestsupport.html)
+* [BDD/Integ Test Support](core/specsupport-and-integtestsupport.html)
+* [Wrapper Factory](core/wrapper.html) [stub]
 
 }
 
@@ -378,8 +373,8 @@ For both:
 #### Runtime
 <p class="display:none"/>
 
-  * [Core Runtime](core/runtime.html) [stub]
-  * [Webserver](core/webserver.html) [stub]
+* [Core Runtime](core/runtime.html) [stub]
+* [Webserver](core/webserver.html) [stub]
 
 }
 
@@ -387,10 +382,10 @@ For both:
   
 #### Bundled components
 
-  - [Bytecode Enhancers](core/bytecode.html) [stub]
-  - [Bypass Security](core/bypass-security.html) [stub]
-  - [In-memory Object Store](core/inmemory-objectstore.html) [stub]
-  - [In-memory Profile Store](core/inmemory-profilestore.html) [stub]
+* [Bytecode Enhancers](core/bytecode.html) [stub]
+* [Bypass Security](core/bypass-security.html) [stub]
+* [In-memory Object Store](core/inmemory-objectstore.html) [stub]
+* [In-memory Profile Store](core/inmemory-profilestore.html) [stub]
 
 }
 
@@ -406,12 +401,12 @@ For both:
 {col-md-4
 ####  Wicket [1.3.1](components/viewers/wicket/release-notes/about.html)
 
-  - [About](components/viewers/wicket/about.html)
-  - [Titles in tables](components/viewers/wicket/titles-in-tables.html)
-  - [Static and dynamic layouts](core/dynamic-layouts.html)
-  - [Suppressing 'remember me'](components/viewers/wicket/suppressing-remember-me.html)
-  - [The About page](components/viewers/wicket/configuring-the-about-page.html)
-  - [Customizing the viewer](components/viewers/wicket/customizing-the-viewer.html)
+* [About](components/viewers/wicket/about.html)
+* [Titles in tables](components/viewers/wicket/titles-in-tables.html)
+* [Static and dynamic layouts](core/dynamic-layouts.html)
+* [Suppressing 'remember me'](components/viewers/wicket/suppressing-remember-me.html)
+* [The About page](components/viewers/wicket/configuring-the-about-page.html)
+* [Customizing the viewer](components/viewers/wicket/customizing-the-viewer.html)
 
 }
 
@@ -419,18 +414,19 @@ For both:
 ####  RestfulObjects [2.1.0](components/viewers/restfulobjects/release-notes/about.html)
 <p class="display:none"/>
 
-  - [About](components/viewers/restfulobjects/about.html)
+* [About](components/viewers/restfulobjects/about.html)
 
 
 ##### Applib service impl.
 
-- [Event Serializer per RO Spec](components/viewers/restfulobjects/event-serializer-rospec.html)
+* [Event Serializer per RO Spec](components/viewers/restfulobjects/event-serializer-rospec.html)
+
 }
 
 {col-md-4
 #### DHTMLX
 
-  - [About](third-party/viewers/dhtmlx/about.html)
+* [About](third-party/viewers/dhtmlx/about.html)
 
 Note: this viewer is third-party open source (outside Apache)
 
@@ -448,14 +444,14 @@ Note: this viewer is third-party open so
 {col-md-4
 ####  Configuration
 
-  - [About](components/objectstores/jdo/about.html)
-  - [DataNucleus and Eclipse](components/objectstores/jdo/datanucleus-and-eclipse.html)
-  - [DataNucleus and Maven](components/objectstores/jdo/datanucleus-and-maven.html)
-  - [`persistence.xml` file](components/objectstores/jdo/persistence_xml.html)
-  - [Using a JNDI Datasource](components/objectstores/jdo/using-jndi-datasource.html)
-  - [Using the `IsisJdoSupport` service](components/objectstores/jdo/isisjdosupport-service.html)
-  - [Enabling Logging](components/objectstores/jdo/enabling-logging.html)
-  - [Deploying on the Google App Engine](components/objectstores/jdo/deploying-on-the-google-app-engine.html)
+* [About](components/objectstores/jdo/about.html)
+* [DataNucleus and Eclipse](components/objectstores/jdo/datanucleus-and-eclipse.html)
+* [DataNucleus and Maven](components/objectstores/jdo/datanucleus-and-maven.html)
+* [`persistence.xml` file](components/objectstores/jdo/persistence_xml.html)
+* [Using a JNDI Datasource](components/objectstores/jdo/using-jndi-datasource.html)
+* [Using the `IsisJdoSupport` service](components/objectstores/jdo/isisjdosupport-service.html)
+* [Enabling Logging](components/objectstores/jdo/enabling-logging.html)
+* [Deploying on the Google App Engine](components/objectstores/jdo/deploying-on-the-google-app-engine.html)
 
 }
 
@@ -463,12 +459,12 @@ Note: this viewer is third-party open so
 ####  JDO mapping hints
 <p class="display:none"/>
 
-  - [Mapping Mandatory and Optional Properties](components/objectstores/jdo/mapping-mandatory-and-optional-properties.html)
-  - [Mapping JODA Dates](components/objectstores/jdo/mapping-joda-dates.html)
-  - [Mapping BigDecimals](components/objectstores/jdo/mapping-bigdecimals.html)
-  - [Mapping Blobs](components/objectstores/jdo/mapping-blobs.html)
-  - [Lazy Loading](components/objectstores/jdo/lazy-loading.html)
-  - [Managed 1:m bidirectional relationships](components/objectstores/jdo/managed-1-to-m-relationships.html)
+* [Mapping Mandatory and Optional Properties](components/objectstores/jdo/mapping-mandatory-and-optional-properties.html)
+* [Mapping JODA Dates](components/objectstores/jdo/mapping-joda-dates.html)
+* [Mapping BigDecimals](components/objectstores/jdo/mapping-bigdecimals.html)
+* [Mapping Blobs](components/objectstores/jdo/mapping-blobs.html)
+* [Lazy Loading](components/objectstores/jdo/lazy-loading.html)
+* [Managed 1:m bidirectional relationships](components/objectstores/jdo/managed-1-to-m-relationships.html)
 
   
 }
@@ -477,13 +473,13 @@ Note: this viewer is third-party open so
 #### Applib service impl.
 <p class="display:none"/>
 
-  - [Eagerly Registering Entity Types](components/objectstores/jdo/eagerly-registering-entities.html)
-  - [Exception Recognizers](components/objectstores/jdo/exception-recognizers-jdo.html)
-  - [Settings Services on JDO](components/objectstores/jdo/settings-services-jdo.html)
-  - [Command Service on JDO](components/objectstores/jdo/command-service-jdo.html) [1.4.0-snapshot, stub]
-  - [Background Command Service on JDO](components/objectstores/jdo/command-service-jdo.html) [1.4.0-snapshot, stub]
-  - [Publishing Service on JDO](components/objectstores/jdo/publishing-service-jdo.html) 
-  - [Auditing Service on JDO](components/objectstores/jdo/auditing-service-jdo.html)
+* [Eagerly Registering Entity Types](components/objectstores/jdo/eagerly-registering-entities.html)
+* [Exception Recognizers](components/objectstores/jdo/exception-recognizers-jdo.html)
+* [Settings Services on JDO](components/objectstores/jdo/settings-services-jdo.html)
+* [Command Service on JDO](components/objectstores/jdo/command-service-jdo.html) [1.4.0-snapshot, stub]
+* [Background Command Service on JDO](components/objectstores/jdo/command-service-jdo.html) [1.4.0-snapshot, stub]
+* [Publishing Service on JDO](components/objectstores/jdo/publishing-service-jdo.html) 
+* [Auditing Service on JDO](components/objectstores/jdo/auditing-service-jdo.html)
 
   
 }
@@ -500,10 +496,10 @@ Note: this viewer is third-party open so
 {col-md-4
 #### Shiro [1.3.0](components/security/shiro/release-notes/about.html)
 
-  - [About](components/security/shiro/about.html)
-  - [Configuring Isis to use Shiro](components/security/shiro/configuring-shiro.html)
-  - [Configuring Shiro to use LDAP](components/security/shiro/using-ldap.html)
-  - [Format of Isis Permissions](components/security/shiro/format-of-permissions.html)
+* [About](components/security/shiro/about.html)
+* [Configuring Isis to use Shiro](components/security/shiro/configuring-shiro.html)
+* [Configuring Shiro to use LDAP](components/security/shiro/using-ldap.html)
+* [Format of Isis Permissions](components/security/shiro/format-of-permissions.html)
 
 }
 
@@ -511,7 +507,7 @@ Note: this viewer is third-party open so
 #### File [1.0.1](components/security/file/release-notes/about.html)
 <p class="display:none"/>
 
-  - [About](components/security/file/about.html)
+* [About](components/security/file/about.html)
 
 }
 
@@ -529,25 +525,26 @@ Note: this viewer is third-party open so
 {col-md-4
 #### NoSQL Object Store [0.2.0-incubating](components/objectstores/nosql/release-notes/about.html)
 
-- [About](components/objectstores/nosql/about.html)
+* [About](components/objectstores/nosql/about.html)
 
 ----------
 
 #### XML Object Store [0.2.0-incubating](components/objectstores/xml/release-notes/about.html)
-- [About](components/objectstores/xml/about.html)
+
+* [About](components/objectstores/xml/about.html)
 
 }
 
 {col-md-4
 ####  Scimpi Viewer [0.2.0-incubating](components/viewers/scimpi/release-notes/about.html)
 
-  - [About](components/viewers/scimpi/about.html)
+* [About](components/viewers/scimpi/about.html)
 
 ----------
 
 #### DnD Viewer [0.2.0-incubating](components/viewers/dnd/release-notes/about.html)
 
-  - [About](components/viewers/dnd/about.html)
+* [About](components/viewers/dnd/about.html)
 
 }
 
@@ -555,13 +552,13 @@ Note: this viewer is third-party open so
 {col-md-4
 #### Groovy Programming Model [0.2.0-incubating](components/progmodels/groovy/release-notes/about.html)
 
-  - [About](components/progmodels/groovy/about.html)
+* [About](components/progmodels/groovy/about.html)
 
 ----------
 
 #### XML Profile Store [0.2.0-incubating](components/profilestores/xml/release-notes/about.html)
 
-  - [About](components/profilestores/xml/about.html)
+* [About](components/profilestores/xml/about.html)
 
 }
 
@@ -577,30 +574,30 @@ Note: this viewer is third-party open so
 
 #### Contributors
 
-  - [Contributing](contributors/contributing.html)
-  - [Development Environment](contributors/development-environment.html)
-  - [Building Isis](contributors/building-isis.html)
-  - [Git Policy](contributors/git-policy.html)
-  - [Git Cookbook](contributors/git-cookbook.html)
-  - [Versioning Policy](contributors/versioning-policy.html)
+* [Contributing](contributors/contributing.html)
+* [Development Environment](contributors/development-environment.html)
+* [Building Isis](contributors/building-isis.html)
+* [Git Policy](contributors/git-policy.html)
+* [Git Cookbook](contributors/git-cookbook.html)
+* [Versioning Policy](contributors/versioning-policy.html)
 
 }
 
 {col-md-4
 #### Committers
 
-  - [Updating the CMS site](contributors/updating-the-cms-site.html)
-  - [Applying Patches](contributors/applying-patches.html)
-  - [Recreating an archetype](contributors/recreating-an-archetype.html)
-  - [Snapshot process](contributors/snapshot-process.html)
-  - [Release process](contributors/release-process.html)
-  - [Release branch and tag names](contributors/release-branch-and-tag-names.html)
-  - [Verifying releases](contributors/verifying-releases.html)
-  - [Key generation](contributors/key-generation.html)
+* [Updating the CMS site](contributors/updating-the-cms-site.html)
+* [Applying Patches](contributors/applying-patches.html)
+* [Recreating an archetype](contributors/recreating-an-archetype.html)
+* [Snapshot process](contributors/snapshot-process.html)
+* [Release process](contributors/release-process.html)
+* [Release branch and tag names](contributors/release-branch-and-tag-names.html)
+* [Verifying releases](contributors/verifying-releases.html)
+* [Key generation](contributors/key-generation.html)
 
 #### PMC
 
-  - [Notes](contributors/pmc-notes.html)
+* [Notes](contributors/pmc-notes.html)
 
 
 }
@@ -608,15 +605,17 @@ Note: this viewer is third-party open so
 {col-md-4
 #### Plugins
 
-  - [Maven Plugin](other/maven-plugin.html) [stub]
-  - [Eclipse IDE Plugin](other/eclipse-plugin.html) [stub]
+* [Maven Plugin](other/maven-plugin.html) [stub]
+* [Eclipse IDE Plugin](other/eclipse-plugin.html) [stub]
 
 <!--
 
 ----------
 
 #### Kemble
-- [About](components/progmodels/kemble/about.html) [stub]
+
+* [About](components/progmodels/kemble/about.html) [stub]
+
 -->
 
 
@@ -624,12 +623,12 @@ Note: this viewer is third-party open so
 
 These are no longer under active development
 
-  - [HTML Viewer](components/viewers/html/about.html) (use Wicket)
-  - [LDAP Security](components/security/ldap/about.html) (use Shiro)
-  - [SQL Security](components/security/sql/about.html) (use Shiro)
-  - [SQL Profile Store](components/profilestores/sql/about.html)
-  - [SQL Object Store](components/objectstores/sql/about.html) (use JDO)
-  - [BDD (Concordion)](components/viewers/bdd/about.html) (use Cucumber-JVM in unittestsupport and integtestsupport)
+* [HTML Viewer](components/viewers/html/about.html) (use Wicket)
+* [LDAP Security](components/security/ldap/about.html) (use Shiro)
+* [SQL Security](components/security/sql/about.html) (use Shiro)
+* [SQL Profile Store](components/profilestores/sql/about.html)
+* [SQL Object Store](components/objectstores/sql/about.html) (use JDO)
+* [BDD (Concordion)](components/viewers/bdd/about.html) (use Cucumber-JVM in unittestsupport and integtestsupport)
 
 }
 

Modified: isis/site/trunk/content/download.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/download.md?rev=1566750&r1=1566749&r2=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/download.md (original)
+++ isis/site/trunk/content/download.md Mon Feb 10 21:27:41 2014
@@ -19,7 +19,7 @@ mvn archetype:generate  \
     -B
 </pre>
 
-For more information, see [here](getting-started/simple-archetype.html) and [here](getting-started/quickstart-archetype.html).
+For more information, see [here](intro/getting-started/simple-archetype.html).
 
 ## Formal Releases
 
@@ -39,8 +39,8 @@ Components:
 
 Archetypes:
 
-* [quickstart_wicket_restful_jdo-archetype-1.3.1](https://www.apache.org/dyn/closer.cgi/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip) ([asc](http://www.apache.org/dist/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip.asc), [md5](http://www.apache.org/dist/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip.md5))
 * [simple_wicket_restful_jdo-archetype-1.3.1](https://www.apache.org/dyn/closer.cgi/isis/archetype/simple_wicket_restful_jdo-archetype/simple_wicket_restful_jdo-archetype-1.3.1-source-release.zip) ([asc](http://www.apache.org/dist/isis/archetype/simple_wicket_restful_jdo-archetype/simple_wicket_restful_jdo-archetype-1.3.1-source-release.zip.asc), [md5](http://www.apache.org/dist/isis/archetype/simple_wicket_restful_jdo-archetype/simple_wicket_restful_jdo-archetype-1.3.1-source-release.zip.md5))
+* [quickstart_wicket_restful_jdo-archetype-1.3.1](https://www.apache.org/dyn/closer.cgi/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip) ([asc](http://www.apache.org/dist/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip.asc), [md5](http://www.apache.org/dist/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.3.1-source-release.zip.md5))
 
 See the [release matrix](release-matrix.html) for details on the dependencies between core, components and archetypes.
 

Copied: isis/site/trunk/content/how-tos/about.md (from r1565152, isis/site/trunk/content/applib-guide/how-tos/about.md)
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/how-tos/about.md?p2=isis/site/trunk/content/how-tos/about.md&p1=isis/site/trunk/content/applib-guide/how-tos/about.md&r1=1565152&r2=1566750&rev=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/applib-guide/how-tos/about.md (original)
+++ isis/site/trunk/content/how-tos/about.md Mon Feb 10 21:27:41 2014
@@ -1,213 +1,10 @@
 title: How-tos
 
-
 {note
-A lot of the programming conventions described in these how-tos are encapsulated in the [Eclipse templates](../../getting-started/editor-templates.html).  If you use Eclipse, do install these first; they will save a lot of time.
+A lot of the programming conventions described in these how-tos are encapsulated in the [Eclipse templates](../intro/getting-started/editor-templates.html).  If you use Eclipse, do install these first; they will save a lot of time.
 }
 
-##How to write a basic Domain Entity or Service
-
-Domain entities are instances of some class, usually (the vast majority)
-being persisted. Domain services are singletons that act typically act
-as factories and repositories. Domain entities have state in the form of
-properties and collections; domain services do not. Both domain entities
-and services have behaviour, in the form of actions.
-
-* [How to have a domain entity/service be a POJO](./how-to-01-010-How-to-have-a-domain-object-be-a-POJO.html)
-
-* [How to add a property to a domain entity](./how-to-01-030-How-to-add-a-property-to-a-domain-entity.html)
-
-* [How to specify a title for a domain entity](./how-to-01-040-How-to-specify-a-title-for-a-domain-entity.html)
-
-* [How to add a collection to a domain entity](./how-to-01-050-How-to-add-a-collection-to-a-domain-entity.html)
-
-* [How to add an action to a domain entity or service](./how-to-01-060-How-to-add-an-action-to-a-domain-entity-or-service.html)
-
-* [How to decouple dependencies using contributions](how-to-01-062-How-to-decouple-dependencies-using-contributions.html)
-
-* [How to add an action to be called on every object within a list](./how-to-01-065-How-to-add-an-action-to-be-called-on-every-object-in-a-list.html)
-
-* [How to specify the icon for a domain entity](./how-to-01-070-How-to-specify-the-icon-for-a-domain-entity.html)
-
-* [How to specify the order in which properties or collections are displayed](./how-to-01-080-How-to-specify-the-order-in-which-properties-or-collections-are-displayed.html)
-
-* [How to specify the order in which actions appear on the menu](./how-to-01-090-How-to-specify-the-order-in-which-actions-appear-on-the-menu.html)
-
-* [How to make a property optional](./how-to-01-100-How-to-make-a-property-optional.html)
-
-* [How to make an action parameter optional](./how-to-01-110-How-to-make-an-action-parameter-optional.html)
-
-* [How to specify the size of String properties](./how-to-01-120-How-to-specify-the-size-of-String-properties.html)
-
-* [How to specify the size of String action parameters](./how-to-01-130-How-to-specify-the-size-of-String-action-parameters.html)
-
-* [How to specify names or descriptions for an action parameter](./how-to-01-140-How-to-specify-names-or-descriptions-for-an-action-parameter.html)
-
-* [How to inject services into a domain entity or other service](./how-to-01-150-How-to-inject-services-into-a-domain-entity-or-other-service.html)
-
-* [How to create or delete objects within your code](./how-to-01-160-How-to-create-or-delete-objects-within-your-code.html)
-
-
-##How to add business rules
-
-Business rules can be added to domain objects in a number of ways. As
-well as the business logic encapsulated by domain object actions, the
-framework also supports a number of conventions that allow a domain
-entity or service's members to be made visible or hidden, to be enabled
-or disabled (greyed out), and to validate arguments when invoking an
-action, setting a new value for a property, or if adding a new element
-to a collection.
-
-Or, in other words: "see it, use it, do it".
-
-* [How to hide a property](./how-to-02-010-How-to-hide-a-property.html)
-
-* [How to hide a collection](./how-to-02-020-How-to-hide-a-collection.html)
-
-* [How to hide an action](./how-to-02-030-How-to-hide-an-action.html)
-
-* [How to specify that none of an object's members is visible](./how-to-02-040-How-to-specify-that-none-of-an-object's-members-is-visible.html)
-
-* [How to prevent a property from being modified](./how-to-02-050-How-to-prevent-a-property-from-being-modified.html)
-
-* [How to prevent a collection from being modified](./how-to-02-060-How-to-prevent-a-collection-from-being-modified.html)
-
-* [How to prevent an action from being invoked](./how-to-02-070-How-to-prevent-an-action-from-being-invoked.html)
-
-* [How to specify that none of an object's members can be modified or invoked](./how-to-02-080-How-to-specify-that-none-of-an-object's-members-can-be-modified-or-invoked.html)
-
-* [How to specify that an object is immutable](./how-to-02-090-How-to-specify-that-an-object-is-immutable.html)
-
-* [How to validate user input for a property](./how-to-02-100-How-to-validate-user-input-for-a-property.html)
-
-* [How to validate an object being added or removed from a collection](./how-to-02-110-How-to-validate-an-object-being-added-or-removed-from-a-collection.html)
-
-* [How to validate an action parameter argument](./how-to-02-120-How-to-validate-an-action-parameter-argument.html)
-
-* [How to validate declaratively using MustSatisfy](./how-to-02-130-How-to-validate-declaratively-using-MustSatisfy.html)
-
-
-##How to provide drop-downs and default values
-
-Invoking actions or setting properties requires that the user specify a
-valid value; of the correct type, and that passes any validation rules
-that may have been defined. To make things are easier for the user, you
-can provide lists of choices; viewers typically render these values in a
-drop-down list box.
-
-In a similar vein, there may be a default value for an action parameter;
-this can also be specified.
-
-For properties:
-
-* [How to specify a set of choices for a property](./how-to-03-010-How-to-specify-a-set-of-choices-for-a-property.html)
-
-* [How to specify an auto-complete for a property](./how-to-03-015-How-to-specify-an-autocomplete-for-a-property.html)
-
-* [How to specify the default value of an object property](./how-to-03-017-How-to-specify-default-value-of-an-object-property.html)
-
-For actions:
-
-* [How to specify a set of choices for an action parameter](./how-to-03-020-How-to-specify-a-set-of-choices-for-an-action-parameter.html)
-
-* [How to specify dependent choices for action parameters (eg category/subcategory)](./how-to-03-022-How-to-specify-dependent-choices-for-action-parameters.html)
-
-* [How to specify an auto-complete for an action parameter](./how-to-03-025-How-to-specify-an-autocomplete-for-an-action-parameter.html)
-
-* [How to specify default values for an action parameter](./how-to-03-050-How-to-specify-default-values-for-an-action-parameter.html)
-
-
-
-For both:
-
-* [How to specify (for an action parameter or property) that a class has a limited number of instances](./how-to-03-030-How-to-specify-that-a-class-of-objects-has-a-limited-number-of-instances.html)
-
-* [How to find an entity (for an action parameter or property) using auto-complete](./how-to-03-040-How-to-find-an-entity-(for-an-action-parameter-or-property)-using-auto-complete.html)
-
-
-
-##How to derive properties and collections, and other side-effects
-
-The *Isis* viewers will automatically render the state of properties and
-collections, but the values of such need not be persisted; they can be
-derived from other information available to the object.
-
-* [How to make a derived property](./how-to-04-010-How-to-make-a-derived-property.html)
-
-* [How to make a derived collection](./how-to-04-020-How-to-make-a-derived-collection.html)
-
-* [How to inline the results of a query-only repository action](./how-to-04-030-How-to-inline-the-results-of-a-query-only-repository-action.html)
-
-* [How to trigger other behaviour when a property is changed](./how-to-04-040-How-to-trigger-other-behaviour-when-a-property-is-changed.html)
-
-* [How to trigger other behaviour when an object is added or removed](./how-to-04-050-How-to-trigger-other-behaviour-when-an-object-is-added-or-removed.html)
-
-* [How to set up and maintain bidirectional relationships](./how-to-04-060-How-to-set-up-and-maintain-bidirectional-relationships.html)
-
-
-##How to provide additional UI hints
-
-With the exception of value types for action parameters <!--(see ?)-->, Isis
-can normally infer a reasonable name for entity/service and its class
-members. However, these defaults can be overridden if required. One
-possible case is where the desired name is a reserved word in Java (eg
-"default", or "package").
-
-A slightly more advanced use-case is to specify an icon not for an
-entity's type, but for an entity instance. Typically this reflects that
-instance's state, eg with an overlay on top of the base icon. For
-example, this allows the user to distinguish between an Order that has
-been placed vs one that has been shipped.
-
-* [How to specify a name or description for an object](./how-to-05-010-How-to-specify-a-name-or-description-for-an-object.html)
-
-* [How to specify a name or description for a property](./how-to-05-020-How-to-specify-a-name-or-description-for-a-property.html)
-
-* [How to specify a name or description for a collection](./how-to-05-030-How-to-specify-a-name-or-description-for-a-collection.html)
-
-* [How to specify names or description for an action](./how-to-05-040-How-to-specify-names-or-description-for-an-action.html)
-
-* [How to specify the icon for an individual objects state](./how-to-05-050-How-to-specify-the-icon-for-an-individual-objects-state.html)
-
-
-
-##How to deal with errors
-
-Things go wrong. *Isis* handles many of the usual error conditions, but
-your app may also wish to notify the user also when something goes awry.
-
-* [How to pass a messages and raise errors to the user](./how-to-06-010-How-to-pass-a-messages-and-errors-back-to-the-user.html)
-
-
-##How to handle the entity persistence lifecycle
-
-*Isis* automatically persists domain entities, performing both lazy
-loading and dirty object tracking. As an application programmer you can
-get visibility into and influence this behaviour.
-
-
-* [How to set up the initial value of a property programmatically](./how-to-07-010-How-to-set-up-the-initial-value-of-a-property-programmatically.html)
-
-* [How to insert behaviour into the object life cycle](./how-to-07-020-How-to-insert-behaviour-into-the-object-life-cycle.html)
-
-* [How to ensure object is in valid state](./how-to-07-030-How-to-ensure-object-is-in-valid-state.html)
-
-* [How to specify that an object should not be persisted](./how-to-07-040-How-to-specify-that-an-object-should-not-be-persisted.html)
-
-* [How to perform lazy loading](./how-to-07-050-How-to-perform-lazy-loading.html)
-
-* [How to perform dirty object tracking](./how-to-07-060-How-to-perform-dirty-object-tracking.html)
-
-* [How to hook into the object lifecycle using callbacks](./how-to-07-070-How-to-hook-into-the-object-lifecycle-using-callbacks.html)
-
-
-##How to control access to entity features
-
-*Isis* allows you to control access to entities either using application logic or through a pluggable authorisation manager.
-
-* [How to write application logic to hide, disable and validate for specific users/roles](./how-to-08-010-Hiding,-disabling-or-validating-for-specific-users-or-roles.html)
-
-* [How to use Isis' authorization manager](./how-to-08-020-How-to-use-Isis-authorization-manager.html)
+go back to: [documentation](../documentation.html)
 
 
 

Copied: isis/site/trunk/content/how-tos2/dynamic-layouts.md (from r1557348, isis/site/trunk/content/core/dynamic-layouts.md)
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/how-tos2/dynamic-layouts.md?p2=isis/site/trunk/content/how-tos2/dynamic-layouts.md&p1=isis/site/trunk/content/core/dynamic-layouts.md&r1=1557348&r2=1566750&rev=1566750&view=diff
==============================================================================
--- isis/site/trunk/content/core/dynamic-layouts.md (original)
+++ isis/site/trunk/content/how-tos2/dynamic-layouts.md Mon Feb 10 21:27:41 2014
@@ -1,6 +1,6 @@
 Title: Static and Dynamic Layouts
 
-> You can also watch a [screencast](../getting-started/screencasts.html) demonstrating static and dynamic layouts. 
+> You can also watch a [screencast](../intro/getting-started/screencasts.html) demonstrating static and dynamic layouts. 
 
 Because Isis implements the [naked objects pattern](http://en.wikipedia.org/wiki/Naked_objects), the domain objects are rendered in the UI based only metadata gleaned from the domain classes themselves.  This metadata can be specified statically, using annotations, or dynamically, using a JSON file.