From 59faaa7434413fba7ec247d3a9d8b36352a9c919 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Sat, 29 Mar 2008 18:27:38 +0000
Subject: [PATCH] Manually merge a few documentation updates

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@642576 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/spreadsheet/eval.xml  | 11 ++++++-----
 .../content/xdocs/spreadsheet/how-to.xml              |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/documentation/content/xdocs/spreadsheet/eval.xml b/src/documentation/content/xdocs/spreadsheet/eval.xml
index 8d63512173..a0d7ae4a77 100644
--- a/src/documentation/content/xdocs/spreadsheet/eval.xml
+++ b/src/documentation/content/xdocs/spreadsheet/eval.xml
@@ -32,11 +32,12 @@
 				formulas in Excels sheets read-in, or created in POI. This document explains
 				how to use the API to evaluate your formulas. 
 			</p>
-			<note> This code currently lives the scratchpad area of the POI SVN repository. 
-				Ensure that you have the scratchpad jar or the scratchpad build area in your
-				classpath before experimenting with this code. You are advised
-				to make use of a recent SVN checkout, as new functions are
-				being supported fairly frequently.
+			<note>In versions of POI before 3.0.3, this code lived in the
+				scratchpad area of the POI SVN repository. If using an such an older
+				version of POI, ensure that you have the scratchpad jar or the 
+				scratchpad build area in your classpath before experimenting with this 
+				code. Users of all versions of POI may wish to make use of a recent 
+				SVN checkout, as new functions are currently being added fairly frequently.
 			</note>
 		</section>
 
diff --git a/src/documentation/content/xdocs/spreadsheet/how-to.xml b/src/documentation/content/xdocs/spreadsheet/how-to.xml
index a4ac41209d..053333e6e3 100644
--- a/src/documentation/content/xdocs/spreadsheet/how-to.xml
+++ b/src/documentation/content/xdocs/spreadsheet/how-to.xml
@@ -421,7 +421,7 @@ public class EventExample
      <anchor id="record_aware_event_api" />
      <section><title>Record Aware Event API</title>
 <p>
-This is an experimental extension to the normal 
+This is an extension to the normal 
 <link href="#event_api">Event API</link>. With this, your listener
 will be called with extra, dummy records. These dummy records should
 alert you to records which aren't present in the file (eg cells that have
@@ -463,7 +463,8 @@ The latest version is always available from
 <link href="http://svn.apache.org/repos/asf/poi/trunk/src/scratchpad/examples/src/org/apache/poi/hssf/eventusermodel/examples/">subversion</link>.
 </p>
 <p>
-<em>This code is currently in the scratchpad section, so you will either
+<em>In POI versions before 3.0.3, this code lived in the scratchpad section. 
+ If you're using one of these older versions of POI, you will either
  need to include the scratchpad jar on your classpath, or build from a</em>
  <link href="../subversion.html">subversion checkout</link>.
 </p>