Index: doc/C/func.defs =================================================================== RCS file: /cvs/gnome/gnumeric/doc/C/func.defs,v retrieving revision 1.30 diff -u -r1.30 func.defs --- doc/C/func.defs 2001/12/29 06:08:54 1.30 +++ doc/C/func.defs 2001/12/30 15:11:23 @@ -1337,9 +1337,9 @@ #DIV/0! 2 #VALUE! 3 #REF! 4 -#NAME! 5 +#NAME? 5 #NUM! 6 -#NA! 7 +#N/A 7 This function is Excel compatible. @EXAMPLES= ERROR.TYPE(NA()) equals 7. Index: doc/C/functions.sgml =================================================================== RCS file: /cvs/gnome/gnumeric/doc/C/functions.sgml,v retrieving revision 1.38 diff -u -r1.38 functions.sgml --- doc/C/functions.sgml 2001/12/29 06:08:54 1.38 +++ doc/C/functions.sgml 2001/12/30 15:11:28 @@ -2864,7 +2864,7 @@ Description ERROR.TYPE returns an error number corresponding to the given error value. The error numbers for error values are - #DIV/0! 2 #VALUE! 3 #REF! 4 #NAME! 5 #NUM! 6 #NA! 7 This function is Excel compatible. + #DIV/0! 2 #VALUE! 3 #REF! 4 #NAME? 5 #NUM! 6 #N/A 7 This function is Excel compatible. Examples @@ -9925,4 +9925,4 @@ - \ No newline at end of file + Index: src/GNOME_Gnumeric.xml =================================================================== RCS file: /cvs/gnome/gnumeric/src/GNOME_Gnumeric.xml,v retrieving revision 1.82 diff -u -r1.82 GNOME_Gnumeric.xml --- src/GNOME_Gnumeric.xml 2001/12/30 00:33:14 1.82 +++ src/GNOME_Gnumeric.xml 2001/12/30 15:11:29 @@ -748,8 +748,8 @@ = @y, returning 1 if it " - "is so, and 0 otherwise @y is optional, and defaults to 0." + "is so, and 0 otherwise. @y is optional, and defaults to 0." "\n" "If either argument is non-numeric returns a #VALUE! error.\n" "This function is Excel compatible." Index: src/functions/fn-information.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/functions/fn-information.c,v retrieving revision 1.77 diff -u -r1.77 fn-information.c --- src/functions/fn-information.c 2001/12/21 23:51:27 1.77 +++ src/functions/fn-information.c 2001/12/30 15:11:31 @@ -581,9 +581,9 @@ "#DIV/0! 2\n" "#VALUE! 3\n" "#REF! 4\n" - "#NAME! 5\n" + "#NAME? 5\n" "#NUM! 6\n" - "#NA! 7\n" + "#N/A 7\n" "This function is Excel compatible. " "\n" "@EXAMPLES=\n" Index: src/functions/fn-math.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/functions/fn-math.c,v retrieving revision 1.156 diff -u -r1.156 fn-math.c --- src/functions/fn-math.c 2001/12/21 23:51:28 1.156 +++ src/functions/fn-math.c 2001/12/30 15:11:33 @@ -180,7 +180,7 @@ "This function is Excel compatible. " "\n" "@EXAMPLES=\n" - "LCM(2,13) equlas to 26.\n" + "LCM(2,13) equals to 26.\n" "LCM(4,7,5) equals to 140.\n" "\n" "@SEEALSO=GCD") @@ -255,7 +255,7 @@ "@DESCRIPTION=" "ACOS function calculates the arc cosine of @x; that " "is the value whose cosine is @x. If @x falls outside the " - "range -1 to 1, ACOS fails and returns the NUM! error. " + "range -1 to 1, ACOS fails and returns the #NUM! error. " "The value it returns is in radians.\n" "This function is Excel compatible." "\n" @@ -287,7 +287,7 @@ "@DESCRIPTION=" "ACOSH function calculates the inverse hyperbolic " "cosine of @x; that is the value whose hyperbolic cosine is " - "@x. If @x is less than 1.0, ACOSH() returns the NUM! error.\n" + "@x. If @x is less than 1.0, ACOSH() returns the #NUM! error.\n" "This function is Excel compatible. " "\n" "@EXAMPLES=\n" @@ -318,7 +318,7 @@ "@DESCRIPTION=" "ASIN function calculates the arc sine of @x; that is " "the value whose sine is @x. If @x falls outside the range " - "-1 to 1, ASIN fails and returns the NUM! error.\n" + "-1 to 1, ASIN fails and returns the #NUM! error.\n" "This function is Excel compatible. " "\n" "@EXAMPLES=\n" @@ -399,7 +399,7 @@ "ATANH function calculates the inverse hyperbolic tangent " "of @x; that is the value whose hyperbolic tangent is @x. " "If the absolute value of @x is greater than 1.0, ATANH " - "returns NUM! error.\n" + "returns #NUM! error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -1817,7 +1817,7 @@ "@DESCRIPTION=" "FACTDOUBLE function returns the double factorial " - "of a @number. " + "of a @number, i.e., x!!." "\n" "If @number is not an integer, it is truncated. " "If @number is negative FACTDOUBLE returns #NUM! error.\n" @@ -1851,11 +1851,12 @@ static char *help_quotient = { N_("@FUNCTION=QUOTIENT\n" - "@SYNTAX=QUOTIENT(num,den)\n" + "@SYNTAX=QUOTIENT(numerator,denumerator)\n" "@DESCRIPTION=" "QUOTIENT function returns the integer portion " - "of a division. @num is the divided and @den is the divisor.\n" + "of a division. @numerator is the divided number and \n" + "@denumerator is the divisor.\n" "This function is Excel compatible. " "\n" "@EXAMPLES=\n" @@ -1949,7 +1950,7 @@ "@DESCRIPTION=" "RANDBETWEEN function returns a random integer number " - "between @bottom and @top.\n" + "between and including @bottom and @top.\n" "If @bottom or @top is non-integer, they are truncated. " "If @bottom > @top, RANDBETWEEN returns #NUM! error.\n" "This function is Excel compatible. " @@ -1982,7 +1983,7 @@ "@SYNTAX=ROUNDDOWN(number[,digits])\n" "@DESCRIPTION=" - "ROUNDDOWN function rounds a given @number down, towards zero. " + "ROUNDDOWN function rounds a given @number down. " "@number is the number you want rounded down and @digits is the " "number of digits to which you want to round that number. " "\n" @@ -2067,7 +2068,7 @@ "@SYNTAX=ROUNDUP(number[,digits])\n" "@DESCRIPTION=" - "ROUNDUP function rounds a given number up, away from zero. " + "ROUNDUP function rounds a given number up. " "@number is the number you want rounded up and @digits is the " "number of digits to which you want to round that number. " "\n" @@ -2436,7 +2437,7 @@ "Strings and empty cells are simply ignored." "\n" "If @array1 and @array2 have different number of data points, " - "SUMX2MY2 returns #N/A! error.\n" + "SUMX2MY2 returns #N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2549,7 +2550,7 @@ "Strings and empty cells are simply ignored." "\n" "If @array1 and @array2 have different number of data points, " - "SUMX2PY2 returns #N/A! error.\n" + "SUMX2PY2 returns #N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2661,7 +2662,7 @@ "Strings and empty cells are simply ignored." "\n" "If @array1 and @array2 have different number of data points, " - "SUMXMY2 returns #N/A! error.\n" + "SUMXMY2 returns #N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2849,7 +2850,7 @@ "@DESCRIPTION=" "SERIESSUM function returns the sum of a power series. @x is " - "the base of the power serie, @n is the initial power to raise @x, " + "the base of the power series, @n is the initial power to raise @x, " "@m is the increment to the power for each term in the series, and " "@coefficients is the coefficents by which each successive power " "of @x is multiplied.\n" Index: src/functions/fn-stat.c =================================================================== RCS file: /cvs/gnome/gnumeric/src/functions/fn-stat.c,v retrieving revision 1.145 diff -u -r1.145 fn-stat.c --- src/functions/fn-stat.c 2001/12/21 23:51:28 1.145 +++ src/functions/fn-stat.c 2001/12/30 15:11:35 @@ -714,7 +714,7 @@ "\n" "Strings and empty cells are simply ignored. " "If the data set does not contain any duplicates MODE returns " - "#N/A! error.\n" + "#N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2459,7 +2459,7 @@ static char *help_prob = { N_("@FUNCTION=PROB\n" - "@SYNTAX=PROB(range_x,prob_range,lower_limit[,upper_limit])\n" + "@SYNTAX=PROB(x_range,prob_range,lower_limit[,upper_limit])\n" "@DESCRIPTION=" "PROB function returns the probability that values in a range or " @@ -2472,7 +2472,7 @@ "If any value in @prob_range is <=0 or > 1, PROB returns #NUM! " "error. " "If @x_range and @prob_range contain a different number of data " - "entries, PROB returns #N/A! error.\n" + "entries, PROB returns #N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2560,7 +2560,7 @@ "y-value for each x in the regression." "\n" "If @known_y's and @known_x's are empty or have a different number " - "of arguments then STEYX returns #N/A! error.\n" + "of arguments then STEYX returns #N/A error.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" @@ -2838,7 +2838,7 @@ "@EXAMPLES=\n" "Let us assume that the cells A1, A2, ..., A5 contain numbers " "and strings 11.4, 17.3, \"missing\", 25.9, and 40.1. Then\n" - "MINA(A1:A5) equals 0.\n" + "MAXA(A1:A5) equals 40.1.\n" "\n" "@SEEALSO=MAX,MINA") }; @@ -2863,17 +2863,17 @@ "@DESCRIPTION=" "MINA returns the smallest value of the given arguments. Numbers, " - "text and logical values are included in the calculation, blank " - "cells are not. If the cell contains text or the argument evaluates " - "to FALSE, it is counted as value zero (0). If the argument " - "evaluates to TRUE, it is counted as one (1). Note that empty " - "cells are not counted.\n" + "text and logical values are included in the calculation too. " + "If the cell contains text or the argument evaluates to FALSE, " + "it is counted as value zero (0). If the argument evaluates to " + "TRUE, it is counted as one (1). Note that empty cells are not " + "counted.\n" "This function is Excel compatible." "\n" "@EXAMPLES=\n" "Let us assume that the cells A1, A2, ..., A5 contain numbers " "and strings 11.4, 17.3, \"missing\", 25.9, and 40.1. Then\n" - "MAXA(A1:A5) equals 40.1.\n" + "MINA(A1:A5) equals 0.\n" "\n" "@SEEALSO=MIN,MAXA") }; @@ -4313,7 +4313,7 @@ "future value is a y-value for a given x-value (@x). " "\n" "If @known_x or @known_y contains no data entries or different " - "number of data entries, FORECAST returns #N/A! error. " + "number of data entries, FORECAST returns #N/A error. " "If the variance of the @known_x is zero, FORECAST returns #DIV/0 " "error.\n" "This function is Excel compatible." @@ -4383,7 +4383,7 @@ "regression line intersects the y-axis. " "\n" "If @known_x or @known_y contains no data entries or different " - "number of data entries, INTERCEPT returns #N/A! error. " + "number of data entries, INTERCEPT returns #N/A error. " "If the variance of the @known_x is zero, INTERCEPT returns #DIV/0 " "error.\n" "This function is Excel compatible."