[gnumeric] Fix INTERPOLATION documentation. [#627461]

[Andreas J. Guelzow <guelzow src gnome org>]

commit b11eda1218cf709fcac2544dcc655c7bd269b8e7
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Aug 20 14:17:26 2010 -0600

    Fix INTERPOLATION documentation. [#627461]
    
    2010-08-20 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* functions.c (help_interpolation): clarify the description

 NEWS                                 |    1 +
 plugins/fn-tsa/ChangeLog             |    4 ++++
 plugins/fn-tsa/functions.c           |   11 +++++++----
 plugins/openoffice/openoffice-read.c |    1 +
 4 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4a21c0b..6beb52c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Andreas:
 	* Handle grids, dashes etc. in the ODF import/export.
 	* Improve handling of corrupted ODF files.
 	* Fix percentage style import from ODF. [#627517]
+	* Fix INTERPOLATION documentation. [#627461]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.9
diff --git a/plugins/fn-tsa/ChangeLog b/plugins/fn-tsa/ChangeLog
index 9a2b011..2c17c7e 100644
--- a/plugins/fn-tsa/ChangeLog
+++ b/plugins/fn-tsa/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-20 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* functions.c (help_interpolation): clarify the description
+
 2010-08-16  Morten Welinder <terra gnome org>
 
 	* Release 1.10.9
diff --git a/plugins/fn-tsa/functions.c b/plugins/fn-tsa/functions.c
index 8876f2c..3883d2e 100644
--- a/plugins/fn-tsa/functions.c
+++ b/plugins/fn-tsa/functions.c
@@ -67,7 +67,7 @@ enum {
 };
 
 enum {
-	INTERPOLATION_LINEAR,
+	INTERPOLATION_LINEAR = 0,
 	INTERPOLATION_LINEAR_AVG,
 	INTERPOLATION_STAIRCASE,
 	INTERPOLATION_STAIRCASE_AVG,
@@ -369,13 +369,16 @@ spline_averaging (const gnm_float *absc, const gnm_float *ord, int nb_knots,
 
 static GnmFuncHelp const help_interpolation[] = {
 	{ GNM_FUNC_HELP_NAME, F_("INTERPOLATION:interpolated values corresponding to the given abscissa targets") },
-	{ GNM_FUNC_HELP_ARG, F_("abscissae:abscissae of the given data points") },
+	{ GNM_FUNC_HELP_ARG, F_("abscissae:ordered abscissae of the given data points") },
 	{ GNM_FUNC_HELP_ARG, F_("ordinates:ordinates of the given data points") },
 	{ GNM_FUNC_HELP_ARG, F_("targets:abscissae of the interpolated data") },
-	{ GNM_FUNC_HELP_ARG, F_("interpolation:method of interpolation, defaults to none") },
-	{ GNM_FUNC_HELP_DESCRIPTION, F_("If an interpolation method is used, the number of returned values is one less than the number of targets and the targets values must be given in increasing order.") },
+	{ GNM_FUNC_HELP_ARG, F_("interpolation:method of interpolation, defaults to 0 (\'linear\')") },
 	{ GNM_FUNC_HELP_DESCRIPTION, F_("The output consists always of one column of numbers.") },
 	INTERPOLATIONMETHODS,
+	{ GNM_FUNC_HELP_NOTE, F_("The @{abscissae} must be given in increasing order.") },
+	{ GNM_FUNC_HELP_NOTE, F_("If an interpolation method other than \'linear\' (0) is used, the number "
+				 "of returned values is one less than the number of targets and the targets "
+				 "values must be given in increasing order.") },
 	{ GNM_FUNC_HELP_NOTE, F_("Strings and empty cells in @{abscissae} and @{ordinates} are ignored.") },
 	{ GNM_FUNC_HELP_NOTE, F_("If several target data are provided they must be in the same column in consecutive cells.") },
 	{ GNM_FUNC_HELP_SEEALSO, "PERIODOGRAM" },
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index da3f38f..bb5ca66 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2002-2007 Jody Goldberg (jody gnome org)
  * Copyright (C) 2006 Luciano Miguel Wolf (luciano wolf indt org br)
  * Copyright (C) 2007 Morten Welinder (terra gnome org)
+ * Copyright (C) 2010 Andreas J. Guelzow (aguelzow pyrshep ca)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public