From 84ed6b810c97c46c0ccaddc57872be8f4f9a48d7 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 15 Feb 2011 22:09:33 +0000
Subject: [PATCH] Merge r2885-2686 from rel-1.2-maint

---
 doc/install.html          | 5 +++--
 doc/upgrade-1.2.html      | 5 +++--
 example.deploy.properties | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index 53de5176..5c5fb2ed 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -578,8 +578,9 @@
                                 </li>
                             </ul>
                             The VIVO developers are working to make this visualization more efficient.
-                            In the meantime, VIVO release 1.2 allows you to guard against this impact
-                            by setting the "visualization.temporal" flag to "disabled". 
+                            In the meantime, VIVO release 1.2 guards against this impact by disabling 
+							the temporal graph visualization unless the "visualization.temporal" flag 
+							is set to "enabled". To enable it, uncomment the line for this setting.
                         </td>
                     </tr>
                     <tr class="odd_row">
diff --git a/doc/upgrade-1.2.html b/doc/upgrade-1.2.html
index 969aed17..3d6aa581 100644
--- a/doc/upgrade-1.2.html
+++ b/doc/upgrade-1.2.html
@@ -554,8 +554,9 @@
                                 </li>
                             </ul>
                             The VIVO developers are working to make this visualization more efficient.
-                            In the meantime, VIVO release 1.2 allows you to guard against this impact
-                            by setting the "visualization.temporal" flag to "disabled". 
+                            In the meantime, VIVO release 1.2 guards against this impact by disabling 
+							the temporal graph visualization unless the "visualization.temporal" flag 
+							is set to "enabled". To enable it, uncomment the line for this setting.
                         </td>
                     </tr>
                     <tr class="odd_row blue">
diff --git a/example.deploy.properties b/example.deploy.properties
index f4732b34..f2fa75ee 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -133,10 +133,10 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId
 # - VIVO is configured to use Jena SDB,
 # - The organization tree is deep,
 # - The number of grants and publications is large.
-# VIVO release 1.2 allows you to guard against this impact by setting 
-# the "visualization.temporal" flag to "disabled".
+# VIVO release 1.2 guards against this impact by disabling the temporal graph
+# visualization unless the "visualization.temporal" flag is set to "enabled".
 #
-visualization.temporal = enabled 
+# visualization.temporal = enabled 
 
 #
 # The temporal graph visualization is used to compare different organizations/people