[GRASS-SVN] r54965 - in grass/trunk: db/db.execute db/db.select display/d.graph display/d.text raster/r.category raster/r.mapcalc raster/r.out.mat raster/r.out.pov raster/r.profile raster/r.series raster/r.series.interp raster/r.univar raster/r.watershed/front raster/r.what raster3d/r3.gwflow raster3d/r3.stats vector/v.clean vector/v.net vector/v.net.iso vector/v.segment
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 7 01:56:18 PST 2013
Author: annakrat
Date: 2013-02-07 01:56:17 -0800 (Thu, 07 Feb 2013)
New Revision: 54965
Modified:
grass/trunk/db/db.execute/db.execute.html
grass/trunk/db/db.select/db.select.html
grass/trunk/display/d.graph/d.graph.html
grass/trunk/display/d.text/d.text.html
grass/trunk/raster/r.category/r.category.html
grass/trunk/raster/r.mapcalc/r.mapcalc.html
grass/trunk/raster/r.mapcalc/r3.mapcalc.html
grass/trunk/raster/r.out.mat/r.out.mat.html
grass/trunk/raster/r.out.pov/r.out.pov.html
grass/trunk/raster/r.profile/r.profile.html
grass/trunk/raster/r.series.interp/r.series.interp.html
grass/trunk/raster/r.series/r.series.html
grass/trunk/raster/r.univar/r.univar.html
grass/trunk/raster/r.watershed/front/r.watershed.html
grass/trunk/raster/r.what/r.what.html
grass/trunk/raster3d/r3.gwflow/r3.gwflow.html
grass/trunk/raster3d/r3.stats/r3.stats.html
grass/trunk/vector/v.clean/v.clean.html
grass/trunk/vector/v.net.iso/v.net.iso.html
grass/trunk/vector/v.net/v.net.html
grass/trunk/vector/v.segment/v.segment.html
Log:
html: replace less than by < to fix displaying manual in gui
Modified: grass/trunk/db/db.execute/db.execute.html
===================================================================
--- grass/trunk/db/db.execute/db.execute.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/db/db.execute/db.execute.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -49,7 +49,7 @@
Delete selected rows from attribute table:
<div class="code"><pre>
-db.execute sql="DELETE FROM gsod_stationlist WHERE latitude < -91"
+db.execute sql="DELETE FROM gsod_stationlist WHERE latitude < -91"
</pre></div>
Add new column to attribute table:
Modified: grass/trunk/db/db.select/db.select.html
===================================================================
--- grass/trunk/db/db.select/db.select.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/db/db.select/db.select.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -60,7 +60,7 @@
<div class="code"><pre>
cat file.sql
SELECT * FROM busstopsall WHERE cat = 1
-SELECT cat FROM busstopsall WHERE cat > 4 AND cat < 8
+SELECT cat FROM busstopsall WHERE cat > 4 AND cat < 8
db.select input=file.sql
</pre></div>
Modified: grass/trunk/display/d.graph/d.graph.html
===================================================================
--- grass/trunk/display/d.graph/d.graph.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/display/d.graph/d.graph.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -183,7 +183,7 @@
<div class="code"><pre>
d.frame -s full_screen
-d.graph << EOF
+d.graph << EOF
color 80:80:120
polygon
0 49.75
Modified: grass/trunk/display/d.text/d.text.html
===================================================================
--- grass/trunk/display/d.text/d.text.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/display/d.text/d.text.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -71,7 +71,7 @@
<p>
<pre>
-<b>d.text</b> << EOF
+<b>d.text</b> << EOF
.C yellow
.G grey
.S 4
Modified: grass/trunk/raster/r.category/r.category.html
===================================================================
--- grass/trunk/raster/r.category/r.category.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.category/r.category.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -141,7 +141,7 @@
<dl>
<dt>Example defining category labels:
<dd><div class="code"><pre>
-r.category diseasemap rules=- << EOF
+r.category diseasemap rules=- << EOF
1:potential absence
2:potential presence
EOF
Modified: grass/trunk/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r.mapcalc.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.mapcalc/r.mapcalc.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -432,7 +432,7 @@
if(x,a,b,c) = NULL if x is NULL
if(x,a,b,c) = a if x > 0
if(x,a,b,c) = b if x = 0
-if(x,a,b,c) = c if x < 0
+if(x,a,b,c) = c if x < 0
</pre></div>
More generally, all operators and most functions return NULL if *any*
of their arguments are NULL.
Modified: grass/trunk/raster/r.mapcalc/r3.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -339,7 +339,7 @@
if(x,a,b,c) = NULL if x is NULL
if(x,a,b,c) = a if x > 0
if(x,a,b,c) = b if x = 0
-if(x,a,b,c) = c if x < 0
+if(x,a,b,c) = c if x < 0
</pre></div>
More generally, all operators and most functions return NULL if *any*
of their arguments are NULL.
Modified: grass/trunk/raster/r.out.mat/r.out.mat.html
===================================================================
--- grass/trunk/raster/r.out.mat/r.out.mat.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.out.mat/r.out.mat.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -34,7 +34,7 @@
As there is no IEEE value for <tt>NaN</tt> for integer maps, GRASS's null
value is used to represent it within these maps. You'll have to do something
like this to clean them once the map is loaded into Matlab:
-<pre> map_data(find(map_data < -1e9)) = NaN;</pre>
+<pre> map_data(find(map_data < -1e9)) = NaN;</pre>
Null values in maps containing either floating point or double-precision
floating point data should translate into <tt>NaN</tt> values as expected.
Modified: grass/trunk/raster/r.out.pov/r.out.pov.html
===================================================================
--- grass/trunk/raster/r.out.pov/r.out.pov.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.out.pov/r.out.pov.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -26,9 +26,9 @@
light_source { <40000, Scale*3000, 5000> color MainLight }
camera {
- location < 23000, Scale*2000, 0>
+ location < 23000, Scale*2000, 0>
angle 90
- look_at < 23000, Scale*1400, 5000>
+ look_at < 23000, Scale*1400, 5000>
}
height_field {
@@ -52,7 +52,7 @@
specular 0.5
roughness 0.05
}
- scale < 14500, Scale*6553.6, 13000 >
+ scale < 14500, Scale*6553.6, 13000 >
translate <18300, 0, 1100>
}
</pre></div>
Modified: grass/trunk/raster/r.profile/r.profile.html
===================================================================
--- grass/trunk/raster/r.profile/r.profile.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.profile/r.profile.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -94,7 +94,7 @@
<b>Example 4</b><br>
Pipe coordinates into r.profile
<div class="code"><pre>
-r.profile elevation.dem res=1000 << EOF
+r.profile elevation.dem res=1000 << EOF
591243,4926344
592509,4922156
594100,4920793
Modified: grass/trunk/raster/r.series/r.series.html
===================================================================
--- grass/trunk/raster/r.series/r.series.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.series/r.series.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -105,7 +105,7 @@
<p>Example to use the file option of r.series:
<div class="code"><pre>
-cat > input.txt << EOF
+cat > input.txt << EOF
map1
map2
map3
@@ -117,7 +117,7 @@
<p>Example to use the file option of r.series including weights. The weight 0.75
should be assigned to map2. As the other maps do not have weights we can leave it out:
<div class="code"><pre>
-cat > input.txt << EOF
+cat > input.txt << EOF
map1
map2|0.75
map3
Modified: grass/trunk/raster/r.series.interp/r.series.interp.html
===================================================================
--- grass/trunk/raster/r.series.interp/r.series.interp.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.series.interp/r.series.interp.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -34,7 +34,7 @@
First prepare the input file:
<br>
<div class="code"><pre>
-cat > outfile.txt << EOF
+cat > outfile.txt << EOF
prec_2|0.25
prec_3|0.5
prec_4|0.75
Modified: grass/trunk/raster/r.univar/r.univar.html
===================================================================
--- grass/trunk/raster/r.univar/r.univar.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.univar/r.univar.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -74,7 +74,7 @@
#### convert text file table to a database table
# not safe for commas in the label
-tr '|' ',' < fields_stats.txt > fields_stats.csv
+tr '|' ',' < fields_stats.txt > fields_stats.csv
echo '"Integer","String","Real","Real","Real"' > fields_stats.csvt
# import table
Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -310,7 +310,7 @@
Problem areas, i.e. those parts of a basin with a likely underestimate of
flow accumulation, can be easily identified with e.g.
<div class="code"><pre>
- r.mapcalc "problems = if(flow_acc < 0, basin, null())"
+ r.mapcalc "problems = if(flow_acc < 0, basin, null())"
</pre></div>
If the region of interest contains such problem areas, and this is not
desired, the computational region must be expanded until the catchment
@@ -374,7 +374,7 @@
stddev_x_2=`echo $stddev | awk '{print $1 * 2}'`
stddev_div_2=`echo $stddev | awk '{print $1 / 2}'`
- r.colors $MAP col=rules << EOF
+ r.colors $MAP col=rules << EOF
0% red
-$stddev_x_2 red
-$stddev yellow
Modified: grass/trunk/raster/r.what/r.what.html
===================================================================
--- grass/trunk/raster/r.what/r.what.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster/r.what/r.what.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -58,7 +58,7 @@
coordinates and labels given in the example above:
<div class="code"><pre>
-r.what map=soils,aspect < input_coord.txt
+r.what map=soils,aspect < input_coord.txt
635342.21|7654321.09|site 1|45|21
653324.88|7563412.42|site 2|44|20
@@ -70,7 +70,7 @@
(input data appears between the "<tt>EOF</tt>" markers):
<div class="code"><pre>
-r.what map=soils,aspect << EOF
+r.what map=soils,aspect << EOF
635342.21 7654321.09 site 1
653324.88 7563412.42 site 2
EOF
@@ -102,7 +102,7 @@
associated with the raster cell(s), as well as values (categorical maps only).
<div class="code"><pre>
-r.what -f map=soils,aspect << EOF
+r.what -f map=soils,aspect << EOF
635342.21 7654321.09 site 1
653324.88 7563412.42 site 2
EOF
Modified: grass/trunk/raster3d/r3.gwflow/r3.gwflow.html
===================================================================
--- grass/trunk/raster3d/r3.gwflow/r3.gwflow.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster3d/r3.gwflow/r3.gwflow.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -108,9 +108,9 @@
r3.mapcalc expression="well = if(row() == 20 && col() == 20 && depth() == 3, -0.25, 0)"
r3.mapcalc expression="well = if(row() == 50 && col() == 50 && depth() == 3, -0.25, well)"
r3.mapcalc expression="hydcond = 0.0025"
-r3.mapcalc expression="hydcond = if(depth() < 30 && depth() > 23 && col() < 60, 0.000025, hydcond)"
-r3.mapcalc expression="hydcond = if(depth() < 20 && depth() > 13 && col() > 7, 0.000025, hydcond)"
-r3.mapcalc expression="hydcond = if(depth() < 10 && depth() > 7 && col() < 60, 0.000025, hydcond)"
+r3.mapcalc expression="hydcond = if(depth() < 30 && depth() > 23 && col() < 60, 0.000025, hydcond)"
+r3.mapcalc expression="hydcond = if(depth() < 20 && depth() > 13 && col() > 7, 0.000025, hydcond)"
+r3.mapcalc expression="hydcond = if(depth() < 10 && depth() > 7 && col() < 60, 0.000025, hydcond)"
r3.mapcalc expression="syield = 0.0001"
r3.gwflow solver=cg phead=phead status=status hc_x=hydcond hc_y=hydcond \
Modified: grass/trunk/raster3d/r3.stats/r3.stats.html
===================================================================
--- grass/trunk/raster3d/r3.stats/r3.stats.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/raster3d/r3.stats/r3.stats.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -60,7 +60,7 @@
r3.stats input=volmap nsteps=10
#the result should look like this
- num | minimum <= value | value < maximum | volume | perc | cell count
+ num | minimum <= value | value < maximum | volume | perc | cell count
1 1.000000000 1.900000000 60000000.000 10.00000 60
2 1.900000000 2.800000000 60000000.000 10.00000 60
3 2.800000000 3.700000000 60000000.000 10.00000 60
Modified: grass/trunk/vector/v.clean/v.clean.html
===================================================================
--- grass/trunk/vector/v.clean/v.clean.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/vector/v.clean/v.clean.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -237,7 +237,7 @@
creating new node if needed. Example:
<div class="code"><pre>
-v.in.ascii -n out=crossed_lines format=standard << EOF
+v.in.ascii -n out=crossed_lines format=standard << EOF
L 2
0 5
10 5
Modified: grass/trunk/vector/v.net/v.net.html
===================================================================
--- grass/trunk/vector/v.net/v.net.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/vector/v.net/v.net.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -134,7 +134,7 @@
</pre></div>
<div class="code"><pre>
-v.net points=geodetic_swwake_pts output=geodetic_swwake_pts_net operation=arcs file=- << EOF
+v.net points=geodetic_swwake_pts output=geodetic_swwake_pts_net operation=arcs file=- << EOF
> 1 28000 28005
> 2 27945 27958
> 3 27886 27897
Modified: grass/trunk/vector/v.net.iso/v.net.iso.html
===================================================================
--- grass/trunk/vector/v.net.iso/v.net.iso.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/vector/v.net.iso/v.net.iso.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -60,9 +60,9 @@
v.category myroads_net_iso option=report
# ... reports 4 categories:
#cat | distance from point in meters
-#1 0 - < 1000
-#2 1000 - < 2000
-#3 2000 - < 5000
+#1 0 - < 1000
+#2 1000 - < 2000
+#3 2000 - < 5000
#4 >= 5000
</pre></div>
Modified: grass/trunk/vector/v.segment/v.segment.html
===================================================================
--- grass/trunk/vector/v.segment/v.segment.html 2013-02-07 09:32:25 UTC (rev 54964)
+++ grass/trunk/vector/v.segment/v.segment.html 2013-02-07 09:56:17 UTC (rev 54965)
@@ -70,7 +70,7 @@
# create parallel 1km long line segments along first 8km of track,
# offset 500m to the left of the tracks.
-v.segment myrailroads out=myrailroads_segl_side << EOF
+v.segment myrailroads out=myrailroads_segl_side << EOF
L 1 1 1000 2000 -500
L 2 1 3000 4000 -500
L 3 1 5000 6000 -500
@@ -81,7 +81,7 @@
d.vect -c myrailroads_segl_side width=2
# A series of points, spaced every 2km along the tracks
-v.segment myrailroads out=myrailroads_pt2km << EOF
+v.segment myrailroads out=myrailroads_pt2km << EOF
P 1 1 1000
P 2 1 3000
P 3 1 5000
@@ -90,7 +90,7 @@
d.vect myrailroads_pt2km icon=basic/circle color=blue fcolor=blue size=5
# A series of points, spaced every 2km along the tracks, offset 500m to the right
-v.segment myrailroads out=myrailroads_pt2kmO500m << EOF
+v.segment myrailroads out=myrailroads_pt2kmO500m << EOF
P 1 1 1000 500
P 2 1 3000 500
P 3 1 5000 500
More information about the grass-commit
mailing list