Jelajahi Sumber

version update: trunk is grass71

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59692 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 11 tahun lalu
induk
melakukan
736151b08d

+ 1 - 1
gui/wxpython/docs/wxGUI.html

@@ -47,7 +47,7 @@ The user can also start GRASS from the shell command line with the wxGUI
 specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
 specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 -gui
+grass71 -gui
 </pre></div>
 </pre></div>
 
 
 <p>
 <p>

+ 1 - 1
lib/gis/parser_wps.c

@@ -578,7 +578,7 @@ static void wps_print_process_description_begin(int store, int status, const cha
     if(abstract)
     if(abstract)
     {
     {
         fprintf(stdout,"\t\t<ows:Abstract>");
         fprintf(stdout,"\t\t<ows:Abstract>");
-        fprintf(stdout, "http://grass.osgeo.org/grass70/manuals/html70_user/%s.html", identifier);
+        fprintf(stdout, "http://grass.osgeo.org/grass71/manuals/%s.html", identifier);
         fprintf(stdout, "</ows:Abstract>\n");
         fprintf(stdout, "</ows:Abstract>\n");
     }
     }
 
 

+ 2 - 2
lib/gpde/gpdelib.dox

@@ -223,7 +223,7 @@ void #N_write_array_2d_to_rast (N_array_2d * array, char *name);
 
 
 <P>
 <P>
 <b>Example implementation:</b><br>
 <b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.osgeo.org/grass70/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass71/manuals/r.gwflow.html">r.gwflow</a>
 implements numerical calculation program for transient,
 implements numerical calculation program for transient,
 confined and unconfined groundwater flow in two dimensions.
 confined and unconfined groundwater flow in two dimensions.
 
 
@@ -294,7 +294,7 @@ void #N_write_array_3d_to_rast3d (N_array_3d * array, char *name, int mask);
 
 
 <P>
 <P>
 <b>Example implementation:</b><br>
 <b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.itc.it/grass70/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.itc.it/grass71/manuals/r3.gwflow.html">r3.gwflow</a>
 implements numerical calculation program for transient, confined
 implements numerical calculation program for transient, confined
 groundwater flow in three dimensions.
 groundwater flow in three dimensions.
 
 

+ 11 - 11
lib/init/README

@@ -1,10 +1,10 @@
 o GRASS text mode startup
 o GRASS text mode startup
 
 
-  "grass70" starts up d.m by default (if not first time user).
-  "grass70 -text" will start up in text mode.
-  "grass70 -wxpython" or "grass70 -gui" will start up in wxpython mode.
+  "grass71" starts up d.m by default (if not first time user).
+  "grass71 -text" will start up in text mode.
+  "grass71 -wxpython" or "grass71 -gui" will start up in wxpython mode.
 
 
-  You can use alias "grass70" to "grass70 -text" to use text mode by default.
+  You can use alias "grass71" to "grass71 -text" to use text mode by default.
   Or set env var GRASS_GUI=text.
   Or set env var GRASS_GUI=text.
 
 
 
 
@@ -25,18 +25,18 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
 
 
-	grass70 -	# non-interactive startup using LOCATION location
+	grass71 -	# non-interactive startup using LOCATION location
 
 
   ex2)
   ex2)
 	export GISDBASE=/usr/home/grass/usr/data1
 	export GISDBASE=/usr/home/grass/usr/data1
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
   	
   	
-	grass70 -	# non-interactive startup using
+	grass71 -	# non-interactive startup using
 			# GISDBASE/LOCATION_NAME/MAPSET location
 			# GISDBASE/LOCATION_NAME/MAPSET location
 
 
 
 
-  Also, the first argument of grass70 can override these env vars.
+  Also, the first argument of grass71 can override these env vars.
 
 
   ex3)
   ex3)
   	export LOCATION=/usr/home/grass/usr/data1/loc1/map1
   	export LOCATION=/usr/home/grass/usr/data1/loc1/map1
@@ -44,7 +44,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
 
 
-	grass70 /usr/home/grass/usr/data2/loc2-1/map1-1
+	grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
 			# non-interactive startup using
 			# non-interactive startup using
 			# /usr/home/grass/usr/data2/loc2-1/map1-1 location
 			# /usr/home/grass/usr/data2/loc2-1/map1-1 location
 
 
@@ -53,7 +53,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
   	
   	
-	grass70 /usr/home/grass/usr/data2/loc2-1/map1-1
+	grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
 			# non-interactive startup using
 			# non-interactive startup using
 			# /usr/home/grass/usr/data2/loc2-1/map1-1 location
 			# /usr/home/grass/usr/data2/loc2-1/map1-1 location
 
 
@@ -63,7 +63,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
 
 
-	grass70 map1-1	# non-interactive startup using
+	grass71 map1-1	# non-interactive startup using
 			# GISDBASE/LOCATION_NAME/map1-1 location
 			# GISDBASE/LOCATION_NAME/map1-1 location
 
 
   ex6)
   ex6)
@@ -72,7 +72,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 	export MAPSET=map1
 
 
-	grass70 loc2-1/map1-1
+	grass71 loc2-1/map1-1
 			# non-interactive startup using
 			# non-interactive startup using
 			# GISDBASE/loc2-1/map1-1 location
 			# GISDBASE/loc2-1/map1-1 location
 
 

+ 2 - 2
lib/init/grass.py

@@ -1357,10 +1357,10 @@ if os.getenv('HOSTTYPE') == 'arm':
 if not os.access(gisrc, os.F_OK):
 if not os.access(gisrc, os.F_OK):
     if grass_gui == 'text' and len(args) == 0:
     if grass_gui == 'text' and len(args) == 0:
         fatal(_("Unable to start GRASS. You can:\n"
         fatal(_("Unable to start GRASS. You can:\n"
-                " - Launch GRASS with '-gui' switch (`grass70 -gui`)\n"
+                " - Launch GRASS with '-gui' switch (`grass71 -gui`)\n"
                 " - Create manually GISRC file (%s)\n"
                 " - Create manually GISRC file (%s)\n"
                 " - Launch GRASS with path to "
                 " - Launch GRASS with path to "
-                "the location/mapset as an argument (`grass70 /path/to/location/mapset`)") % gisrcrc)
+                "the location/mapset as an argument (`grass71 /path/to/location/mapset`)") % gisrcrc)
     grass_intro()
     grass_intro()
 else:
 else:
     clean_temp()
     clean_temp()

+ 1 - 1
lib/init/grass.sh

@@ -28,4 +28,4 @@ if [ -z "$GRASS_PYTHON" ] ; then
 fi
 fi
 export GRASS_PYTHON
 export GRASS_PYTHON
 
 
-exec "$GRASS_PYTHON" "@BINDIR@/grass70.py" "$@" &
+exec "$GRASS_PYTHON" "@BINDIR@/grass71.py" "$@" &

+ 21 - 21
lib/init/grass7.html

@@ -2,7 +2,7 @@
 
 
 <h2>SYNOPSIS</h2>
 <h2>SYNOPSIS</h2>
 
 
-<b>grass70</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
+<b>grass71</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
     [<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code</b>]
     [<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code</b>]
     [<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
     [<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
     [[[<b>&lt;GISDBASE&gt;/</b>]<b>&lt;LOCATION_NAME&gt;/</b>]
     [[[<b>&lt;GISDBASE&gt;/</b>]<b>&lt;LOCATION_NAME&gt;/</b>]
@@ -72,13 +72,13 @@ user interface, as well as the desired mapset to work on.
 
 
 <p>The startup program will remember both the desired user interface
 <p>The startup program will remember both the desired user interface
 and mapset. Thus, the next time the user runs GRASS, typing
 and mapset. Thus, the next time the user runs GRASS, typing
-<em>grass70</em> (without any options) will start GRASS with the
+<em>grass71</em> (without any options) will start GRASS with the
 previous settings for the user interface and mapset selected.
 previous settings for the user interface and mapset selected.
 
 
 <p>If you specify a graphical user interface (<b>-gui</b>)
 <p>If you specify a graphical user interface (<b>-gui</b>)
-the <em>grass70</em> program will try to verify that the system you
+the <em>grass71</em> program will try to verify that the system you
 specified exists and that you can access it successfully. If any of
 specified exists and that you can access it successfully. If any of
-these checks fail then <em>grass70</em> will automatically switch back
+these checks fail then <em>grass71</em> will automatically switch back
 to the text user interface mode.
 to the text user interface mode.
 
 
 <h2>ENVIRONMENT VARIABLES</h2>
 <h2>ENVIRONMENT VARIABLES</h2>
@@ -103,14 +103,14 @@ propogate).
 
 
 <h3>User Interface Environment Variable</h3>
 <h3>User Interface Environment Variable</h3>
 
 
-<p>The <em>grass70</em> program will check for the existence of an
+<p>The <em>grass71</em> program will check for the existence of an
 environment variable called GRASS_GUI which indicates the type of user
 environment variable called GRASS_GUI which indicates the type of user
 interface for GRASS to use. If this variable is not set
 interface for GRASS to use. If this variable is not set
-when <em>grass70</em> is run, then it will be created and then saved
+when <em>grass71</em> is run, then it will be created and then saved
 in the <tt>$HOME/.grass7/rc</tt> file for the next time GRASS is
 in the <tt>$HOME/.grass7/rc</tt> file for the next time GRASS is
 run. It can be set to <tt>text</tt>, <tt>gtext</tt> or <tt>gui</tt>.
 run. It can be set to <tt>text</tt>, <tt>gtext</tt> or <tt>gui</tt>.
 
 
-<p>There is an order of precedence in the way <em>grass70</em>
+<p>There is an order of precedence in the way <em>grass71</em>
 determines the user interface to use. The following is the hierarchy
 determines the user interface to use. The following is the hierarchy
 from highest precedence to lowest.
 from highest precedence to lowest.
 <ol>
 <ol>
@@ -209,39 +209,39 @@ script. The script file must have its executable bit set.
 <p>The following are some examples of how you could start GRASS
 <p>The following are some examples of how you could start GRASS
 
 
 <dl>
 <dl>
-<dt><b>grass70</b>
+<dt><b>grass71</b>
 <dd> Start GRASS using the default user interface. The user will be
 <dd> Start GRASS using the default user interface. The user will be
     prompted to choose the appropriate location and mapset.
     prompted to choose the appropriate location and mapset.
 
 
-<dt><b>grass70 -gui</b>
+<dt><b>grass71 -gui</b>
 <dd> Start GRASS using the graphical user interface. The user will be
 <dd> Start GRASS using the graphical user interface. The user will be
     prompted to choose the appropriate location and mapset.
     prompted to choose the appropriate location and mapset.
 
 
-<dt><b>grass70 -text</b>
+<dt><b>grass71 -text</b>
 <dd> Start GRASS using the text-based user interface. Appropriate
 <dd> Start GRASS using the text-based user interface. Appropriate
 location and mapset must be set by environmental variables (see
 location and mapset must be set by environmental variables (see
 examples bellow) otherwise taken from the last GRASS session.</dd>
 examples bellow) otherwise taken from the last GRASS session.</dd>
 
 
-<dt><b>grass70 -gtext</b>
+<dt><b>grass71 -gtext</b>
 <dd> Start GRASS using the text-based user interface. The user will be
 <dd> Start GRASS using the text-based user interface. The user will be
     prompted to choose the appropriate location and mapset.
     prompted to choose the appropriate location and mapset.
 
 
-<dt><b>grass70 $HOME/grassdata/spearfish60/user1</b>
+<dt><b>grass71 $HOME/grassdata/spearfish60/user1</b>
 <dd> Start GRASS using the default user interface and automatically
 <dd> Start GRASS using the default user interface and automatically
     launch into the given mapset, bypassing the mapset selection menu.
     launch into the given mapset, bypassing the mapset selection menu.
 
 
-<dt><b>grass70 -gui -</b>
+<dt><b>grass71 -gui -</b>
 <dd> Start GRASS using the graphical user interface and try to
 <dd> Start GRASS using the graphical user interface and try to
     obtain the location and mapset from environment variables.
     obtain the location and mapset from environment variables.
 
 
-<dt><b>grass70 -c EPSG:4326 $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -c EPSG:4326 $HOME/grassdata/mylocation</b>
 <dd> Creates new GRASS location with EPSG code 4326 (latitude-longitude, WGS84)
 <dd> Creates new GRASS location with EPSG code 4326 (latitude-longitude, WGS84)
     in the specified GISDBASE
     in the specified GISDBASE
 
 
-<dt><b>grass70 -c myvector.shp $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -c myvector.shp $HOME/grassdata/mylocation</b>
 <dd> Creates new GRASS location based on georeferenced Shapefile
 <dd> Creates new GRASS location based on georeferenced Shapefile
 
 
-<dt><b>grass70 -c myraster.tif $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -c myraster.tif $HOME/grassdata/mylocation</b>
 <dd> Creates new GRASS location based on georeferenced GeoTIFF file
 <dd> Creates new GRASS location based on georeferenced GeoTIFF file
 </dl>
 </dl>
 
 
@@ -265,7 +265,7 @@ MAPSET = PERMANENT
 Start GRASS with the following command:
 Start GRASS with the following command:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 -
+grass71 -
 </pre></div>
 </pre></div>
 
 
 GRASS will start with the mapset defined by LOCATION since the LOCATION
 GRASS will start with the mapset defined by LOCATION since the LOCATION
@@ -284,14 +284,14 @@ MAPSET = PERMANENT
 Start GRASS with the following command:
 Start GRASS with the following command:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 -
+grass71 -
 </pre></div>
 </pre></div>
     
     
 GRASS will start with the mapset defined by
 GRASS will start with the mapset defined by
 GISDBASE/LOCATION_NAME/MAPSET.
 GISDBASE/LOCATION_NAME/MAPSET.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 /usr/home/grass/data/thailand/forests
+grass71 /usr/home/grass/data/thailand/forests
 </pre></div>
 </pre></div>
     
     
 GRASS will start with the
 GRASS will start with the
@@ -299,7 +299,7 @@ mapset <tt>/home/grass/data/thailand/forests</tt> which overrides the
 environment variables.
 environment variables.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 swamps
+grass71 swamps
 </pre></div>
 </pre></div>
 
 
 GRASS will start with the mapset defined by
 GRASS will start with the mapset defined by
@@ -307,7 +307,7 @@ GISDBASE/LOCATION_NAME/swamps since the command line argument for the
 mapset overrides the environment variable MAPSET.
 mapset overrides the environment variable MAPSET.
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-grass70 thailand/forests
+grass71 thailand/forests
 </pre></div>
 </pre></div>
 
 
 GRASS will start with the mapset defined by GISDBASE/thailand/forests
 GRASS will start with the mapset defined by GISDBASE/thailand/forests

+ 1 - 1
lib/python/pygrass/modules/shortcuts.py

@@ -50,7 +50,7 @@ class MetaModule(object):
         return self.cls('%s.%s' % (self.prefix, name.replace('_', '.')))
         return self.cls('%s.%s' % (self.prefix, name.replace('_', '.')))
 
 
 
 
-# http://grass.osgeo.org/grass70/manuals/html70_user/full_index.html
+# http://grass.osgeo.org/grass71/manuals/full_index.html
 #[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
 #[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
 #
 #
 #  d.*	display commands
 #  d.*	display commands