From 2189a98360fcc8759193382447a98565e66a9e0e Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 27 Jul 2010 17:26:34 +0000 Subject: [PATCH] Merge r1221 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint --- doc/upgrade-1.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/upgrade-1.1.txt b/doc/upgrade-1.1.txt index 67d2262c..1b938986 100644 --- a/doc/upgrade-1.1.txt +++ b/doc/upgrade-1.1.txt @@ -339,8 +339,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 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