Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.3.1.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.3.1.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.3.1.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.0.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.0.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.0.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.1.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.1.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.4.1.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.5.0.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.5.0.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.5.0.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.6.0.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.6.0.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.6.0.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.7.0.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.7.0.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/release-notes/isis-viewer-wicket-1.7.0.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/showing-a-theme-chooser.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/showing-a-theme-chooser.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/showing-a-theme-chooser.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/specifying-a-default-theme.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/specifying-a-default-theme.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/specifying-a-default-theme.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/static-layouts.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/stripped-wicket-tags.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/stripped-wicket-tags.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/stripped-wicket-tags.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-header-and-footer.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-header-and-footer.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-header-and-footer.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-password-reset.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-password-reset.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-password-reset.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-remember-me.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-remember-me.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-remember-me.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-sign-up.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-sign-up.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/suppressing-sign-up.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/tips-and-workarounds.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/tips-and-workarounds.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/tips-and-workarounds.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/titles-in-tables.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/titles-in-tables.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/titles-in-tables.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/user-registration.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/user-registration.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/user-registration.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/components/viewers/wicket/writing-a-custom-theme.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/viewers/wicket/writing-a-custom-theme.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/viewers/wicket/writing-a-custom-theme.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../../../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts<img 
src="./../../../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../../../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../../../images/tv_show-25.png"></a></li>
               <li><a 
href="./../../../intro/powered-by/powered-by.html">Powered by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../../../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/config/custom-validator.html
==============================================================================
--- websites/staging/isis/trunk/content/config/custom-validator.html (original)
+++ websites/staging/isis/trunk/content/config/custom-validator.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/config/disallowing-deprecations.html
==============================================================================
--- websites/staging/isis/trunk/content/config/disallowing-deprecations.html 
(original)
+++ websites/staging/isis/trunk/content/config/disallowing-deprecations.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/config/dynamic-layout-metadata-reader.html
==============================================================================
--- 
websites/staging/isis/trunk/content/config/dynamic-layout-metadata-reader.html 
(original)
+++ 
websites/staging/isis/trunk/content/config/dynamic-layout-metadata-reader.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/config/i18n-support.html
==============================================================================
--- websites/staging/isis/trunk/content/config/i18n-support.html (original)
+++ websites/staging/isis/trunk/content/config/i18n-support.html Wed Feb 18 
16:30:27 2015
@@ -3,7 +3,7 @@
   <head>
 
     <meta charset="utf-8">
-      <title>Internationalization (i18n) support
</title>
+      <title>Internationalization (i18n) support (1.8.0-SNAPSHOT)
</title>
     <meta name="description" content="">
     <meta name="author" content="">
 
@@ -298,7 +298,7 @@
       };
       function twshare () {
           window.open(
-                  
"https://twitter.com/intent/tweet?url="+document.URL+"&text=Internationalization
 (i18n) support
",
+                  
"https://twitter.com/intent/tweet?url="+document.URL+"&text=Internationalization
 (i18n) support (1.8.0-SNAPSHOT)
",
                   'Share on Twitter',
                   'width=800,height=526');
       };
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>
@@ -418,13 +418,281 @@
 
 <div class="page-header">
 <p><a href="./../documentation.html">Docs</a>&nbsp;&raquo&nbsp;<a 
href="./../config/about.html">Config</a></p>
-<h1>Internationalization (i18n) support
+<h1>Internationalization (i18n) support (1.8.0-SNAPSHOT)
 
 </h1>
 </div>
 
+<p>As of 1.8.0-SNAPSHOT (ISIS-903), Isis' support for i18n has been 
re-implemented
+to use GNU <a 
href="https://www.gnu.org/software/gettext/manual/index.html";>gettext</a> 
<code>.pot</code> and <code>.po</code> 
+files.  The implementation does <i>not</i> however use any GNU software (to
+simplify the toolchain/developer experience, and because GNU software is 
usually
+GPL, incompatible with the Apache license).</p>
+
+<h2>Rationale</h2>
+
+<p>The gnutext <code>.pot</code> and <code>.po</code> files are intended to be 
used as follows:</p>
+
+<ul>
+<li>the <code>.pot</code> (portable object template) file holds the message 
text to be translated</li>
+<li>this file is translated into multiple <code>.po</code> (portable object) 
files, one per supported locale</li>
+<li>these <code>.po</code> files are renamed according to their locale, and 
placed into the 'appropriate' location to be picked up by the runtime.</li>
+</ul>
+
+<p>The format  of the <code>.pot</code> and <code>.po</code> files is 
identical; the only difference is that 
+the <code>.po</code> file has translations for each of the message strings.  
In Isis' implementation,
+if the translation is missing then the original message text will be returned. 
 What that
+means in practice is that the <code>.pot</code> file can be copied to a 
<code>.po</code> file and used as is.</p>
+
+<blockquote>
+  <p>In fact, if there is no translation available then Isis' implementation 
will return the original text, so it isn't even necessary for their to be any 
<code>.po</code> files.</p>
+</blockquote>
+
+<p>There are a couple of advantages of using <code>.po</code> files rather 
than the more Java's own <code>ResourceBundle</code> API:</p>
+
+<ul>
+<li>the <code>.po</code> message format is such that any given message text to 
translate need only be translated once, even if it appears in multiple places 
in the application (eg "Name")</li>
+<li>the <code>.po</code> message format includes translations for (optional) 
plural form as well as singular form</li>
+<li>there are lots of freely available editors <a 
href="https://www.google.co.uk/search?q=.po+file+editor";>to be found</a>, many 
summarized on this <a href="https://www.drupal.org/node/11131";>Drupal.org</a> 
webpage</li>
+</ul>
+
+<p>Perhaps most usefully, there are also online communities/platforms of 
translators to assist with translating files.  One such is <a 
href="https://crowdin.com/";>crowdin</a> (nb: this link does not imply 
endorsement).</p>
+
+<h2>Service API and Implementation</h2>
+
+<p>The cornerstone of Isis' support for i18n is the 
<code>TranslationService</code> service.  This is defined in the applib with 
the following API:</p>
+
+<pre><code>public interface TranslationService {
+
+    public String translate(final String context, final String text);
+    public String translate(final String context, final String singularText, 
final String pluralText, int num);
+
+    public enum Mode {
+        READ,
+        WRITE;
+    }
+    Mode getMode();
+}
+</code></pre>
+
+<p>where:</p>
+
+<ul>
+<li>translate(...) : overloaded method to return either the singular/regular 
or plural form of the text</li>
+<li>getMode() : indicates whether the translation service is in read or write 
mode.</li>
+</ul>
+
+<p>The idea behind these two modes is so that the service can be configured 
either to run in normal (read) mode, and provide translations, or alternatively 
in (write) mode whereby messages are simply returned untranslated, but also the 
fact that the translation was requested is also recorded (a little like a 
spy/mock in unit testing mock).  </p>
+
+<h4><code>TranslationServicePo</code></h4>
+
+<p>Isis provides a default implementation of <code>TranslationService</code>, 
namely <code>TranslationServicePo</code>.  When in read mode this service 
locates the appropriate  <code>.po</code> file (based on the requesting user's 
locale), finds the translation and returns it.  When in write mode however it 
will write all translations into a <code>.pot</code> file.</p>
+
+<p>To make the service as convenient as possible to use, the service 
configures itself as follows:</p>
+
+<ul>
+<li>if running in prototype mode or during integration tests, then the service 
runs in <em>write</em> mode, in which it records all translations.  The 
<code>.pot</code> file is written out when the system is shutdown.</li>
+<li>if running in server (production) mode, then the service runs in 
<em>read</em> mode.  It is also possible to set a configuration setting in 
<code>isis.properties</code> to force read mode even if running in prototype 
mode (useful to manually test/demo the translations).</li>
+</ul>
+
+<p>When running in write mode the original text is returned to the caller 
untranslated.  If in read mode, then the translated <code>.po</code> files are 
read and translations provided as required.</p>
+
+<h2>Translating validation and other (imperative) messages</h2>
+
+<p>The <code>TranslationService</code> it is used internally by Isis when 
building up the metamodel; the name and description of every class, property, 
collection, action and action parameter is automatically translated.  Thus the 
simple act of bootstrapping Isis will cause most of the messages requiring 
translation (that is: those for the Isis metamodel) to be captured by the 
<code>TranslationService</code>. </p>
+
+<p>However, for an application to be fully internationalized, any validation 
messages (from either <code>disableXxx()</code> or <code>validateXxx()</code> 
supporting methods) and also possibly an object's title (from the 
<code>title()</code> method) will also require translation.  Moreover, these 
messages must be captured in the <code>.pot</code> file such that they can be 
translated.</p>
+
+<p>The first part of the puzzle is tackled by an extension to Isis' 
programming model.  Whereas previously the 
<code>disableXxx()</code>/<code>validateXxx()</code>/<code>title()</code> 
methods could only return a <code>java.lang.String</code>, they may now 
optionally return a <code>TranslatableString</code> (defined in Isis applib 
instead).</p>
+
+<p>Here's a (silly) example from the <a 
href="../intro/getting-started/simpleapp-archetype.html">simpleapp</a>:</p>
+
+<pre><code>public TranslatableString validateUpdateName(final String name) {
+    return name.contains("!")? TranslatableString.tr("Exclamation mark is not 
allowed"): null;
+}
+</code></pre>
+
+<p>This corresponds to the following entry in the <code>.pot</code> file:</p>
+
+<pre><code>#: dom.simple.SimpleObject#updateName()
+msgid "Exclamation mark is not allowed"
+msgstr ""
+</code></pre>
+
+<p>The full API of <code>TranslatableString</code> is closely modelled on the 
GNU gettext design:</p>
+
+<pre><code>public final class TranslatableString {
+
+    public static TranslatableString tr(
+            final String pattern,
+            final Object... paramArgs) { ... }
+
+    public static TranslatableString trn(
+            final String singularPattern,
+            final String pluralPattern,
+            final int number,
+            final Object... paramArgs) { ... }
+
+    public String translate(
+            final TranslationService translationService, 
+            final String context) { ... }
+}
+</code></pre>
+
+<p>where:</p>
+
+<ul>
+<li>tr(...) : returns a translatable string with a single pattern for both 
singular and plural forms.</li>
+<li>trn(...) : returns a translatable string with different patterns for 
singular and plural forms; the one to use is determined by the 'number' 
argument</li>
+<li>translate(...): translates the string using the provided 
<code>TranslationService</code>, using the appropriate singular/regular or 
plural form, and interpolating any arguments.</li>
+</ul>
+
+<p>The interpolation uses the format <code>{xxx}</code>, where the placeholder 
can occur multiple times.  For example:</p>
+
+<pre><code>final TranslatableString ts = TranslatableString.tr(
+    "My name is {lastName}, {firstName} {lastName}.",
+    "lastName", "Bond", "firstName", "James");
+</code></pre>
+
+<p>This would interpolate (for the English locale) as "My name is Bond, James 
Bond".   But for a German user, if the translation in the corresponding 
<code>.po</code> file was:</p>
+
+<pre><code>#: xxx.yyy.Whatever#context()
+msgid "My name is {lastName}, {firstName} {lastName}."
+msgstr "Iche heisse {firstName} {lastName}."
+</code></pre>
+
+<p>Then the translation would be: "Ich heisse James Bond".</p>
+
+<p>So much for the API; but as noted, it is also necessary to ensure that the 
required translations are recorded (by the <code>TranslationService</code>) 
into the <code>.pot</code> file.  </p>
+
+<p>For this, we recommend that you ensure that all such methods are tested 
through <em>an integration test</em> (not unit test).  For example, here's the 
corresponding integration test for the "Exclamation mark" example from the 
simpleapp (above):</p>
+
+<pre><code>@Rule
+public ExpectedException expectedException = ExpectedException.none();
+
+@Inject
+FixtureScripts fixtureScripts;
+
+@Test
+public void failsValidation() throws Exception {
+    // given
+    RecreateSimpleObjects fs = new RecreateSimpleObjects().setNumber(1);
+    fixtureScripts.runFixtureScript(fs, null);
+    SimpleObject simpleObjectWrapped = wrap(fs.getSimpleObjects().get(0));
+
+    // expect
+    expectedExceptions.expect(InvalidException.class);
+    expectedExceptions.expectMessage("Exclamation mark is not allowed");
+
+    // when
+    simpleObjectWrapped.updateName("new name!");
+}
+</code></pre>
+
+<p>Running this test will result in the framework calling the 
<code>validateUpdateName(...)</code> method, and thus to record the required 
translation.</p>
+
+<p>When the integration tests are complete (that is, when Isis is shutdown), 
the <code>TranslationServicePo</code> will write out all captured translations 
to its log (more on this below).  This will include all the translations 
captured from the Isis metamodel, along with all translations as exercised by 
the integration tests.</p>
+
+<p>To ensure your app is fully internationalized app, you must therefore:</p>
+
+<ul>
+<li>use <code>TranslatableString</code> rather than <code>String</code> for 
all validation/disable and title methods.</li>
+<li>ensure that (at a minimum) all validation messages and title methods are 
integration tested.</li>
+</ul>
+
+<blockquote>
+  <p>One of the reasons that we decided to implement Isis i18n/translation 
support in this way is because it encourages (requires) the app to be properly 
tested.</p>
+</blockquote>
+
+<h2>Configuration</h2>
+
+<h4>Logging</h4>
+
+<p>To configure the <code>TranslationServicePo</code> to write to out the 
<code>translations.pot</code> file, add the following to the 
<em>integtests</em> <code>logging.properties</code> file:</p>
+
+<pre><code>log4j.appender.translations-po=org.apache.log4j.FileAppender
+log4j.appender.translations-po.File=./translations.pot
+log4j.appender.translations-po.Append=false
+log4j.appender.translations-po.layout=org.apache.log4j.PatternLayout
+log4j.appender.translations-po.layout.ConversionPattern=%m%n
+
+log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
+log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false
+</code></pre>
+
+<p>Just to repeat, this is <em>not</em> the 
<code>WEB-INF/logging.properties</code> file, it should instead be added to the 
<code>integtests/logging.properties</code> file.</p>
+
+<h4>Location of the <code>.po</code> files</h4>
+
+<p>The default location of the translated <code>.po</code> files is in the 
<code>WEB-INF</code> directory.  These are named and searched for similarly to 
regular Java resource bundles.</p>
+
+<p>For example, assuming these translations:</p>
+
+<pre><code>/WEB-INF/translations_en-US.po    
+/WEB-INF/translations_en.po
+/WEB-INF/translations_fr-FR.po
+/WEB-INF/translations.po
+</code></pre>
+
+<p>then:</p>
+
+<ul>
+<li>a user with <code>en-US</code> locale will use 
<code>translations_en-US.po</code></li>
+<li>a user with <code>en-GB</code> locale will use 
<code>translations_en.po</code></li>
+<li>a user with <code>fr-FR</code> locale will use 
<code>translations_fr-FR.po</code></li>
+<li>a user with <code>fr-CA</code> locale will use 
<code>translations.po</code></li>
+</ul>
+
+<p>The basename for translation files is always <code>translations</code>; 
this cannot be altered.</p>
+
+<h4>Externalized translation files</h4>
+
+<p>Normally Isis configuration files are read from the <code>WEB-INF</code> 
file.  However, Isis can be configured to read config files from an <a 
href="../reference/externalized-configuration.html">external directory</a>; 
this is also supported for translations.</p>
+
+<p>Thus, if in <code>web.xml</code> the external configuration directory has 
been set:</p>
+
+<pre><code>&lt;context-param&gt;
+    &lt;param-name&gt;isis.config.dir&lt;/param-name&gt;
+    &lt;param-value&gt;location of external config 
directory&lt;/param-value&gt;
+&lt;/context-param&gt;
+</code></pre>
+
+<p>Then this directory will be used as the base for searching for translations 
(rather than the default 'WEB-INF/' directory).</p>
+
+<h4>Force read mode</h4>
+
+<p>As noted above, if running in prototype mode then 
<code>TranslationServicePo</code> will be in write mode, if in production mode 
then will be in read mode.  To force read mode (ie use translations) even if in 
prototype mode, add the following configuration property to 
<code>isis.properties</code>:</p>
+
+<pre><code>isis.services.translation.po.mode=read
+</code></pre>
+
+<h2>Supporting services</h2>
+
+<p>The <code>TranslationServicePo</code> has a number of supporting/related 
services.</p>
+
+<h3>LocaleProvider</h3>
+
+<p>The <code>LocaleProvider</code> API is used by the 
<code>TranslationServicePo</code> implementation to obtain the locale of the 
"current user".  </p>
+
+<p>A default implementation is provided by the Wicket viewer.  Note that this 
default implementation does not support requests made through the Restful 
Objects viewer (there is no Wicket 'application' object available); the upshot 
is that requests through Restful Objects are never translated.  Registering a 
different implementation of <code>LocaleProvider</code> that taps into 
appropriate REST (RestEasy?) APIs would be the way to address this.</p>
+
+<h3><code>TranslationsResolver</code></h3>
+
+<p>The <code>TranslationResolver</code> is used by the 
<code>TranslationService</code> implementation to lookup translations for a 
specified locale.  It is this service that reads from the <code>WEB-INF/</code> 
(or externalized directory).  Again, an alternative implementation of this 
service could be registered if required.</p>
+
+<h3><code>TranslationServicePoMenu</code></h3>
+
+<p>The <code>TranslationServicePoMenu</code> provides a couple of menu actions 
in the UI (prototype mode only) that interacts with the underlying 
<code>TranslationServicePo</code>:</p>
+
+<ul>
+<li>the <code>downloadTranslationsFile()</code> action - available only in 
write mode - allows the current <code>.pot</code> file to be downloaded.  Note 
however that while this will contain all the translations from the metamodel, 
it will not necessarily contain all translations for all imperative methods 
returning <code>TranslatableString</code> instances.</li>
+<li>the <code>clearTranslationsCache()</code> action - available only in read 
mode - will clear the cache so that new translations can be loaded.  This 
allows a translator to edit the appropriate <code>translations-xx-XX.po</code> 
file and check the translation is correct without having to restart the 
app.</li>
+</ul>
+
+<h2>Using ResourceBundles (no-op in 1.8.0-SNAPSHOT)</h2>
+
 <blockquote>
-  <p>this is a stub</p>
+  <p>This earlier i18n implementation only honoured the locale of the server, 
not of the user making the request.</p>
 </blockquote>
 
 <p>Use the following settings in <code>isis.properties</code> to provide 
localized names and  descriptions for object members.</p>

Modified: 
websites/staging/isis/trunk/content/config/metamodel-finetuning-the-programming-model.html
==============================================================================
--- 
websites/staging/isis/trunk/content/config/metamodel-finetuning-the-programming-model.html
 (original)
+++ 
websites/staging/isis/trunk/content/config/metamodel-finetuning-the-programming-model.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/config/standardised-font-awesome-icons-and-CSS.html
==============================================================================
--- 
websites/staging/isis/trunk/content/config/standardised-font-awesome-icons-and-CSS.html
 (original)
+++ 
websites/staging/isis/trunk/content/config/standardised-font-awesome-icons-and-CSS.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/about.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/about.html (original)
+++ websites/staging/isis/trunk/content/contributors/about.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/applying-patches.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/applying-patches.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/applying-patches.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/building-isis.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/building-isis.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/building-isis.html Wed Feb 
18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/contributing.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/contributing.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/contributing.html Wed Feb 
18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/development-environment.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/development-environment.html 
(original)
+++ 
websites/staging/isis/trunk/content/contributors/development-environment.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/git-cookbook.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/git-cookbook.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/git-cookbook.html Wed Feb 
18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/git-policy.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/git-policy.html (original)
+++ websites/staging/isis/trunk/content/contributors/git-policy.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/key-generation.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/key-generation.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/key-generation.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/pmc-notes.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/pmc-notes.html (original)
+++ websites/staging/isis/trunk/content/contributors/pmc-notes.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html 
(original)
+++ 
websites/staging/isis/trunk/content/contributors/recreating-an-archetype.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
 (original)
+++ 
websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/release-checklist.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-checklist.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/release-checklist.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/release-process-one-pager.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/release-process-one-pager.html 
(original)
+++ 
websites/staging/isis/trunk/content/contributors/release-process-one-pager.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/snapshot-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/snapshot-process.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/snapshot-process.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/contributors/upd_sh.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/upd_sh.html (original)
+++ websites/staging/isis/trunk/content/contributors/upd_sh.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/updating-the-cms-site.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html 
(original)
+++ 
websites/staging/isis/trunk/content/contributors/verifying-releases-script.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/verifying-releases-using-creadur-tools.html
==============================================================================
--- 
websites/staging/isis/trunk/content/contributors/verifying-releases-using-creadur-tools.html
 (original)
+++ 
websites/staging/isis/trunk/content/contributors/verifying-releases-using-creadur-tools.html
 Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/verifying-releases.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/verifying-releases.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/verifying-releases.html 
Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: 
websites/staging/isis/trunk/content/contributors/versioning-policy.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/versioning-policy.html 
(original)
+++ websites/staging/isis/trunk/content/contributors/versioning-policy.html Wed 
Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/core/about.html
==============================================================================
--- websites/staging/isis/trunk/content/core/about.html (original)
+++ websites/staging/isis/trunk/content/core/about.html Wed Feb 18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/core/bypass-security.html
==============================================================================
--- websites/staging/isis/trunk/content/core/bypass-security.html (original)
+++ websites/staging/isis/trunk/content/core/bypass-security.html Wed Feb 18 
16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>

Modified: websites/staging/isis/trunk/content/core/inmemory-objectstore.html
==============================================================================
--- websites/staging/isis/trunk/content/core/inmemory-objectstore.html 
(original)
+++ websites/staging/isis/trunk/content/core/inmemory-objectstore.html Wed Feb 
18 16:30:27 2015
@@ -342,14 +342,14 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Demos<b 
class="caret"></b></a>
             <ul class="dropdown-menu">
               <li><a 
href="./../intro/elevator-pitch/isis-in-pictures.html">Screenshots</a></li>
-              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts<img 
src="./../images/tv_show-25.png"></a></li>
+              <li><a 
href="./../intro/tutorials/screencasts.html">Screencasts&nbsp;<img 
src="./../images/tv_show-25.png"></a></li>
               <li><a href="./../intro/powered-by/powered-by.html">Powered 
by</a></li>
               <li><a href="http://isisdemo.mmyco.co.uk/"; 
target="_blank">Online Demo</a></li>
             </ul>
           </li>
 
           <li><a href="./../documentation.html">Docs</a></li>
-          <li><a href="http://www.isisaddons.org"; 
target="_blank">Add-ons</a></li>
+          <li><a href="http://www.isisaddons.org"; target="_blank">Add-ons</a> 
(non-ASF)</li>
 
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">Downloads<b class="caret"></b></a>


Reply via email to