svn commit: r1485626 - in /isis/site/trunk/content: applib-guide/applib-guide-intro.md contributors/updating-the-applib-docs.md core/applib.md documentation.md

[da...@apache.org]

Author: danhaywood
Date: Thu May 23 09:35:55 2013
New Revision: 1485626

URL: http://svn.apache.org/r1485626
Log:
more on the applib markdown

Removed:
    isis/site/trunk/content/contributors/updating-the-applib-docs.md
    isis/site/trunk/content/core/applib.md
Modified:
    isis/site/trunk/content/applib-guide/applib-guide-intro.md
    isis/site/trunk/content/documentation.md

Modified: isis/site/trunk/content/applib-guide/applib-guide-intro.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/applib-guide/applib-guide-intro.md?rev=1485626&r1=1485625&r2=1485626&view=diff
==============================================================================
--- isis/site/trunk/content/applib-guide/applib-guide-intro.md (original)
+++ isis/site/trunk/content/applib-guide/applib-guide-intro.md Thu May 23 09:35:55 2013
@@ -1,14 +1,10 @@
-Apache Isis Programming Model
-=======
+Title: Apache Isis Programming Model
 
-*Apache Isis* is designed to allow programmers rapidly develop domain-driven applications following the [Naked Objects](http://en.wikipedia.org/wiki/Naked_Objects) pattern. It is made up of a core plus a number of components for each of the main APIs: objectstores, viewers, and security.
+*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.
 
-This guide is written for programmers looking to understand the
-*Apache Isis* programming mode: the programming conventions, annotations 
-and supporting utilities supplied within the *Apache Isis* application library 
-(or *applib*).  Applications that follow these conventions enable the framework to correctly pick up and render the business rules and logic encoded within their domain objects.
+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.
 
-The guide breaks into three main parts:
+This guide to the programming model breaks into three main parts:
 
 * How-tos
 

Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1485626&r1=1485625&r2=1485626&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Thu May 23 09:35:55 2013
@@ -10,12 +10,16 @@ Title: Documentation
 
 - [Screencasts](getting-started/screencasts.html)
 - [Wicket/Restful/JDO Archetype](getting-started/quickstart-archetype.html) ([1.0.2](getting-started/release-notes/about.html))
+- [Programming Model and How-tos](applib-guide/applib-guide-intro.html)
+- [Programming Model Cheat Sheet](getting-started/cheat-sheet.html)
+
+### Resources
+
 - [Editor templates](getting-started/editor-templates.html)
-- [Cheat Sheet](getting-started/cheat-sheet.html)
 - [Icons](getting-started/icons.html)
 
 ### Releases
-D
+
 - [Release Matrix](release-matrix.html)
 
 }
@@ -61,7 +65,6 @@ Guidance for committers is at the bottom
 
 ###  Applib
 
-- [Programmers' Guide](core/applib.html)
 - [Configuration Files](core/configuration-files.html)
 - [Deployment Types](core/deployment-type.html)
 
@@ -312,7 +315,6 @@ all the above are released only in [1.1.
 ###  Committers
 
 - [Updating the CMS site](contributors/updating-the-cms-site.html)
-- [Updating the applib docs](contributors/updating-the-applib-docs.html)
 - [Recreating an archetype](contributors/recreating-an-archetype.html)
 - [Snapshot process](contributors/snapshot-process.html)
 - [Release process](contributors/release-process.html)