Author: danhaywood
Date: Mon Nov 26 17:09:44 2012
New Revision: 1413728
URL: http://svn.apache.org/viewvc?rev=1413728&view=rev
Log:
working on isis documentation page
Modified:
isis/site/trunk/content/getting-started/icons.md
isis/site/trunk/content/learning-more/isis-programming-model.md
Modified: isis/site/trunk/content/getting-started/icons.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/icons.md?rev=1413728&r1=1413727&r2=1413728&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/icons.md (original)
+++ isis/site/trunk/content/getting-started/icons.md Mon Nov 26 17:09:44 2012
@@ -2,5 +2,5 @@ Title: Icons
Most Isis viewers use icons to help identify domain objects in the user
interface. It's a good idea to ensure that these are styled consistently. To
get you started, we provide a number of icon sets, and reference a few others
freely available.
-Currently our [icon sets](http://incubator.apache.org/isis/icons.html) are
available from our original incubator website. We will move this content when
that site is decommissioned.
+Currently our [icon sets](http://incubator.apache.org/isis/icons.html) are
available from our original incubator website. We will move the content here
when that site is decommissioned.
Modified: isis/site/trunk/content/learning-more/isis-programming-model.md
URL:
http://svn.apache.org/viewvc/isis/site/trunk/content/learning-more/isis-programming-model.md?rev=1413728&r1=1413727&r2=1413728&view=diff
==============================================================================
--- isis/site/trunk/content/learning-more/isis-programming-model.md (original)
+++ isis/site/trunk/content/learning-more/isis-programming-model.md Mon Nov 26
17:09:44 2012
@@ -1,9 +1,7 @@
Title: Isis Programming Model
-{stub
-This page is a stub.
-}
+Apache Isis works using convention-over-configuration; you write your domain
objects following a set of conventions, and these are interpreted by the
framework in order to render, persist, remote or otherwise interact with your
domain model.
-Isis graduated from the Apache incubator in October 2012; we are currently
setting ourselves up as a top-level project.
+These conventions are together known as the Apache Isis Programming Model. The
Apache Isis Application Library - or AppLib - constitutes those elements of the
programming model that are declarative (such as annotations and interfaces). It
also contains the DomainObjectContainer interface, which is normally injected
into your domain objects and represents the only point of coupling from your
domain into the framework.
-In the meantime you can access our original incubator website
[here](http://incubator.apache.org/isis "Apache Isis (incubator website)").
+See the AppLib guide (HTML or PDF) for further details. (These resources are
currently on our priginal incubator website. We will move the content here
when that site is decommissioned.
