Index: modules/spatial/build.xml
===================================================================
--- modules/spatial/build.xml	(revision 0)
+++ modules/spatial/build.xml	(revision 0)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="spatial" default="default">
+
+  <description>
+  	Spatial Search Support for Solr and Lucene
+  </description>
+
+  <property name="build.dir" location="build" />
+  <property name="dist.dir" location="dist" />
+
+  <import file="../../lucene/contrib/contrib-build.xml"/>
+
+  <path id="classpath">
+    <path refid="base.classpath"/>
+  </path>
+
+  <path id="test.classpath">
+    <path refid="classpath"/>
+    <path refid="junit-path"/>
+    <pathelement location="${build.dir}/classes/java"/>
+  </path>
+
+	<target name="default" depends="compile"/>
+	<target name="build-artifacts-and-tests" depends="default,compile-test" />
+</project>
Index: modules/build.xml
===================================================================
--- modules/build.xml	(revision 1040929)
+++ modules/build.xml	(working copy)
@@ -22,6 +22,7 @@
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -30,6 +31,7 @@
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -38,6 +40,7 @@
     <sequential>
       <subant target="compile-test" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -46,6 +49,7 @@
     <sequential>
       <subant target="javadocs" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -54,6 +58,7 @@
     <sequential>
       <subant target="dist-maven" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
@@ -62,6 +67,7 @@
     <sequential>
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
+		<fileset dir="spatial" includes="build.xml" />
       </subant>
     </sequential>
   </target>
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/IProjector.java	(working copy)
@@ -21,7 +21,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public interface IProjector {
   public String coordsAsString(double latitude, double longitude);
   public double[] coords(double latitude, double longitude);
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/SinusoidalProjector.java	(working copy)
@@ -28,7 +28,7 @@
  * flux and might change in incompatible ways in the next
  * release.</font>
  *
- * @deprecated (3.1) Until we can put in place proper tests and a proper fix. 
+ * @deprecated (3.1) Will be removed in a future version
  */
 @Deprecated
 public class SinusoidalProjector implements IProjector {
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/projections/CartesianTierPlotter.java	(working copy)
@@ -21,7 +21,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class CartesianTierPlotter {
   public static final String DEFALT_FIELD_PREFIX = "_tier_";
   
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianShapeFilter.java	(working copy)
@@ -33,7 +33,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class CartesianShapeFilter extends Filter {
  
   private final Shape shape;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFilter.java	(working copy)
@@ -29,7 +29,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public abstract class DistanceFilter extends Filter {
 
   final protected Filter startingFilter;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/InvalidGeoException.java	(working copy)
@@ -21,7 +21,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class InvalidGeoException extends Exception {
 
   /**
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/Shape.java	(working copy)
@@ -25,7 +25,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class Shape implements Serializable{
 
   private List<Double> area = new ArrayList<Double>();
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/LatLongDistanceFilter.java	(working copy)
@@ -30,7 +30,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class LatLongDistanceFilter extends DistanceFilter {
 
   /**
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceFieldComparatorSource.java	(working copy)
@@ -28,7 +28,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class DistanceFieldComparatorSource extends FieldComparatorSource {
 
 	private static final long serialVersionUID = 1L;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java	(working copy)
@@ -28,7 +28,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class DistanceQueryBuilder {
 
   private static final long serialVersionUID = 1L;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceHandler.java	(working copy)
@@ -30,7 +30,9 @@
  * flux and might change in incompatible ways in the next
  * release.</font>
  *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class DistanceHandler {
 
   public enum Precision {EXACT, TWOFEET, TWENTYFEET, TWOHUNDREDFEET}
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/CartesianPolyFilterBuilder.java	(working copy)
@@ -33,7 +33,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class CartesianPolyFilterBuilder {
 
   // Finer granularity than 1 mile isn't accurate with
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Point2D.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class Point2D {
   private double x;
   private double y;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Geometry2D.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public interface Geometry2D {
   /**
    * Translate according to the vector
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Rectangle.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class Rectangle implements Geometry2D {
   private Point2D ptMin, ptMax;
   
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LLRect.java	(working copy)
@@ -28,7 +28,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class LLRect {
   private LatLng ll, ur;
   
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Vector2D.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class Vector2D {
   private double x;
   private double y;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/LineSegment.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class LineSegment {
   public final Point2D A = new Point2D();
   public final Point2D B = new Point2D();
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/IntersectCase.java	(working copy)
@@ -22,7 +22,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public enum IntersectCase {
   WITHIN,
   CONTAINS,
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/shape/Ellipse.java	(working copy)
@@ -24,7 +24,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class Ellipse implements Geometry2D {
   private Point2D center;
 
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FixedLatLng.java	(working copy)
@@ -21,7 +21,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class FixedLatLng extends LatLng {
   public static final double SCALE_FACTOR=1000000;
   public static final int SCALE_FACTOR_INT=1000000;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/LatLng.java	(working copy)
@@ -27,7 +27,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public abstract class LatLng {
 
   public abstract boolean isNormalized();
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/CartesianPoint.java	(working copy)
@@ -25,7 +25,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class CartesianPoint {
   private int x;
   private int y;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/FloatLatLng.java	(working copy)
@@ -21,7 +21,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class FloatLatLng extends LatLng {
   private double lat;
   private double lng;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geometry/DistanceUnits.java	(working copy)
@@ -20,7 +20,10 @@
 /**
  * Enum representing difference distance units, currently only kilometers and
  * miles
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public enum DistanceUnits {
 
   MILES("miles", 3959, 24902),
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/DistanceUtils.java	(working copy)
@@ -28,8 +28,10 @@
  * <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
-
+@Deprecated
 public class DistanceUtils {
 
   public static final double DEGREES_TO_RADIANS = Math.PI / 180.0;
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashDistanceFilter.java	(working copy)
@@ -33,8 +33,10 @@
 /** <p><font color="red"><b>NOTE:</b> This API is still in
  * flux and might change in incompatible ways in the next
  * release.</font>
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
-
+@Deprecated
 public class GeoHashDistanceFilter extends DistanceFilter {
 
   /**
Index: lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java
===================================================================
--- lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java	(revision 1040929)
+++ lucene/contrib/spatial/src/java/org/apache/lucene/spatial/geohash/GeoHashUtils.java	(working copy)
@@ -23,7 +23,10 @@
 /**
  * Utilities for encoding and decoding geohashes. Based on
  * http://en.wikipedia.org/wiki/Geohash.
+ *
+ * @deprecated (3.1) Will be removed in a future version
  */
+@Deprecated
 public class GeoHashUtils {
 
   private static final char[] BASE_32 = {'0', '1', '2', '3', '4', '5', '6',
Index: lucene/contrib/spatial/src/java/overview.html
===================================================================
--- lucene/contrib/spatial/src/java/overview.html	(revision 1040929)
+++ lucene/contrib/spatial/src/java/overview.html	(working copy)
@@ -30,17 +30,11 @@
 <p>See <a href="http://www.nsshutdown.com/projects/lucene/whitepaper/locallucene_v2.html">here</a>
 for details on the technical approach.</p>
 
-<p>Unfortunately, this package is still very new, and has little to no
-documentation.  It's best to ask for pointers on
-java-user@lucene.apache.org, and look at the unit tests included in
-the source distribution.</p>
-
-<p>There are also known issues, eg at
+<p>The package suffers from known issues including
 least <a href="https://issues.apache.org/jira/browse/LUCENE-1815">LUCENE-1781</a>
 and <a href="https://issues.apache.org/jira/browse/LUCENE-1815">LUCENE-1815</a>.</p>
 
-<p><font color="red"><b>NOTE:</b> This package is still in flux and
-might change in incompatible ways in the next release.</font>
+<p>Because of these issues, the package is deprecated (3.1) and will be removed in a future version</p>
 
   </body>
 </html>