From 65c772c35bada3359fe74bf79a70fe21a940cafb Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 27 Jul 2010 13:47:32 +0000 Subject: [PATCH] Merge r1202 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint --- doc/upgrade-1.1.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/upgrade-1.1.txt b/doc/upgrade-1.1.txt index 0e43691d..8ccfedb4 100644 --- a/doc/upgrade-1.1.txt +++ b/doc/upgrade-1.1.txt @@ -337,9 +337,8 @@ theme to VIVO 1.1. menu.jsp => menu.ftl and search.ftl footer.jsp => footer.ftl and googleAnalytics.ftl - googleAnalytics.ftl is a new file included from footer.ftl to - which you will add your site's Google Analytics Tracking Code - (see section II). + googleAnalytics.ftl is a new file to which you will add + your site's Google Analytics Tracking Code (see section II). Because the FreeMarker Template Language uses many syntactic conventions that will be familiar to template authors from JSP