From 2690904eb6a6f89d36e09a1154a5370fb1cc4a9d Mon Sep 17 00:00:00 2001
From: Scott Yeadon <scott.yeadon@anu.edu.au>
Date: Tue, 7 Nov 2006 22:22:24 +0000
Subject: [PATCH] added info about handle.jar update in install and upgrade
 docs

git-svn-id: http://scm.dspace.org/svn/repo/trunk@1665 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 dspace/docs/index.html   | 1 +
 dspace/docs/install.html | 4 ++--
 dspace/docs/update.html  | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dspace/docs/index.html b/dspace/docs/index.html
index 7c0e10b0b0..99be8f645a 100644
--- a/dspace/docs/index.html
+++ b/dspace/docs/index.html
@@ -56,6 +56,7 @@
       </LI>
       <LI><A HREF="update.html">Updating a DSpace Installation</A>
         <UL>
+          <LI><A HREF="update.html#14_141">Updating From 1.4 to 1.4.x</A></LI>
           <LI><A HREF="update.html#132_14">Updating From 1.3.x to 1.4.x</A></LI>
           <LI><A HREF="update.html#131_132">Updating From 1.3.1 to 1.3.2</A></LI>
           <LI><A HREF="update.html#12_13">Updating From 1.2.x to 1.3.x</A></LI>
diff --git a/dspace/docs/install.html b/dspace/docs/install.html
index 3658e667a6..c67993a086 100644
--- a/dspace/docs/install.html
+++ b/dspace/docs/install.html
@@ -161,7 +161,6 @@ cp * ..</pre>
 	</ol></p>
       </li>
 
-
       <li>
         <P>Edit <code><i>[dspace-source]</i>/config/dspace.cfg</code>, in particular you'll need to set these properties:
 
@@ -490,7 +489,8 @@ $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA -keysize 1024 \
     <P>A Handle server runs as a separate process that receives TCP requests from other Handle servers, and issues resolution requests to a global server or servers if a Handle entered locally does not correspond to some local content.  The Handle protocol is based on TCP, so it will need to be installed on a server that can broadcast and receive TCP on port 2641.</P>
 
     <P>The Handle server code is included with the DSpace code in
-<code><i>[dspace-source]</i>/lib/handle.jar</code>.  A script exists to create a simple Handle configuration - simply run <code><i>[dspace]</i>/bin/make-handle-config</code> after you've set the appropriate parameters in <code>dspace.cfg</code>.  You can also create a Handle configuration directly by following the <A HREF="http://www.handle.net/hs_manual_18jan02/server_manual_2.html">installation instructions on handle.net</A>, but with these changes:</P>
+<code><i>[dspace-source]</i>/lib/handle.jar</code>. <strong>Note:</strong> The latest version of the <code>handle.jar</code> file is not included in the release due to licensing conditions changing between the provided version and later versions. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-source]</i>/lib with the new version and rebuild your war files.</p>
+    <p>A script exists to create a simple Handle configuration - simply run <code><i>[dspace]</i>/bin/make-handle-config</code> after you've set the appropriate parameters in <code>dspace.cfg</code>.  You can also create a Handle configuration directly by following the <A HREF="http://www.handle.net/hs_manual_18jan02/server_manual_2.html">installation instructions on handle.net</A>, but with these changes:</P>
 
     <UL>
       <LI>Instead of running:
diff --git a/dspace/docs/update.html b/dspace/docs/update.html
index a7421466e6..59f1454107 100644
--- a/dspace/docs/update.html
+++ b/dspace/docs/update.html
@@ -26,6 +26,8 @@
       <pre>cd <i>[dspace]</i>/lib
 cp postgresql.jar <i>[dspace-1.4.1-source]</i>/lib</pre></li>
 
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
+
       <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
 
       <li><p>Your 'localized' JSPs (those in jsp/local) now need to be maintained in the <em>source</em> directory. If you have locally modified JSPs in your <code><i>[dspace]</i>/jsp/local</code> directory, you will need to merge the changes in the new 1.4.1 versions into your locally modified ones. You can use the <code>diff</code> command to compare your JSPs against the 1.4.1 versions to do this. You can also check against the <a href="http://dspace.cvs.sourceforge.net/dspace/">DSpace CVS</a>.</p></li>
@@ -66,6 +68,8 @@ cp postgresql.jar <i>[dspace-1.4.1-source]</i>/lib</pre></li>
       <pre>cd <i>[dspace]</i>/lib
 cp postgresql.jar <i>[dspace-1.4.x-source]</i>/lib</pre></li>
 
+      <li><strong>Note:</strong> Licensing conditions for the <code>handle.jar</code> file have changed. As a result, the latest version of the <code>handle.jar</code> file is not included in this distribution. It is recommended you read the <a href="http://www.handle.net/upgrade_6-2_DSpace.html">new license conditions</a> and decide whether you wish to update your installation's <code>handle.jar</code>. If you decide to update, you should replace the existing <code>handle.jar</code> in <i>[dspace-1.4.1-source]</i>/lib with the new version.</li>
+
       <li><p>Take down Tomcat (or whichever servlet container you're using).</p></li>
 
       <li><p>Your DSpace configuration will need some updating:</p>