diff --git a/doc/install.txt b/doc/install.txt index 515a1bb7..fd7e9c91 100644 --- a/doc/install.txt +++ b/doc/install.txt @@ -47,7 +47,7 @@ the desired machine: * Apache Ant 1.7 or higher [http://ant.apache.org] * MySQL 5.1 or higher [http://www.mysql.com] -Be sure to setup the environment variables for ÒJAVA_HOMEÓ and ÒANT_HOMEÓ and +Be sure to setup the environment variables for "JAVA_HOME" and "ANT_HOME" and add the executables to your path per your operating system and installation directions from the software support web sites. @@ -88,8 +88,8 @@ example.deploy.properties to a file named simply deploy.properties. This file sets several properties used in compilation and deployment. NOTE: For those installing on Windows operating system, include the windows -directory and use the forward slash Ò/Ó and not the back slash Ò\Ó in the -directory locations, e.g. Òc:/tomcatÓ. +drive and use the forward slash "/" and not the back slash "\" in the +directory locations, e.g. "c:/tomcat". Default namespace: VIVO installations make their RDF resources available for harvest using linked data. Requests for RDF resource URIs redirect to HTML diff --git a/doc/upgrade-1.1.1.txt b/doc/upgrade-1.1.1.txt index 44b4bca9..a737afac 100644 --- a/doc/upgrade-1.1.1.txt +++ b/doc/upgrade-1.1.1.txt @@ -3,10 +3,10 @@ Upgrading VIVO -Steps to Upgrade from Release 1 Version 1.0 to Release 1 Version 1.1 +Steps to Upgrade from Release 1 Version 1.1 to Release 1 Version 1.1.1 This file provides a short description of the steps involved in upgrading your -installation of VIVO from Release 1 Version 1.0 to Release 1 Version 1.1. +installation of VIVO from Release 1 Version 1.1 to Release 1 Version 1.1.1. This and other documentation can be found at: http://vivoweb.org/support @@ -97,33 +97,8 @@ II. The Upgrade Process 6. Stop "Apache Tomcat" and run ant by typing: ant all 7. If you have set up the Apache Tomcat Connector using mod_jk and modified - your tomcat/conf/server.xml file, you will need to add a line to your - context section specifying a "Manager" tag; see examples below. - - Context section before: - - - - - - Context section after: - - - - - + your tomcat/conf/server.xml file, there are no changes in this upgrade. + For upgrades from V1.0 to V1.1.1, please see the upgrade-1.1.txt file. 8. Start "Apache Tomcat" and log in to VIVO.