svn commit: r927018 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/components/security/shiro/configuring-shiro.html content/documentation.html

[bu...@apache.org]

Author: buildbot
Date: Mon Oct 27 10:37:56 2014
New Revision: 927018

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
    websites/staging/isis/trunk/content/documentation.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 27 10:37:56 2014
@@ -1 +1 @@
-1634495
+1634496

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 27 10:37:56 2014
@@ -1 +1 @@
-1634495
+1634496

Modified: websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html
==============================================================================
--- websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html (original)
+++ websites/staging/isis/trunk/content/components/security/shiro/configuring-shiro.html Mon Oct 27 10:37:56 2014
@@ -425,7 +425,7 @@
 
 <h3>Example Configuration</h3>
 
-<p>The <a href="../../../intro/getting-started/quickstart-archetype.html">simple archetype</a> and the <a href="../../../intro/getting-started/simple-archetype.html">quickstart archetype</a> are both configured with Shiro; you should see all the configuration explained below in these.</p>
+<p>The <a href="../../../intro/getting-started/simpleapp-archetype.html">simpleapp archetype</a> and the <a href="../../../intro/getting-started/todoapp-archetype.html">todoapp archetype</a> are both configured with Shiro; you should see all the configuration explained below in these.</p>
 
 <h2>Bootstrapping Shiro</h2>
 

Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Mon Oct 27 10:37:56 2014
@@ -974,6 +974,8 @@
 
 <p><i>previously released as the Shiro Security Component (v<a href="components/security/shiro/release-notes/about.html">1.5.0</a>)</i></p>
 
+<p>We strongly recommend using the <a href="http://github.com/isisaddons//isis-module-security">Security Isis add-on</a>, see <a href="./intro/tutorials/screencasts.html"><img src="./images/tv_show-25.png"></a></p>
+
 <ul>
 <li><a href="components/security/shiro/configuring-shiro.html">Configuring Isis to use Shiro</a></li>
 <li><a href="components/security/shiro/using-ldap.html">Configuring Shiro to use LDAP</a></li>
@@ -986,6 +988,8 @@
 
 <p><i>previously released as the JDO/DataNucleus Objectstore component (v<a href="components/objectstores/jdo/release-notes/about.html">1.5.0</a>)</i></p>
 
+<p>See also <a href="#jdo-objectstore-jdo-mapping-hints">JDO Mapping Hints</a>, <a href="#more-advanced-topics-error-handling">Error handling</a> and <a href="#more-advanced-topics-deployment">Deployment</a>, above.</p>
+
 <ul>
 <li><a href="components/objectstores/jdo/persistence_xml.html"><code>persistence.xml</code> file</a></li>
 <li><a href="components/objectstores/jdo/eagerly-registering-entities.html">Eagerly Registering Entity Types</a></li>