[GRASS-SVN] r42210 - grass/trunk/raster/r.mapcalc

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-05-10 06:50:30 -0400 (Mon, 10 May 2010)
New Revision: 42210

Modified:
   grass/trunk/raster/r.mapcalc/main.c
   grass/trunk/raster/r.mapcalc/r.mapcalc.html
Log:
Fix r42183


Modified: grass/trunk/raster/r.mapcalc/main.c
===================================================================
--- grass/trunk/raster/r.mapcalc/main.c	2010-05-10 10:15:31 UTC (rev 42209)
+++ grass/trunk/raster/r.mapcalc/main.c	2010-05-10 10:50:30 UTC (rev 42210)
@@ -130,7 +130,7 @@
     {
 	char **p = G_malloc(3 * sizeof(char *));
 	p[0] = argv[0];
-	p[1] = G_store("input=-");
+	p[1] = G_store("file=-");
 	p[2] = NULL;
 	argv = p;
 	argc = 2;

Modified: grass/trunk/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r.mapcalc.html	2010-05-10 10:15:31 UTC (rev 42209)
+++ grass/trunk/raster/r.mapcalc/r.mapcalc.html	2010-05-10 10:50:30 UTC (rev 42210)
@@ -41,7 +41,7 @@
 Sorry, <foo> is not a valid parameter
 </pre></div>
 
-If no options are given, it manufactures "input=-" (which reads from
+If no options are given, it manufactures "file=-" (which reads from
 stdin), so you can continue to use e.g.:
 
 <div class="code"><pre>
@@ -53,15 +53,15 @@
 foo = 1
 EOF
 </pre></div>
-But unless you need compatibility with previous versions, use input=
+But unless you need compatibility with previous versions, use file=
 explicitly, e.g.:
 
 <div class="code"><pre>
-r.mapcalc input=file
+r.mapcalc file=file
 </pre></div>
 or:
 <div class="code"><pre>
-r.mapcalc input=- &lt;&lt;EOF
+r.mapcalc file=- &lt;&lt;EOF
 foo = 1
 EOF
 </pre></div>